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

Health pickups is now working!

This commit is contained in:
Pontus Fransson 2014-02-26 10:23:38 +01:00 committed by Dander7BD
parent 8a65907625
commit 28e84854d1
7 changed files with 101 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,8 +146,8 @@ void GameState::InitiatePlayer( int id, const std::string &modelName, const floa
this->privData->camera.SetPosition( p->getPos() );
Float3 offset = Float3( 0.0f );
// DEBUG position of camera so we can see the player model
offset.y = p->getScale().y * 5.0f;
offset.z = p->getScale().z * -5.0f;
//offset.y = p->getScale().y * 5.0f;
//offset.z = p->getScale().z * -5.0f;
// !DEBUG
this->privData->camera.SetHeadOffset( offset );
this->privData->camera.UpdateOrientation();
@ -191,7 +191,7 @@ bool GameState::Render()
{
if(playerObject->second)
{
//if( this->privData->myId != playerObject->second->GetId() )
if( this->privData->myId != playerObject->second->GetId() )
{
playerObject->second->Render();
}
@ -601,6 +601,12 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState
{
// if it is not a player
object = (*this->privData->dynamicObjects)[decoded.objectID];
if(!object)
{
//If it is a static object
object = (*this->privData->staticObjects)[decoded.objectID];
}
}
if( object )
@ -618,6 +624,12 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState
{
// if it is not a player
object = (*this->privData->dynamicObjects)[decoded.objectID];
if(!object)
{
//If it is a static object
object = (*this->privData->staticObjects)[decoded.objectID];
}
}
if( object )

20
Code/Game/GameLogic/CollisionManager.cpp
View File

@ -44,7 +44,6 @@ using namespace GameLogic;
realObjB = realObjA;
}
switch (realObjB->GetObjectType())
{
case ObjectSpecialType::ObjectSpecialType_Generic:
@ -369,14 +368,19 @@ using namespace GameLogic;
Object* a = (Object*)objA->GetCustomTag();
Object* b = (Object*)objB->GetCustomTag();
if(!a)
if(!a)
return;
if(!b)
if(!b)
return;
if(b->GetObjectType() == ObjectSpecialType_Player)
{
((Pickup*)a)->OnCollision((Player*)(b));
//Only update if it is active. And if the player is alive
if(((Pickup*)a)->IsActive() && ((Player*)b)->GetState() != PLAYER_STATE_DEAD && ((Player*)b)->GetState() != PLAYER_STATE_DIED)
{
((Pickup*)a)->OnCollision((Player*)(b));
}
return;
}
else if(a->GetObjectType() != ObjectSpecialType_Player)
{
@ -384,6 +388,10 @@ using namespace GameLogic;
//Do nothing.
return;
}
((Pickup*)b)->OnCollision((Player*)a);
//Only update if it is active. And if the player is alive
if(((Pickup*)b)->IsActive() && ((Player*)a)->GetState() != PLAYER_STATE_DEAD && ((Player*)a)->GetState() != PLAYER_STATE_DIED)
{
((Pickup*)b)->OnCollision((Player*)a);
}
}

1
Code/Game/GameLogic/PickupSystem/Pickup.cpp
View File

@ -9,6 +9,7 @@ Pickup::Pickup(Oyster::Physics::ICustomBody *rigidBody, EventOnCollision collisi
this->active = true;
this->spawnTime = spawnTime;
timer.reset();
this->GetRigidBody()->MoveToLimbo();
}
Pickup::~Pickup()

4
Code/Game/GameLogic/PickupSystem/PickupHealth.cpp
View File

@ -1,4 +1,5 @@
#include "PickupHealth.h"
#include "../Game.h"
using namespace GameLogic;
@ -14,5 +15,8 @@ PickupHealth::~PickupHealth()
void PickupHealth::OnCollision(Player *player)
{
timer.reset();
((Game*)&Game::Instance())->onDisableFnc(this);
this->active = false;
player->DamageLife(-hpValue);
}

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

@ -12,24 +12,26 @@ Player::Player()
:DynamicObject()
{
Player::initPlayerData();
AffectedObjects.Reserve(15);
this->weapon = NULL;
this->teamID = -1;
}
Player::Player(Oyster::Physics::ICustomBody *rigidBody, void (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss), ObjectSpecialType type, int objectID, int teamID)
:DynamicObject(rigidBody, EventOnCollision, type, objectID)
{
weapon = new Weapon(2,this);
this->weapon = new Weapon(2,this);
Player::initPlayerData();
AffectedObjects.Reserve(15);
this->teamID = teamID;
}
Player::Player(Oyster::Physics::ICustomBody *rigidBody, Oyster::Physics::ICustomBody::SubscriptMessage (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss), ObjectSpecialType type, int objectID, int teamID)
:DynamicObject(rigidBody, EventOnCollision, type, objectID)
{
weapon = new Weapon(2,this);
this->weapon = new Weapon(2,this);
Player::initPlayerData();
AffectedObjects.Reserve(15);
this->teamID = teamID;
}
@ -70,9 +72,13 @@ void Player::BeginFrame()
Oyster::Math::Float maxSpeed = 30;
// Rotate player accordingly
this->rigidBody->AddRotationAroundY(this->rotationUp);
this->rigidBody->SetUp(this->rigidBody->GetState().centerPos.GetNormalized());
Oyster::Math::Quaternion firstUp = this->rigidBody->GetState().quaternion;
this->rigidBody->SetRotationAsAngularAxis(Oyster::Math3D::Float4(this->rigidBody->GetState().centerPos.GetNormalized(), this->rotationUp));
Oyster::Math::Quaternion secondTurn = this->rigidBody->GetState().quaternion;
this->rigidBody->SetRotation(secondTurn*firstUp);
// Direction data
Oyster::Math::Float4x4 xform;
xform = this->rigidBody->GetState().GetOrientation();
@ -119,7 +125,7 @@ void Player::BeginFrame()
}
// Dampen velocity if certain keys are not pressed
if(key_jump <= 0.001 && IsWalking())
if(key_jump <= 0.001 && this->rigidBody->GetLambda() < 0.9f)
{
if(key_forward <= 0.001 && key_backward <= 0.001)
{
@ -146,7 +152,7 @@ void Player::BeginFrame()
walkDirection.Normalize();
// If on the ground, accelerate normally
if(IsWalking())
if(this->rigidBody->GetLambda() < 0.9f)
{
if(forwardSpeed < maxSpeed)
{
@ -158,7 +164,7 @@ void Player::BeginFrame()
}
}
// If in the air, accelerate slower
if(IsJumping())
if(this->rigidBody->GetLambda() >= 0.9f)
{
if(forwardSpeed < maxSpeed)
{
@ -188,7 +194,7 @@ void Player::BeginFrame()
if(key_jump > 0.001)
{
this->key_jump -= this->gameInstance->GetFrameTime();
if(IsWalking())
if(this->rigidBody->GetLambda() < 0.9f)
{
Oyster::Math::Float3 up = this->rigidBody->GetState().centerPos.GetNormalized();
this->rigidBody->ApplyImpulse(up*this->rigidBody->GetState().mass * 20);
@ -211,6 +217,16 @@ void Player::BeginFrame()
void Player::EndFrame()
{
//check if there are any objects that can be removed from the AffectedObjects list
for(int i = 0; i < this->AffectedObjects.Size(); i++)
{
if(this->AffectedObjects[i] && (this->AffectedObjects[i]->GetRigidBody()->GetState().previousVelocity).GetMagnitude() <= 0.1f)
{
this->AffectedObjects[i]->RemoveAffectedBy();
this->AffectedObjects.Remove(i);
}
}
}
void Player::Move(const PLAYER_MOVEMENT &movement)
@ -280,7 +296,7 @@ void Player::SetLookDir(const Oyster::Math3D::Float3& lookDir)
}
void Player::TurnLeft(Oyster::Math3D::Float deltaRadians)
{
this->rotationUp = deltaRadians;
this->rotationUp += deltaRadians;
}
void Player::Jump()
@ -290,15 +306,15 @@ void Player::Jump()
bool Player::IsWalking()
{
return (this->rigidBody->GetLambda() < 0.99f);
return (this->playerState == PLAYER_STATE::PLAYER_STATE_WALKING);
}
bool Player::IsJumping()
{
return (this->rigidBody->GetLambda() == 1.0f);
return (this->playerState == PLAYER_STATE::PLAYER_STATE_JUMPING);
}
bool Player::IsIdle()
{
return (this->rigidBody->GetLambda() == 1.0f && this->rigidBody->GetLinearVelocity().GetMagnitude() < 0.0001f);
return (this->playerState == PLAYER_STATE::PLAYER_STATE_IDLE);
}
void Player::Inactivate()
@ -329,16 +345,38 @@ PLAYER_STATE Player::GetState() const
void Player::DamageLife(int damage)
{
this->life -= damage;
this->life = 0;
if(this->life <= 0)
if(damage != 0)
{
this->life = 0;
playerState = PLAYER_STATE_DEAD;
this->gameInstance->onDisableFnc(this, 0.0f);
this->playerStats.hp -= damage;
if(this->playerStats.hp > 100)
this->playerStats.hp = 100;
// send hp to client
this->gameInstance->onDamageTakenFnc( this, this->playerStats.hp);
if(this->playerStats.hp <= 0)
{
this->playerStats.hp = 0;
this->playerState = PLAYER_STATE_DIED;
}
}
}
void Player::AddAffectedObject(DynamicObject &AffectedObject)
{
//check if object already exists in the list, if so then do not add
for(int i = 0; i < AffectedObjects.Size(); i++)
{
if(AffectedObjects[i]->GetID() == AffectedObject.GetID())
{
//object already exists, exit function
return;
}
}
//else you add the object to the stack
AffectedObjects.Push(&AffectedObject);
}
bool Player::deathTimerTick(float dt)
{
this->deathTimer -= dt;

2
Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp
View File

@ -152,7 +152,7 @@ using namespace DanBias;
}
void GameSession::ObjectEnabled( GameLogic::IObjectData* movedObject )
{
GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID()).GetProtocol());
GameSession::gameSession->Send(Protocol_ObjectEnable(movedObject->GetID()).GetProtocol());
}
void GameSession::ObjectDamaged( GameLogic::IObjectData* movedObject, float hp )
{

8
Code/Game/LevelLoader/LevelParser.cpp
View File

@ -167,6 +167,14 @@ std::vector<SmartPointer<ObjectTypeHeader>> LevelParser::Parse(std::string filen
ParseObject(&buffer[counter], &header->healthValue, 4);
counter += 4;
// DEBUG
header->position[1] = 150;
header->spawnTime = 5;
header->boundingVolume.box.mass = 0;
header->typeID = ObjectType_Static;
header->healthValue = 50;
// !DEBUG
objects.push_back(header);
break;