Load Texture Rework Needed

.gitattributes

@@ -1,10 +0,0 @@
-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

.gitignore

@@ -9,6 +9,14 @@
 *.slo
 *.lo
 *.o
+*.obj
+
+# Don't ignore 3d model in OBJ
+!enginecustom/monke.obj
+!enginecustom/isosphere.obj
+!enginecustom/cone.obj
+!enginecustom/vaisseau.obj
+!enginecustom/86.obj
 
 # Precompiled Headers
 *.gch
@@ -434,5 +442,3 @@ FodyWeavers.xsd
 # Additional files built by Visual Studio
 
 # End of https://www.toptal.com/developers/gitignore/api/visualstudio,c++
-
-.idea/

Jenkinsfile

@@ -1,136 +0,0 @@
-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}
-				"""
-			}
-		}
-	}
-
-}

KhaoticDemo/KhaoticDemo.vcxproj

@@ -0,0 +1,140 @@
+<?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>

KhaoticDemo/KhaoticDemo.vcxproj.filters

@@ -0,0 +1,22 @@
+<?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>

KhaoticDemo/main.cpp

@@ -0,0 +1,4 @@
+int main()
+{
+		return 0;
+}

KhaoticDemo/water.ps

@@ -0,0 +1,72 @@
+/////////////
+// 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;
+}

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** et utilise **ImGui** pour son interface graphique.
+Ce moteur est basé sur **DirectX11** utilise **ImGui** avec une couche d'abstraction pour permetre son usage avec d'autres API.
 
 ---
 
 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**  for the user interface.
+This **DirectX11** based engine uses **ImGui** with an abstraction layer to enable its use with other APIs.
 
 ## Installation
 
@@ -35,36 +35,15 @@ This **DirectX11** based engine uses **ImGui**  for the user interface.
 
 **SHADER** :
 
-+ Sunlight shader
-+ Cel Shading
-+ Skysphere 
+- Cel Shading
 
 **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** :
-
-+ All the format supported by Windows Imaging Component (WIC)
-
-**Optimization** :
-
-- Shader rendering
-- Frustum culling
-- Object rendering
-- Terrain Instancing
+- Shader Manager
 
 ## Demo :
 
-[![Demo Video](https://img.youtube.com/vi/CbK1a0Ar94Q/0.jpg)](https://youtu.be/CbK1a0Ar94Q)
+[![Demo Video](https://img.youtube.com/vi/qCOCTyB_97c/0.jpg)](https://www.youtube.com/watch?v=qCOCTyB_97c)
 
 ## Engine Build by :
 
@@ -77,7 +56,7 @@ This **DirectX11** based engine uses **ImGui**  for the user interface.
 -   [@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** :