Merge pull request AstechzGO#147 from eandr127/vma

Vulkan Improvements
ryanlarkin · Jun 1, 2020 · 02a22e6 · 02a22e6
2 parents d0d754f + 1ae7762
commit 02a22e6
Show file tree

Hide file tree

Showing 17 changed files with 595 additions and 621 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@
 /.idea/libraries
 .gradle/
 Luminescent.iws
-Luminescent.jar
+Luminescent.jar
+*.log
diff --git a/acknowledgements.txt b/acknowledgements.txt
@@ -85,7 +85,7 @@ astechzgo.luminescent:
 			Based on tutorial at https://vulkan-tutorial.com/.
 			Dynamic uniform buffers based on tutorial at https://github.com/SaschaWillems/Vulkan/tree/master/dynamicuniformbuffer
 			readPixelsToArray():
-				https://github.com/SaschaWillems/Vulkan/blob/master/examples/screenshot/screenshot.cpp
+				https://github.com/LunarG/VulkanTools/blob/master/layersvt/screenshot.cpp#L522
 	shader:
 		Shader:
 			(Nothing)

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
 	implementation("org.lwjgl", "lwjgl-openal")
 	implementation("org.lwjgl", "lwjgl-stb")
 	implementation("org.lwjgl", "lwjgl-vulkan")
+	implementation("org.lwjgl", "lwjgl-vma")
 	runtimeOnly("org.lwjgl", "lwjgl", classifier = "natives-linux")
 	runtimeOnly("org.lwjgl", "lwjgl", classifier = "natives-macos")
 	runtimeOnly("org.lwjgl", "lwjgl", classifier = "natives-windows")
@@ -40,6 +41,10 @@ dependencies {
 	runtimeOnly("org.lwjgl", "lwjgl-stb", classifier = "natives-macos")
 	runtimeOnly("org.lwjgl", "lwjgl-stb", classifier = "natives-windows")
 	runtimeOnly("org.lwjgl", "lwjgl-vulkan", classifier = "natives-macos")
+	runtimeOnly("org.lwjgl", "lwjgl-vma", classifier = "natives-linux")
+	runtimeOnly("org.lwjgl", "lwjgl-vma", classifier = "natives-windows")
+	runtimeOnly("org.lwjgl", "lwjgl-vma", classifier = "natives-macos")
+
 	implementation("org.joml", "joml", project.extra["jomlVersion"] as String)
 }
 

diff --git a/src/main/java/astechzgo/luminescent/gameobject/Room.java b/src/main/java/astechzgo/luminescent/gameobject/Room.java
@@ -10,7 +10,7 @@ public class Room extends RectangularObjectRenderer {
 
 	public Room(JSONWorldLoader loader) {
 		super(new WindowCoordinates(loader.getCoordinates()), loader.getWidth(), loader.getHeight());
-		super.setColour(new Color(0.15f, 0.15f, 0.15f));
+		super.setColour(new Color(0.08f, 0.08f, 0.08f));
 	}
 
 	public void setSize(int width, int height) {

diff --git a/src/main/java/astechzgo/luminescent/main/Luminescent.java b/src/main/java/astechzgo/luminescent/main/Luminescent.java
@@ -30,6 +30,7 @@
 import astechzgo.luminescent.utils.ControllerUtils;
 import astechzgo.luminescent.utils.DisplayUtils;
 import astechzgo.luminescent.worldloader.JSONWorldLoader;
+import org.lwjgl.system.MemoryUtil;
 
 public class Luminescent
 {
@@ -52,9 +53,7 @@ public class Luminescent
 	public static QuadrilateralObjectRenderer[] resBorders;
 
 	public static void Init()
-	{	
-		TextureList.loadSlickTextures();
-
+	{
 		Sound.init();
 
 		background = new RectangularObjectRenderer(new WindowCoordinates(0, 0), Camera.CAMERA_WIDTH, Camera.CAMERA_HEIGHT);

diff --git a/src/main/java/astechzgo/luminescent/main/Main.java b/src/main/java/astechzgo/luminescent/main/Main.java
@@ -3,8 +3,6 @@
 import static org.lwjgl.glfw.GLFW.glfwPollEvents;
 import static org.lwjgl.glfw.GLFW.glfwWindowShouldClose;
 
-import org.lwjgl.glfw.GLFW;
-
 import astechzgo.luminescent.utils.Constants;
 import astechzgo.luminescent.rendering.Vulkan;
 import astechzgo.luminescent.textures.TextureList;
@@ -16,6 +14,7 @@ public class Main
 {
 	public static void main(String[] args)
 	{
+		LoggingUtils.configureLogger();
 		SystemUtils.doOSSetUp();
 		SystemUtils.setUpDebug();
 
@@ -37,9 +36,8 @@ public void Run()
 	public void Init()
 	{
 		Constants.readConstantPropertiesFromFile();
-		LoggingUtils.configureLogger();
 
-		TextureList.loadNonSlickTextures();
+		TextureList.loadTextures();
 		try
 		{
 			DisplayUtils.setIcons(
@@ -64,6 +62,7 @@ public void Shutdown()
 	{
 		Luminescent.Shutdown();
 		Vulkan.shutdown();
+		LoggingUtils.cleanupLogger();
 	}
 
 	/**