Browse Source

Added fresnel falloff

Added a fresnel falloff to the environment reflections.
Jef Belmans 2 years ago
parent
commit
c78388268d

+ 26 - 44
.idea/workspace.xml

@@ -32,30 +32,12 @@
   </component>
   </component>
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="e2ea9cb6-a6b7-419f-9266-e5263673b6e6" name="Changes" comment="Fixed MaterialUBO memory alignment. All variables are now correctly aligned and read in the shader.">
     <list default="true" id="e2ea9cb6-a6b7-419f-9266-e5263673b6e6" name="Changes" comment="Fixed MaterialUBO memory alignment. All variables are now correctly aligned and read in the shader.">
-      <change afterPath="$PROJECT_DIR$/assets/textures/cubemap/negx.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/textures/cubemap/negy.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/textures/cubemap/negz.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/textures/cubemap/posx.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/textures/cubemap/posy.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/textures/cubemap/posz.jpg" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/coral_renderer/coral_cubemap.cpp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/coral_renderer/coral_cubemap.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/debug/CMakeFiles/clion-Debug-log.txt" beforeDir="false" afterPath="$PROJECT_DIR$/build/debug/CMakeFiles/clion-Debug-log.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/debug/build.ninja" beforeDir="false" afterPath="$PROJECT_DIR$/build/debug/build.ninja" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/release/.ninja_log" beforeDir="false" afterPath="$PROJECT_DIR$/build/release/.ninja_log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/release/CMakeFiles/clion-Release-log.txt" beforeDir="false" afterPath="$PROJECT_DIR$/build/release/CMakeFiles/clion-Release-log.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/release/assets/shaders/compiled/simple_shader.vert.spv" beforeDir="false" afterPath="$PROJECT_DIR$/build/release/assets/shaders/compiled/simple_shader.vert.spv" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/release/build.ninja" beforeDir="false" afterPath="$PROJECT_DIR$/build/release/build.ninja" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/coral_renderer/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/CMakeLists.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/coral_renderer/coral_cubemap.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/coral_cubemap.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/coral_renderer/coral_mesh.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/coral_mesh.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/coral_renderer/coral_mesh.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/coral_mesh.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/coral_renderer/coral_mesh.h" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/coral_mesh.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/coral_renderer/first_app.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/first_app.cpp" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/coral_renderer/first_app.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/first_app.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/coral_renderer/first_app.h" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/first_app.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/shaders/compiled/simple_shader.frag.spv" beforeDir="false" afterPath="$PROJECT_DIR$/shaders/compiled/simple_shader.frag.spv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/shaders/compiled/simple_shader.frag.spv" beforeDir="false" afterPath="$PROJECT_DIR$/shaders/compiled/simple_shader.frag.spv" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shaders/compiled/simple_shader.vert.spv" beforeDir="false" afterPath="$PROJECT_DIR$/shaders/compiled/simple_shader.vert.spv" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/shaders/simple_shader.frag" beforeDir="false" afterPath="$PROJECT_DIR$/shaders/simple_shader.frag" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/shaders/simple_shader.frag" beforeDir="false" afterPath="$PROJECT_DIR$/shaders/simple_shader.frag" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/shaders/simple_shader.vert" beforeDir="false" afterPath="$PROJECT_DIR$/shaders/simple_shader.vert" afterDir="false" />
     </list>
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -109,32 +91,32 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ASKED_ADD_EXTERNAL_FILES": "true",
-    "ASKED_MARK_IGNORED_FILES_AS_EXCLUDED": "true",
-    "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "cf.advertisement.text.has.clang-format": "true",
-    "cf.advertisement.text.overridden": "true",
-    "cf.first.check.clang-format": "false",
-    "cidr.known.project.marker": "true",
-    "git-widget-placeholder": "cubemap",
-    "ignore.virus.scanning.warn.message": "true",
-    "last_opened_file_path": "E:/Game Development/Visual Studio Solutions/Coral3D/coral_renderer",
-    "node.js.detected.package.eslint": "true",
-    "node.js.detected.package.tslint": "true",
-    "node.js.selected.package.eslint": "(autodetect)",
-    "node.js.selected.package.tslint": "(autodetect)",
-    "settings.editor.selected.configurable": "CPPToolchains",
-    "structure.view.defaults.are.configured": "true",
-    "vue.rearranger.settings.migration": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;ASKED_MARK_IGNORED_FILES_AS_EXCLUDED&quot;: &quot;true&quot;,
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
+    &quot;cf.advertisement.text.has.clang-format&quot;: &quot;true&quot;,
+    &quot;cf.advertisement.text.overridden&quot;: &quot;true&quot;,
+    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
+    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;cubemap&quot;,
+    &quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;E:/Game Development/Visual Studio Solutions/Coral3D/coral_renderer&quot;,
+    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
+    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
+    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
+    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;CPPToolchains&quot;,
+    &quot;structure.view.defaults.are.configured&quot;: &quot;true&quot;,
+    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
   }
   }
