Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed random statics positions while shooting

Browse source
This commit is contained in:
MontyTRC89 2024-12-13 05:20:23 +01:00
parent 8978a51bfe
commit c5f10777e7
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
TombEngine/Renderer/RendererDraw.cpp
View file

@ -2667,8 +2667,7 @@ namespace TEN::Renderer
while (baseStaticIndex < staticsCount) while (baseStaticIndex < staticsCount)
{ {
int k = 0; int instancesCount = 0;
int instanceCount = std::min(bucketSize, staticsCount - baseStaticIndex);
int max = std::min(baseStaticIndex + bucketSize, staticsCount); int max = std::min(baseStaticIndex + bucketSize, staticsCount);
for (int s = baseStaticIndex; s < max; s++) for (int s = baseStaticIndex; s < max; s++)
@ -2686,23 +2685,23 @@ namespace TEN::Renderer
{ {
world = world * _currentMirror->ReflectionMatrix; world = world * _currentMirror->ReflectionMatrix;
} }
_stInstancedStaticMeshBuffer.StaticMeshes[k].World = world; _stInstancedStaticMeshBuffer.StaticMeshes[instancesCount].World = world;
_stInstancedStaticMeshBuffer.StaticMeshes[k].Color = current->Color; _stInstancedStaticMeshBuffer.StaticMeshes[instancesCount].Color = current->Color;
_stInstancedStaticMeshBuffer.StaticMeshes[k].Ambient = room->AmbientLight; _stInstancedStaticMeshBuffer.StaticMeshes[instancesCount].Ambient = room->AmbientLight;
_stInstancedStaticMeshBuffer.StaticMeshes[k].LightMode = (int)refMesh->LightMode; _stInstancedStaticMeshBuffer.StaticMeshes[instancesCount].LightMode = (int)refMesh->LightMode;
if (rendererPass != RendererPass::GBuffer) if (rendererPass != RendererPass::GBuffer)
{ {
BindInstancedStaticLights(current->LightsToDraw, k); BindInstancedStaticLights(current->LightsToDraw, instancesCount);
} }
k++; instancesCount++;
} }
baseStaticIndex += bucketSize; baseStaticIndex += bucketSize;
if (k > 0) if (instancesCount > 0)
{ {
_cbInstancedStaticMeshBuffer.UpdateData(_stInstancedStaticMeshBuffer, _context.Get()); _cbInstancedStaticMeshBuffer.UpdateData(_stInstancedStaticMeshBuffer, _context.Get());
@ -2728,7 +2727,7 @@ namespace TEN::Renderer
BindTexture(TextureRegister::NormalMap, BindTexture(TextureRegister::NormalMap,
&std::get<1>(_staticTextures[bucket.Texture]), SamplerStateRegister::AnisotropicClamp); &std::get<1>(_staticTextures[bucket.Texture]), SamplerStateRegister::AnisotropicClamp);
DrawIndexedInstancedTriangles(bucket.NumIndices, instanceCount, bucket.StartIndex, 0); DrawIndexedInstancedTriangles(bucket.NumIndices, instancesCount, bucket.StartIndex, 0);
_numInstancedStaticsDrawCalls++; _numInstancedStaticsDrawCalls++;
} }