|
|
@@ -32,11 +32,30 @@
|
|
|
</component>
|
|
|
<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.">
|
|
|
+ <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$/coral_renderer/coral_frame_info.h" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/coral_frame_info.h" 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_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/point_light_system.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/coral_renderer/point_light_system.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.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.vert" beforeDir="false" afterPath="$PROJECT_DIR$/shaders/simple_shader.vert" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -46,7 +65,7 @@
|
|
|
<component name="ClangdSettings">
|
|
|
<option name="formatViaClangd" value="false" />
|
|
|
</component>
|
|
|
- <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Debug" />
|
|
|
+ <component name="ExecutionTargetManager" SELECTED_TARGET="CMakeBuildProfile:Release" />
|
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
</component>
|
|
|
@@ -90,32 +109,32 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
|
- <component name="PropertiesComponent">{
|
|
|
- "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": "point-lights",
|
|
|
- "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"><![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>
|
|
|
+}]]></component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
<recent name="E:\Game Development\Visual Studio Solutions\Coral3D\coral_renderer" />
|