-}]]></component>
+}</component>
   <component name="RecentsManager">
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="E:\Game Development\Visual Studio Solutions\Coral3D\coral_renderer" />
       <recent name="E:\Game Development\Visual Studio Solutions\Coral3D\coral_renderer" />

BIN
build/release/.ninja_deps


+ 114 - 88
build/release/.ninja_log

@@ -1,7 +1,7 @@
 # ninja log v5
 # ninja log v5
-11	1225	7183294213546818	coral_renderer/CMakeFiles/coral_renderer.dir/point_light_system.cpp.obj	9032090700129b1a
+112	1734	7183867963157293	coral_renderer/CMakeFiles/coral_renderer.dir/point_light_system.cpp.obj	9032090700129b1a
 55	1725	7183022336983463	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_thread.c.obj	1d3576b97de4dcfd
 55	1725	7183022336983463	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_thread.c.obj	1d3576b97de4dcfd
-5	1256	7183283047301730	coral_renderer/CMakeFiles/coral_renderer.dir/main.cpp.obj	2b1afc763cc7fd7d
+98	1674	7183867962552077	coral_renderer/CMakeFiles/coral_renderer.dir/main.cpp.obj	2b1afc763cc7fd7d
 223	1227	7183022331958345	coral_renderer/CMakeFiles/coral_renderer.dir/coral_window.cpp.obj	ebb5501fcd7328ce
 223	1227	7183022331958345	coral_renderer/CMakeFiles/coral_renderer.dir/coral_window.cpp.obj	ebb5501fcd7328ce
 81	1905	7183022338800220	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_monitor.c.obj	149f73e3b2fe6a10
 81	1905	7183022338800220	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_monitor.c.obj	149f73e3b2fe6a10
 37	1800	7183022337689163	third_party/GLFW/src/CMakeFiles/glfw.dir/init.c.obj	2200c22e2fbf5f9b
 37	1800	7183022337689163	third_party/GLFW/src/CMakeFiles/glfw.dir/init.c.obj	2200c22e2fbf5f9b
@@ -9,108 +9,134 @@
 65	1877	7183022338494917	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_init.c.obj	6d7558a01a2b92c3
 65	1877	7183022338494917	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_init.c.obj	6d7558a01a2b92c3
 86	1781	7183022337343800	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_time.c.obj	e692993acf9f94ac
 86	1781	7183022337343800	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_time.c.obj	e692993acf9f94ac
 92	1810	7183022337824274	third_party/GLFW/src/CMakeFiles/glfw.dir/osmesa_context.c.obj	54773fed0db7e7b1
 92	1810	7183022337824274	third_party/GLFW/src/CMakeFiles/glfw.dir/osmesa_context.c.obj	54773fed0db7e7b1
-1988	2134	7183296088005525	coral_renderer/coral_renderer.exe	4d6a346da4510760
-166	1660	7183263084377971	coral_renderer/CMakeFiles/coral_renderer.dir/coral_descriptors.cpp.obj	976f54a312d4fda
+16393	16535	7183869488794476	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+145	2060	7183858163342437	coral_renderer/CMakeFiles/coral_renderer.dir/coral_descriptors.cpp.obj	976f54a312d4fda
 75	1799	7183022337674141	third_party/GLFW/src/CMakeFiles/glfw.dir/vulkan.c.obj	1d1eab9fa8d7eeed
 75	1799	7183022337674141	third_party/GLFW/src/CMakeFiles/glfw.dir/vulkan.c.obj	1d1eab9fa8d7eeed
 29	1877	7183022338504965	third_party/GLFW/src/CMakeFiles/glfw.dir/monitor.c.obj	da1b97f86a6f1881
 29	1877	7183022338504965	third_party/GLFW/src/CMakeFiles/glfw.dir/monitor.c.obj	da1b97f86a6f1881
 33	1891	7183022338650093	third_party/GLFW/src/CMakeFiles/glfw.dir/context.c.obj	769cf2954fa9296c
 33	1891	7183022338650093	third_party/GLFW/src/CMakeFiles/glfw.dir/context.c.obj	769cf2954fa9296c
 70	1892	7183022338650093	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_joystick.c.obj	731e24eae4f6c3c0
 70	1892	7183022338650093	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_joystick.c.obj	731e24eae4f6c3c0
 41	1899	7183022338735169	third_party/GLFW/src/CMakeFiles/glfw.dir/egl_context.c.obj	3d2a39fb62cc5d09
 41	1899	7183022338735169	third_party/GLFW/src/CMakeFiles/glfw.dir/egl_context.c.obj	3d2a39fb62cc5d09
 46	2214	7183022341898103	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_window.c.obj	ac8316922cd6d380
 46	2214	7183022341898103	third_party/GLFW/src/CMakeFiles/glfw.dir/win32_window.c.obj	ac8316922cd6d380
