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

GL - almost ok, at least on the top of the world

This commit is contained in:
lindaandersson 2014-02-05 11:53:38 +01:00
parent 426444ca34
commit 70a2cf27e3
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Code/Game/DanBiasGame/GameClientState/GameState.cpp
View File

@ -454,7 +454,7 @@ void GameState::Protocol( ObjPos* pos )
camera->setRight(right); camera->setRight(right);
camera->setUp(up); camera->setUp(up);
//camera->setLook(objForward); camera->setLook(objForward);
up *= 2; up *= 2;
objForward *= -3; objForward *= -3;

2
Code/Game/GameLogic/Level.cpp
View File

@ -84,7 +84,7 @@ void Level::InitiateLevel(float radius)
int nrOfBoxex = 5; int nrOfBoxex = 5;
for(int i =0; i< nrOfBoxex; i ++) for(int i =0; i< nrOfBoxex; i ++)
{ {
sbDesc_TestBox.centerPosition = Oyster::Math::Float4(10 + ( i*5) ,320,0,0); sbDesc_TestBox.centerPosition = Oyster::Math::Float4(20 ,320,0 + ( i*7),0);
rigidBody_TestBox = API::Instance().CreateRigidBody(sbDesc_TestBox).Release(); rigidBody_TestBox = API::Instance().CreateRigidBody(sbDesc_TestBox).Release();
rigidBody_TestBox->SetSubscription(Level::PhysicsOnMoveLevel); rigidBody_TestBox->SetSubscription(Level::PhysicsOnMoveLevel);

5
Code/Game/GameLogic/Player.cpp
View File

@ -154,11 +154,6 @@ void Player::Rotate(const Oyster::Math3D::Float4 lookDir)
{ {
int i =0 ; int i =0 ;
} }
//Oyster::Math::Float3 up = currPhysicsState.GetOrientation().v[1];
//Oyster::Math::Float3 deltaAxis = up * (-dx * 0.02) ;
//Oyster::Math::Float3 oldOrt = currPhysicsState.GetRotation();
//newPhysicsState.SetRotation(oldOrt + deltaAxis);
this->lookDir = lookDir.xyz; this->lookDir = lookDir.xyz;
this->dx = lookDir.w; this->dx = lookDir.w;

4
Code/GamePhysics/Implementation/PhysicsAPI_Impl.cpp
View File

@ -91,7 +91,7 @@ namespace
} }
// PLayerHAck // PLayerHAck
/*if( proto->CallSubscription_BeforeCollisionResponse(proto) == ICustomBody::SubscriptMessage_player_collision_response ) if( proto->CallSubscription_BeforeCollisionResponse(proto) == ICustomBody::SubscriptMessage_player_collision_response )
{ {
Float3 linearMomentum = protoState.GetLinearMomentum(); Float3 linearMomentum = protoState.GetLinearMomentum();
Float3 up = -protoState.GetGravityNormal(); Float3 up = -protoState.GetGravityNormal();
@ -101,7 +101,7 @@ namespace
protoState.SetLinearMomentum(noBounceForce); protoState.SetLinearMomentum(noBounceForce);
proto->SetState(protoState); proto->SetState(protoState);
return; return;
}*/ }
// calculate and store time interpolation value, for later rebound. // calculate and store time interpolation value, for later rebound.
proto->SetTimeOfContact( worldPointOfContact ); proto->SetTimeOfContact( worldPointOfContact );