ShibaGit/khaotic-engine-Reborn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

Patch Update - Naming - V9.3.6

Browse Source
This commit is contained in:
CatChow0 2025-05-01 20:09:08 +02:00
parent f8503e5a2a
commit 74151de6f7
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/.idea.KhaoticEngineReborn/.idea/workspace.xml generated
View File

@ -5,12 +5,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e81d6e08-efc7-40a0-909d-ec4943d948e9" name="Changes" comment=""> <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/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.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/hlsl/skybox.vs" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/hlsl/skybox.vs" 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/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/SkyboxShaderClass.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/enginecustom/src/src/shader/SkyboxShaderClass.cpp" 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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -167,7 +165,7 @@
<workItem from="1746106963725" duration="5888000" /> <workItem from="1746106963725" duration="5888000" />
<workItem from="1746112904421" duration="75000" /> <workItem from="1746112904421" duration="75000" />
<workItem from="1746113092234" duration="1477000" /> <workItem from="1746113092234" duration="1477000" />
<workItem from="1746117455914" duration="4400000" /> <workItem from="1746117455914" duration="4814000" />
</task> </task>
<task id="LOCAL-00001" summary="Minor update - viewport window tweak"> <task id="LOCAL-00001" summary="Minor update - viewport window tweak">
<option name="closed" value="true" /> <option name="closed" value="true" />

4
enginecustom/src/hlsl/skybox.ps
View File

@ -3,7 +3,7 @@
///////////// /////////////
Texture2D shaderTexture : register(t0); Texture2D shaderTexture : register(t0);
SamplerState SampleType : register(s0); SamplerState SampleType : register(s0);
cbuffer SunLightBuffer cbuffer SkyboxBuffer
{ {
float4 ambientColor; float4 ambientColor;
float4 diffuseColor; float4 diffuseColor;
@ -11,7 +11,7 @@ cbuffer SunLightBuffer
float intensity; float intensity;
}; };
cbuffer SunLightColorBuffer cbuffer SkyboxColorBuffer
{ {
float4 sunColor; float4 sunColor;
}; };

2
enginecustom/src/hlsl/skybox.vs
View File

@ -14,7 +14,7 @@ cbuffer CameraBuffer
float padding; float padding;
}; };
cbuffer SunLightBuffer cbuffer SkyboxBuffer
{ {
float4 ambientColor; float4 ambientColor;
float4 diffuseColor; float4 diffuseColor;

4
enginecustom/src/inc/shader/SkyboxShaderClass.h
View File

@ -25,7 +25,7 @@ class SkyboxShaderClass
float padding; float padding;
}; };
struct SunLightBufferType struct SkyboxBufferType
{ {
XMFLOAT4 diffuseColor; XMFLOAT4 diffuseColor;
XMFLOAT4 ambientColor; XMFLOAT4 ambientColor;
@ -33,7 +33,7 @@ class SkyboxShaderClass
float intensity; float intensity;
}; };
struct SunLightColorBufferType struct SkyboxColorBufferType
{ {
XMFLOAT4 sunColor; XMFLOAT4 sunColor;
}; };

6
enginecustom/src/src/shader/SkyboxShaderClass.cpp
View File

@ -244,7 +244,7 @@ bool SkyboxShaderClass::InitializeShader(ID3D11Device* device, HWND hwnd, WCHAR*
// Setup the description of the dynamic sunlight constant buffer that is in the pixel shader. // Setup the description of the dynamic sunlight constant buffer that is in the pixel shader.
sunlightBufferDesc.Usage = D3D11_USAGE_DYNAMIC; sunlightBufferDesc.Usage = D3D11_USAGE_DYNAMIC;
sunlightBufferDesc.ByteWidth = sizeof(SunLightBufferType); sunlightBufferDesc.ByteWidth = sizeof(SkyboxBufferType);
sunlightBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER; sunlightBufferDesc.BindFlags = D3D11_BIND_CONSTANT_BUFFER;
sunlightBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; sunlightBufferDesc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE;
sunlightBufferDesc.MiscFlags = 0; sunlightBufferDesc.MiscFlags = 0;
@ -380,7 +380,7 @@ bool SkyboxShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
D3D11_MAPPED_SUBRESOURCE mappedResource; D3D11_MAPPED_SUBRESOURCE mappedResource;
MatrixBufferType* dataPtr; MatrixBufferType* dataPtr;
CameraBufferType* dataPtr2; CameraBufferType* dataPtr2;
SunLightBufferType* dataPtr3; SkyboxBufferType* dataPtr3;
unsigned int bufferNumber; unsigned int bufferNumber;
// Transpose the matrices to prepare them for the shader. // Transpose the matrices to prepare them for the shader.
@ -420,7 +420,7 @@ bool SkyboxShaderClass::SetShaderParameters(ID3D11DeviceContext* deviceContext,
} }
// Get a pointer to the data in the constant buffer. // Get a pointer to the data in the constant buffer.
dataPtr3 = (SunLightBufferType*)mappedResource.pData; dataPtr3 = (SkyboxBufferType*)mappedResource.pData;
// Copy the lighting variables into the constant buffer. // Copy the lighting variables into the constant buffer.
dataPtr3->ambientColor = ambientColor; dataPtr3->ambientColor = ambientColor;