-143	1003	7183263077808835	coral_renderer/CMakeFiles/coral_renderer.dir/vk_initializers.cpp.obj	c70ea6a045b04a90
+121	1050	7183858153237435	coral_renderer/CMakeFiles/coral_renderer.dir/vk_initializers.cpp.obj	c70ea6a045b04a90
 60	1982	7183022339565951	third_party/GLFW/src/CMakeFiles/glfw.dir/window.c.obj	a05896c745e87d4a
 60	1982	7183022339565951	third_party/GLFW/src/CMakeFiles/glfw.dir/window.c.obj	a05896c745e87d4a
 293	1059	7183022330311772	coral_renderer/CMakeFiles/coral_renderer.dir/coral_utils.cpp.obj	6f14caec93e90570
 293	1059	7183022330311772	coral_renderer/CMakeFiles/coral_renderer.dir/coral_utils.cpp.obj	6f14caec93e90570
-9	102	7183289687027214	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/point_light.frag.spv	6d3a602ccc13fa0e
+4	100	7183858143702629	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/point_light.frag.spv	6d3a602ccc13fa0e
 50	1972	7183022339460801	third_party/GLFW/src/CMakeFiles/glfw.dir/wgl_context.c.obj	371d8c14a557d0ce
 50	1972	7183022339460801	third_party/GLFW/src/CMakeFiles/glfw.dir/wgl_context.c.obj	371d8c14a557d0ce
 25	2089	7183022340631937	third_party/GLFW/src/CMakeFiles/glfw.dir/input.c.obj	a690aad864a072ff
 25	2089	7183022340631937	third_party/GLFW/src/CMakeFiles/glfw.dir/input.c.obj	a690aad864a072ff
-4	99	7183289686981961	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/point_light.vert.spv	87717d1f7db06f5d
-2214	2298	7183022342738867	third_party/GLFW/src/libglfw3.a	fc48f5f1f632859b
-161	1396	7183263081734204	coral_renderer/CMakeFiles/coral_renderer.dir/coral_texture.cpp.obj	c0771ce2d8c57d44
-149	1510	7183263082875236	coral_renderer/CMakeFiles/coral_renderer.dir/coral_renderer.cpp.obj	cb2e4f201849c024
-21	1206	7183283046801007	coral_renderer/CMakeFiles/coral_renderer.dir/coral_gameobject.cpp.obj	3e1fca21fb1049ab
-8	1161	7183294212905021	coral_renderer/CMakeFiles/coral_renderer.dir/render_system.cpp.obj	3426bcb39c57484b
-129	1727	7183263085058568	coral_renderer/CMakeFiles/coral_renderer.dir/coral_pipeline.cpp.obj	c97492ac4e9c2f4f
-87	3107	7165258684040000	coral_renderer/CMakeFiles/coral_renderer.dir/coral_material.cpp.obj	432ccaf3a8cd54b8
-15	15809	7183283192809073	coral_renderer/CMakeFiles/coral_renderer.dir/coral_mesh.cpp.obj	ec9b9c950c06d57a
-139	1855	7183263086334773	coral_renderer/CMakeFiles/coral_renderer.dir/coral_swapchain.cpp.obj	9f4b5b8fbef6fb7c
-18	4738	7183022367136384	third_party/CMakeFiles/vkbootstrap.dir/vkbootstrap/VkBootstrap.cpp.obj	f6b337d1309e9955
-28	1202	7183091372760031	coral_renderer/CMakeFiles/coral_renderer.dir/coral_frame_info.cpp.obj	9f969c086058a660
-146	2176	7183263089544832	coral_renderer/CMakeFiles/coral_renderer.dir/coral_device.cpp.obj	f22c3ebb3984eea4
-4	1988	7183296086591942	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
-4739	4785	7183022367622250	third_party/libvkbootstrap.a	c71ed427a7b8907
-174	3650	7183263104275051	coral_renderer/CMakeFiles/coral_renderer.dir/coral_buffer.cpp.obj	8b51063e5bc12069
-3	552	7183820684973347	build.ninja	fa936e3b47cbade3
-0	1430	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-22	4062	7183022360380247	third_party/CMakeFiles/tinyobjloader.dir/tinyobjloader/tiny_obj_loader.cc.obj	fd1983a21fbb7956
-9	93	7183272486981321	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.vert.spv	3c7e702a8a128f67
-4062	4108	7183022360855718	third_party/libtinyobjloader.a	99fa9adb75ddfe5c
-15	129	7183263068966629	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
-0	1430	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-4	100	7183858143702629	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/point_light.frag.spv	6d3a602ccc13fa0e
-11	108	7183858143785593	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
 8	108	7183858143785593	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/point_light.vert.spv	87717d1f7db06f5d
 8	108	7183858143785593	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/point_light.vert.spv	87717d1f7db06f5d
