diff --git a/Engine/Source/Gx/Buffer.cpp b/Engine/Source/Gx/Buffer.cpp index 4437351..e0248d6 100644 --- a/Engine/Source/Gx/Buffer.cpp +++ b/Engine/Source/Gx/Buffer.cpp @@ -100,8 +100,8 @@ static CGxVertexAttrib s_vertexAttribsPBNT2[] = { static CGxVertexAttrib s_vertexAttribsPNC2T2[] = { { GxVA_Position, 4, GxVertexAttribOffset(GxVBF_PNC2T2, GxVA_Position), 48 }, { GxVA_Normal, 4, GxVertexAttribOffset(GxVBF_PNC2T2, GxVA_Normal), 48 }, - { GxVA_Color0, 4, GxVertexAttribOffset(GxVBF_PNC2T2, GxVA_Color0), 48 }, - { GxVA_Color1, 4, GxVertexAttribOffset(GxVBF_PNC2T2, GxVA_Color1), 48 }, + { GxVA_Color0, 0, GxVertexAttribOffset(GxVBF_PNC2T2, GxVA_Color0), 48 }, + { GxVA_Color1, 0, GxVertexAttribOffset(GxVBF_PNC2T2, GxVA_Color1), 48 }, { GxVA_TexCoord0, 3, GxVertexAttribOffset(GxVBF_PNC2T2, GxVA_TexCoord0), 48 }, { GxVA_TexCoord1, 3, GxVertexAttribOffset(GxVBF_PNC2T2, GxVA_TexCoord1), 48 } }; diff --git a/Engine/Source/ShaderEffect/ShaderEffect.cpp b/Engine/Source/ShaderEffect/ShaderEffect.cpp index 8f1501e..76bf84f 100644 --- a/Engine/Source/ShaderEffect/ShaderEffect.cpp +++ b/Engine/Source/ShaderEffect/ShaderEffect.cpp @@ -234,7 +234,13 @@ void CShaderEffect::SetGlobalLighting(CM2Light* light) { sunSpec.z = CShaderEffect::s_sunSpec.z; sunSpec.w = 14.0f; - GxShaderConstantsSet(GxSh_Vertex, 12, &CShaderEffect::s_sunDir.x, 1); + C4Vector sunDirConst; + sunDirConst.x = CShaderEffect::s_sunDir.x; + sunDirConst.y = CShaderEffect::s_sunDir.y; + sunDirConst.z = CShaderEffect::s_sunDir.z; + sunDirConst.w = CShaderEffect::s_sunSpec.x; + + GxShaderConstantsSet(GxSh_Vertex, 12, &sunDirConst.x, 1); GxShaderConstantsSet(GxSh_Vertex, 13, &sunSpec.x, 1); } } @@ -561,9 +567,27 @@ void CShaderEffect::SetLocalLighting(CM2Lighting* lighting, int32_t enabled, con CShaderEffect::s_sunDiffuse.y = g >= 1.0f ? 1.0f : g; CShaderEffect::s_sunDiffuse.z = b < 1.0f ? b : 1.0f; - GxShaderConstantsSet(GxSh_Vertex, 10, &CShaderEffect::s_sunDiffuse.x, 1); - GxShaderConstantsSet(GxSh_Vertex, 11, &CShaderEffect::s_sunAmbient.x, 1); - GxShaderConstantsSet(GxSh_Vertex, 12, &CShaderEffect::s_sunDir.x, 1); + C4Vector sunDiffuse; + sunDiffuse.x = CShaderEffect::s_sunDiffuse.x; + sunDiffuse.y = CShaderEffect::s_sunDiffuse.y; + sunDiffuse.z = CShaderEffect::s_sunDiffuse.z; + sunDiffuse.w = CShaderEffect::s_sunAmbient.x; + + C4Vector sunAmbient; + sunAmbient.x = CShaderEffect::s_sunAmbient.x; + sunAmbient.y = CShaderEffect::s_sunAmbient.y; + sunAmbient.z = CShaderEffect::s_sunAmbient.z; + sunAmbient.w = CShaderEffect::s_sunDir.x; + + C4Vector sunDir; + sunDir.x = CShaderEffect::s_sunDir.x; + sunDir.y = CShaderEffect::s_sunDir.y; + sunDir.z = CShaderEffect::s_sunDir.z; + sunDir.w = CShaderEffect::s_sunSpec.x; + + GxShaderConstantsSet(GxSh_Vertex, 10, &sunDiffuse.x, 1); + GxShaderConstantsSet(GxSh_Vertex, 11, &sunAmbient.x, 1); + GxShaderConstantsSet(GxSh_Vertex, 12, &sunDir.x, 1); if (CShaderEffect::s_localLightCount) { CShaderEffect::ComputeLocalLights(&CShaderEffect::s_localLights, CShaderEffect::s_localLightCount, lighting->m_lights, origin); diff --git a/WoW/Source/WorldClient/ShadowQuery.cpp b/WoW/Source/WorldClient/ShadowQuery.cpp index cc2d2e4..63ff6ed 100644 --- a/WoW/Source/WorldClient/ShadowQuery.cpp +++ b/WoW/Source/WorldClient/ShadowQuery.cpp @@ -250,11 +250,11 @@ void CShadowQuery::AllocBuffers() { buffers.m_textured.m_maxCount = 0x2000; if (!buffers.m_groups) { - buffers.m_groups = SMemAlloc(0x2000, __FILE__, __LINE__, 0); + buffers.m_groups = SMemAlloc(0x800 * sizeof(CMapObjGroup*), __FILE__, __LINE__, 0); } if (!buffers.m_groupData) { - buffers.m_groupData = SMemAlloc(0x2000, __FILE__, __LINE__, 0); + buffers.m_groupData = SMemAlloc(0x800 * sizeof(C44Matrix*), __FILE__, __LINE__, 0); } if (!buffers.m_untextured.m_batches) {