From 2804ad2363626958be7513014b9a302ea72768b6 Mon Sep 17 00:00:00 2001 From: aap Date: Wed, 13 Jan 2021 13:06:38 +0100 Subject: anim velocity union --- src/objects/CutsceneObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/objects/CutsceneObject.cpp') diff --git a/src/objects/CutsceneObject.cpp b/src/objects/CutsceneObject.cpp index 8d1be357..e36d8e25 100644 --- a/src/objects/CutsceneObject.cpp +++ b/src/objects/CutsceneObject.cpp @@ -46,7 +46,7 @@ CCutsceneObject::SetModelIndex(uint32 id) CEntity::SetModelIndex(id); assert(RwObjectGetType(m_rwObject) == rpCLUMP); RpAnimBlendClumpInit((RpClump*)m_rwObject); - (*RPANIMBLENDCLUMPDATA(m_rwObject))->velocity = &m_vecMoveSpeed; + (*RPANIMBLENDCLUMPDATA(m_rwObject))->velocity3d = &m_vecMoveSpeed; (*RPANIMBLENDCLUMPDATA(m_rwObject))->frames[0].flag |= AnimBlendFrameData::VELOCITY_EXTRACTION_3D; } -- cgit v1.2.3 From 0e9a44dd43441c081266665c74a150afa0386858 Mon Sep 17 00:00:00 2001 From: Sergeanur Date: Wed, 13 Jan 2021 14:55:55 +0200 Subject: Fix backface culling of cutscene objects --- src/objects/CutsceneObject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/objects/CutsceneObject.cpp') diff --git a/src/objects/CutsceneObject.cpp b/src/objects/CutsceneObject.cpp index e36d8e25..7d9fe640 100644 --- a/src/objects/CutsceneObject.cpp +++ b/src/objects/CutsceneObject.cpp @@ -150,9 +150,9 @@ CCutsceneObject::PreRender(void) void CCutsceneObject::Render(void) { - RwRenderStateSet(rwRENDERSTATECULLMODE, (void *)rwCULLMODECULLNONE); + SetCullMode(rwCULLMODECULLNONE); CObject::Render(); - RwRenderStateSet(rwRENDERSTATECULLMODE, (void *)rwCULLMODECULLBACK); + SetCullMode(rwCULLMODECULLBACK); } bool -- cgit v1.2.3