-14	108	7183858143795595	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.vert.spv	3c7e702a8a128f67
-121	1050	7183858153237435	coral_renderer/CMakeFiles/coral_renderer.dir/vk_initializers.cpp.obj	c70ea6a045b04a90
-153	1792	7183858160639569	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+2214	2298	7183022342738867	third_party/GLFW/src/libglfw3.a	fc48f5f1f632859b
 149	1824	7183858160951519	coral_renderer/CMakeFiles/coral_renderer.dir/coral_texture.cpp.obj	c0771ce2d8c57d44
 149	1824	7183858160951519	coral_renderer/CMakeFiles/coral_renderer.dir/coral_texture.cpp.obj	c0771ce2d8c57d44
 127	1835	7183858161067273	coral_renderer/CMakeFiles/coral_renderer.dir/coral_renderer.cpp.obj	cb2e4f201849c024
 127	1835	7183858161067273	coral_renderer/CMakeFiles/coral_renderer.dir/coral_renderer.cpp.obj	cb2e4f201849c024
-130	2044	7183858163181753	coral_renderer/CMakeFiles/coral_renderer.dir/coral_gameobject.cpp.obj	3e1fca21fb1049ab
-145	2060	7183858163342437	coral_renderer/CMakeFiles/coral_renderer.dir/coral_descriptors.cpp.obj	976f54a312d4fda
-115	2088	7183858163621939	coral_renderer/CMakeFiles/coral_renderer.dir/main.cpp.obj	2b1afc763cc7fd7d
-138	2088	7183858163621939	coral_renderer/CMakeFiles/coral_renderer.dir/render_system.cpp.obj	3426bcb39c57484b
-108	2194	7183858164675610	coral_renderer/CMakeFiles/coral_renderer.dir/coral_pipeline.cpp.obj	c97492ac4e9c2f4f
-157	2230	7183858165042179	coral_renderer/CMakeFiles/coral_renderer.dir/point_light_system.cpp.obj	9032090700129b1a
-117	2234	7183858165082435	coral_renderer/CMakeFiles/coral_renderer.dir/coral_swapchain.cpp.obj	9f4b5b8fbef6fb7c
-124	2636	7183858169102355	coral_renderer/CMakeFiles/coral_renderer.dir/coral_device.cpp.obj	f22c3ebb3984eea4
-112	3016	7183858172905343	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
-141	4147	7183858184210293	coral_renderer/CMakeFiles/coral_renderer.dir/coral_buffer.cpp.obj	8b51063e5bc12069
-134	16881	7183858311519092	coral_renderer/CMakeFiles/coral_renderer.dir/coral_mesh.cpp.obj	ec9b9c950c06d57a
-16881	17026	7183858312969827	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
-0	1466	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1466	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-4	1946	7183858769780104	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
-1946	2091	7183858771186944	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
-0	1525	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1525	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-4	1946	7183858972209442	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
-1946	2093	7183858973639093	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
-0	1503	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1503	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-5	90	7183859539012929	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
-0	1550	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1550	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-4	1932	7183859871318693	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
-1932	2073	7183859872684199	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
-0	1687	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1687	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-5	1931	7183860359787520	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
-1931	2073	7183860361170205	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
-0	1420	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1420	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-4	88	7183865888080520	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
-88	1542	7183865902638356	coral_renderer/CMakeFiles/coral_renderer.dir/main.cpp.obj	2b1afc763cc7fd7d
-91	2370	7183865910916072	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
-5	1081	7183865988806190	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
-1081	1225	7183865990215893	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
-0	1509	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1509	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-4	92	7183867946711710	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.vert.spv	3c7e702a8a128f67
-8	94	7183867946731731	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
 103	1585	7183867961658051	coral_renderer/CMakeFiles/coral_renderer.dir/coral_gameobject.cpp.obj	3e1fca21fb1049ab
 103	1585	7183867961658051	coral_renderer/CMakeFiles/coral_renderer.dir/coral_gameobject.cpp.obj	3e1fca21fb1049ab
 109	1665	7183867962466742	coral_renderer/CMakeFiles/coral_renderer.dir/render_system.cpp.obj	3426bcb39c57484b
 109	1665	7183867962466742	coral_renderer/CMakeFiles/coral_renderer.dir/render_system.cpp.obj	3426bcb39c57484b
