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

Fixed meshes in wrong places

Browse source
This commit is contained in:
MontyTRC89 2020-07-24 07:03:36 +02:00
parent 6cd500008c
commit 9a5f1950ee
3 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TR5Main/Renderer/Render11Helper.cpp
View file

@ -148,15 +148,15 @@ namespace T5M::Renderer
}*/
}
void Renderer11::updateEffects()
void Renderer11::updateEffects(RenderView& view)
{
for (int i = 0; i < m_effectsToDraw.size(); i++)
for (int i = 0; i < view.effectsToDraw.size(); i++)
{
RendererEffect *fx = m_effectsToDraw[i];
Matrix translation = Matrix::CreateTranslation(fx->Effect->pos.xPos, fx->Effect->pos.yPos, fx->Effect->pos.zPos);
Matrix rotation = Matrix::CreateFromYawPitchRoll(TO_RAD(fx->Effect->pos.yRot), TO_RAD(fx->Effect->pos.xRot), TO_RAD(fx->Effect->pos.zRot));
m_effectsToDraw[i]->World = rotation * translation;
view.effectsToDraw[i]->World = rotation * translation;
}
}
@ -310,16 +310,14 @@ namespace T5M::Renderer
itemToDraw->DoneAnimations = true;
}
void Renderer11::updateItemsAnimations()
void Renderer11::updateItemsAnimations(RenderView& view)
{
Matrix translation;
Matrix rotation;
int numItems = m_itemsToDraw.size();
for (int i = 0; i < numItems; i++)
for (int i = 0; i < view.itemsToDraw.size(); i++)
{
RendererItem *itemToDraw = m_itemsToDraw[i];
RendererItem *itemToDraw = view.itemsToDraw[i];
ITEM_INFO *item = itemToDraw->Item;
CREATURE_INFO *creature = (CREATURE_INFO *)item->data;

4
TR5Main/Renderer/Renderer11.h
View file

@ -553,8 +553,8 @@ namespace T5M::Renderer
void prepareLights();
void collectEffects(short roomNumber, RenderView& renderView);
void clearSceneItems();
void updateItemsAnimations();
void updateEffects();
void updateItemsAnimations(RenderView& view);
void updateEffects(RenderView& view);
int getFrame(short animation, short frame, short** framePtr, int* rate);
bool drawAmbientCubeMap(short roomNumber);
bool sphereBoxIntersection(DirectX::SimpleMath::Vector3 boxMin, DirectX::SimpleMath::Vector3 boxMax, DirectX::SimpleMath::Vector3 sphereCentre, float sphereRadius);

4
TR5Main/Renderer/Renderer11Draw.cpp
View file

@ -1924,8 +1924,8 @@ namespace T5M::Renderer
clearSceneItems();
collectRooms(view);
UpdateLaraAnimations(false);
updateItemsAnimations();
updateEffects();
updateItemsAnimations(view);
updateEffects(view);
if (g_Configuration.EnableShadows)
drawShadowMap();
m_items[Lara.itemNumber].Item = LaraItem;