|
|
@@ -32,13 +32,9 @@
|
|
|
</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$/images/coral_scifi_helmet.png" 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/CMakeCache.txt" beforeDir="false" afterPath="$PROJECT_DIR$/build/debug/CMakeCache.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$/shaders/compiled/simple_shader.frag.spv" beforeDir="false" afterPath="$PROJECT_DIR$/shaders/compiled/simple_shader.frag.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$/build/release/Testing/Temporary/LastTest.log" beforeDir="false" afterPath="$PROJECT_DIR$/build/release/Testing/Temporary/LastTest.log" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -92,41 +88,41 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</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": "main",
|
|
|
- "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">{
|
|
|
+ "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": "main",
|
|
|
+ "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" />
|
|
|
</key>
|
|
|
</component>
|
|
|
<component name="RunManager">
|
|
|
- <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true">
|
|
|
+ <configuration default="true" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true">
|
|
|
<method v="2">
|
|
|
- <option name="CLION.EXTERNAL.BUILD" enabled="true" />
|
|
|
+ <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
|
|
|
</method>
|
|
|
</configuration>
|
|
|
<configuration name="coral_renderer" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="Coral3D" TARGET_NAME="coral_renderer" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="Coral3D" RUN_TARGET_NAME="coral_renderer">
|
|
|
@@ -207,6 +203,7 @@
|
|
|
<workItem from="1696602059143" duration="666000" />
|
|
|
<workItem from="1696605383562" duration="9264000" />
|
|
|
<workItem from="1696621767016" duration="4866000" />
|
|
|
+ <workItem from="1696698697580" duration="457000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="Have I forgotten how to git?">
|
|
|
<option name="closed" value="true" />
|