-98	1674	7183867962552077	coral_renderer/CMakeFiles/coral_renderer.dir/main.cpp.obj	2b1afc763cc7fd7d
-112	1734	7183867963157293	coral_renderer/CMakeFiles/coral_renderer.dir/point_light_system.cpp.obj	9032090700129b1a
 94	1773	7183867963538306	coral_renderer/CMakeFiles/coral_renderer.dir/coral_pipeline.cpp.obj	c97492ac4e9c2f4f
 94	1773	7183867963538306	coral_renderer/CMakeFiles/coral_renderer.dir/coral_pipeline.cpp.obj	c97492ac4e9c2f4f
-100	2555	7183867971365827	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
-106	16564	7183868111426663	coral_renderer/CMakeFiles/coral_renderer.dir/coral_mesh.cpp.obj	ec9b9c950c06d57a
-16564	16706	7183868112841373	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
-0	1487	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1487	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-4	90	7183868570642168	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
-0	1477	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-0	1477	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
-4	2312	7183869346597571	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+87	3107	7165258684040000	coral_renderer/CMakeFiles/coral_renderer.dir/coral_material.cpp.obj	432ccaf3a8cd54b8
 8	16393	7183869487376989	coral_renderer/CMakeFiles/coral_renderer.dir/coral_mesh.cpp.obj	ec9b9c950c06d57a
 8	16393	7183869487376989	coral_renderer/CMakeFiles/coral_renderer.dir/coral_mesh.cpp.obj	ec9b9c950c06d57a
-16393	16535	7183869488794476	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+117	2234	7183858165082435	coral_renderer/CMakeFiles/coral_renderer.dir/coral_swapchain.cpp.obj	9f4b5b8fbef6fb7c
+18	4738	7183022367136384	third_party/CMakeFiles/vkbootstrap.dir/vkbootstrap/VkBootstrap.cpp.obj	f6b337d1309e9955
+28	1202	7183091372760031	coral_renderer/CMakeFiles/coral_renderer.dir/coral_frame_info.cpp.obj	9f969c086058a660
+124	2636	7183858169102355	coral_renderer/CMakeFiles/coral_renderer.dir/coral_device.cpp.obj	f22c3ebb3984eea4
+4	2312	7183869346597571	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+5	1081	7183865988806190	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+4739	4785	7183022367622250	third_party/libvkbootstrap.a	c71ed427a7b8907
+141	4147	7183858184210293	coral_renderer/CMakeFiles/coral_renderer.dir/coral_buffer.cpp.obj	8b51063e5bc12069
+3	552	7183870791875193	build.ninja	fa936e3b47cbade3
 0	1500	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
 0	1500	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+22	4062	7183022360380247	third_party/CMakeFiles/tinyobjloader.dir/tinyobjloader/tiny_obj_loader.cc.obj	fd1983a21fbb7956
+4	92	7183867946711710	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.vert.spv	3c7e702a8a128f67
+4062	4108	7183022360855718	third_party/libtinyobjloader.a	99fa9adb75ddfe5c
+4	90	7183868570642168	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
 0	1500	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
 0	1500	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	115	7183874516795372	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.vert.spv	3c7e702a8a128f67
