From c15cb2956d7244db371746da4efbb6870d09f4b0 Mon Sep 17 00:00:00 2001
From: CatChow0 <thetrueshibadoggo@gmail.com>
Date: Thu, 1 May 2025 19:27:14 +0200
Subject: [PATCH] Patch Update - Skysphere

---
 .../.idea/workspace.xml                       |  13 ++--
 enginecustom/assets/Model/OBJ/skysphere.obj   |   3 +
 enginecustom/assets/Model/OBJ/vaisseautri.mtl |   3 +
 enginecustom/shader-error.txt                 | Bin 59 -> 127 bytes
 enginecustom/src/hlsl/skybox.ps               |  62 +++++++-----------
 enginecustom/src/hlsl/skybox.vs               |  29 +++-----
 enginecustom/src/src/system/Skybox.cpp        |   2 +-
 7 files changed, 43 insertions(+), 69 deletions(-)
 create mode 100644 enginecustom/assets/Model/OBJ/skysphere.obj
 create mode 100644 enginecustom/assets/Model/OBJ/vaisseautri.mtl

diff --git a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
index d92b15f..ee4c0f3 100644
--- a/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
+++ b/.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml
@@ -6,14 +6,10 @@
   <component name="ChangeListManager">
     <list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment="">
       <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/enginecustom.vcxproj" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj.filters" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/enginecustom.vcxproj.filters" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/SkyboxShaderClass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/SkyboxShaderClass.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/inc/shader/shadermanagerclass.h" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/inc/shader/shadermanagerclass.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/SkyboxShaderClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/SkyboxShaderClass.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/enginecustom/src/src/shader/shadermanagerclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/shadermanagerclass.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/textureclass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/system/textureclass.cpp" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/shader-error.txt" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/shader-error.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.ps" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.ps" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.vs" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.vs" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -170,6 +166,7 @@
       <workItem from="1746106963725" duration="5888000" />
       <workItem from="1746112904421" duration="75000" />
       <workItem from="1746113092234" duration="1477000" />
+      <workItem from="1746117455914" duration="2790000" />
     </task>
     <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
       <option name="closed" value="true" />
