Compare commits
120 Commits
V10.0.0
...
145a1b323f
| Author | SHA1 | Date | |
|---|---|---|---|
| 145a1b323f | |||
| 2e33adf4a9 | |||
| c67a805bd7 | |||
| cb234f64f0 | |||
| 5ab98c9a0a | |||
| 37bba7866c | |||
| ebbbd181e3 | |||
| ba7d0ca27e | |||
| 13fc189ee8 | |||
| af5473f6e3 | |||
| 526b38eb4f | |||
| 295b7354d9 | |||
| b31b242775 | |||
| 7c6562719f | |||
| 00339aa6c2 | |||
| 2b8e222d7c | |||
| 7c5a6435bb | |||
| fe77100612 | |||
| 985e4de77d | |||
| b1ba23f9c0 | |||
| 884db4877e | |||
| 38569b18a7 | |||
| aa8e5c0782 | |||
| 6680e4689b | |||
| a2dc31f49c | |||
| fc9a4bdc47 | |||
| 4922305921 | |||
| 14c07f8750 | |||
| 2f5a970a4e | |||
| 6667a57585 | |||
| 9da4a5e852 | |||
| 871d7c8265 | |||
| 3352f2afa7 | |||
| 715955ef6a | |||
| 90a43254f3 | |||
| f1db564fb3 | |||
| 97b5483cc9 | |||
| ad056fa2a8 | |||
| 1bdcd5cd1b | |||
| 467b357620 | |||
| 0368276fbf | |||
| 9515b18d1e | |||
| d131c78a59 | |||
| 56389b5dee | |||
| 389cde97c2 | |||
| 0e41fb0ec9 | |||
| e4836174b4 | |||
| 284e282679 | |||
| 4b47346208 | |||
| a3d80256f5 | |||
| 29db39910c | |||
| 2346625afb | |||
| e9d906ce72 | |||
| aee0704fe7 | |||
| f3039f22ed | |||
| 76fdd3c76e | |||
| 7fc4b08808 | |||
| de05631608 | |||
| f875580197 | |||
| 42b7ca04a4 | |||
| aa8e5d2abd | |||
| 5ee88ff932 | |||
| 4f4151201d | |||
| 9a8bfc43eb | |||
| 5bb802f0fc | |||
| 7d33e2da72 | |||
| 42c44b9ff1 | |||
| defc1cb795 | |||
| 118e635415 | |||
| 55e561fd14 | |||
| 25e7d97b71 | |||
| ccd0d045f9 | |||
| 9431552316 | |||
| 2c005592f0 | |||
| 763ecff93d | |||
| e527e85b9c | |||
| 9d0d2d1dfd | |||
| 7755150ae8 | |||
| ddf5ea30a6 | |||
| 8f0e583c62 | |||
| bf1b5d78e5 | |||
| 3adfddf44f | |||
| 039b034175 | |||
| 688fe7ff1c | |||
| de16b97f8e | |||
| f5331444cb | |||
| ae3fc21ffc | |||
| 315d259acd | |||
| 2a1b474df0 | |||
| d364517633 | |||
| ce51c11b31 | |||
| 0e11ead55b | |||
| 1af71960c3 | |||
| f20adee22f | |||
| eb2cd17ec3 | |||
| dbd27d1fe7 | |||
| d6b7626446 | |||
| f9d4523f09 | |||
| 24203060be | |||
| 8b77b189a8 | |||
| e5ee8fdad3 | |||
| 3a2d19dff4 | |||
| dbc7003569 | |||
| c5bfa2e621 | |||
| 32b71ac97f | |||
| 5c3c6d944c | |||
| 8d32f51e8c | |||
| 644fc57762 | |||
| f8bfb62e98 | |||
| 94fd900ce8 | |||
| 2744c809d3 | |||
| b80f66fec3 | |||
| 8bcd3eed48 | |||
| 2b1e64ffbd | |||
| 96aa41f649 | |||
| 00e6749d01 | |||
| 5a3a4f73a8 | |||
| c442a87883 | |||
| e681943aa8 | |||
| e68f1d5dd0 |
8
.gitattributes
vendored
8
.gitattributes
vendored
@@ -1,2 +1,10 @@
|
||||
enginecustom/assets/Model/OBJ/*.obj filter=lfs diff=lfs merge=lfs -text
|
||||
enginecustom/assets/Model/OBJ/*.mtl filter=lfs diff=lfs merge=lfs -text
|
||||
doxygen_docs/** filter=lfs diff=lfs merge=lfs -text
|
||||
enginecustom/include/Lua/Lib/lua54.lib filter=lfs diff=lfs merge=lfs -text
|
||||
enginecustom/x64/Debug/lua54.dll filter=lfs diff=lfs merge=lfs -text
|
||||
enginecustom/x64/Release/lua54.dll filter=lfs diff=lfs merge=lfs -text
|
||||
x64/Debug/lua54.dll filter=lfs diff=lfs merge=lfs -text
|
||||
x64/Release/lua54.dll filter=lfs diff=lfs merge=lfs -text
|
||||
x64/Debug/config.txt filter=lfs diff=lfs merge=lfs -text
|
||||
x64/Release/config.txt filter=lfs diff=lfs merge=lfs -text
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -434,3 +434,5 @@ FodyWeavers.xsd
|
||||
# Additional files built by Visual Studio
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/visualstudio,c++
|
||||
|
||||
.idea/
|
||||
|
||||
1
.idea/.idea.KhaoticEngineReborn/.idea/.name
generated
1
.idea/.idea.KhaoticEngineReborn/.idea/.name
generated
@@ -1 +0,0 @@
|
||||
KhaoticEngineReborn
|
||||
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AndroidProjectSystem">
|
||||
<option name="providerId" value="RiderAndroidProjectSystem" />
|
||||
</component>
|
||||
</project>
|
||||
14
.idea/.idea.KhaoticEngineReborn/.idea/discord.xml
generated
14
.idea/.idea.KhaoticEngineReborn/.idea/discord.xml
generated
@@ -1,14 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="DiscordProjectSettings">
|
||||
<option name="show" value="PROJECT_FILES" />
|
||||
<option name="description" value="" />
|
||||
<option name="applicationTheme" value="default" />
|
||||
<option name="iconsTheme" value="default" />
|
||||
<option name="button1Title" value="" />
|
||||
<option name="button1Url" value="" />
|
||||
<option name="button2Title" value="" />
|
||||
<option name="button2Url" value="" />
|
||||
<option name="customApplicationId" value="" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding">
|
||||
<file url="file://$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" charset="windows-1252" />
|
||||
<file url="file://$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" charset="windows-1252" />
|
||||
<file url="PROJECT" charset="windows-1252" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GitToolBoxBlameSettings">
|
||||
<option name="version" value="2" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,15 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GitToolBoxProjectSettings">
|
||||
<option name="commitMessageIssueKeyValidationOverride">
|
||||
<BoolValueOverride>
|
||||
<option name="enabled" value="true" />
|
||||
</BoolValueOverride>
|
||||
</option>
|
||||
<option name="commitMessageValidationEnabledOverride">
|
||||
<BoolValueOverride>
|
||||
<option name="enabled" value="true" />
|
||||
</BoolValueOverride>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="UserContentModel">
|
||||
<attachedFolders />
|
||||
<explicitIncludes />
|
||||
<explicitExcludes />
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,6 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="ReassignedToPlainText" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
</profile>
|
||||
</component>
|
||||
@@ -1,12 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="MaterialThemeProjectNewConfig">
|
||||
<option name="metadata">
|
||||
<MTProjectMetadataState>
|
||||
<option name="migrated" value="true" />
|
||||
<option name="pristineConfig" value="false" />
|
||||
<option name="userId" value="4025287c:194ad69ad19:-7ff7" />
|
||||
</MTProjectMetadataState>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RiderProjectSettingsUpdater">
|
||||
<option name="singleClickDiffPreview" value="1" />
|
||||
<option name="unhandledExceptionsIgnoreList" value="1" />
|
||||
<option name="vcsConfiguration" value="3" />
|
||||
</component>
|
||||
</project>
|
||||
6
.idea/.idea.KhaoticEngineReborn/.idea/vcs.xml
generated
6
.idea/.idea.KhaoticEngineReborn/.idea/vcs.xml
generated
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
262
.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
generated
262
.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
generated
@@ -1,262 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/projectSettingsUpdater.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/projectSettingsUpdater.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/enginecustom/assets/Texture/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/assets/Texture/imgui.ini" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/enginecustom/imgui.ini" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/imgui.ini" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/inc/system/modelclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/system/modelclass.h" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/Skybox.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/Skybox.cpp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/applicationclass.cpp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/imguiManager.cpp" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/enginecustom/src/src/system/modelclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/modelclass.cpp" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="DpaMonitoringSettings">
|
||||
<option name="firstShow" value="false" />
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="HighlightingSettingsPerFile">
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="mock:///dummy.cpp" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="cidr-memory-view://0" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/enginecustom/include/Vulkan/Include/vulkan/vulkan_core.h" root0="SKIP_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/enginecustom/src/src/shader/CelShadingShader.cpp" root0="FORCE_HIGHLIGHTING" />
|
||||
<setting file="file://$PROJECT_DIR$/../../IDE_VS/VC/Tools/MSVC/14.38.33130/include/type_traits" root0="SKIP_HIGHLIGHTING" />
|
||||
</component>
|
||||
<component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
|
||||
<component name="ProblemsViewState">
|
||||
<option name="selectedTabId" value="CurrentFile" />
|
||||
</component>
|
||||
<component name="ProjectColorInfo">{
|
||||
"associatedIndex": 6
|
||||
}</component>
|
||||
<component name="ProjectId" id="2sGIWDeT5ixyzDQ0he4A3RFpG9W" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||
"C++ Project.enginecustom.executor": "Run",
|
||||
"C/C++ Project.enginecustom.executor": "Run",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.git.unshallow": "true",
|
||||
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
||||
"git-widget-placeholder": "main",
|
||||
"ignore.virus.scanning.warn.message": "true",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "preferences.build.unityPlugin",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="RunManager" selected="C/C++ Project.enginecustom">
|
||||
<configuration name="KhaoticDemo" type="CppProject" factoryName="C++ Project">
|
||||
<configuration_1 setup="1">
|
||||
<option name="CONFIGURATION" value="Debug" />
|
||||
<option name="PLATFORM" value="x64" />
|
||||
<option name="CURRENT_LAUNCH_PROFILE" value="Local" />
|
||||
<option name="EXE_PATH" value="$(LocalDebuggerCommand)" />
|
||||
<option name="PROGRAM_PARAMETERS" value="$(LocalDebuggerCommandArguments)" />
|
||||
<option name="WORKING_DIRECTORY" value="$(LocalDebuggerWorkingDirectory)" />
|
||||
<option name="PASS_PARENT_ENVS" value="1" />
|
||||
<option name="USE_EXTERNAL_CONSOLE" value="0" />
|
||||
<option name="TERMINAL_INTERACTION_BEHAVIOR" value="AUTO_DETECT" />
|
||||
<option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/KhaoticDemo/KhaoticDemo.vcxproj" />
|
||||
</configuration_1>
|
||||
<option name="DEFAULT_PROJECT_PATH" value="$PROJECT_DIR$/KhaoticDemo/KhaoticDemo.vcxproj" />
|
||||
<option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/KhaoticDemo/KhaoticDemo.vcxproj" />
|
||||
<option name="AUTO_SELECT_PRIORITY" value="0" />
|
||||
<method v="2">
|
||||
<option name="Build" />
|
||||
</method>
|
||||
</configuration>
|
||||
<configuration name="enginecustom" type="CppProject" factoryName="C++ Project">
|
||||
<configuration_1 setup="1">
|
||||
<option name="CONFIGURATION" value="Debug" />
|
||||
<option name="PLATFORM" value="x64" />
|
||||
<option name="CURRENT_LAUNCH_PROFILE" value="Local" />
|
||||
<option name="EXE_PATH" value="$(LocalDebuggerCommand)" />
|
||||
<option name="PROGRAM_PARAMETERS" value="$(LocalDebuggerCommandArguments)" />
|
||||
<option name="WORKING_DIRECTORY" value="$(LocalDebuggerWorkingDirectory)" />
|
||||
<option name="PASS_PARENT_ENVS" value="1" />
|
||||
<option name="USE_EXTERNAL_CONSOLE" value="0" />
|
||||
<option name="TERMINAL_INTERACTION_BEHAVIOR" value="AUTO_DETECT" />
|
||||
<option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" />
|
||||
</configuration_1>
|
||||
<configuration_2 setup="1">
|
||||
<option name="CONFIGURATION" value="Release" />
|
||||
<option name="PLATFORM" value="x64" />
|
||||
<option name="CURRENT_LAUNCH_PROFILE" value="Local" />
|
||||
<option name="EXE_PATH" value="$(TargetPath)" />
|
||||
<option name="PROGRAM_PARAMETERS" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="$(ProjectDir)" />
|
||||
<option name="PASS_PARENT_ENVS" value="1" />
|
||||
<option name="USE_EXTERNAL_CONSOLE" value="0" />
|
||||
<option name="TERMINAL_INTERACTION_BEHAVIOR" value="AUTO_DETECT" />
|
||||
<option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" />
|
||||
</configuration_2>
|
||||
<option name="DEFAULT_PROJECT_PATH" value="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" />
|
||||
<option name="PROJECT_FILE_PATH" value="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" />
|
||||
<option name="AUTO_SELECT_PRIORITY" value="0" />
|
||||
<method v="2">
|
||||
<option name="Build" />
|
||||
</method>
|
||||
</configuration>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="" />
|
||||
<created>1738075515913</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1738075515913</updated>
|
||||
<workItem from="1738075517746" duration="553000" />
|
||||
<workItem from="1738076088229" duration="80000" />
|
||||
<workItem from="1738076192788" duration="19000" />
|
||||
<workItem from="1738076222547" duration="6131000" />
|
||||
<workItem from="1738171504772" duration="876000" />
|
||||
<workItem from="1738172392786" duration="67000" />
|
||||
<workItem from="1738173151768" duration="2361000" />
|
||||
<workItem from="1738175535254" duration="279000" />
|
||||
<workItem from="1738178991872" duration="2736000" />
|
||||
<workItem from="1738244577624" duration="3000" />
|
||||
<workItem from="1738321399968" duration="689000" />
|
||||
<workItem from="1738358054789" duration="9000" />
|
||||
<workItem from="1738358091089" duration="6675000" />
|
||||
<workItem from="1738364887298" duration="2275000" />
|
||||
<workItem from="1738515031789" duration="14018000" />
|
||||
<workItem from="1741705445392" duration="138000" />
|
||||
<workItem from="1741706018301" duration="5499000" />
|
||||
<workItem from="1742198713923" duration="31000" />
|
||||
<workItem from="1742198792655" duration="4618000" />
|
||||
<workItem from="1742203643675" duration="600000" />
|
||||
<workItem from="1742206836574" duration="258000" />
|
||||
<workItem from="1742207107802" duration="5340000" />
|
||||
<workItem from="1742228751298" duration="38000" />
|
||||
<workItem from="1742228870107" duration="1198000" />
|
||||
<workItem from="1742314944369" duration="79000" />
|
||||
<workItem from="1742318452773" duration="2258000" />
|
||||
<workItem from="1742331065936" duration="3030000" />
|
||||
<workItem from="1742371397157" duration="13355000" />
|
||||
<workItem from="1742425863119" duration="231000" />
|
||||
<workItem from="1742474596806" duration="67000" />
|
||||
<workItem from="1742474683111" duration="689000" />
|
||||
<workItem from="1742574318953" duration="552000" />
|
||||
<workItem from="1742581210996" duration="681000" />
|
||||
<workItem from="1742651501885" duration="47000" />
|
||||
<workItem from="1742664377329" duration="746000" />
|
||||
<workItem from="1742665243312" duration="310000" />
|
||||
<workItem from="1742667326806" duration="95000" />
|
||||
<workItem from="1743185728805" duration="15000" />
|
||||
<workItem from="1743185754182" duration="815000" />
|
||||
<workItem from="1743355100472" duration="708000" />
|
||||
<workItem from="1743355837694" duration="1514000" />
|
||||
<workItem from="1743370106270" duration="901000" />
|
||||
<workItem from="1743505399891" duration="2361000" />
|
||||
<workItem from="1746106963725" duration="5888000" />
|
||||
<workItem from="1746112904421" duration="75000" />
|
||||
<workItem from="1746113092234" duration="1477000" />
|
||||
<workItem from="1746117455914" duration="5976000" />
|
||||
<workItem from="1746126812110" duration="180000" />
|
||||
<workItem from="1746188920194" duration="1870000" />
|
||||
<workItem from="1746274246641" duration="89000" />
|
||||
<workItem from="1746274352144" duration="8039000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="Minor update - viewport window tweak">
|
||||
<option name="closed" value="true" />
|
||||
<created>1738175474520</created>
|
||||
<option name="number" value="00001" />
|
||||
<option name="presentableId" value="LOCAL-00001" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1738175474520</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00002" summary="Patch update - add menu button">
|
||||
<option name="closed" value="true" />
|
||||
<created>1738181617050</created>
|
||||
<option name="number" value="00002" />
|
||||
<option name="presentableId" value="LOCAL-00002" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1738181617050</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="3" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
|
||||
<component name="UnityProjectConfiguration" hasMinimizedUI="false" />
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
|
||||
<MESSAGE value="Minor update - viewport window tweak" />
|
||||
<MESSAGE value="Patch update - add menu button" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Patch update - add menu button" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
<breakpoints>
|
||||
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
|
||||
<properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
|
||||
<option name="timeStamp" value="1" />
|
||||
</breakpoint>
|
||||
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
|
||||
<properties exception="System.Threading.Tasks.TaskCanceledException" breakIfHandledByOtherCode="false" displayValue="System.Threading.Tasks.TaskCanceledException" />
|
||||
<option name="timeStamp" value="2" />
|
||||
</breakpoint>
|
||||
<breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
|
||||
<properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
|
||||
<option name="timeStamp" value="3" />
|
||||
</breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
<watches-manager>
|
||||
<configuration name="CppProject">
|
||||
<watch expression="((class ModelClass &) (*(*(*this).m_Application).m_object[0]))" />
|
||||
</configuration>
|
||||
</watches-manager>
|
||||
</component>
|
||||
<component name="XSLT-Support.FileAssociations.UIState">
|
||||
<expand />
|
||||
<select />
|
||||
</component>
|
||||
</project>
|
||||
136
Jenkinsfile
vendored
Normal file
136
Jenkinsfile
vendored
Normal file
@@ -0,0 +1,136 @@
|
||||
pipeline {
|
||||
agent { label 'windows' }
|
||||
|
||||
parameters {
|
||||
string(name: 'DISCORD_USER_ID', defaultValue: '378262266723696651', description: 'ID Discord pour recevoir le DM')
|
||||
choice(name: 'BUILD_TYPE', choices: ['Both', 'Debug', 'Release'], description: 'Type de build à exécuter')
|
||||
}
|
||||
|
||||
options {
|
||||
timestamps()
|
||||
disableConcurrentBuilds()
|
||||
timeout(time: 30, unit: 'MINUTES')
|
||||
}
|
||||
|
||||
triggers {
|
||||
pollSCM('')
|
||||
}
|
||||
|
||||
stages {
|
||||
stage('Checkout') {
|
||||
steps {
|
||||
checkout scm
|
||||
}
|
||||
}
|
||||
|
||||
stage('Build') {
|
||||
parallel {
|
||||
stage('Build Debug') {
|
||||
when { expression { params.BUILD_TYPE in ['Both', 'Debug'] } }
|
||||
steps {
|
||||
echo 'Building Debug...'
|
||||
bat """
|
||||
"C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\MSBuild.exe" ^
|
||||
"%WORKSPACE%\\KhaoticEngineReborn.sln" ^
|
||||
/p:Configuration=Debug ^
|
||||
/p:Platform=x64 ^
|
||||
/m ^
|
||||
/verbosity:minimal
|
||||
"""
|
||||
}
|
||||
}
|
||||
stage('Build Release') {
|
||||
when { expression { params.BUILD_TYPE in ['Both', 'Release'] } }
|
||||
steps {
|
||||
echo 'Building Release...'
|
||||
bat """
|
||||
"C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\MSBuild.exe" ^
|
||||
"%WORKSPACE%\\KhaoticEngineReborn.sln" ^
|
||||
/p:Configuration=Release ^
|
||||
/p:Platform=x64 ^
|
||||
/m ^
|
||||
/verbosity:minimal
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Package') {
|
||||
parallel {
|
||||
stage('Package Debug') {
|
||||
when { expression { params.BUILD_TYPE in ['Both', 'Debug'] } }
|
||||
steps {
|
||||
echo 'Packaging Debug into ZIP'
|
||||
bat 'if not exist "%WORKSPACE%\\builds" mkdir "%WORKSPACE%\\builds"'
|
||||
bat """
|
||||
powershell -Command "Compress-Archive -Path '%WORKSPACE%\\**\\Debug\\*' -DestinationPath '%WORKSPACE%\\builds\\KhaoticEngineReborn_Debug.zip' -Force"
|
||||
"""
|
||||
}
|
||||
}
|
||||
stage('Package Release') {
|
||||
when { expression { params.BUILD_TYPE in ['Both', 'Release'] } }
|
||||
steps {
|
||||
echo 'Packaging Release into ZIP'
|
||||
bat 'if not exist "%WORKSPACE%\\builds" mkdir "%WORKSPACE%\\builds"'
|
||||
bat """
|
||||
powershell -Command "Compress-Archive -Path '%WORKSPACE%\\**\\Release\\*' -DestinationPath '%WORKSPACE%\\builds\\KhaoticEngineReborn_Release.zip' -Force"
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
stage('Archive Artifacts') {
|
||||
steps {
|
||||
archiveArtifacts artifacts: 'builds/*.zip', fingerprint: true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
post {
|
||||
success {
|
||||
script {
|
||||
def urlsList = []
|
||||
if (params.BUILD_TYPE in ['Both', 'Debug']) {
|
||||
urlsList << "${env.BUILD_URL}artifact/builds/KhaoticEngineReborn_Debug.zip"
|
||||
}
|
||||
if (params.BUILD_TYPE in ['Both', 'Release']) {
|
||||
urlsList << "${env.BUILD_URL}artifact/builds/KhaoticEngineReborn_Release.zip"
|
||||
}
|
||||
|
||||
def data = [
|
||||
userId: params.DISCORD_USER_ID,
|
||||
status: 'success',
|
||||
urls: urlsList
|
||||
]
|
||||
def jsonFile = "${env.WORKSPACE}\\payload.json"
|
||||
writeFile file: jsonFile, text: groovy.json.JsonOutput.toJson(data)
|
||||
|
||||
bat """
|
||||
curl -X POST http://192.168.1.131:2500/ci-notify ^
|
||||
-H "Content-Type: application/json" ^
|
||||
--data @${jsonFile}
|
||||
"""
|
||||
}
|
||||
}
|
||||
failure {
|
||||
script {
|
||||
def data = [
|
||||
userId: params.DISCORD_USER_ID,
|
||||
status: 'failure',
|
||||
urls: []
|
||||
]
|
||||
def jsonFile = "${env.WORKSPACE}\\payload-fail.json"
|
||||
writeFile file: jsonFile, text: groovy.json.JsonOutput.toJson(data)
|
||||
|
||||
bat """
|
||||
curl -X POST http://192.168.1.131:2500/ci-notify ^
|
||||
-H "Content-Type: application/json" ^
|
||||
--data @${jsonFile}
|
||||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,140 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<VCProjectVersion>17.0</VCProjectVersion>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<ProjectGuid>{9e5ef415-5337-4eed-ae23-edc4b1fff455}</ProjectGuid>
|
||||
<RootNamespace>KhaoticDemo</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="Shared">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>true</SDLCheck>
|
||||
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\enginecustom\enginecustom.vcxproj">
|
||||
<Project>{92cf56c4-76bb-40d4-8fe5-36c15f5f127a}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="main.cpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
@@ -1,22 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Fichiers sources">
|
||||
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Fichiers d%27en-tête">
|
||||
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
|
||||
</Filter>
|
||||
<Filter Include="Fichiers de ressources">
|
||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="main.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -1,4 +0,0 @@
|
||||
int main()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
/////////////
|
||||
// GLOBALS //
|
||||
/////////////
|
||||
SamplerState SampleType : register(s0);
|
||||
|
||||
Texture2D reflectionTexture : register(t0);
|
||||
Texture2D refractionTexture : register(t1);
|
||||
Texture2D normalTexture : register(t2);
|
||||
|
||||
cbuffer WaterBuffer
|
||||
{
|
||||
float waterTranslation;
|
||||
float reflectRefractScale;
|
||||
float2 padding;
|
||||
};
|
||||
|
||||
|
||||
//////////////
|
||||
// TYPEDEFS //
|
||||
//////////////
|
||||
struct PixelInputType
|
||||
{
|
||||
float4 position : SV_POSITION;
|
||||
float2 tex : TEXCOORD0;
|
||||
float4 reflectionPosition : TEXCOORD1;
|
||||
float4 refractionPosition : TEXCOORD2;
|
||||
};
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
// Pixel Shader
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
float4 WaterPixelShader(PixelInputType input) : SV_TARGET
|
||||
{
|
||||
float2 reflectTexCoord;
|
||||
float2 refractTexCoord;
|
||||
float4 normalMap;
|
||||
float3 normal;
|
||||
float4 reflectionColor;
|
||||
float4 refractionColor;
|
||||
float4 color;
|
||||
|
||||
// Move the position the water normal is sampled from to simulate moving water.
|
||||
input.tex.y += waterTranslation;
|
||||
|
||||
// Calculate the projected reflection texture coordinates.
|
||||
reflectTexCoord.x = input.reflectionPosition.x / input.reflectionPosition.w / 2.0f + 0.5f;
|
||||
reflectTexCoord.y = -input.reflectionPosition.y / input.reflectionPosition.w / 2.0f + 0.5f;
|
||||
|
||||
// Calculate the projected refraction texture coordinates.
|
||||
refractTexCoord.x = input.refractionPosition.x / input.refractionPosition.w / 2.0f + 0.5f;
|
||||
refractTexCoord.y = -input.refractionPosition.y / input.refractionPosition.w / 2.0f + 0.5f;
|
||||
|
||||
// Sample the normal from the normal map texture.
|
||||
normalMap = normalTexture.Sample(SampleType, input.tex);
|
||||
|
||||
// Expand the range of the normal from (0,1) to (-1,+1).
|
||||
normal = (normalMap.xyz * 2.0f) - 1.0f;
|
||||
|
||||
// Re-position the texture coordinate sampling position by the normal map value to simulate the rippling wave effect.
|
||||
reflectTexCoord = reflectTexCoord + (normal.xy * reflectRefractScale);
|
||||
refractTexCoord = refractTexCoord + (normal.xy * reflectRefractScale);
|
||||
|
||||
// Sample the texture pixels from the textures using the updated texture coordinates.
|
||||
reflectionColor = reflectionTexture.Sample(SampleType, reflectTexCoord);
|
||||
refractionColor = refractionTexture.Sample(SampleType, refractTexCoord);
|
||||
|
||||
// Combine the reflection and refraction results for the final color.
|
||||
color = lerp(reflectionColor, refractionColor, 0.6f);
|
||||
|
||||
return color;
|
||||
}
|
||||
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.9.34607.119
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enginecustom", "enginecustom\enginecustom.vcxproj", "{92CF56C4-76BB-40D4-8FE5-36C15F5F127A}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KhaoticDemo", "KhaoticDemo\KhaoticDemo.vcxproj", "{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KhaoticCore", "enginecustom\enginecustom.vcxproj", "{92CF56C4-76BB-40D4-8FE5-36C15F5F127A}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@@ -23,14 +21,6 @@ Global
|
||||
{92CF56C4-76BB-40D4-8FE5-36C15F5F127A}.Release|x64.Build.0 = Release|x64
|
||||
{92CF56C4-76BB-40D4-8FE5-36C15F5F127A}.Release|x86.ActiveCfg = Release|Win32
|
||||
{92CF56C4-76BB-40D4-8FE5-36C15F5F127A}.Release|x86.Build.0 = Release|Win32
|
||||
{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}.Debug|x64.Build.0 = Debug|x64
|
||||
{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}.Debug|x86.Build.0 = Debug|Win32
|
||||
{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}.Release|x64.ActiveCfg = Release|x64
|
||||
{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}.Release|x64.Build.0 = Release|x64
|
||||
{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}.Release|x86.ActiveCfg = Release|Win32
|
||||
{9E5EF415-5337-4EED-AE23-EDC4B1FFF455}.Release|x86.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
||||
18
README.md
18
README.md
@@ -2,13 +2,13 @@
|
||||
|
||||
Khaotic Engine Reborn reprend comme base le moteur Khaotic Engine pour lui ajouter plus de fonctionalité.
|
||||
|
||||
Ce moteur est basé sur **DirectX11** utilise **ImGui** avec une couche d'abstraction pour permetre son usage avec d'autres API.
|
||||
Ce moteur est basé sur **DirectX11** et utilise **ImGui** pour son interface graphique.
|
||||
|
||||
---
|
||||
|
||||
Khaotic Engine is a rendering engine made in **C++** by a small team with the aim of learning how to use rendering APIs (OpenGL, DirectX 11/12 and Vulkan).
|
||||
|
||||
This **DirectX11** based engine uses **ImGui** with an abstraction layer to enable its use with other APIs.
|
||||
This **DirectX11** based engine uses **ImGui** for the user interface.
|
||||
|
||||
## Installation
|
||||
|
||||
@@ -36,13 +36,20 @@ This **DirectX11** based engine uses **ImGui** with an abstraction layer to enab
|
||||
**SHADER** :
|
||||
|
||||
+ Sunlight shader
|
||||
+ Cel Shading (Work In Progress)
|
||||
+ Cel Shading
|
||||
+ Skysphere
|
||||
|
||||
**Interface Graphique** :
|
||||
|
||||
+ Console link to the Logger object
|
||||
+ Shader Manager
|
||||
+ Engine Settings
|
||||
+ Sunlight Settings
|
||||
|
||||
**Save And Load of a Scene** :
|
||||
|
||||
+ Save All Custom object
|
||||
+ Save All Custom Texture for Custom Object
|
||||
|
||||
**Texture File** :
|
||||
|
||||
@@ -53,10 +60,11 @@ This **DirectX11** based engine uses **ImGui** with an abstraction layer to enab
|
||||
- Shader rendering
|
||||
- Frustum culling
|
||||
- Object rendering
|
||||
- Terrain Instancing
|
||||
|
||||
## Demo :
|
||||
|
||||
[](https://www.youtube.com/watch?v=qCOCTyB_97c)
|
||||
[](https://youtu.be/CbK1a0Ar94Q)
|
||||
|
||||
## Engine Build by :
|
||||
|
||||
@@ -69,7 +77,7 @@ This **DirectX11** based engine uses **ImGui** with an abstraction layer to enab
|
||||
- [@Harpie94](https://github.com/Harpie94)
|
||||
- [@axelpicou](https://github.com/axelpicou)
|
||||
- [@GolfOcean334](https://github.com/GolfOcean334)
|
||||
- [@sutabasuto](https://github.com/sutabasuto)
|
||||
- [@sutabasuto](https://github.com/sutabasuto)
|
||||
|
||||
|
||||
**Moteur Reborn** :
|
||||
|
||||
2924
doxygen.txt
Normal file
2924
doxygen.txt
Normal file
File diff suppressed because it is too large
Load Diff
BIN
doxygen_docs/html/.stfolder/syncthing-folder-b68556.txt
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/.stfolder/syncthing-folder-b68556.txt
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/_logger_8h_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/_logger_8h_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/_main_8cpp_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/_main_8cpp_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/_modellistclass_8cpp_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/_modellistclass_8cpp_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/_modellistclass_8h_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/_modellistclass_8h_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/_skybox_8cpp_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/_skybox_8cpp_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/_skybox_8h_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/_skybox_8h_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/alpha__map__shader__class_8cpp_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/alpha__map__shader__class_8cpp_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/alpha__map__shader__class_8h_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/alpha__map__shader__class_8h_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/annotated.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/annotated.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/annotated_dup.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/annotated_dup.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/application__class_8cpp_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/application__class_8cpp_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/application__class_8h_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/application__class_8h_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/bc_s.png
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/bc_s.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/bc_sd.png
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/bc_sd.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/bitmap__class_8cpp_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/bitmap__class_8cpp_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/bitmap__class_8h_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/bitmap__class_8h_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/camera__class_8cpp_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/camera__class_8cpp_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/camera__class_8h_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/camera__class_8h_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/celshade__class_8cpp_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/celshade__class_8cpp_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/celshade__class_8h_source.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/celshade__class_8h_source.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_frustum_class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_frustum_class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_frustum_class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_frustum_class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_logger-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_logger-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_logger.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_logger.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_logger.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_logger.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_model_list_class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_model_list_class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_model_list_class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_model_list_class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_skybox-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_skybox-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_skybox.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_skybox.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/class_skybox.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/class_skybox.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classalpha__map__shader__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classalpha__map__shader__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classalpha__map__shader__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classalpha__map__shader__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classapplication__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classapplication__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classapplication__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classapplication__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classapplication__class.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classapplication__class.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classbitmap__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classbitmap__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classbitmap__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classbitmap__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classcamera__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classcamera__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classcamera__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classcamera__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classcamera__class.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classcamera__class.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classcelshade__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classcelshade__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classcelshade__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classcelshade__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classcolor__shader__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classcolor__shader__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classcolor__shader__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classcolor__shader__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classd__3d__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classd__3d__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classd__3d__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classd__3d__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classd__3d__class.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classd__3d__class.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classdepth__shader__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classdepth__shader__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classdepth__shader__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classdepth__shader__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classdisplay__plane__class-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classdisplay__plane__class-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classdisplay__plane__class.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classdisplay__plane__class.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_component-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_component-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_component.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_component.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_component.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_component.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_component.png
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_component.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_entity-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_entity-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_entity.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_entity.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_entity.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_entity.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_entity_manager-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_entity_manager-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_entity_manager.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_entity_manager.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_entity_manager.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_entity_manager.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_identity_component-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_identity_component-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_identity_component.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_identity_component.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_identity_component.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_identity_component.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_identity_component.png
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_identity_component.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_model_path_component-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_model_path_component-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_model_path_component.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_model_path_component.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_model_path_component.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_model_path_component.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_model_path_component.png
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_model_path_component.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_physics_component-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_physics_component-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_physics_component.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_physics_component.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_physics_component.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_physics_component.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_physics_component.png
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_physics_component.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_render_component-members.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_render_component-members.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_render_component.html
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_render_component.html
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_render_component.js
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_render_component.js
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
doxygen_docs/html/classecs_1_1_render_component.png
(Stored with Git LFS)
Normal file
BIN
doxygen_docs/html/classecs_1_1_render_component.png
(Stored with Git LFS)
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user