+8	120	7183874516825403	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+129	1061	7183874526294255	coral_renderer/CMakeFiles/coral_renderer.dir/vk_initializers.cpp.obj	c70ea6a045b04a90
+164	1558	7183874531258795	coral_renderer/CMakeFiles/coral_renderer.dir/coral_texture.cpp.obj	c0771ce2d8c57d44
+173	1560	7183874531299087	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+140	1592	7183874531615144	coral_renderer/CMakeFiles/coral_renderer.dir/coral_renderer.cpp.obj	cb2e4f201849c024
+144	1729	7183874532985137	coral_renderer/CMakeFiles/coral_renderer.dir/coral_gameobject.cpp.obj	3e1fca21fb1049ab
+120	1793	7183874533614760	coral_renderer/CMakeFiles/coral_renderer.dir/main.cpp.obj	2b1afc763cc7fd7d
+151	1800	7183874533684842	coral_renderer/CMakeFiles/coral_renderer.dir/render_system.cpp.obj	3426bcb39c57484b
+159	1850	7183874534196497	coral_renderer/CMakeFiles/coral_renderer.dir/coral_descriptors.cpp.obj	976f54a312d4fda
+168	1889	7183874534583050	coral_renderer/CMakeFiles/coral_renderer.dir/point_light_system.cpp.obj	9032090700129b1a
+126	1947	7183874535165519	coral_renderer/CMakeFiles/coral_renderer.dir/coral_pipeline.cpp.obj	c97492ac4e9c2f4f
+132	2021	7183874535878383	coral_renderer/CMakeFiles/coral_renderer.dir/coral_swapchain.cpp.obj	9f4b5b8fbef6fb7c
+136	2310	7183874538792649	coral_renderer/CMakeFiles/coral_renderer.dir/coral_device.cpp.obj	f22c3ebb3984eea4
+123	2822	7183874543912979	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+155	4018	7183874555858953	coral_renderer/CMakeFiles/coral_renderer.dir/coral_buffer.cpp.obj	8b51063e5bc12069
+147	16922	7183874684888116	coral_renderer/CMakeFiles/coral_renderer.dir/coral_mesh.cpp.obj	ec9b9c950c06d57a
+16922	17065	7183874686308813	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+4	92	7183877768024173	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+92	1025	7183877777375065	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+1025	1169	7183877778770758	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1576	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1576	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+5	92	7183880585005090	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+92	2430	7183880608414666	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+5	17326	7183881028485021	coral_renderer/CMakeFiles/coral_renderer.dir/coral_mesh.cpp.obj	ec9b9c950c06d57a
+17326	17471	7183881029923255	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1482	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1482	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+5	1940	7183881510848480	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+1940	2081	7183881512219286	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1508	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1508	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+5	92	7183882265916812	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+99	1044	7183882275463783	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+92	2073	7183882285753913	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+96	15702	7183882422016801	coral_renderer/CMakeFiles/coral_renderer.dir/coral_mesh.cpp.obj	ec9b9c950c06d57a
+15703	15843	7183882423416378	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1529	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1529	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	916	7183882760839944	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+916	1057	7183882762207450	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1540	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1540	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	1034	7183885438539224	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+1034	1176	7183885439925033	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1516	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1516	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+5	1102	7183885732080191	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+1102	1242	7183885733457964	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1532	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1532	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+5	993	7183886380731879	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+993	1135	7183886382115657	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1514	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1514	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+13	1418	7183896909334047	coral_renderer/CMakeFiles/coral_renderer.dir/coral_cubemap.cpp.obj	66bbab00cb591c37
+8	2640	7183896921563519	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+4	145	7183896960415951	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+5	1961	7183897907145204	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+1962	2103	7183897908520894	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1425	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1425	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+5	1949	7183898442438358	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+1949	2090	7183898443811421	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1503	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1503	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	95	7183898671088464	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+0	1537	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1537	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	90	7183906297715575	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+0	1459	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1459	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	91	7183906549250775	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+0	1501	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1501	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	89	7183906819919325	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+89	2062	7183906839669855	coral_renderer/CMakeFiles/coral_renderer.dir/first_app.cpp.obj	db0c627bbb247e94
+2062	2210	7183906841113397	coral_renderer/coral_renderer.exe	1a0c68274d1f4cc0
+0	1497	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1497	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	90	7183907096425824	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+0	1488	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1488	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+5	98	7183907235041604	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+1	1575	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+1	1575	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	96	7183908407525624	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+0	1437	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1437	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+4	90	7183908676282737	E:/Game Development/Visual Studio Solutions/Coral3D/shaders/compiled/simple_shader.frag.spv	f376e2cf516c4f9c
+0	1524	0	coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866
+0	1524	0	E:/Game Development/Visual Studio Solutions/Coral3D/build/release/coral_renderer/CMakeFiles/copy_assets	66424d61a55ca866

+ 2 - 2
build/release/Testing/Temporary/LastTest.log

