refactored file structure!!!

WindyDarian · Dec 14, 2016 · cd56e76 · cd56e76
1 parent dfd5ca7
commit cd56e76
Show file tree

Hide file tree

Showing 16 changed files with 206 additions and 175 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,21 +20,25 @@ include_directories("${GLFW_ROOT_DIR}/include")
 # Find our Vulkan!
 find_package(Vulkan REQUIRED)
 
-
+# Note: trying to write files in dependency order
 set(SOURCE_FILES
-    "src/main.cpp"
+    "src/main.cpp" 
     "src/third_party.cpp"
-    "src/renderer/vulkan_util.h"
-    "src/renderer/vulkan_util.cpp"
-    "src/renderer/VDeleter.h"
-    "src/renderer/VulkanContext.cpp"
-    "src/renderer/VulkanContext.h"
     "src/util.h"
     "src/util.cpp"
+    "src/scene.h"
+    "src/scene.cpp"
+    "src/renderer/raii.h"
+    "src/renderer/vulkan_util.h"
+    "src/renderer/vulkan_util.cpp"
+    "src/renderer/context.h"
+    "src/renderer/context.cpp"
+    "src/renderer/model.h"
+    "src/renderer/model.cpp"
+    "src/renderer/VulkanRenderer.h"
+    "src/renderer/VulkanRenderer.cpp"
     "src/ShowBase.h"
     "src/ShowBase.cpp"
-    "src/Scene.h"
-    "src/Scene.cpp"
     )
 
 add_executable(${CMAKE_PROJECT_NAME} ${SOURCE_FILES})

diff --git a/content/helloworld_frag.spv → content/forwardplus_frag.spv b/content/helloworld_frag.spv → content/forwardplus_frag.spv
diff --git a/content/helloworld_vert.spv → content/forwardplus_vert.spv b/content/helloworld_vert.spv → content/forwardplus_vert.spv
diff --git a/content/light_culling.comp.spv → content/light_culling_comp.spv b/content/light_culling.comp.spv → content/light_culling_comp.spv
diff --git a/src/ShowBase.cpp b/src/ShowBase.cpp
@@ -3,8 +3,8 @@
 
 #include "ShowBase.h"
 
-#include "renderer/VulkanContext.h"
-#include "Scene.h"
+#include "renderer/VulkanRenderer.h"
+#include "scene.h"
 #include "util.h"
 
 #include <GLFW/glfw3.h>
@@ -24,7 +24,7 @@ class _ShowBase_Impl
 {
 private:
 	GLFWwindow* window = createWindow();
-	VulkanContext context{window};
+	VulkanRenderer context{window};
 	Camera camera;
 	// for measurement
 	float total_time_past = 0.0f;