immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rendering glasses in FPP camera, closes #775 (#959)

master
MatiRg 2017-05-23 18:57:41 +02:00 committed by krzys_h
parent 108551c199
commit 417301ff06
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/object/motion/motionhuman.cpp
View File

@ -71,6 +71,7 @@ CMotionHuman::CMotionHuman(COldObject* object)
m_time = 0.0f; m_time = 0.0f;
m_tired = 0.0f; m_tired = 0.0f;
m_bDisplayPerso = false; m_bDisplayPerso = false;
m_glassesRank = -1;
} }
// Object's constructor. // Object's constructor.
@ -198,12 +199,12 @@ void CMotionHuman::Create(Math::Vector pos, float angle, ObjectType type,
glasses = m_main->GetGamerGlasses(); glasses = m_main->GetGamerGlasses();
if ( glasses != 0 && type == OBJECT_HUMAN ) if ( glasses != 0 && type == OBJECT_HUMAN )
{ {
rank = m_engine->CreateObject(); m_glassesRank = m_engine->CreateObject();
m_engine->SetObjectType(rank, Gfx::ENG_OBJTYPE_DESCENDANT); m_engine->SetObjectType(m_glassesRank, Gfx::ENG_OBJTYPE_DESCENDANT);
m_object->SetObjectRank(15, rank); m_object->SetObjectRank(15, m_glassesRank);
m_object->SetObjectParent(15, 1); m_object->SetObjectParent(15, 1);
sprintf(filename, "human2g%d.mod", glasses); sprintf(filename, "human2g%d.mod", glasses);
modelManager->AddModelReference(filename, false, rank); modelManager->AddModelReference(filename, false, m_glassesRank);
} }
// Creates the right arm. // Creates the right arm.
@ -652,6 +653,18 @@ bool CMotionHuman::EventFrame(const Event &event)
m_object->SetCirVibration(Math::Vector(0.0f, m_main->GetPersoAngle()+0.2f, 0.0f)); m_object->SetCirVibration(Math::Vector(0.0f, m_main->GetPersoAngle()+0.2f, 0.0f));
} }
if ( m_glassesRank != -1 )
{
if ( m_camera->GetType() == Gfx::CAM_TYPE_ONBOARD )
{
m_engine->SetObjectDrawWorld(m_glassesRank, false);
}
else
{
m_engine->SetObjectDrawWorld(m_glassesRank, true);
}
}
bSwim = m_physics->GetSwim(); bSwim = m_physics->GetSwim();
rot = m_physics->GetCirMotionY(MO_MOTSPEED); rot = m_physics->GetCirMotionY(MO_MOTSPEED);

1
src/object/motion/motionhuman.h
View File

@ -91,4 +91,5 @@ protected:
float m_time; float m_time;
float m_tired; float m_tired;
bool m_bDisplayPerso; bool m_bDisplayPerso;
int m_glassesRank;
}; };