@@ -1,3 +1,3 @@
-Start testing: Oct 07 15:02 Romance Daylight Time
+Start testing: Oct 07 16:07 Romance Daylight Time
 ----------------------------------------------------------
 ----------------------------------------------------------
-End testing: Oct 07 15:02 Romance Daylight Time
+End testing: Oct 07 16:07 Romance Daylight Time

BIN
build/release/assets/shaders/compiled/simple_shader.frag.spv


+ 6 - 4
coral_renderer/coral_cubemap.cpp

@@ -53,7 +53,6 @@ namespace coral_3d
         };
         };
         staging_buffer.map();
         staging_buffer.map();
         staging_buffer.write_to_buffer(pixels, layer_size);
         staging_buffer.write_to_buffer(pixels, layer_size);
-
         stbi_image_free(pixels);
         stbi_image_free(pixels);
 
 
         // Load other 5 faces
         // Load other 5 faces
@@ -99,8 +98,10 @@ namespace coral_3d
         img_extent.height = static_cast<uint32_t>(height_);
         img_extent.height = static_cast<uint32_t>(height_);
         img_extent.depth = 1;
         img_extent.depth = 1;
 
 
-        VkImageCreateInfo create_info{vkinit::image_ci(format, VK_IMAGE_USAGE_TRANSFER_DST_BIT |
-        VK_IMAGE_USAGE_SAMPLED_BIT, img_extent)};
+        VkImageCreateInfo create_info{vkinit::image_ci(
+                format,
+                VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT,
+                img_extent)};
         create_info.mipLevels = mip_levels_;
         create_info.mipLevels = mip_levels_;
         create_info.arrayLayers = NUMBER_OF_CUBEMAP_IMAGES;
         create_info.arrayLayers = NUMBER_OF_CUBEMAP_IMAGES;
         create_info.flags = VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT;
         create_info.flags = VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT;
@@ -120,9 +121,10 @@ namespace coral_3d
         image_info.subresourceRange.levelCount = mip_levels_;
         image_info.subresourceRange.levelCount = mip_levels_;
         image_info.subresourceRange.layerCount = NUMBER_OF_CUBEMAP_IMAGES;
         image_info.subresourceRange.layerCount = NUMBER_OF_CUBEMAP_IMAGES;
         image_info.viewType = VK_IMAGE_VIEW_TYPE_CUBE;
         image_info.viewType = VK_IMAGE_VIEW_TYPE_CUBE;
+        image_info.components = { VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A };
 
 
         if (vkCreateImageView(device_.device(), &image_info, nullptr, &image_view_) != VK_SUCCESS)
         if (vkCreateImageView(device_.device(), &image_info, nullptr, &image_view_) != VK_SUCCESS)
-            throw std::runtime_error("ERROR! coral_cubemap::create_inage_view() >> Failed to create image view!");
+            throw std::runtime_error("ERROR! coral_cubemap::create_image_view() >> Failed to create image view!");
 
 
         return true;
         return true;
     }
     }

+ 2 - 1
coral_renderer/coral_mesh.cpp

