NoEdge/Danbias
NoEdge
/
Danbias
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GameClient - fixed render RB

This commit is contained in:
lindaandersson 2014-02-19 13:41:05 +01:00
parent d6d45392d3
commit 3fe0221342
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Code/Game/GameClient/GameClientState/GameState.cpp
View File

@ -122,7 +122,7 @@ void GameState::InitiatePlayer( int id, const std::string &modelName, const floa
RBInitData RBData; RBInitData RBData;
RBData.position = position; RBData.position = position;
RBData.rotation = ArrayToQuaternion( rotation ); RBData.rotation = ArrayToQuaternion( rotation );
RBData.scale = Float3( 1 ); RBData.scale = scale;
// !RB DEBUG // !RB DEBUG
if( isMyPlayer ) if( isMyPlayer )
{ {
@ -216,13 +216,16 @@ bool GameState::Render()
dynamicObject = this->privData->dynamicObjects->begin(); dynamicObject = this->privData->dynamicObjects->begin();
for( ; dynamicObject != this->privData->dynamicObjects->end(); ++dynamicObject ) for( ; dynamicObject != this->privData->dynamicObjects->end(); ++dynamicObject )
{ {
if( dynamicObject->second->getBRtype() == RB_Type_Cube) if( dynamicObject->second )
{ {
Oyster::Graphics::API::RenderDebugCube( dynamicObject->second->getRBWorld()); if( dynamicObject->second->getBRtype() == RB_Type_Cube)
} {
if( dynamicObject->second->getBRtype() == RB_Type_Sphere) Oyster::Graphics::API::RenderDebugCube( dynamicObject->second->getRBWorld());
{ }
Oyster::Graphics::API::RenderDebugSphere( dynamicObject->second->getRBWorld()); if( dynamicObject->second->getBRtype() == RB_Type_Sphere)
{
Oyster::Graphics::API::RenderDebugSphere( dynamicObject->second->getRBWorld());
}
} }
} }
} }
@ -479,8 +482,8 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState
// if is this player. Remember to change camera // if is this player. Remember to change camera
if( this->privData->myId == decoded.object_ID ) if( this->privData->myId == decoded.object_ID )
{ {
//this->privData->camera.SetPosition( position ); this->privData->camera.SetPosition( position );
//this->privData->camera.SetRotation( rotation ); this->privData->camera.SetRotation( rotation );
this->privData->player.setPos( position ); this->privData->player.setPos( position );
//this->privData->player.setRot( rotation ); //this->privData->player.setRot( rotation );
} }