diff --git a/enginecustom/assets/Model/OBJ/skysphere.obj b/enginecustom/assets/Model/OBJ/skysphere.obj
new file mode 100644
index 0000000..5d702da
--- /dev/null
+++ b/enginecustom/assets/Model/OBJ/skysphere.obj
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24fe4869bcb0624edec73322a356f107d381390bed51ec4f9de654c20928f848
+size 73616
diff --git a/enginecustom/assets/Model/OBJ/vaisseautri.mtl b/enginecustom/assets/Model/OBJ/vaisseautri.mtl
new file mode 100644
index 0000000..b5ba996
--- /dev/null
+++ b/enginecustom/assets/Model/OBJ/vaisseautri.mtl
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3f7b10b0af6d1c2519b968959643e1ceeb98dac3d1fbb9d8c91248613036edd
+size 3663
diff --git a/enginecustom/shader-error.txt b/enginecustom/shader-error.txt
index fdfff2df3ebcbbe80cd55c59597458d6c90a9a1f..813fa0a56d8f732351e2499154bc3f4491cfb2a4 100644
GIT binary patch
literal 127
zcmXBNu?oU45CBkT!GFkB1tTfJB_E)BCx?KT^x7PacXCNY{dxt*H@%bdXRN7(>i`e-
zOS*BzsDWlA&;tY(@_)rvD&KvP=u<A)m*pM!b$FJo?e|CBo1If2!lEwL7~@nUfyguA
V2S$Y>P{j#BR5#_{V!O?H^##61EV=*y

literal 59
zcmYc-D#|ZXh%h!aFtk!ocg!isNc2rC2*|8R%?Zv(Oi3+Lw^B&WD=Dfh$j{6xQOL_L
OQAo=#%}e3sVgLYE=@aV!

diff --git a/enginecustom/src/hlsl/skybox.ps b/enginecustom/src/hlsl/skybox.ps
index 0e1b84b..277833a 100644
--- a/enginecustom/src/hlsl/skybox.ps
+++ b/enginecustom/src/hlsl/skybox.ps
@@ -1,20 +1,16 @@
+////////////////////////////////////////////////////////////////////////////////
+// Filename: multitexture.ps
+////////////////////////////////////////////////////////////////////////////////
+
+
 /////////////
 // GLOBALS //
 /////////////
-Texture2D shaderTexture : register(t0);
-SamplerState SampleType : register(s0);
-cbuffer SunLightBuffer
-{
-    float4 ambientColor;
-    float4 diffuseColor;
-    float3 lightDirection;
-    float intensity;
-};
 
-cbuffer SunLightColorBuffer
-{
-    float4 sunColor;
-};
+Texture2D shaderTexture1 : register(t0);
+Texture2D shaderTexture2 : register(t1);
+SamplerState SampleType : register(s0);
+
 
 //////////////
 // TYPEDEFS //
@@ -23,39 +19,27 @@ struct PixelInputType
 {
     float4 position : SV_POSITION;
     float2 tex : TEXCOORD0;
-    float3 normal : NORMAL;
 };
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // Pixel Shader
 ////////////////////////////////////////////////////////////////////////////////
-float4 SunLightPixelShader(PixelInputType input) : SV_TARGET
+float4 SkyboxShaderPixelShader(PixelInputType input) : SV_TARGET
 {
-    float4 textureColor;
-    float4 color;
-    float lightIntensity;
-    float4 colorArray;
-    float4 colorSum;
+    float4 color1;
+    float4 color2;
+    float4 blendColor;
 
-    // Sample the pixel color from the texture using the sampler at this texture coordinate location.
-    textureColor = shaderTexture.Sample(SampleType, input.tex);
+        // Sample the pixel color from the textures using the sampler at this texture coordinate location.
+    color1 = shaderTexture1.Sample(SampleType, input.tex);
+    color2 = shaderTexture2.Sample(SampleType, input.tex);
+	
+    // Combine the two textures together.
+    blendColor = color1 * color2 * 2.0;
 
-    // Calculate the different amounts of light on this pixel based on the direction of the light.
-    lightIntensity = saturate(dot(input.normal, -lightDirection));
+    // Saturate the final color.
+    blendColor = saturate(blendColor);
 
-    // Determine the diffuse color amount of the light.
-    colorArray = (diffuseColor * lightIntensity) * intensity;
-
-    // Initialize the sum of colors.
-    colorSum = float4(0.0f, 0.0f, 0.0f, 1.0f);
-
-    // Add the light color.
-    colorSum.r += colorArray.r;
-    colorSum.g += colorArray.g;
-    colorSum.b += colorArray.b;
-
-    // Multiply the texture pixel by the light color to get the final result.
-    color = saturate(colorSum) * textureColor;
-
-    return color;
+    return blendColor;
 }
diff --git a/enginecustom/src/hlsl/skybox.vs b/enginecustom/src/hlsl/skybox.vs
index 46fab3b..c277824 100644
--- a/enginecustom/src/hlsl/skybox.vs
+++ b/enginecustom/src/hlsl/skybox.vs
@@ -1,3 +1,8 @@
+////////////////////////////////////////////////////////////////////////////////
+// Filename: multitexture.vs
+////////////////////////////////////////////////////////////////////////////////
+
+
 /////////////
 // GLOBALS //
 /////////////
@@ -8,19 +13,6 @@ cbuffer MatrixBuffer
     matrix projectionMatrix;
 };
 
-cbuffer CameraBuffer
-{
-    float3 cameraPosition;
-    float padding;
-};
-
-cbuffer SunLightBuffer
-{
-    float4 ambientColor;
-    float4 diffuseColor;
-    float3 lightDirection;
-    float intensity;
-};
 
 //////////////
 // TYPEDEFS //
@@ -36,15 +28,16 @@ struct PixelInputType
 {
     float4 position : SV_POSITION;
     float2 tex : TEXCOORD0;
-    float3 normal : NORMAL;
 };
 
+
 ////////////////////////////////////////////////////////////////////////////////
 // Vertex Shader
 ////////////////////////////////////////////////////////////////////////////////
-PixelInputType SunLightVertexShader(VertexInputType input)
+PixelInputType SkyboxShaderVertexShader(VertexInputType input)
 {
     PixelInputType output;
+    
 
     // Change the position vector to be 4 units for proper matrix calculations.
     input.position.w = 1.0f;
@@ -57,11 +50,5 @@ PixelInputType SunLightVertexShader(VertexInputType input)
     // Store the texture coordinates for the pixel shader.
     output.tex = input.tex;
     
-    // Calculate the normal vector against the world matrix only.
-    output.normal = mul(input.normal, (float3x3) worldMatrix);
-	
-    // Normalize the normal vector.
-    output.normal = normalize(output.normal);
-
     return output;
 }
diff --git a/enginecustom/src/src/system/Skybox.cpp b/enginecustom/src/src/system/Skybox.cpp
index 0c0b685..d99f786 100644
--- a/enginecustom/src/src/system/Skybox.cpp
+++ b/enginecustom/src/src/system/Skybox.cpp
@@ -28,7 +28,7 @@ Object* Skybox::ConstructSkybox()
     Logger::Get().Log("Construct skybox", __FILE__, __LINE__, Logger::LogLevel::Initialize);
 
     char modelFilename[128];
-    strcpy_s(modelFilename, "assets/Model/OBJ/invertcube.obj");
+    strcpy_s(modelFilename, "assets/Model/OBJ/skysphere.obj");
 
     textures.clear();
     std::vector<std::wstring> skyboxTextures = {