@@ -417,7 +417,7 @@ std::unique_ptr<coral_mesh> coral_mesh::create_mesh_from_file(coral_device& devi
 }
 }
 
 
 void coral_mesh::load_materials(coral_descriptor_set_layout& material_set_layout,
 void coral_mesh::load_materials(coral_descriptor_set_layout& material_set_layout,
-                                coral_descriptor_pool& material_set_pool, VkDescriptorImageInfo)
+                                coral_descriptor_pool& material_set_pool, VkDescriptorImageInfo cubemap_descriptor)
 {
 {
     for(auto& material : materials_)
     for(auto& material : materials_)
     {
     {
@@ -427,6 +427,7 @@ void coral_mesh::load_materials(coral_descriptor_set_layout& material_set_layout
         coral_descriptor_writer(material_set_layout, material_set_pool)
         coral_descriptor_writer(material_set_layout, material_set_pool)
                 .write_image(0, &color_desc)
                 .write_image(0, &color_desc)
                 .write_image(1, &normal_desc)
                 .write_image(1, &normal_desc)
+                .write_image(2, &cubemap_descriptor)
                 .build(material.descriptor_set);
                 .build(material.descriptor_set);
     }
     }
 }
 }

+ 14 - 12
coral_renderer/first_app.cpp

@@ -16,17 +16,6 @@ using namespace coral_3d;
 first_app::first_app()
 first_app::first_app()
  : cubemap_{device_, true}
  : cubemap_{device_, true}
 {
 {
-    std::vector<std::string> file_names
-    {
-      "assets/textures/cubemap/posx.jpg",
-      "assets/textures/cubemap/negx.jpg",
-      "assets/textures/cubemap/negy.jpg",
-      "assets/textures/cubemap/posy.jpg",
-      "assets/textures/cubemap/posz.jpg",
-      "assets/textures/cubemap/negz.jpg"
-    };
-    cubemap_.init(file_names,true, true);
-
     descriptor_pool_ = coral_descriptor_pool::Builder(device_)
     descriptor_pool_ = coral_descriptor_pool::Builder(device_)
             .set_max_sets(MAX_MATERIAL_SETS)
             .set_max_sets(MAX_MATERIAL_SETS)
             .add_pool_size(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, coral_swapchain::MAX_FRAMES_IN_FLIGHT)
             .add_pool_size(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, coral_swapchain::MAX_FRAMES_IN_FLIGHT)
@@ -69,6 +58,7 @@ void first_app::run()
     auto material_set_layout = coral_descriptor_set_layout::Builder(device_)
     auto material_set_layout = coral_descriptor_set_layout::Builder(device_)
             .add_binding(0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT)
             .add_binding(0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT)
             .add_binding(1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT)
             .add_binding(1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT)
+            .add_binding(2, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VK_SHADER_STAGE_FRAGMENT_BIT)
             .build();
             .build();
 
 
     // Combined descriptor set layouts
     // Combined descriptor set layouts
@@ -146,8 +136,20 @@ void first_app::load_gameobjects(coral_descriptor_set_layout& material_set_layou
 
 
     std::shared_ptr<coral_mesh> sponza_mesh
     std::shared_ptr<coral_mesh> sponza_mesh
     {
     {
-        coral_mesh::create_mesh_from_file(device_,"assets/meshes/Sponza/Sponza.gltf", sponza_scene.get())
+        coral_mesh::create_mesh_from_file(device_,"assets/meshes/Helmet/Scene.gltf", sponza_scene.get())
     };
     };
+
+    std::vector<std::string> file_names
+            {
+                    "assets/textures/cubemap/posx.jpg",
+                    "assets/textures/cubemap/negx.jpg",
+                    "assets/textures/cubemap/negy.jpg",
+                    "assets/textures/cubemap/posy.jpg",
+                    "assets/textures/cubemap/posz.jpg",
+                    "assets/textures/cubemap/negz.jpg"
+            };
+    cubemap_.init(file_names,true, true);
+
     sponza_mesh->load_materials(material_set_layout, *descriptor_pool_, cubemap_.get_descriptor_image_info());
     sponza_mesh->load_materials(material_set_layout, *descriptor_pool_, cubemap_.get_descriptor_image_info());
     sponza_mesh->create_pipelines(
     sponza_mesh->create_pipelines(
             "assets/shaders/simple_shader.vert.spv",
             "assets/shaders/simple_shader.vert.spv",

BIN
shaders/compiled/simple_shader.frag.spv


+ 15 - 2
shaders/simple_shader.frag

@@ -68,6 +68,18 @@ vec3 calculate_specular(vec3 N, vec3 V, vec3 L, vec3 C)
 	return C * specularity;
 	return C * specularity;
 }
 }
 
 
+vec3 calculate_fresnel(vec3 N, vec3 V, vec3 C)
+{
+	float fresnelPower = 1.f;
+	float fresnelMultiplier = 1.f;
+	float fresnelHardness = 0.f;
+
+	float fresnel = pow(1.f - max(abs(dot(N, V)), 0), fresnelPower) * fresnelMultiplier;
+	vec3 fresnelMask = pow(1.f - max(vec3(0.0f, -1.0f, 0.0f) * N, 0.f), vec3(fresnelHardness));
+
+	return fresnel * fresnelMask * C;
+}
+
 void main()
 void main()
 {
 {
 	// BASE COLOR
 	// BASE COLOR
@@ -101,6 +113,7 @@ void main()
 		specular += calculate_specular(N, V, directionToLight, lightColor);
 		specular += calculate_specular(N, V, directionToLight, lightColor);
 	}
 	}
 
 
-	vec3 environment = texture(samplerCubeMap, R).rgb * 0.2f;
-	outFragColor = vec4(ambient + diffuse + specular, color.a);
+	vec3 environment = texture(samplerCubeMap, R).rgb;
+	environment = calculate_fresnel(N, V, environment);
+	outFragColor = vec4(ambient + diffuse + specular + environment, color.a);
 }
 }