From bc17a9f09ee3f2bc61b1ab7d367a40768c22379f Mon Sep 17 00:00:00 2001 From: Erik Persson Date: Tue, 25 Feb 2014 10:37:33 +0100 Subject: [PATCH 01/13] merge --- Code/Game/GameLogic/AttatchmentMassDriver.cpp | 2 + Code/Game/GameLogic/CollisionManager.cpp | 67 ++++++++++++++++++- Code/Game/GameLogic/DynamicObject.cpp | 26 +++++++ Code/Game/GameLogic/DynamicObject.h | 9 +++ Code/Game/GameLogic/GameLogicStates.h | 3 + Code/Game/GameLogic/Level.cpp | 10 +-- Code/Game/GameLogic/Player.cpp | 47 ++++++++++--- Code/Game/GameLogic/Player.h | 7 ++ 8 files changed, 156 insertions(+), 15 deletions(-) diff --git a/Code/Game/GameLogic/AttatchmentMassDriver.cpp b/Code/Game/GameLogic/AttatchmentMassDriver.cpp index b988451f..c6b0df0a 100644 --- a/Code/Game/GameLogic/AttatchmentMassDriver.cpp +++ b/Code/Game/GameLogic/AttatchmentMassDriver.cpp @@ -99,6 +99,7 @@ void AttatchmentMassDriver::ForcePush(const GameLogic::WEAPON_FIRE &usage, float forcePushData args; args.pushForce = pushForce; + args.p = this->owner; Oyster::Physics::API::Instance().ApplyEffect(hitCone,&args,ForcePushAction); @@ -136,6 +137,7 @@ void AttatchmentMassDriver::ForcePull(const WEAPON_FIRE &usage, float dt) Oyster::Collision3D::Cone *hitCone = new Oyster::Collision3D::Cone(lenght,pos,(Oyster::Math::Float4)owner->GetRigidBody()->GetState().quaternion,radius); forcePushData args; args.pushForce = -pushForce; + args.p = this->owner; Oyster::Physics::API::Instance().ApplyEffect(hitCone,&args,ForcePushAction); diff --git a/Code/Game/GameLogic/CollisionManager.cpp b/Code/Game/GameLogic/CollisionManager.cpp index 90a2aefe..8a360059 100644 --- a/Code/Game/GameLogic/CollisionManager.cpp +++ b/Code/Game/GameLogic/CollisionManager.cpp @@ -113,7 +113,7 @@ using namespace GameLogic; Object *realObjA = ((Object*)(objA->GetCustomTag())); - Object *realObjB = (Object*)objB->GetCustomTag(); //needs to be changed? + Object *realObjB = (Object*)objB->GetCustomTag(); ExplosiveCrate* crate; if(!realObjA) @@ -166,9 +166,13 @@ using namespace GameLogic; Player *hitPlayer = (Player*)realObj; hitPlayer->DamageLife(ExplosionSource->extraDamageOnCollision); //hitPlayer->GetRigidBody()->ApplyImpulse(force); + + //hitPlayer->DamageLife(ExplosionSource->getExtraDamageOnCollision()); + realObj->GetRigidBody()->ApplyImpulse(force * 5); //do shredding damage } + } @@ -226,6 +230,58 @@ using namespace GameLogic; { return Physics::ICustomBody::SubscriptMessage_none; } + + void DynamicObject::DynamicDefaultOnCollision(Oyster::Physics::ICustomBody *objA, Oyster::Physics::ICustomBody *objB, Oyster::Math::Float kineticEnergyLoss) + { + + DynamicObject *realObjA = dynamic_cast((Object*)objA->GetCustomTag()); + + DynamicObject *realObjB = dynamic_cast((Object*)objB->GetCustomTag()); + + if(!realObjA || !realObjB) // one of the objects cannot be cast into a dynamicObject and so we leave the function + { + return; + } + + //check which obj is the one that is already affected, if both are then use the special case of changing ownership. + if(realObjA->getAffectingPlayer() == NULL && realObjB->getAffectingPlayer() == NULL) //None of the objects have a player affecting them + { + return;//leave function as the are not to transfer any ownership + } + + if(realObjA->getAffectingPlayer() != NULL && realObjB->getAffectingPlayer() == NULL) + { + //realobjA is the affectedObject, transfer this to realobjB + realObjB->SetAffectedBy(*realObjA->getAffectingPlayer()); + + } + if(realObjB->getAffectingPlayer() != NULL && realObjA->getAffectingPlayer() == NULL) + { + //realobjB is the affectedObject, transfer this to realobjA + realObjA->SetAffectedBy(*realObjB->getAffectingPlayer()); + + } + + if(realObjA->getAffectingPlayer() != NULL && realObjB->getAffectingPlayer() != NULL) + { + //Both objects have a player affecting them, now use the special case + if(realObjA->GetRigidBody()->GetState().previousVelocity.GetMagnitude() > realObjB->GetRigidBody()->GetState().previousVelocity.GetMagnitude() ) + { + //realObjA is the winner and will change Bs ownership to A + realObjB->SetAffectedBy(*realObjA->getAffectingPlayer()); + } + else + { + realObjA->SetAffectedBy(*realObjB->getAffectingPlayer()); + //realObjB is the winner and will change As ownership to B + } + } + + + + + } + Oyster::Physics::ICustomBody::SubscriptMessage Player::PlayerCollisionAfter(Oyster::Physics::ICustomBody *rigidBodyLevel, Oyster::Physics::ICustomBody *obj, Oyster::Math::Float kineticEnergyLoss) { return Physics::ICustomBody::SubscriptMessage_none; @@ -250,7 +306,16 @@ using namespace GameLogic; if(realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_Player || realObj->GetObjectType() == ObjectSpecialType::ObjectSpecialType_World) return; + + obj->ApplyImpulse(((forcePushData*)(args))->pushForce); + + DynamicObject *dynamicObj = dynamic_cast(realObj); + + if(dynamicObj) + { + dynamicObj->SetAffectedBy(*((forcePushData*)(args))->p); + } } void AttatchmentMassDriver::AttemptPickUp(Oyster::Physics::ICustomBody *obj, void* args) diff --git a/Code/Game/GameLogic/DynamicObject.cpp b/Code/Game/GameLogic/DynamicObject.cpp index e6d9ff49..961d29fc 100644 --- a/Code/Game/GameLogic/DynamicObject.cpp +++ b/Code/Game/GameLogic/DynamicObject.cpp @@ -1,5 +1,6 @@ #include "DynamicObject.h" #include "CollisionManager.h" +#include "Player.h" using namespace GameLogic; using namespace Oyster::Math; @@ -10,6 +11,7 @@ DynamicObject::DynamicObject() { this->isReleased = false; this->isActive = true; + this->affectedBy = NULL; } DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , void (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss), ObjectSpecialType type, int objectID) @@ -17,12 +19,14 @@ DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , void (*Ev { this->isReleased = false; this->isActive = true; + this->affectedBy = NULL; } DynamicObject::DynamicObject(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) :Object(rigidBody, EventOnCollision, type, objectID) { this->isReleased = false; this->isActive = true; + this->affectedBy = NULL; } DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , void (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss), ObjectSpecialType type, int objectID, Oyster::Math::Float extraDamageOnCollision) @@ -31,6 +35,7 @@ DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , void (*Ev this->extraDamageOnCollision = extraDamageOnCollision; this->isReleased = false; this->isActive = true; + this->affectedBy = NULL; } DynamicObject::DynamicObject(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, Oyster::Math::Float extraDamageOnCollision) @@ -39,6 +44,7 @@ DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , Oyster::P this->extraDamageOnCollision = extraDamageOnCollision; this->isReleased = false; this->isActive = true; + this->affectedBy = NULL; } DynamicObject::~DynamicObject(void) { @@ -74,4 +80,24 @@ void DynamicObject::Activate() { this->isActive = true; this->isReleased = false; +} + +void DynamicObject::SetAffectedBy(Player &player) +{ + this->affectedBy = &player; + if(this->type != ObjectSpecialType::ObjectSpecialType_Player) //should not add itself to its own list if its a player + { + player.AddAffectedObject(*this); + } + +} + +Player* DynamicObject::getAffectingPlayer() +{ + return this->affectedBy; +} + +void DynamicObject::RemoveAffectedBy() +{ + this->affectedBy = NULL; } \ No newline at end of file diff --git a/Code/Game/GameLogic/DynamicObject.h b/Code/Game/GameLogic/DynamicObject.h index 8a32e849..d1bb63bc 100644 --- a/Code/Game/GameLogic/DynamicObject.h +++ b/Code/Game/GameLogic/DynamicObject.h @@ -9,6 +9,7 @@ namespace GameLogic { + class Player; class DynamicObject : public Object { @@ -28,9 +29,17 @@ namespace GameLogic void Inactivate(); void Activate(); + void SetAffectedBy(GameLogic::Player &player); + void RemoveAffectedBy(); + GameLogic::Player* getAffectingPlayer(); + + static void DynamicObject::DynamicDefaultOnCollision(Oyster::Physics::ICustomBody *rigidBodyObject, Oyster::Physics::ICustomBody *obj, Oyster::Math::Float kineticEnergyLoss); + private: bool isActive; bool isReleased; + protected: + GameLogic::Player *affectedBy; }; diff --git a/Code/Game/GameLogic/GameLogicStates.h b/Code/Game/GameLogic/GameLogicStates.h index 9ae0d482..ae4e192f 100644 --- a/Code/Game/GameLogic/GameLogicStates.h +++ b/Code/Game/GameLogic/GameLogicStates.h @@ -2,8 +2,10 @@ #define GAMELOGICSTATES_H #include "OysterMath.h" + namespace GameLogic { + class Player; enum PLAYER_MOVEMENT { PLAYER_MOVEMENT_FORWARD = 0, @@ -41,6 +43,7 @@ namespace GameLogic struct forcePushData { Oyster::Math::Float3 pushForce; + Player *p; }; diff --git a/Code/Game/GameLogic/Level.cpp b/Code/Game/GameLogic/Level.cpp index 922d2a8f..a4252bc4 100644 --- a/Code/Game/GameLogic/Level.cpp +++ b/Code/Game/GameLogic/Level.cpp @@ -59,12 +59,12 @@ Object* Level::CreateGameObj(ObjectHeader* obj, ICustomBody* rigidBody) break; case ObjectSpecialType_Stone: { - gameObj = new DynamicObject(rigidBody, Object::DefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); + gameObj = new DynamicObject(rigidBody, DynamicObject::DynamicDefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); } break; case ObjectSpecialType_StandardBox: { - gameObj = new DynamicObject(rigidBody, Object::DefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); + gameObj = new DynamicObject(rigidBody, DynamicObject::DynamicDefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); } break; case ObjectSpecialType_RedExplosiveBox: @@ -81,12 +81,12 @@ Object* Level::CreateGameObj(ObjectHeader* obj, ICustomBody* rigidBody) // break; case ObjectSpecialType_SpikeBox: { - gameObj = new DynamicObject(rigidBody, Object::DefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); + gameObj = new DynamicObject(rigidBody, DynamicObject::DynamicDefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); } break; case ObjectSpecialType_Spike: { - gameObj = new DynamicObject(rigidBody, Object::DefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); + gameObj = new DynamicObject(rigidBody, DynamicObject::DynamicDefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); } break; case ObjectSpecialType_CrystalFormation: @@ -98,7 +98,7 @@ Object* Level::CreateGameObj(ObjectHeader* obj, ICustomBody* rigidBody) break; case ObjectSpecialType_CrystalShard: { - gameObj = new DynamicObject(rigidBody, Object::DefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); + gameObj = new DynamicObject(rigidBody, DynamicObject::DynamicDefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); } break; case ObjectSpecialType_JumpPad: diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp index 69569d44..4dcdacaa 100644 --- a/Code/Game/GameLogic/Player.cpp +++ b/Code/Game/GameLogic/Player.cpp @@ -18,6 +18,8 @@ Player::Player(Oyster::Physics::ICustomBody *rigidBody, void (*EventOnCollision) :DynamicObject(rigidBody, EventOnCollision, type, objectID) { weapon = new Weapon(2,this); + AffectedObjects.Reserve(15); + this->life = 100; this->teamID = teamID; @@ -46,6 +48,9 @@ Player::Player(Oyster::Physics::ICustomBody *rigidBody, Oyster::Physics::ICustom { weapon = new Weapon(2,this); + AffectedObjects.Reserve(15); + + this->life = 100; this->teamID = teamID; this->playerState = PLAYER_STATE_IDLE; @@ -213,6 +218,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]->GetRigidBody()->GetState().previousVelocity).GetMagnitude() <= 0.1f) + { + this->AffectedObjects[i]->RemoveAffectedBy(); + this->AffectedObjects.Remove(i); + } + + } } @@ -334,17 +349,31 @@ PLAYER_STATE Player::GetState() const void Player::DamageLife(int damage) { - if( this->playerState != PLAYER_STATE_DEAD) - { - this->life -= damage; - this->gameInstance->onDamageTakenFnc( this, this->life); - if(this->life <= 0) + this->life -= damage; + this->gameInstance->onDamageTakenFnc( this, this->life); + + if(this->life <= 0) + { + this->life = 0; + playerState = PLAYER_STATE_DEAD; + this->deathTimeLeft = this->deathTime; + this->gameInstance->onDeadFnc(this, this->deathTimeLeft); + } + +} + +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()) { - this->life = 0; - playerState = PLAYER_STATE_DEAD; - this->deathTimeLeft = this->deathTime; - this->gameInstance->onDeadFnc(this, this->deathTimeLeft); + //object already exists, exit function + return; } } + //else you add the object to the stack + AffectedObjects.Push(&AffectedObject); } diff --git a/Code/Game/GameLogic/Player.h b/Code/Game/GameLogic/Player.h index 001c9141..99af52c5 100644 --- a/Code/Game/GameLogic/Player.h +++ b/Code/Game/GameLogic/Player.h @@ -7,6 +7,7 @@ #include "GameLogicStates.h" #include "OysterMath.h" #include "DynamicObject.h" +#include "DynamicArray.h" namespace GameLogic @@ -49,6 +50,8 @@ namespace GameLogic void SetLookDir(const Oyster::Math3D::Float3& lookDir); void TurnLeft(Oyster::Math3D::Float deltaRadians); + + void AddAffectedObject(DynamicObject &AffectedObject); /******************************************************** * Collision function for player, this is to be sent to physics through the subscribe function with the rigidbody @@ -77,10 +80,14 @@ namespace GameLogic void EndFrame(); static Oyster::Physics::ICustomBody::SubscriptMessage PlayerCollisionAfter(Oyster::Physics::ICustomBody *rigidBodyLevel, Oyster::Physics::ICustomBody *obj, Oyster::Math::Float kineticEnergyLoss); + + private: void Jump(); private: + Utility::DynamicMemory::DynamicArray AffectedObjects; + Oyster::Math::Float life; int teamID; Weapon *weapon; From 8a359bd1baca45e4e2528b0f7aee12dd92361ae5 Mon Sep 17 00:00:00 2001 From: Erik Persson Date: Tue, 25 Feb 2014 11:20:46 +0100 Subject: [PATCH 02/13] GL - only 1 player can manipulate a object at a time --- Code/Game/GameLogic/AttatchmentMassDriver.cpp | 2 +- Code/Game/GameLogic/CollisionManager.cpp | 14 +++++++++++-- Code/Game/GameLogic/DynamicObject.cpp | 20 +++++++++++++++++++ Code/Game/GameLogic/DynamicObject.h | 5 +++++ Code/Game/GameLogic/Player.cpp | 2 +- 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/Code/Game/GameLogic/AttatchmentMassDriver.cpp b/Code/Game/GameLogic/AttatchmentMassDriver.cpp index c6b0df0a..1f86bf60 100644 --- a/Code/Game/GameLogic/AttatchmentMassDriver.cpp +++ b/Code/Game/GameLogic/AttatchmentMassDriver.cpp @@ -80,7 +80,7 @@ void AttatchmentMassDriver::ForcePush(const GameLogic::WEAPON_FIRE &usage, float { pushForce = Oyster::Math::Float4(this->owner->GetLookDir()) * (800); heldObject->ApplyImpulse((Oyster::Math::Float3)pushForce); - + ((DynamicObject*)(heldObject->GetCustomTag()))->RemoveManipulation(); hasObject = false; heldObject = NULL; return; diff --git a/Code/Game/GameLogic/CollisionManager.cpp b/Code/Game/GameLogic/CollisionManager.cpp index 8a360059..d60d16ce 100644 --- a/Code/Game/GameLogic/CollisionManager.cpp +++ b/Code/Game/GameLogic/CollisionManager.cpp @@ -309,6 +309,7 @@ using namespace GameLogic; obj->ApplyImpulse(((forcePushData*)(args))->pushForce); + DynamicObject *dynamicObj = dynamic_cast(realObj); @@ -333,12 +334,21 @@ using namespace GameLogic; Object* realObj = (Object*)(obj->GetCustomTag()); //check so that it is an object that you can pickup - switch(realObj->GetObjectType()) + DynamicObject *dynamicObj = dynamic_cast(realObj); + + if(!dynamicObj) return; + + if(dynamicObj->getManipulatingPlayer() != NULL) + { + return; + } + + switch(dynamicObj->GetObjectType()) { case ObjectSpecialType::ObjectSpecialType_StandardBox: weapon->heldObject = obj; //weapon now holds the object weapon->hasObject = true; - + dynamicObj->SetManipulatingPlayer(*weapon->owner); //TODO: add if this is to be a struggle of who has the most power in its weapon, the player that is already manipulating the object or you. if you then you take the object from the other player, if not then you do not take the object break; } diff --git a/Code/Game/GameLogic/DynamicObject.cpp b/Code/Game/GameLogic/DynamicObject.cpp index 961d29fc..844deaf2 100644 --- a/Code/Game/GameLogic/DynamicObject.cpp +++ b/Code/Game/GameLogic/DynamicObject.cpp @@ -12,6 +12,7 @@ DynamicObject::DynamicObject() this->isReleased = false; this->isActive = true; this->affectedBy = NULL; + this->manipulatedBy = NULL; } DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , void (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss), ObjectSpecialType type, int objectID) @@ -20,6 +21,7 @@ DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , void (*Ev this->isReleased = false; this->isActive = true; this->affectedBy = NULL; + this->manipulatedBy = NULL; } DynamicObject::DynamicObject(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) :Object(rigidBody, EventOnCollision, type, objectID) @@ -27,6 +29,7 @@ DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , Oyster::P this->isReleased = false; this->isActive = true; this->affectedBy = NULL; + this->manipulatedBy = NULL; } DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , void (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss), ObjectSpecialType type, int objectID, Oyster::Math::Float extraDamageOnCollision) @@ -36,6 +39,7 @@ DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , void (*Ev this->isReleased = false; this->isActive = true; this->affectedBy = NULL; + this->manipulatedBy = NULL; } DynamicObject::DynamicObject(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, Oyster::Math::Float extraDamageOnCollision) @@ -45,6 +49,7 @@ DynamicObject::DynamicObject(Oyster::Physics::ICustomBody *rigidBody , Oyster::P this->isReleased = false; this->isActive = true; this->affectedBy = NULL; + this->manipulatedBy = NULL; } DynamicObject::~DynamicObject(void) { @@ -100,4 +105,19 @@ Player* DynamicObject::getAffectingPlayer() void DynamicObject::RemoveAffectedBy() { this->affectedBy = NULL; +} + +GameLogic::Player* DynamicObject::getManipulatingPlayer() +{ + return this->manipulatedBy; +} + +void DynamicObject::SetManipulatingPlayer(GameLogic::Player &player) +{ + this->manipulatedBy = &player; +} + +void DynamicObject::RemoveManipulation() +{ + this->manipulatedBy = NULL; } \ No newline at end of file diff --git a/Code/Game/GameLogic/DynamicObject.h b/Code/Game/GameLogic/DynamicObject.h index d1bb63bc..03a03ad6 100644 --- a/Code/Game/GameLogic/DynamicObject.h +++ b/Code/Game/GameLogic/DynamicObject.h @@ -30,8 +30,11 @@ namespace GameLogic void Activate(); void SetAffectedBy(GameLogic::Player &player); + void SetManipulatingPlayer(GameLogic::Player &player); void RemoveAffectedBy(); + void RemoveManipulation(); GameLogic::Player* getAffectingPlayer(); + GameLogic::Player* getManipulatingPlayer(); static void DynamicObject::DynamicDefaultOnCollision(Oyster::Physics::ICustomBody *rigidBodyObject, Oyster::Physics::ICustomBody *obj, Oyster::Math::Float kineticEnergyLoss); @@ -40,6 +43,8 @@ namespace GameLogic bool isReleased; protected: GameLogic::Player *affectedBy; + GameLogic::Player *manipulatedBy; + }; diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp index 4dcdacaa..d8ba38ba 100644 --- a/Code/Game/GameLogic/Player.cpp +++ b/Code/Game/GameLogic/Player.cpp @@ -221,7 +221,7 @@ 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]->GetRigidBody()->GetState().previousVelocity).GetMagnitude() <= 0.1f) + if(this->AffectedObjects[i] && (this->AffectedObjects[i]->GetRigidBody()->GetState().previousVelocity).GetMagnitude() <= 0.1f) { this->AffectedObjects[i]->RemoveAffectedBy(); this->AffectedObjects.Remove(i); From 7460f16512752721054f79c5513a86dcf83c1792 Mon Sep 17 00:00:00 2001 From: Linda Andersson Date: Tue, 25 Feb 2014 11:46:05 +0100 Subject: [PATCH 03/13] Added player stats. Added players to level. Respawn logic in level. --- .../GameClient/GameClientState/GamingUI.cpp | 2 +- Code/Game/GameLogic/Game.cpp | 5 +- Code/Game/GameLogic/Game.h | 13 ++- Code/Game/GameLogic/GameAPI.h | 2 + Code/Game/GameLogic/GameLogicStates.h | 3 +- Code/Game/GameLogic/Game_LevelData.cpp | 14 ++- Code/Game/GameLogic/Game_PlayerData.cpp | 4 + Code/Game/GameLogic/Level.cpp | 56 ++++++++- Code/Game/GameLogic/Level.h | 14 ++- Code/Game/GameLogic/Player.cpp | 110 ++++++++---------- Code/Game/GameLogic/Player.h | 34 ++++-- .../Implementation/GameSession_Gameplay.cpp | 5 - 12 files changed, 167 insertions(+), 95 deletions(-) diff --git a/Code/Game/GameClient/GameClientState/GamingUI.cpp b/Code/Game/GameClient/GameClientState/GamingUI.cpp index d356028a..1486fdda 100644 --- a/Code/Game/GameClient/GameClientState/GamingUI.cpp +++ b/Code/Game/GameClient/GameClientState/GamingUI.cpp @@ -105,7 +105,7 @@ void GamingUI::ReadKeyInput() float yaw = this->input->GetYaw(); //if( yaw != 0.0f ) //This made the camera reset to a specific rotation. { - this->netClient->Send( Protocol_PlayerLeftTurn(yaw * mouseSensitivity,camera->GetLook()) ); + this->netClient->Send( Protocol_PlayerLeftTurn(yaw * mouseSensitivity, camera->GetLook()) ); } } diff --git a/Code/Game/GameLogic/Game.cpp b/Code/Game/GameLogic/Game.cpp index 0e1ab178..a33ce03c 100644 --- a/Code/Game/GameLogic/Game.cpp +++ b/Code/Game/GameLogic/Game.cpp @@ -108,6 +108,7 @@ Game::PlayerData* Game::CreatePlayer() this->players[insert] = new PlayerData(freeID, 0); // user constructor with objectID and teamID this->players[insert]->player->GetRigidBody()->SetSubscription(Game::PhysicsOnMove); + this->level->AddPlayerToGame(this->players[insert]); return this->players[insert]; } @@ -128,6 +129,9 @@ void Game::CreateTeam() bool Game::NewFrame() { + // HACK need dynamic delta time + this->level->Update(this->frameTime); + for (unsigned int i = 0; i < this->players.Size(); i++) { if(this->players[i] && this->players[i]->player) this->players[i]->player->BeginFrame(); @@ -202,4 +206,3 @@ void Game::PhysicsOnDestroy(::Utility::DynamicMemory::UniquePointer { if(gameInstance.onDisableFnc) gameInstance.onDisableFnc(0, 0); } - diff --git a/Code/Game/GameLogic/Game.h b/Code/Game/GameLogic/Game.h index 37abe97f..c03de2ed 100644 --- a/Code/Game/GameLogic/Game.h +++ b/Code/Game/GameLogic/Game.h @@ -45,7 +45,7 @@ namespace GameLogic ObjectSpecialType GetObjectType() const override; void Inactivate() override; void Release() override; - + Player* GetPlayer(); Player *player; }; @@ -63,7 +63,8 @@ namespace GameLogic int getNrOfDynamicObj()const override; IObjectData* GetObjectAt(int ID) const override; void GetAllDynamicObjects(Utility::DynamicMemory::DynamicArray& mem) const override; - + void Update(float deltaTime); + void AddPlayerToGame(IPlayerData *player); Level *level; }; @@ -80,16 +81,16 @@ namespace GameLogic void SetFrameTimeLength( float seconds ) override; void SetSubscription(GameEvent::ObjectMovedFunction functionPointer) override; void SetSubscription(GameEvent::ObjectDisabledFunction functionPointer) override; - void SetHpSubscription(GameEvent::ObjectHpFunction functionPointer) override; - void SetRespawnSubscription(GameEvent::ObjectRespawnedFunction functionPointer) override; - void SetDeadSubscription(GameEvent::ObjectDeadFunction functionPointer) override; - + void SetHpSubscription(GameEvent::ObjectHpFunction functionPointer) override; + void SetRespawnSubscription(GameEvent::ObjectRespawnedFunction functionPointer) override; + void SetDeadSubscription(GameEvent::ObjectDeadFunction functionPointer) override; bool Initiate() override; float GetFrameTime() const; static void PhysicsOnMove(const Oyster::Physics::ICustomBody *object); static void PhysicsOnDestroy(::Utility::DynamicMemory::UniquePointer proto); + static void PhysicsOnDead(const Oyster::Physics::ICustomBody *object); Utility::DynamicMemory::DynamicArray players; LevelData* level; diff --git a/Code/Game/GameLogic/GameAPI.h b/Code/Game/GameLogic/GameAPI.h index 0c79f33d..627ea547 100644 --- a/Code/Game/GameLogic/GameAPI.h +++ b/Code/Game/GameLogic/GameAPI.h @@ -117,8 +117,10 @@ namespace GameLogic class ILevelData :public IObjectData { public: + virtual void Update(float deltaTime) = 0; virtual int getNrOfDynamicObj()const = 0; virtual IObjectData* GetObjectAt(int ID) const = 0; + virtual void AddPlayerToGame(IPlayerData *player) = 0; virtual void GetAllDynamicObjects(Utility::DynamicMemory::DynamicArray& destMem) const = 0; }; diff --git a/Code/Game/GameLogic/GameLogicStates.h b/Code/Game/GameLogic/GameLogicStates.h index 9ae0d482..be4bd60e 100644 --- a/Code/Game/GameLogic/GameLogicStates.h +++ b/Code/Game/GameLogic/GameLogicStates.h @@ -18,7 +18,8 @@ namespace GameLogic PLAYER_STATE_WALKING = 1, PLAYER_STATE_IDLE = 2, PLAYER_STATE_DEAD = 4, - PLAYER_STATE_INVALID = 8, + PLAYER_STATE_DIED = 8, + PLAYER_STATE_INVALID = 16, }; enum WEAPON_FIRE diff --git a/Code/Game/GameLogic/Game_LevelData.cpp b/Code/Game/GameLogic/Game_LevelData.cpp index 903cb959..f16f4072 100644 --- a/Code/Game/GameLogic/Game_LevelData.cpp +++ b/Code/Game/GameLogic/Game_LevelData.cpp @@ -54,9 +54,17 @@ IObjectData* Game::LevelData::GetObjectAt(int ID) const void Game::LevelData::GetAllDynamicObjects(Utility::DynamicMemory::DynamicArray& mem) const { - mem.Resize(level->dynamicObjects.Size()); - for(int i = 0; i < (int)level->dynamicObjects.Size(); i++) + mem.Resize(level->GetDynamicObject().Size()); + for(int i = 0; i < (int)level->GetDynamicObject().Size(); i++) { - mem[i] = level->dynamicObjects[i]; + mem[i] = level->GetDynamicObject()[i]; } +} +void Game::LevelData::Update(float deltaTime) +{ + this->level->Update(deltaTime); +} +void Game::LevelData::AddPlayerToGame(IPlayerData *player) +{ + this->level->AddPlayerToGame(((PlayerData*)player)->GetPlayer()); } \ No newline at end of file diff --git a/Code/Game/GameLogic/Game_PlayerData.cpp b/Code/Game/GameLogic/Game_PlayerData.cpp index ad409e3b..88b4bbbe 100644 --- a/Code/Game/GameLogic/Game_PlayerData.cpp +++ b/Code/Game/GameLogic/Game_PlayerData.cpp @@ -101,4 +101,8 @@ void Game::PlayerData::Inactivate() void Game::PlayerData::Release() { this->player->ReleaseDynamicObject(); +} +Player* Game::PlayerData::GetPlayer() +{ + return this->player; } \ No newline at end of file diff --git a/Code/Game/GameLogic/Level.cpp b/Code/Game/GameLogic/Level.cpp index 922d2a8f..3eb57bf5 100644 --- a/Code/Game/GameLogic/Level.cpp +++ b/Code/Game/GameLogic/Level.cpp @@ -12,7 +12,7 @@ using namespace GameLogic; using namespace Utility::DynamicMemory; using namespace Oyster::Physics; - +using namespace Oyster::Math; Level::Level(void) { @@ -69,7 +69,7 @@ Object* Level::CreateGameObj(ObjectHeader* obj, ICustomBody* rigidBody) break; case ObjectSpecialType_RedExplosiveBox: { - Oyster::Math::Float dmg = 90; + Oyster::Math::Float dmg = 120; Oyster::Math::Float force = 500; Oyster::Math::Float radie = 3; gameObj = new ExplosiveCrate(rigidBody, (ObjectSpecialType)obj->specialTypeID, objID++, dmg, force, radie); @@ -393,7 +393,20 @@ void Level::AddPlayerToTeam(Player *player, int teamID) { this->teamManager.AddPlayerToTeam(player,teamID); } - +void Level::AddPlayerToGame(Player *player) +{ + this->playerObjects.Push(player); +} +void Level::RemovePlayerFromGame(Player *player) +{ + for(int i = 0; i < (int)this->playerObjects.Size(); i++) + { + if ((Player*)this->playerObjects[i] == player) + { + //this->playerObjects[i]. + } + } +} void Level::CreateTeam(int teamSize) { this->teamManager.CreateTeam(teamSize); @@ -401,9 +414,29 @@ void Level::CreateTeam(int teamSize) void Level::RespawnPlayer(Player *player) { - this->teamManager.RespawnPlayerRandom(player); -} + //this->teamManager.RespawnPlayerRandom(player); + Float3 spawnPoint = spawnPoints[0]; + player->Respawn(spawnPoint); +} +void Level::Update(float deltaTime) +{ + // update lvl-things + for(int i = 0; i < (int)this->playerObjects.Size(); i++) + { + if (this->playerObjects[i]->GetState() == PLAYER_STATE::PLAYER_STATE_DEAD) + { + // true when timer reaches 0 + if(this->playerObjects[i]->deathTimerTick(deltaTime)) + RespawnPlayer(this->playerObjects[i]); + } + else if (this->playerObjects[i]->GetState() == PLAYER_STATE::PLAYER_STATE_DIED) + { + this->playerObjects[i]->setDeathTimer(DEATH_TIMER); + ((Game*)&Game::Instance())->onDeadFnc(this->playerObjects[i], DEATH_TIMER); // add killer ID + } + } +} int Level::getNrOfDynamicObj() { return this->dynamicObjects.Size(); @@ -417,10 +450,23 @@ Object* Level::GetObj( int ID) const } return NULL; } + void Level::PhysicsOnMoveLevel(const ICustomBody *object) { // function call from physics update when object was moved Object* temp = (Object*)object->GetCustomTag(); ((Game*)&Game::Instance())->onMoveFnc(temp); } +Utility::DynamicMemory::DynamicArray> Level::GetPlayers() +{ + return this->playerObjects; +} +Utility::DynamicMemory::DynamicArray> Level::GetStaticObjects() +{ + return this->staticObjects; +} +Utility::DynamicMemory::DynamicArray> Level::GetDynamicObject() +{ + return this->dynamicObjects; +} diff --git a/Code/Game/GameLogic/Level.h b/Code/Game/GameLogic/Level.h index 27f0bab6..9fb3dbad 100644 --- a/Code/Game/GameLogic/Level.h +++ b/Code/Game/GameLogic/Level.h @@ -16,6 +16,7 @@ #include "DynamicArray.h" #include "LevelLoader.h" +const int DEATH_TIMER = 5; namespace GameLogic { @@ -48,7 +49,8 @@ namespace GameLogic * @param teamID: ArrayPos of the team you want to add the player to ********************************************************/ void AddPlayerToTeam(Player *player, int teamID); - + void AddPlayerToGame(Player *player); + void RemovePlayerFromGame(Player *player); /******************************************************** * Respawns a player on a random teammate @@ -64,13 +66,21 @@ namespace GameLogic ********************************************************/ static Oyster::Physics::ICustomBody::SubscriptMessage LevelCollisionAfter(Oyster::Physics::ICustomBody *rigidBodyLevel, Oyster::Physics::ICustomBody *obj, Oyster::Math::Float kineticEnergyLoss); + void Update(float deltaTime); + int getNrOfDynamicObj(); Object* GetObj( int ID ) const; + static void PlayerDied( Player* player ); static void PhysicsOnMoveLevel(const Oyster::Physics::ICustomBody *object); + Utility::DynamicMemory::DynamicArray> GetPlayers(); + Utility::DynamicMemory::DynamicArray> GetStaticObjects(); + Utility::DynamicMemory::DynamicArray> GetDynamicObject(); - //private: + private: + Utility::DynamicMemory::DynamicArray> playerObjects; + Utility::DynamicMemory::DynamicArray> deadPlayerObjects; TeamManager teamManager; Utility::DynamicMemory::DynamicArray> staticObjects; Utility::DynamicMemory::DynamicArray> dynamicObjects; diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp index 69569d44..91f09c56 100644 --- a/Code/Game/GameLogic/Player.cpp +++ b/Code/Game/GameLogic/Player.cpp @@ -11,7 +11,8 @@ const float KEY_TIMER = 0.03f; Player::Player() :DynamicObject() { - + Player::initPlayerData(); + 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) @@ -19,26 +20,8 @@ Player::Player(Oyster::Physics::ICustomBody *rigidBody, void (*EventOnCollision) { weapon = new Weapon(2,this); - this->life = 100; + Player::initPlayerData(); this->teamID = teamID; - this->playerState = PLAYER_STATE_IDLE; - this->lookDir = Oyster::Math::Float3(0,0,-1); - key_forward = 0; - key_backward = 0; - key_strafeRight = 0; - key_strafeLeft = 0; - key_jump = 0; - invincibleCooldown = 0; - this->deathTimeLeft = 0; - this->deathTime = 5; - - this->previousPosition = Oyster::Math::Float3(0,0,0); - - this->moveDir = Oyster::Math::Float3(0,0,0); - this->moveSpeed = 100; - this->previousMoveSpeed = Oyster::Math::Float3(0,0,0); - - this->rotationUp = 0; } 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) @@ -46,24 +29,8 @@ Player::Player(Oyster::Physics::ICustomBody *rigidBody, Oyster::Physics::ICustom { weapon = new Weapon(2,this); - this->life = 100; + Player::initPlayerData(); this->teamID = teamID; - this->playerState = PLAYER_STATE_IDLE; - this->lookDir = Oyster::Math::Float3(0,0,-1); - key_forward = 0; - key_backward = 0; - key_strafeRight = 0; - key_strafeLeft = 0; - key_jump = 0; - invincibleCooldown = 0; - this->deathTimeLeft = 0; - this->deathTime = 5; - this->previousPosition = Oyster::Math::Float3(0,0,0); - this->moveDir = Oyster::Math::Float3(0,0,0); - this->moveSpeed = 20; - this->previousMoveSpeed = Oyster::Math::Float3(0,0,0); - - this->rotationUp = 0; } Player::~Player(void) @@ -74,10 +41,29 @@ Player::~Player(void) weapon = NULL; } } +void Player::initPlayerData() +{ + this->playerStats.hp = MAX_HP; + this->playerStats.movementSpeed = BASIC_SPEED; + this->playerScore.killScore = 0; + this->playerScore.deathScore = 0; + this->playerState = PLAYER_STATE_IDLE; + this->lookDir = Oyster::Math::Float3(0,0,-1); + + this->key_forward = 0; + this->key_backward = 0; + this->key_strafeRight = 0; + this->key_strafeLeft = 0; + this->key_jump = 0; + this->invincibleCooldown = 0; + this->deathTimer = 0; + + this->rotationUp = 0; +} void Player::BeginFrame() { - if( this->playerState != PLAYER_STATE_DEAD) + if( this->playerState != PLAYER_STATE_DEAD && PLAYER_STATE_DIED) { weapon->Update(0.002f); @@ -112,7 +98,7 @@ void Player::BeginFrame() // Walking data Oyster::Math::Float3 walkDirection = Oyster::Math::Float3(0.0, 0.0, 0.0); - Oyster::Math::Float walkSpeed = this->moveSpeed*0.2f; + Oyster::Math::Float walkSpeed = this->playerStats.movementSpeed*0.2f; // Check for input if(key_forward > 0.001) @@ -194,26 +180,15 @@ void Player::BeginFrame() if(this->rigidBody->GetLambda() < 0.9f) { Oyster::Math::Float3 up = this->rigidBody->GetState().centerPos.GetNormalized(); - this->rigidBody->ApplyImpulse(up*this->rigidBody->GetState().mass*20); + this->rigidBody->ApplyImpulse(up*this->rigidBody->GetState().mass * 20); this->playerState = PLAYER_STATE::PLAYER_STATE_JUMPING; } } } - else - { - // player is dead - // TODO move this logic to lvl - this->deathTimeLeft -= gameInstance->GetFrameTime(); - if( this->deathTimeLeft <= 0) - { - Respawn( Oyster::Math::Float3( -50, 180, 0)); - } - } } void Player::EndFrame() { - } void Player::Move(const PLAYER_MOVEMENT &movement) @@ -268,12 +243,10 @@ void Player::Respawn(Oyster::Math::Float3 spawnPoint) { if( this->playerState == PLAYER_STATE_DEAD) { - this->life = 100; - this->playerState = PLAYER_STATE::PLAYER_STATE_IDLE; - //this->lookDir = Oyster::Math::Float4(1,0,0); + Player::initPlayerData(); this->rigidBody->SetPosition(spawnPoint); this->gameInstance->onRespawnFnc( this, spawnPoint); - this->gameInstance->onDamageTakenFnc( this, this->life); + this->gameInstance->onDamageTakenFnc( this, this->playerStats.hp); } } @@ -336,15 +309,28 @@ void Player::DamageLife(int damage) { if( this->playerState != PLAYER_STATE_DEAD) { - this->life -= damage; - this->gameInstance->onDamageTakenFnc( this, this->life); + this->playerStats.hp -= damage; + // send hp to client + this->gameInstance->onDamageTakenFnc( this, this->playerStats.hp); - if(this->life <= 0) + if(this->playerStats.hp <= 0) { - this->life = 0; - playerState = PLAYER_STATE_DEAD; - this->deathTimeLeft = this->deathTime; - this->gameInstance->onDeadFnc(this, this->deathTimeLeft); + this->playerStats.hp = 0; + this->playerState = PLAYER_STATE_DIED; } } } +bool Player::deathTimerTick(float dt) +{ + this->deathTimer -= dt; + if( this->deathTimer <= 0) + { + return true; + } + return false; +} +void Player::setDeathTimer(float deathTimer) +{ + this->deathTimer = deathTimer; + this->playerState = PLAYER_STATE_DEAD; +} \ No newline at end of file diff --git a/Code/Game/GameLogic/Player.h b/Code/Game/GameLogic/Player.h index 001c9141..c7900d5f 100644 --- a/Code/Game/GameLogic/Player.h +++ b/Code/Game/GameLogic/Player.h @@ -8,6 +8,8 @@ #include "OysterMath.h" #include "DynamicObject.h" +const float MAX_HP = 100.0f; +const float BASIC_SPEED = 30.0f; namespace GameLogic { @@ -15,6 +17,21 @@ namespace GameLogic class Player : public DynamicObject { public: + struct PlayerStats + { + Oyster::Math::Float hp; + Oyster::Math::Float movementSpeed; + //Oyster::Math::Float resistance; + }; + + struct PlayerScore + { + int killScore; + int deathScore; + // int assistScore; + // int suicideScore; + }; + Player(void); 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); @@ -72,16 +89,18 @@ namespace GameLogic PLAYER_STATE GetState() const; void DamageLife(int damage); + void setDeathTimer(float deathTimer); + bool deathTimerTick(float dt); void BeginFrame(); void EndFrame(); static Oyster::Physics::ICustomBody::SubscriptMessage PlayerCollisionAfter(Oyster::Physics::ICustomBody *rigidBodyLevel, Oyster::Physics::ICustomBody *obj, Oyster::Math::Float kineticEnergyLoss); - private: void Jump(); + void initPlayerData(); private: - Oyster::Math::Float life; + int teamID; Weapon *weapon; PLAYER_STATE playerState; @@ -93,18 +112,15 @@ namespace GameLogic float key_jump; - Oyster::Math::Float3 previousPosition; - Oyster::Math::Float3 moveDir; - Oyster::Math::Float moveSpeed; - Oyster::Math::Float3 previousMoveSpeed; - Oyster::Math::Float rotationUp; - float deathTime; - float deathTimeLeft; + float deathTimer; bool hasTakenDamage; float invincibleCooldown; + PlayerStats playerStats; + PlayerScore playerScore; + }; } #endif \ No newline at end of file diff --git a/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp b/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp index 8cc47dcc..5d3f2a71 100644 --- a/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp +++ b/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp @@ -188,7 +188,6 @@ using namespace DanBias; break; case protocol_Gameplay_PlayerShot: this->Gameplay_PlayerShot ( Protocol_PlayerShot (p), c ); break; - case protocol_Gameplay_ObjectPickup: this->Gameplay_ObjectPickup ( Protocol_ObjectPickup (p), c ); break; case protocol_Gameplay_ObjectDamage: this->Gameplay_ObjectDamage ( Protocol_ObjectDamage (p), c ); @@ -201,7 +200,6 @@ using namespace DanBias; break; case protocol_Gameplay_ObjectCreate: this->Gameplay_ObjectCreate ( Protocol_ObjectCreate (p), c ); break; - case protocol_General_Status: this->General_Status ( Protocol_General_Status (p), c ); break; case protocol_General_Text: this->General_Text ( Protocol_General_Text (p), c ); @@ -242,11 +240,8 @@ using namespace DanBias; { if(p.secondaryPressed) c->GetPlayer()->UseWeapon(GameLogic::WEAPON_USE_SECONDARY_PRESS); if(p.primaryPressed) c->GetPlayer()->UseWeapon(GameLogic::WEAPON_USE_PRIMARY_PRESS); - if(p.utilityPressed) c->GetPlayer()->UseWeapon(GameLogic::WEAPON_USE_UTILLITY_PRESS); } - - void GameSession::Gameplay_ObjectPickup ( Protocol_ObjectPickup& p, DanBias::GameClient* c ) { From 31bf73c2fd4204b14d23f28c6a0733b2c4a1454a Mon Sep 17 00:00:00 2001 From: Erik Persson Date: Tue, 25 Feb 2014 13:56:35 +0100 Subject: [PATCH 04/13] GL - weapon energy, force etc inside weapon --- Code/Game/GameLogic/AttatchmentMassDriver.cpp | 45 ++++++++++++++----- Code/Game/GameLogic/AttatchmentMassDriver.h | 19 ++++++++ 2 files changed, 54 insertions(+), 10 deletions(-) diff --git a/Code/Game/GameLogic/AttatchmentMassDriver.cpp b/Code/Game/GameLogic/AttatchmentMassDriver.cpp index 1f86bf60..62f3599e 100644 --- a/Code/Game/GameLogic/AttatchmentMassDriver.cpp +++ b/Code/Game/GameLogic/AttatchmentMassDriver.cpp @@ -11,10 +11,18 @@ AttatchmentMassDriver::AttatchmentMassDriver(void) this->owner = 0; this->heldObject = NULL; this->hasObject = false; + this->currentEnergy = StandardMaxEnergy; + this->maxEnergy = StandardMaxEnergy; + this->rechargeRate = StandardrechargeRate; + this->force = Standardforce; } AttatchmentMassDriver::AttatchmentMassDriver(Player &owner) { + this->currentEnergy = StandardMaxEnergy; + this->maxEnergy = StandardMaxEnergy; + this->rechargeRate = StandardrechargeRate; + this->force = Standardforce; this->owner = &owner; this->heldObject = NULL; @@ -36,15 +44,27 @@ void AttatchmentMassDriver::UseAttatchment(const GameLogic::WEAPON_FIRE &usage, switch (usage) { case WEAPON_FIRE::WEAPON_USE_PRIMARY_PRESS: - ForcePush(usage,dt); + if(currentEnergy >= 90.0f) + { + currentEnergy -= 90.0f; + ForcePush(usage,dt); + } break; case WEAPON_FIRE::WEAPON_USE_SECONDARY_PRESS: - ForcePull(usage,dt); + if(currentEnergy >= 1.0f) + { + currentEnergy -= 1.0f; + ForcePull(usage,dt); + } break; case WEAPON_FIRE::WEAPON_USE_UTILLITY_PRESS: - ForceZip(usage,dt); + if(currentEnergy >= 90.0f) + { + currentEnergy -= 90.0f; + ForceZip(usage,dt); + } break; } @@ -64,7 +84,14 @@ void AttatchmentMassDriver::Update(float dt) heldObject->SetPosition(pos); heldObject->SetLinearVelocity(Oyster::Math::Float3::null); + currentEnergy += rechargeRate * 0.5f; //rechargeRate is halfed if you are holding an object } + else + { + currentEnergy += rechargeRate; + } + + } /******************************************************** @@ -78,7 +105,7 @@ void AttatchmentMassDriver::ForcePush(const GameLogic::WEAPON_FIRE &usage, float if(hasObject) { - pushForce = Oyster::Math::Float4(this->owner->GetLookDir()) * (800); + pushForce = Oyster::Math::Float4(this->owner->GetLookDir()) * (this->force); heldObject->ApplyImpulse((Oyster::Math::Float3)pushForce); ((DynamicObject*)(heldObject->GetCustomTag()))->RemoveManipulation(); hasObject = false; @@ -91,12 +118,10 @@ void AttatchmentMassDriver::ForcePush(const GameLogic::WEAPON_FIRE &usage, float Oyster::Math::Float lenght = 10; Oyster::Math::Float3 pos = owner->GetRigidBody()->GetState().centerPos; - pushForce = Oyster::Math::Float4(this->owner->GetLookDir()) * (400); + pushForce = Oyster::Math::Float4(this->owner->GetLookDir()) * (this->force * 0.6f); Oyster::Collision3D::Cone *hitCone = new Oyster::Collision3D::Cone(lenght,pos,(Oyster::Math::Float4)owner->GetRigidBody()->GetState().quaternion,radius); - - forcePushData args; args.pushForce = pushForce; args.p = this->owner; @@ -111,7 +136,7 @@ void AttatchmentMassDriver::ForcePush(const GameLogic::WEAPON_FIRE &usage, float ********************************************************/ void AttatchmentMassDriver::ForceZip(const WEAPON_FIRE &usage, float dt) { - Oyster::Math::Float3 force = Oyster::Math::Float4(this->owner->GetLookDir()) * (1000); + Oyster::Math::Float3 force = Oyster::Math::Float4(this->owner->GetLookDir()) * (this->force); this->owner->GetRigidBody()->ApplyImpulse(force); } @@ -132,11 +157,11 @@ void AttatchmentMassDriver::ForcePull(const WEAPON_FIRE &usage, float dt) Oyster::Math::Float lenght = 10; Oyster::Math::Float3 pos = owner->GetRigidBody()->GetState().centerPos; - Oyster::Math::Float4 pushForce = Oyster::Math::Float4(this->owner->GetLookDir()) * (100); + Oyster::Math::Float4 pullForce = Oyster::Math::Float4(this->owner->GetLookDir()) * (this->force * 0.2); Oyster::Collision3D::Cone *hitCone = new Oyster::Collision3D::Cone(lenght,pos,(Oyster::Math::Float4)owner->GetRigidBody()->GetState().quaternion,radius); forcePushData args; - args.pushForce = -pushForce; + args.pushForce = -pullForce; args.p = this->owner; Oyster::Physics::API::Instance().ApplyEffect(hitCone,&args,ForcePushAction); diff --git a/Code/Game/GameLogic/AttatchmentMassDriver.h b/Code/Game/GameLogic/AttatchmentMassDriver.h index 51368e91..385fcca3 100644 --- a/Code/Game/GameLogic/AttatchmentMassDriver.h +++ b/Code/Game/GameLogic/AttatchmentMassDriver.h @@ -4,8 +4,14 @@ #ifndef ATTATCHMENTMASSDRIVER_H #define ATTATCHMENTMASSDRIVER_H #include "IAttatchment.h" + + + namespace GameLogic { + const Oyster::Math::Float StandardMaxEnergy = 100.0f; + const Oyster::Math::Float StandardrechargeRate = 0.5f; + const Oyster::Math::Float Standardforce = 1000.0f; class AttatchmentMassDriver : public IAttatchment { @@ -53,6 +59,19 @@ namespace GameLogic Oyster::Physics::ICustomBody *heldObject; bool hasObject; + Oyster::Math::Float force; + + Oyster::Math::Float maxEnergy; + Oyster::Math::Float currentEnergy; + + Oyster::Math::Float rechargeRate; + + struct Aim + { + + }; + + }; } #endif From b8395e9af7b0cdd6c7914fb98b10c3ea9cb117c3 Mon Sep 17 00:00:00 2001 From: Linda Andersson Date: Tue, 25 Feb 2014 14:35:27 +0100 Subject: [PATCH 05/13] Added eventfunctions for PlayerAction and PickupEvent --- Code/Game/GameLogic/Game.cpp | 19 +++++++++++++++---- Code/Game/GameLogic/Game.h | 19 +++++++++++++------ Code/Game/GameLogic/GameAPI.h | 16 +++++++++------- Code/Game/GameLogic/Level.cpp | 3 +++ Code/Game/GameServer/GameSession.h | 6 ++++-- .../Implementation/GameSession_Gameplay.cpp | 18 ++++++++++++++++-- .../Implementation/GameSession_General.cpp | 7 +++++-- Code/Game/LevelLoader/ObjectDefines.h | 12 ++++++++++++ 8 files changed, 77 insertions(+), 23 deletions(-) diff --git a/Code/Game/GameLogic/Game.cpp b/Code/Game/GameLogic/Game.cpp index a33ce03c..e4782582 100644 --- a/Code/Game/GameLogic/Game.cpp +++ b/Code/Game/GameLogic/Game.cpp @@ -156,14 +156,18 @@ void Game::SetFrameTimeLength( float seconds ) this->frameTime = seconds; } -void Game::SetSubscription(GameEvent::ObjectMovedFunction functionPointer) +void Game::SetMoveSubscription(GameEvent::ObjectMovedFunction functionPointer) { this->onMoveFnc = functionPointer; } -void Game::SetSubscription(GameEvent::ObjectDisabledFunction functionPointer) +void Game::SetDisableSubscription(GameEvent::ObjectDisabledFunction functionPointer) { this->onDisableFnc = functionPointer; } +void Game::SetEnableSubscription(GameEvent::ObjectEnabledFunction functionPointer) +{ + this->onEnableFnc = functionPointer; +} void Game::SetHpSubscription(GameEvent::ObjectHpFunction functionPointer) { this->onDamageTakenFnc = functionPointer; @@ -176,7 +180,14 @@ void Game::SetDeadSubscription(GameEvent::ObjectDeadFunction functionPointer) { this->onDeadFnc = functionPointer; } - +void Game::SetActionSubscription(GameEvent::AnimationEventFunction functionPointer) +{ + this->onPlayerActionEventFnc = functionPointer; +} +void Game::SetPickupSubscription(GameEvent::PickupEventFunction functionPointer) +{ + this->onPickupEventFnc = functionPointer; +} bool Game::Initiate() { API::Instance().Init(); @@ -204,5 +215,5 @@ void Game::PhysicsOnMove(const ICustomBody *object) } void Game::PhysicsOnDestroy(::Utility::DynamicMemory::UniquePointer proto) { - if(gameInstance.onDisableFnc) gameInstance.onDisableFnc(0, 0); + if(gameInstance.onDisableFnc) gameInstance.onDisableFnc(0); } diff --git a/Code/Game/GameLogic/Game.h b/Code/Game/GameLogic/Game.h index c03de2ed..22b9fbda 100644 --- a/Code/Game/GameLogic/Game.h +++ b/Code/Game/GameLogic/Game.h @@ -79,11 +79,14 @@ namespace GameLogic bool NewFrame() override; void SetFPS( int FPS ) override; void SetFrameTimeLength( float seconds ) override; - void SetSubscription(GameEvent::ObjectMovedFunction functionPointer) override; - void SetSubscription(GameEvent::ObjectDisabledFunction functionPointer) override; - void SetHpSubscription(GameEvent::ObjectHpFunction functionPointer) override; - void SetRespawnSubscription(GameEvent::ObjectRespawnedFunction functionPointer) override; - void SetDeadSubscription(GameEvent::ObjectDeadFunction functionPointer) override; + void SetMoveSubscription(GameEvent::ObjectMovedFunction functionPointer) override; + void SetDisableSubscription(GameEvent::ObjectDisabledFunction functionPointer) override; + void SetEnableSubscription(GameEvent::ObjectEnabledFunction functionPointer) override; + void SetHpSubscription(GameEvent::ObjectHpFunction functionPointer) override; + void SetRespawnSubscription(GameEvent::ObjectRespawnedFunction functionPointer) override; + void SetDeadSubscription(GameEvent::ObjectDeadFunction functionPointer) override; + void SetActionSubscription(GameEvent::AnimationEventFunction functionPointer) override; + void SetPickupSubscription(GameEvent::PickupEventFunction functionPointer) override; bool Initiate() override; float GetFrameTime() const; @@ -96,11 +99,15 @@ namespace GameLogic LevelData* level; float frameTime; bool initiated; - GameEvent::ObjectDisabledFunction onDisableFnc; + GameEvent::ObjectMovedFunction onMoveFnc; + GameEvent::ObjectDisabledFunction onDisableFnc; + GameEvent::ObjectEnabledFunction onEnableFnc; GameEvent::ObjectHpFunction onDamageTakenFnc; GameEvent::ObjectRespawnedFunction onRespawnFnc; GameEvent::ObjectDeadFunction onDeadFnc; + GameEvent::AnimationEventFunction onPlayerActionEventFnc; + GameEvent::PickupEventFunction onPickupEventFnc; }; } diff --git a/Code/Game/GameLogic/GameAPI.h b/Code/Game/GameLogic/GameAPI.h index 8d0ff695..653fc26b 100644 --- a/Code/Game/GameLogic/GameAPI.h +++ b/Code/Game/GameLogic/GameAPI.h @@ -26,10 +26,13 @@ namespace GameLogic namespace GameEvent { typedef void(*ObjectMovedFunction)(IObjectData* object); // Callback method that recieves and object - typedef void(*ObjectDisabledFunction)(IObjectData* object, float seconds); // Callback method that recieves and object + typedef void(*ObjectDisabledFunction)(IObjectData* object); // Callback method that recieves and object + typedef void(*ObjectEnabledFunction)(IObjectData* object); // Callback method that recieves and object typedef void(*ObjectHpFunction)(IObjectData* object, float hp); // Callback method that sends obj HP typedef void(*ObjectRespawnedFunction)(IObjectData* object, Oyster::Math::Float3 spawnPos ); // Callback method that sends spawnPos typedef void(*ObjectDeadFunction)(IObjectData* victim, IObjectData* killer, float seconds); // Callback method that sends killer and death timer + typedef void(*PickupEventFunction)(IObjectData* player, int pickupEffectID ); // Callback method that sends killer and death timer + typedef void(*AnimationEventFunction)(IObjectData* player, int actionID ); // Callback method that sends killer and death timer //etc... }; @@ -177,15 +180,14 @@ namespace GameLogic /** Set a specific object event subscription callback * @param */ - virtual void SetSubscription(GameEvent::ObjectMovedFunction functionPointer) = 0; - - /** Set a specific object event subscription callback - * @param - */ - virtual void SetSubscription(GameEvent::ObjectDisabledFunction functionPointer) = 0; + virtual void SetMoveSubscription(GameEvent::ObjectMovedFunction functionPointer) = 0; + virtual void SetDisableSubscription(GameEvent::ObjectDisabledFunction functionPointer) = 0; + virtual void SetEnableSubscription(GameEvent::ObjectEnabledFunction functionPointer) = 0; virtual void SetHpSubscription(GameEvent::ObjectHpFunction functionPointer) = 0; virtual void SetRespawnSubscription(GameEvent::ObjectRespawnedFunction functionPointer) = 0; virtual void SetDeadSubscription(GameEvent::ObjectDeadFunction functionPointer) = 0; + virtual void SetActionSubscription(GameEvent::AnimationEventFunction functionPointer) = 0; + virtual void SetPickupSubscription(GameEvent::PickupEventFunction functionPointer) = 0; }; } diff --git a/Code/Game/GameLogic/Level.cpp b/Code/Game/GameLogic/Level.cpp index d258cc27..439f3ac8 100644 --- a/Code/Game/GameLogic/Level.cpp +++ b/Code/Game/GameLogic/Level.cpp @@ -434,10 +434,13 @@ void Level::Update(float deltaTime) { this->playerObjects[i]->setDeathTimer(DEATH_TIMER); // HACK to avoid crasch. affected by tag is NULL + Player* killer = this->playerObjects[i]->getAffectingPlayer(); ((Game*)&Game::Instance())->onDeadFnc(this->playerObjects[i], this->playerObjects[i], DEATH_TIMER); // add killer ID //((Game*)&Game::Instance())->onDeadFnc(this->playerObjects[i], this->playerObjects[i]->getAffectingPlayer(), DEATH_TIMER); // add killer ID } } + + } int Level::getNrOfDynamicObj() { diff --git a/Code/Game/GameServer/GameSession.h b/Code/Game/GameServer/GameSession.h index 0247571d..79b50395 100644 --- a/Code/Game/GameServer/GameSession.h +++ b/Code/Game/GameServer/GameSession.h @@ -98,11 +98,13 @@ namespace DanBias //Callback method receiving from game logic static void ObjectMove ( GameLogic::IObjectData* movedObject ); - static void ObjectDisabled ( GameLogic::IObjectData* movedObject, float seconds ); + static void ObjectDisabled ( GameLogic::IObjectData* movedObject ); + static void ObjectEnabled ( GameLogic::IObjectData* movedObject ); static void ObjectDamaged ( GameLogic::IObjectData* movedObject, float hp ); static void ObjectRespawned ( GameLogic::IObjectData* movedObject, Oyster::Math::Float3 spawnPos ); static void ObjectDead ( GameLogic::IObjectData* victim, GameLogic::IObjectData* killer, float seconds ); - + static void PickupEvent ( GameLogic::IObjectData* movedObject, int pickupEffectID ); + static void ActionEvent ( GameLogic::IObjectData* movedObject , int actionID ); //Private member variables private: Utility::DynamicMemory::DynamicArray gClients; diff --git a/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp b/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp index 6c8e6dc3..8e55f08b 100644 --- a/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp +++ b/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp @@ -146,9 +146,13 @@ using namespace DanBias; GameSession::gameSession->Send(p.GetProtocol()); //} } - void GameSession::ObjectDisabled( GameLogic::IObjectData* movedObject, float seconds ) + void GameSession::ObjectDisabled( GameLogic::IObjectData* movedObject ) { - GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID(), seconds).GetProtocol()); + //GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID()).GetProtocol()); + } + void GameSession::ObjectEnabled( GameLogic::IObjectData* movedObject ) + { + //GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID()).GetProtocol()); } void GameSession::ObjectDamaged( GameLogic::IObjectData* movedObject, float hp ) { @@ -162,6 +166,16 @@ using namespace DanBias; { GameSession::gameSession->Send(Protocol_ObjectDie(victim->GetID(), killer->GetID(), seconds).GetProtocol()); } + void GameSession::PickupEvent( GameLogic::IObjectData* movedObject, int pickupEffectID ) + { + // send pickup protocol + GameSession::gameSession->Send(Protocol_ObjectPickup(movedObject->GetID(), pickupEffectID).GetProtocol()); + } + void GameSession::ActionEvent( GameLogic::IObjectData* movedObject , int actionID ) + { + // send action protocol + GameSession::gameSession->Send(Protocol_ObjectAction(movedObject->GetID(), actionID).GetProtocol()); + } //*****************************************************// //****************** Protocol methods *****************// //******************************************************************************************************************// diff --git a/Code/Game/GameServer/Implementation/GameSession_General.cpp b/Code/Game/GameServer/Implementation/GameSession_General.cpp index 0ad12987..ca869fb7 100644 --- a/Code/Game/GameServer/Implementation/GameSession_General.cpp +++ b/Code/Game/GameServer/Implementation/GameSession_General.cpp @@ -106,11 +106,14 @@ bool GameSession::Create(GameDescription& desc, bool forceStart) } /* Set some game instance data options */ - this->gameInstance.SetSubscription(GameSession::ObjectMove); - this->gameInstance.SetSubscription(GameSession::ObjectDisabled); + this->gameInstance.SetMoveSubscription(GameSession::ObjectMove); + this->gameInstance.SetDisableSubscription(GameSession::ObjectDisabled); + this->gameInstance.SetEnableSubscription(GameSession::ObjectEnabled); this->gameInstance.SetHpSubscription(GameSession::ObjectDamaged); this->gameInstance.SetRespawnSubscription(GameSession::ObjectRespawned); this->gameInstance.SetDeadSubscription(GameSession::ObjectDead); + this->gameInstance.SetActionSubscription(GameSession::ActionEvent); + this->gameInstance.SetPickupSubscription(GameSession::PickupEvent); this->gameInstance.SetFPS(60); this->description.clients.Clear(); diff --git a/Code/Game/LevelLoader/ObjectDefines.h b/Code/Game/LevelLoader/ObjectDefines.h index 52f0e088..8ff3a0af 100644 --- a/Code/Game/LevelLoader/ObjectDefines.h +++ b/Code/Game/LevelLoader/ObjectDefines.h @@ -92,6 +92,18 @@ namespace GameLogic WorldSize_Unknown = -1 }; + enum PlayerAction + { + PlayerAction_Jump, + PlayerAction_Walk, + PlayerAction_Idle, + }; + + enum PickupType + { + PickupType_Health, + PickupType_SpeedBoost + }; /************************************ Structs From 0369d8cf199f0d05ed13e0ee9900e6aad4c2af43 Mon Sep 17 00:00:00 2001 From: Pontus Fransson Date: Tue, 25 Feb 2014 14:36:54 +0100 Subject: [PATCH 06/13] Not finished Pickup system. --- Code/Game/GameLogic/CollisionManager.cpp | 29 +++++++++++++++ Code/Game/GameLogic/GameLogic.vcxproj | 6 ++++ Code/Game/GameLogic/PickupSystem/Pickup.cpp | 29 +++++++++++++++ Code/Game/GameLogic/PickupSystem/Pickup.h | 35 +++++++++++++++++++ .../GameLogic/PickupSystem/PickupHealth.cpp | 18 ++++++++++ .../GameLogic/PickupSystem/PickupHealth.h | 27 ++++++++++++++ .../GameLogic/PickupSystem/PickupSystem.cpp | 22 ++++++++++++ .../GameLogic/PickupSystem/PickupSystem.h | 30 ++++++++++++++++ Code/Game/LevelLoader/ObjectDefines.h | 1 + 9 files changed, 197 insertions(+) create mode 100644 Code/Game/GameLogic/PickupSystem/Pickup.cpp create mode 100644 Code/Game/GameLogic/PickupSystem/Pickup.h create mode 100644 Code/Game/GameLogic/PickupSystem/PickupHealth.cpp create mode 100644 Code/Game/GameLogic/PickupSystem/PickupHealth.h create mode 100644 Code/Game/GameLogic/PickupSystem/PickupSystem.cpp create mode 100644 Code/Game/GameLogic/PickupSystem/PickupSystem.h diff --git a/Code/Game/GameLogic/CollisionManager.cpp b/Code/Game/GameLogic/CollisionManager.cpp index 1ab9afbd..a5ae6380 100644 --- a/Code/Game/GameLogic/CollisionManager.cpp +++ b/Code/Game/GameLogic/CollisionManager.cpp @@ -10,6 +10,8 @@ #include "Portal.h" #include "ExplosiveCrate.h" +#include "PickupSystem/PickupHealth.h" + using namespace Oyster; using namespace GameLogic; @@ -281,4 +283,31 @@ using namespace GameLogic; } + } + + //General collision collision for pickups + //It calls the collision function defined in each pickup. + void Pickup::PickupCollision(Oyster::Physics::ICustomBody* objA, Oyster::Physics::ICustomBody* objB, Oyster::Math::Float kineticEnergyLoss) + { + //Check if player is a player. + Object* a = (Object*)objA->GetCustomTag(); + Object* b = (Object*)objB->GetCustomTag(); + + if(!a) + return; + if(!b) + return; + + if(b->GetObjectType() == ObjectSpecialType_Player) + { + ((Pickup*)a)->OnCollision((Player*)(b)); + } + else if(a->GetObjectType() != ObjectSpecialType_Player) + { + //One of the objects are not a player. + //Do nothing. + return; + } + + ((Pickup*)b)->OnCollision((Player*)a); } \ No newline at end of file diff --git a/Code/Game/GameLogic/GameLogic.vcxproj b/Code/Game/GameLogic/GameLogic.vcxproj index 52b7722b..08a932d2 100644 --- a/Code/Game/GameLogic/GameLogic.vcxproj +++ b/Code/Game/GameLogic/GameLogic.vcxproj @@ -173,6 +173,9 @@ + + + @@ -194,6 +197,9 @@ + + + diff --git a/Code/Game/GameLogic/PickupSystem/Pickup.cpp b/Code/Game/GameLogic/PickupSystem/Pickup.cpp new file mode 100644 index 00000000..84b95e87 --- /dev/null +++ b/Code/Game/GameLogic/PickupSystem/Pickup.cpp @@ -0,0 +1,29 @@ +#include "Pickup.h" + +using namespace GameLogic; + +Pickup::Pickup(Oyster::Physics::ICustomBody *rigidBody, EventOnCollision collisionFunc, ObjectSpecialType type, int objectID, Oyster::Math::Float spawnTime) + : StaticObject(rigidBody, collisionFunc, type, objectID) +{ + this->active = true; + this->spawnTime = spawnTime; +} + +Pickup::~Pickup() +{} + +void Pickup::Update() +{ + if(!active) + { + if(timer.getElapsedSeconds() >= spawnTime) + { + active = true; + } + } +} + +bool Pickup::IsActive() +{ + return active; +} \ No newline at end of file diff --git a/Code/Game/GameLogic/PickupSystem/Pickup.h b/Code/Game/GameLogic/PickupSystem/Pickup.h new file mode 100644 index 00000000..e48017fc --- /dev/null +++ b/Code/Game/GameLogic/PickupSystem/Pickup.h @@ -0,0 +1,35 @@ +#ifndef PICKUP_H +#define PICKUP_H + +#include "../StaticObject.h" +#include "../Player.h" +#include "WinTimer.h" + +typedef void (*EventOnCollision)(Oyster::Physics::ICustomBody *proto,Oyster::Physics::ICustomBody *deuter,Oyster::Math::Float kineticEnergyLoss); + +namespace GameLogic +{ + class Pickup : public StaticObject + { + public: + Pickup(Oyster::Physics::ICustomBody *rigidBody, EventOnCollision collisionFunc, ObjectSpecialType type, int objectID, Oyster::Math::Float spawnTime); + virtual ~Pickup(); + + virtual void Update(); + + bool IsActive(); + + virtual void OnCollision(Player *player) = 0; + + static void PickupCollision(Oyster::Physics::ICustomBody *rigidBodyCrate, Oyster::Physics::ICustomBody *obj, Oyster::Math::Float kineticEnergyLoss); + + protected: + bool active; + + Utility::WinTimer timer; + double spawnTime; + + }; +} + +#endif \ No newline at end of file diff --git a/Code/Game/GameLogic/PickupSystem/PickupHealth.cpp b/Code/Game/GameLogic/PickupSystem/PickupHealth.cpp new file mode 100644 index 00000000..56cbef1e --- /dev/null +++ b/Code/Game/GameLogic/PickupSystem/PickupHealth.cpp @@ -0,0 +1,18 @@ +#include "PickupHealth.h" + +using namespace GameLogic; + +PickupHealth::PickupHealth(Oyster::Physics::ICustomBody *rigidBody, ObjectSpecialType type, int objectID, Oyster::Math::Float spawnTime, Oyster::Math::Float healthValue) + : Pickup(rigidBody, Pickup::PickupCollision, type, objectID, spawnTime) +{ + this->hpValue = healthValue; +} + +PickupHealth::~PickupHealth() +{} + +void PickupHealth::OnCollision(Player *player) +{ + timer.reset(); + player->DamageLife(-hpValue); +} \ No newline at end of file diff --git a/Code/Game/GameLogic/PickupSystem/PickupHealth.h b/Code/Game/GameLogic/PickupSystem/PickupHealth.h new file mode 100644 index 00000000..5d5db809 --- /dev/null +++ b/Code/Game/GameLogic/PickupSystem/PickupHealth.h @@ -0,0 +1,27 @@ +////////////////////////////////////// +// Created by Pontus Fransson 2014 // +////////////////////////////////////// + +#ifndef PICKUP_HEALTH_H +#define PICKUP_HEALTH_H + +#include "Pickup.h" + +namespace GameLogic +{ + class PickupHealth : public Pickup + { + public: + PickupHealth(Oyster::Physics::ICustomBody *rigidBody, ObjectSpecialType type, int objectID, Oyster::Math::Float spawnTime, Oyster::Math::Float HealthValue); + virtual ~PickupHealth(); + + + void OnCollision(Player *player); + + protected: + int hpValue; + + }; +} + +#endif \ No newline at end of file diff --git a/Code/Game/GameLogic/PickupSystem/PickupSystem.cpp b/Code/Game/GameLogic/PickupSystem/PickupSystem.cpp new file mode 100644 index 00000000..0f60ddc9 --- /dev/null +++ b/Code/Game/GameLogic/PickupSystem/PickupSystem.cpp @@ -0,0 +1,22 @@ +#include "PickupSystem.h" + +using namespace GameLogic; + +PickupSystem::PickupSystem() +{} + +PickupSystem::~PickupSystem() +{} + +void PickupSystem::CreatePickup(Pickup* pickup) +{ + pickups.push_back(pickup); +} + +void PickupSystem::Update() +{ + for(int i = 0; i < pickups.size(); i++) + { + pickups.at(i)->Update(); + } +} \ No newline at end of file diff --git a/Code/Game/GameLogic/PickupSystem/PickupSystem.h b/Code/Game/GameLogic/PickupSystem/PickupSystem.h new file mode 100644 index 00000000..4bd1e69e --- /dev/null +++ b/Code/Game/GameLogic/PickupSystem/PickupSystem.h @@ -0,0 +1,30 @@ +////////////////////////////////////// +// Created by Pontus Fransson 2014 // +////////////////////////////////////// + +#ifndef PICKUP_SYSTEM_H +#define PICKUP_SYSTEM_H + +#include + +#include "Pickup.h" + +namespace GameLogic +{ + class PickupSystem + { + public: + PickupSystem(); + ~PickupSystem(); + + void CreatePickup(Pickup* pickup); + + void Update(); + + private: + std::vector> pickups; + + }; +} + +#endif \ No newline at end of file diff --git a/Code/Game/LevelLoader/ObjectDefines.h b/Code/Game/LevelLoader/ObjectDefines.h index 918fb4e6..151bf27c 100644 --- a/Code/Game/LevelLoader/ObjectDefines.h +++ b/Code/Game/LevelLoader/ObjectDefines.h @@ -42,6 +42,7 @@ namespace GameLogic ObjectSpecialType_Player, ObjectSpecialType_Generic, + ObjectSpecialType_PickupHealth, ObjectSpecialType_Count, ObjectSpecialType_Unknown = -1 From d56d1d75694da7369481e499132b98b2beb6fe8a Mon Sep 17 00:00:00 2001 From: Pontus Fransson Date: Tue, 25 Feb 2014 16:07:50 +0100 Subject: [PATCH 07/13] Fixed error with reading lights from level format. --- Code/Game/LevelLoader/ParseFunctions.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Code/Game/LevelLoader/ParseFunctions.cpp b/Code/Game/LevelLoader/ParseFunctions.cpp index ac361c46..060180a2 100644 --- a/Code/Game/LevelLoader/ParseFunctions.cpp +++ b/Code/Game/LevelLoader/ParseFunctions.cpp @@ -23,9 +23,9 @@ namespace GameLogic void ParseLight(char* buffer, BasicLight& header, int& size) { int start = 0; - memcpy(&header.typeID, &buffer[start], 40); - start += 40; - /* + memcpy(&header.typeID, &buffer[start], 4); + start += 4; + memcpy(&header.lightType, &buffer[start], 4); start += 4; @@ -39,7 +39,7 @@ namespace GameLogic start += 4; memcpy(&header.intensity, &buffer[start], 4); - start += 4;*/ + start += 4; size += start; From f2bb50804c8b39fd976f590a70d836320dbeb06d Mon Sep 17 00:00:00 2001 From: Linda Andersson Date: Tue, 25 Feb 2014 16:08:45 +0100 Subject: [PATCH 08/13] Play action animation --- .../GameClient/GameClientState/C_Object.cpp | 5 +- .../GameClient/GameClientState/C_Object.h | 2 +- .../GameClient/GameClientState/GameState.cpp | 198 +++++++++++++++--- Code/Game/GameLogic/Level.h | 1 - Code/Game/GameLogic/Player.cpp | 28 ++- Code/Game/GameProtocols/ObjectProtocols.h | 12 +- 6 files changed, 208 insertions(+), 38 deletions(-) diff --git a/Code/Game/GameClient/GameClientState/C_Object.cpp b/Code/Game/GameClient/GameClientState/C_Object.cpp index 67146770..b168b92c 100644 --- a/Code/Game/GameClient/GameClientState/C_Object.cpp +++ b/Code/Game/GameClient/GameClientState/C_Object.cpp @@ -123,7 +123,10 @@ void C_Object::SetGlowTint(Oyster::Math::Float3 tint) model->GlowTint = tint; } - +void C_Object::SetVisible(bool visible) +{ + model->Visible = visible; +} //////////////////////////////////////////////// // RB DEBUG diff --git a/Code/Game/GameClient/GameClientState/C_Object.h b/Code/Game/GameClient/GameClientState/C_Object.h index fd118068..1a8f7517 100644 --- a/Code/Game/GameClient/GameClientState/C_Object.h +++ b/Code/Game/GameClient/GameClientState/C_Object.h @@ -72,7 +72,7 @@ namespace DanBias void SetTint(Oyster::Math::Float3); void SetGlowTint(Oyster::Math::Float3); - + void SetVisible(bool visible); // RB DEBUG void updateRBWorld(); diff --git a/Code/Game/GameClient/GameClientState/GameState.cpp b/Code/Game/GameClient/GameClientState/GameState.cpp index 37dda789..9597d0ef 100644 --- a/Code/Game/GameClient/GameClientState/GameState.cpp +++ b/Code/Game/GameClient/GameClientState/GameState.cpp @@ -12,6 +12,7 @@ #include "GamingUI.h" #include "RespawnUI.h" #include "StatsUI.h" +#include using namespace ::DanBias::Client; using namespace ::Oyster; @@ -131,7 +132,7 @@ void GameState::InitiatePlayer( int id, const std::string &modelName, const floa p->InitRB( RBData ); // !RB DEBUG // start with runing animation - p->playAnimation( L"run_forwards", true ); + p->playAnimation( L"idle", true ); (this->privData->players)[id] = p; @@ -420,15 +421,59 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState switch(ID) { - case protocol_Gameplay_ObjectPickup: break; /** @todo TODO: implement */ + case protocol_Gameplay_ObjectPickup: + { + Protocol_ObjectPickup decoded(data); + decoded.object_ID; + C_Object *object; + object = (this->privData->players)[decoded.object_ID]; + if( !object) + { + // if it is not a player + object = (*this->privData->dynamicObjects)[decoded.object_ID]; + } + + if( object ) + { + if( this->privData->myId == decoded.object_ID ) + { + // I picked up the pickUp! + } + + if (decoded.pickup_ID == GameLogic::PickupType::PickupType_Health) + { + // object->PickupHealth(); + } + else if (decoded.pickup_ID == GameLogic::PickupType::PickupType_SpeedBoost) + { + // object->PickupSpeed(); + } + } + decoded.pickup_ID; + + + } + return GameClientState::event_processed; case protocol_Gameplay_ObjectDamage: { Protocol_ObjectDamage decoded(data); - if( this->privData->myId == decoded.object_ID ) + C_Object *object; + object = (this->privData->players)[decoded.object_ID]; + if( !object) { - if(currGameUI == gameUI) + // if it is not a player + object = (*this->privData->dynamicObjects)[decoded.object_ID]; + } + + if( object ) + { + if( this->privData->myId == decoded.object_ID ) { - ((GamingUI*)currGameUI)->SetHPtext(std::to_wstring(decoded.healthLost)); + if(currGameUI == gameUI) + { + // set my HP + ((GamingUI*)currGameUI)->SetHPtext(std::to_wstring(decoded.healthLost)); + } } } } @@ -441,38 +486,72 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState { Protocol_ObjectPosition decoded(data); - // if is this player. Remember to change camera - if( this->privData->myId == decoded.object_ID ) - this->privData->camera.SetPosition( decoded.position ); + C_Object *object; + object = (this->privData->players)[decoded.object_ID]; + if( !object) + { + // if it is not a player + object = (*this->privData->dynamicObjects)[decoded.object_ID]; + } - (*this->privData->dynamicObjects)[decoded.object_ID]->setPos( decoded.position ); - // RB DEBUG - (*this->privData->dynamicObjects)[decoded.object_ID]->setRBPos ( decoded.position ); - // !RB DEBUG + if( object ) + { + if( this->privData->myId == decoded.object_ID ) + { + this->privData->camera.SetPosition( decoded.position ); + } + + object->setPos( decoded.position ); + // RB DEBUG + object->setRBPos ( decoded.position ); + // !RB DEBUG + } } return GameClientState::event_processed; case protocol_Gameplay_ObjectScale: { Protocol_ObjectScale decoded(data); - (*this->privData->dynamicObjects)[decoded.object_ID]->setScale( decoded.scale ); - // RB DEBUG - (*this->privData->dynamicObjects)[decoded.object_ID]->setRBScale ( decoded.scale ); - // !RB DEBUG + C_Object *object; + object = (this->privData->players)[decoded.object_ID]; + if( !object) + { + // if it is not a player + object = (*this->privData->dynamicObjects)[decoded.object_ID]; + } + + if( object ) + { + object->setScale( decoded.scale ); + // RB DEBUG + object->setRBScale ( decoded.scale ); + // !RB DEBUG + } } return GameClientState::event_processed; case protocol_Gameplay_ObjectRotation: { Protocol_ObjectRotation decoded(data); Quaternion rotation = Quaternion( Float3(decoded.rotationQ), decoded.rotationQ[3] ); + C_Object *object; + object = (this->privData->players)[decoded.object_ID]; + if( !object) + { + // if it is not a player + object = (*this->privData->dynamicObjects)[decoded.object_ID]; + } - // if is this player. Remember to change camera - if( this->privData->myId == decoded.object_ID ) - this->privData->camera.SetRotation( rotation ); + if( object ) + { + if( this->privData->myId == decoded.object_ID ) + { + this->privData->camera.SetRotation( rotation ); + } - (*this->privData->dynamicObjects)[decoded.object_ID]->setRot( rotation ); - // RB DEBUG - (*this->privData->dynamicObjects)[decoded.object_ID]->setRBRot ( rotation ); - // !RB DEBUG + object->setRot( rotation ); + // RB DEBUG + object->setRBRot( rotation ); + // !RB DEBUG + } } return GameClientState::event_processed; case protocol_Gameplay_ObjectPositionRotation: @@ -506,17 +585,46 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState } } return GameClientState::event_processed; - case protocol_Gameplay_ObjectEnabled: break; /** @todo TODO: implement */ + case protocol_Gameplay_ObjectEnabled: + { + Protocol_ObjectEnable decoded(data); + C_Object *object; + object = (this->privData->players)[decoded.objectID]; + if( !object) + { + // if it is not a player + object = (*this->privData->dynamicObjects)[decoded.objectID]; + } + + if( object ) + { + object->SetVisible(true); + } + } + return GameClientState::event_processed; case protocol_Gameplay_ObjectDisabled: { Protocol_ObjectDisable decoded(data); + C_Object *object; + object = (this->privData->players)[decoded.objectID]; + if( !object) + { + // if it is not a player + object = (*this->privData->dynamicObjects)[decoded.objectID]; + } - auto object = this->privData->dynamicObjects->find( decoded.objectID ); + if( object ) + { + object->SetVisible(false); + } + + /*auto object = this->privData->dynamicObjects->find( decoded.objectID ); if( object != this->privData->dynamicObjects->end() ) { - object->second = nullptr; - this->privData->dynamicObjects->erase( object ); - } + object->second = nullptr; + this->privData->dynamicObjects->erase( object ); + }*/ + } return GameClientState::event_processed; case protocol_Gameplay_ObjectCreate: @@ -613,6 +721,40 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState } } return GameClientState::event_processed; + case protocol_Gameplay_ObjectAction: + { + Protocol_ObjectAction decoded(data); + + C_Player *player; + player = (this->privData->players)[decoded.objectID]; + + if( player ) + { + if( this->privData->myId == decoded.objectID ) + { + // my player animation + //} + //else + //{ + // HACK for now animate my char + switch (decoded.animationID) + { + case GameLogic::PlayerAction::PlayerAction_Walk: + player->playAnimation(L"run_forwards", true); + break; + case GameLogic::PlayerAction::PlayerAction_Jump: + player->playAnimation(L"movement", true); + break; + case GameLogic::PlayerAction::PlayerAction_Idle: + player->playAnimation(L"idle", true); + break; + default: + break; + } + } + } + } + return GameClientState::event_processed; default: break; } } diff --git a/Code/Game/GameLogic/Level.h b/Code/Game/GameLogic/Level.h index 9fb3dbad..f8d41ba9 100644 --- a/Code/Game/GameLogic/Level.h +++ b/Code/Game/GameLogic/Level.h @@ -80,7 +80,6 @@ namespace GameLogic private: Utility::DynamicMemory::DynamicArray> playerObjects; - Utility::DynamicMemory::DynamicArray> deadPlayerObjects; TeamManager teamManager; Utility::DynamicMemory::DynamicArray> staticObjects; Utility::DynamicMemory::DynamicArray> dynamicObjects; diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp index 0ce95948..ddacf25b 100644 --- a/Code/Game/GameLogic/Player.cpp +++ b/Code/Game/GameLogic/Player.cpp @@ -136,7 +136,16 @@ void Player::BeginFrame() rightVelocity *= Oyster::Math::Float3(0.2f*fabs(rightDir.x), 0.2f*fabs(rightDir.y), 0.2f*fabs(rightDir.z)); } } - + + if(walkDirection == Oyster::Math::Float3::null) + { + if(this->playerState != PLAYER_STATE::PLAYER_STATE_JUMPING) + { + if(this->playerState != PLAYER_STATE::PLAYER_STATE_IDLE) + this->gameInstance->onPlayerActionEventFnc( this, PlayerAction::PlayerAction_Idle); + this->playerState = PLAYER_STATE::PLAYER_STATE_IDLE; + } + } // Walk if walkdirection is something if(walkDirection != Oyster::Math::Float3::null) { @@ -166,6 +175,12 @@ void Player::BeginFrame() rightVelocity += walkDirection*Oyster::Math::Float3(fabs(rightDir.x), fabs(rightDir.y), fabs(rightDir.z)) * walkSpeed*0.2f; } } + if(this->playerState != PLAYER_STATE::PLAYER_STATE_JUMPING) + { + if(this->playerState != PLAYER_STATE::PLAYER_STATE_WALKING) + this->gameInstance->onPlayerActionEventFnc( this, PlayerAction::PlayerAction_Walk); + this->playerState = PLAYER_STATE::PLAYER_STATE_WALKING; + } } // Adjust velocities so no squaring occurs @@ -183,9 +198,20 @@ void Player::BeginFrame() { Oyster::Math::Float3 up = this->rigidBody->GetState().centerPos.GetNormalized(); this->rigidBody->ApplyImpulse(up*this->rigidBody->GetState().mass * 20); + + if(this->playerState != PLAYER_STATE::PLAYER_STATE_JUMPING) + this->gameInstance->onPlayerActionEventFnc( this, PlayerAction::PlayerAction_Jump); this->playerState = PLAYER_STATE::PLAYER_STATE_JUMPING; } } + else + { + if(this->playerState == PLAYER_STATE::PLAYER_STATE_JUMPING) + { + this->gameInstance->onPlayerActionEventFnc( this, PlayerAction::PlayerAction_Idle); + this->playerState = PLAYER_STATE::PLAYER_STATE_IDLE; + } + } } } diff --git a/Code/Game/GameProtocols/ObjectProtocols.h b/Code/Game/GameProtocols/ObjectProtocols.h index 1ffc30ad..5b0408fa 100644 --- a/Code/Game/GameProtocols/ObjectProtocols.h +++ b/Code/Game/GameProtocols/ObjectProtocols.h @@ -948,29 +948,29 @@ namespace GameLogic struct Protocol_ObjectAction :public Oyster::Network::CustomProtocolObject { short objectID; - float animationID; + int animationID; Protocol_ObjectAction() { this->protocol[0].value = protocol_Gameplay_ObjectAction; this->protocol[0].type = Oyster::Network::NetAttributeType_Short; this->protocol[1].type = Oyster::Network::NetAttributeType_Short; - this->protocol[2].type = Oyster::Network::NetAttributeType_Float; + this->protocol[2].type = Oyster::Network::NetAttributeType_Int; - objectID = 0; + objectID = -1; animationID = -1; } Protocol_ObjectAction(Oyster::Network::CustomNetProtocol& p) { objectID = p[1].value.netShort; - animationID = p[2].value.netFloat; + animationID = p[2].value.netInt; } - Protocol_ObjectAction(float animID, int id) + Protocol_ObjectAction( int id, float animID) { this->protocol[0].value = protocol_Gameplay_ObjectAction; this->protocol[0].type = Oyster::Network::NetAttributeType_Short; this->protocol[1].type = Oyster::Network::NetAttributeType_Short; - this->protocol[2].type = Oyster::Network::NetAttributeType_Float; + this->protocol[2].type = Oyster::Network::NetAttributeType_Int; objectID = id; animationID = animID; From 11eda5065e09d9f5b114cf13ba67506943ab35ee Mon Sep 17 00:00:00 2001 From: Pontus Fransson Date: Tue, 25 Feb 2014 16:10:02 +0100 Subject: [PATCH 09/13] Reading hp pickups from levelformat. Updating pickups. --- Code/Game/GameLogic/Level.cpp | 16 +++++++++++++--- Code/Game/GameLogic/Level.h | 4 ++++ Code/Game/GameLogic/PickupSystem/Pickup.cpp | 3 +++ Code/Game/LevelLoader/LevelParser.cpp | 15 +++++++++++++++ Code/Game/LevelLoader/ObjectDefines.h | 6 +++++- 5 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Code/Game/GameLogic/Level.cpp b/Code/Game/GameLogic/Level.cpp index 439f3ac8..0f0ab632 100644 --- a/Code/Game/GameLogic/Level.cpp +++ b/Code/Game/GameLogic/Level.cpp @@ -131,6 +131,11 @@ Object* Level::CreateGameObj(ObjectHeader* obj, ICustomBody* rigidBody) gameObj = new StaticObject(rigidBody, Object::DefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); } break; + case ObjectSpecialType_PickupHealth: + { + gameObj = new PickupHealth(rigidBody, obj->specialTypeID, objID, ((PickupHealthAttributes*)obj)->spawnTime, ((PickupHealthAttributes*)obj)->healthValue); + } + break; default: { gameObj = new StaticObject(rigidBody, Object::DefaultOnCollision, (ObjectSpecialType)obj->specialTypeID, objID); @@ -216,7 +221,6 @@ bool Level::InitiateLevel(std::wstring levelPath) std::string convertedLevelPath = converterX.to_bytes(levelPath); objects = ll.LoadLevel(convertedLevelPath); - if(objects.size() == 0) return false; @@ -264,7 +268,12 @@ bool Level::InitiateLevel(std::wstring levelPath) { // create game object Object* staticGameObj = CreateGameObj(staticObjData, rigidBody_Static); - if(staticGameObj != NULL) + + if(staticObjData->specialTypeID == ObjectSpecialType_PickupHealth) + { + this->pickupSystem.CreatePickup((PickupHealth*)staticGameObj); + } + else if(staticGameObj != NULL) { this->staticObjects.Push((StaticObject*)staticGameObj); } @@ -321,6 +330,7 @@ bool Level::InitiateLevel(std::wstring levelPath) break; } } + return true; } bool Level::InitiateLevel(float radius) @@ -440,7 +450,7 @@ void Level::Update(float deltaTime) } } - + this->pickupSystem.Update(); } int Level::getNrOfDynamicObj() { diff --git a/Code/Game/GameLogic/Level.h b/Code/Game/GameLogic/Level.h index 9fb3dbad..cf7ab6d8 100644 --- a/Code/Game/GameLogic/Level.h +++ b/Code/Game/GameLogic/Level.h @@ -16,6 +16,9 @@ #include "DynamicArray.h" #include "LevelLoader.h" +#include "PickupSystem\PickupSystem.h" +#include "PickupSystem\PickupHealth.h" + const int DEATH_TIMER = 5; namespace GameLogic { @@ -89,6 +92,7 @@ namespace GameLogic StaticObject *levelObj; int objID; Utility::DynamicMemory::DynamicArray spawnPoints; + PickupSystem pickupSystem; }; diff --git a/Code/Game/GameLogic/PickupSystem/Pickup.cpp b/Code/Game/GameLogic/PickupSystem/Pickup.cpp index 84b95e87..73a319f8 100644 --- a/Code/Game/GameLogic/PickupSystem/Pickup.cpp +++ b/Code/Game/GameLogic/PickupSystem/Pickup.cpp @@ -1,4 +1,5 @@ #include "Pickup.h" +#include "../Game.h" using namespace GameLogic; @@ -7,6 +8,7 @@ Pickup::Pickup(Oyster::Physics::ICustomBody *rigidBody, EventOnCollision collisi { this->active = true; this->spawnTime = spawnTime; + timer.reset(); } Pickup::~Pickup() @@ -19,6 +21,7 @@ void Pickup::Update() if(timer.getElapsedSeconds() >= spawnTime) { active = true; + ((Game*)&Game::Instance())->onEnableFnc(this); } } } diff --git a/Code/Game/LevelLoader/LevelParser.cpp b/Code/Game/LevelLoader/LevelParser.cpp index fe349988..680b0358 100644 --- a/Code/Game/LevelLoader/LevelParser.cpp +++ b/Code/Game/LevelLoader/LevelParser.cpp @@ -156,6 +156,21 @@ std::vector> LevelParser::Parse(std::string filen objects.push_back(header); break; } + + case ObjectSpecialType_PickupHealth: + { + PickupHealthAttributes* header = new PickupHealthAttributes; + ParseObject(&buffer[counter], *header, counter, loadCgf); + + ParseObject(&buffer[counter], &header->spawnTime, 4); + counter += 4; + + ParseObject(&buffer[counter], &header->healthValue, 4); + counter += 4; + + objects.push_back(header); + break; + } //this is a hotfix, fix so you only load the relevant data when the file is updated default: //Couldn't find specialType diff --git a/Code/Game/LevelLoader/ObjectDefines.h b/Code/Game/LevelLoader/ObjectDefines.h index 9ce7d86a..aadc3382 100644 --- a/Code/Game/LevelLoader/ObjectDefines.h +++ b/Code/Game/LevelLoader/ObjectDefines.h @@ -259,7 +259,11 @@ namespace GameLogic float skySize; }; - + struct PickupHealthAttributes : public ObjectHeader + { + float spawnTime; + float healthValue; + }; From 638f2f624180af36c382f3be1f88aac38bbb5427 Mon Sep 17 00:00:00 2001 From: Linda Andersson Date: Tue, 25 Feb 2014 16:26:37 +0100 Subject: [PATCH 10/13] Addded objectDelete protocol. Enable/ disable will be used for visibility on client --- .../GameClient/GameClientState/GameState.cpp | 40 ++--- Code/Game/GameProtocols/ObjectProtocols.h | 141 +++++++++++------- .../GameProtocols/ProtocolIdentificationID.h | 19 +-- .../Implementation/GameSession_Gameplay.cpp | 4 +- 4 files changed, 116 insertions(+), 88 deletions(-) diff --git a/Code/Game/GameClient/GameClientState/GameState.cpp b/Code/Game/GameClient/GameClientState/GameState.cpp index 9597d0ef..7e8a0ee7 100644 --- a/Code/Game/GameClient/GameClientState/GameState.cpp +++ b/Code/Game/GameClient/GameClientState/GameState.cpp @@ -458,20 +458,21 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState { Protocol_ObjectDamage decoded(data); C_Object *object; - object = (this->privData->players)[decoded.object_ID]; + object = (this->privData->players)[decoded.objectID]; if( !object) { // if it is not a player - object = (*this->privData->dynamicObjects)[decoded.object_ID]; + object = (*this->privData->dynamicObjects)[decoded.objectID]; } if( object ) { - if( this->privData->myId == decoded.object_ID ) + if( this->privData->myId == decoded.objectID ) { + // show that you took dmg if(currGameUI == gameUI) { - // set my HP + // set given players HP ((GamingUI*)currGameUI)->SetHPtext(std::to_wstring(decoded.healthLost)); } } @@ -479,7 +480,8 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState } return GameClientState::event_processed; case protocol_Gameplay_ObjectHealthStatus: - { + { + // don't know if needed } return GameClientState::event_processed; case protocol_Gameplay_ObjectPosition: @@ -487,16 +489,16 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState Protocol_ObjectPosition decoded(data); C_Object *object; - object = (this->privData->players)[decoded.object_ID]; + object = (this->privData->players)[decoded.objectID]; if( !object) { // if it is not a player - object = (*this->privData->dynamicObjects)[decoded.object_ID]; + object = (*this->privData->dynamicObjects)[decoded.objectID]; } if( object ) { - if( this->privData->myId == decoded.object_ID ) + if( this->privData->myId == decoded.objectID ) { this->privData->camera.SetPosition( decoded.position ); } @@ -512,11 +514,11 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState { Protocol_ObjectScale decoded(data); C_Object *object; - object = (this->privData->players)[decoded.object_ID]; + object = (this->privData->players)[decoded.objectID]; if( !object) { // if it is not a player - object = (*this->privData->dynamicObjects)[decoded.object_ID]; + object = (*this->privData->dynamicObjects)[decoded.objectID]; } if( object ) @@ -533,16 +535,16 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState Protocol_ObjectRotation decoded(data); Quaternion rotation = Quaternion( Float3(decoded.rotationQ), decoded.rotationQ[3] ); C_Object *object; - object = (this->privData->players)[decoded.object_ID]; + object = (this->privData->players)[decoded.objectID]; if( !object) { // if it is not a player - object = (*this->privData->dynamicObjects)[decoded.object_ID]; + object = (*this->privData->dynamicObjects)[decoded.objectID]; } if( object ) { - if( this->privData->myId == decoded.object_ID ) + if( this->privData->myId == decoded.objectID ) { this->privData->camera.SetRotation( rotation ); } @@ -560,16 +562,16 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState Float3 position = decoded.position; Quaternion rotation = Quaternion( Float3(decoded.rotationQ), decoded.rotationQ[3] ); C_Object *object; - object = (this->privData->players)[decoded.object_ID]; + object = (this->privData->players)[decoded.objectID]; if( !object) { // if it is not a player - object = (*this->privData->dynamicObjects)[decoded.object_ID]; + object = (*this->privData->dynamicObjects)[decoded.objectID]; } if( object ) { - if( this->privData->myId == decoded.object_ID ) + if( this->privData->myId == decoded.objectID ) { this->privData->camera.SetPosition( position ); this->privData->camera.SetRotation( rotation ); @@ -638,7 +640,7 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState modelData.rotation = Quaternion( Float3(decoded.position), decoded.rotationQ[3] ); modelData.scale = Float3( decoded.scale ); modelData.visible = true; - modelData.id = decoded.object_ID; + modelData.id = decoded.objectID; ::Utility::String::StringToWstring( decoded.name, modelData.modelPath ); } @@ -653,14 +655,14 @@ const GameClientState::NetEvent & GameState::DataRecieved( const GameClientState object->InitRB( RBData ); // !RB DEBUG - (*this->privData->dynamicObjects)[decoded.object_ID] = object; + (*this->privData->dynamicObjects)[decoded.objectID] = object; } return GameClientState::event_processed; case protocol_Gameplay_ObjectCreatePlayer: { Protocol_ObjectCreatePlayer decoded(data); - this->InitiatePlayer( decoded.object_ID, decoded.meshName, decoded.position, decoded.rotationQ, decoded.scale, decoded.owner ); + this->InitiatePlayer( decoded.objectID, decoded.meshName, decoded.position, decoded.rotationQ, decoded.scale, decoded.owner ); } return GameClientState::event_processed; case protocol_Gameplay_ObjectJoinTeam: break; /** @todo TODO: implement */ diff --git a/Code/Game/GameProtocols/ObjectProtocols.h b/Code/Game/GameProtocols/ObjectProtocols.h index 5b0408fa..48fa71f7 100644 --- a/Code/Game/GameProtocols/ObjectProtocols.h +++ b/Code/Game/GameProtocols/ObjectProtocols.h @@ -59,7 +59,7 @@ namespace GameLogic //#define protocol_Gameplay_ObjectDamage 351 struct Protocol_ObjectDamage :public Oyster::Network::CustomProtocolObject { - int object_ID; + int objectID; float healthLost; //Precentage% Protocol_ObjectDamage() @@ -70,12 +70,12 @@ namespace GameLogic this->protocol[1].type = Oyster::Network::NetAttributeType_Int; this->protocol[2].type = Oyster::Network::NetAttributeType_Float; - object_ID = -1; + objectID = -1; healthLost = 0.0f; } Protocol_ObjectDamage(Oyster::Network::CustomNetProtocol& p) { - this->object_ID = p[1].value.netInt; + this->objectID = p[1].value.netInt; this->healthLost = p[2].value.netFloat; } Protocol_ObjectDamage(int id, float hp) @@ -86,12 +86,12 @@ namespace GameLogic this->protocol[1].type = Oyster::Network::NetAttributeType_Int; this->protocol[2].type = Oyster::Network::NetAttributeType_Float; - object_ID = id; + objectID = id; healthLost = hp; } Oyster::Network::CustomNetProtocol GetProtocol() override { - this->protocol[1].value = object_ID; + this->protocol[1].value = objectID; this->protocol[2].value = healthLost; return protocol; } @@ -103,8 +103,8 @@ namespace GameLogic //#define protocol_Gameplay_ObjectHealthStatus 352 struct Protocol_ObjectHealthStatus :public Oyster::Network::CustomProtocolObject { + int objectID; float currentHealth; - int id; Protocol_ObjectHealthStatus() { @@ -112,7 +112,7 @@ namespace GameLogic this->protocol[0].value.netShort = protocol_Gameplay_ObjectHealthStatus; this->protocol[1].type = Oyster::Network::NetAttributeType_Int; this->protocol[2].type = Oyster::Network::NetAttributeType_Float; - this->id = 0; + this->objectID = -1; this->currentHealth = 0.0f; } Protocol_ObjectHealthStatus(int id, float health) @@ -121,16 +121,16 @@ namespace GameLogic this->protocol[0].value.netShort = protocol_Gameplay_ObjectHealthStatus; this->protocol[1].type = Oyster::Network::NetAttributeType_Int; this->protocol[2].type = Oyster::Network::NetAttributeType_Float; - this->id = id; this->currentHealth = health; + this->objectID = id; this->currentHealth = health; } Protocol_ObjectHealthStatus(Oyster::Network::CustomNetProtocol& p) { - this->id = p[1].value.netInt; + this->objectID = p[1].value.netInt; this->currentHealth = p[2].value.netFloat; } Oyster::Network::CustomNetProtocol GetProtocol() override { - this->protocol[1].value = this->id; + this->protocol[1].value = this->objectID; this->protocol[2].value = this->currentHealth; return protocol; @@ -143,7 +143,7 @@ namespace GameLogic //#define protocol_Gameplay_ObjectPosition 353 struct Protocol_ObjectPosition :public Oyster::Network::CustomProtocolObject { - short object_ID; + short objectID; float position[3]; Protocol_ObjectPosition() @@ -155,12 +155,12 @@ namespace GameLogic this->protocol[3].type = Oyster::Network::NetAttributeType_Float; this->protocol[4].type = Oyster::Network::NetAttributeType_Float; - object_ID = 0; + objectID = -1; memset(&position[0], 0, sizeof(float) * 3); } Protocol_ObjectPosition(Oyster::Network::CustomNetProtocol& p) { - object_ID = p[1].value.netShort; + objectID = p[1].value.netShort; position[0] = p[2].value.netFloat; position[1] = p[3].value.netFloat; position[2] = p[4].value.netFloat; @@ -174,12 +174,12 @@ namespace GameLogic this->protocol[3].type = Oyster::Network::NetAttributeType_Float; this->protocol[4].type = Oyster::Network::NetAttributeType_Float; - object_ID = id; + objectID = id; memcpy(&position[0], &v[0], sizeof(float) * 3); } Oyster::Network::CustomNetProtocol GetProtocol() override { - this->protocol[1].value = object_ID; + this->protocol[1].value = objectID; this->protocol[2].value = position[0]; this->protocol[3].value = position[1]; this->protocol[4].value = position[2]; @@ -193,7 +193,7 @@ namespace GameLogic //#define protocol_Gameplay_ObjectScale 354 struct Protocol_ObjectScale :public Oyster::Network::CustomProtocolObject { - short object_ID; + short objectID; float scale[3]; Protocol_ObjectScale() @@ -205,12 +205,12 @@ namespace GameLogic this->protocol[3].type = Oyster::Network::NetAttributeType_Float; this->protocol[4].type = Oyster::Network::NetAttributeType_Float; - object_ID = 0; + objectID = -1; memset(&scale[0], 0, sizeof(float) * 3); } Protocol_ObjectScale(Oyster::Network::CustomNetProtocol& p) { - object_ID = p[1].value.netShort; + objectID = p[1].value.netShort; scale[0] = p[2].value.netFloat; scale[1] = p[3].value.netFloat; scale[2] = p[4].value.netFloat; @@ -224,12 +224,12 @@ namespace GameLogic this->protocol[3].type = Oyster::Network::NetAttributeType_Float; this->protocol[4].type = Oyster::Network::NetAttributeType_Float; - object_ID = id; + objectID = id; memcpy(&scale[0], &v[0], sizeof(float) * 3); } Oyster::Network::CustomNetProtocol GetProtocol() override { - this->protocol[1].value = object_ID; + this->protocol[1].value = objectID; this->protocol[2].value = scale[0]; this->protocol[3].value = scale[1]; this->protocol[4].value = scale[2]; @@ -243,7 +243,7 @@ namespace GameLogic //#define protocol_Gameplay_ObjectRotation 355 struct Protocol_ObjectRotation :public Oyster::Network::CustomProtocolObject { - short object_ID; + short objectID; float rotationQ[4]; Protocol_ObjectRotation() @@ -256,12 +256,12 @@ namespace GameLogic this->protocol[4].type = Oyster::Network::NetAttributeType_Float; this->protocol[5].type = Oyster::Network::NetAttributeType_Float; - object_ID = 0; + objectID = -1; memset(&rotationQ[0], 0, sizeof(float) * 4); } Protocol_ObjectRotation(Oyster::Network::CustomNetProtocol& p) { - object_ID = p[1].value.netShort; + objectID = p[1].value.netShort; rotationQ[0] = p[2].value.netFloat; rotationQ[1] = p[3].value.netFloat; rotationQ[2] = p[4].value.netFloat; @@ -277,12 +277,12 @@ namespace GameLogic this->protocol[4].type = Oyster::Network::NetAttributeType_Float; this->protocol[5].type = Oyster::Network::NetAttributeType_Float; - object_ID = id; + objectID = id; memcpy(&rotationQ[0], &v[0], sizeof(float) * 4); } Oyster::Network::CustomNetProtocol GetProtocol() override { - this->protocol[1].value = object_ID; + this->protocol[1].value = objectID; this->protocol[2].value = rotationQ[0]; this->protocol[3].value = rotationQ[1]; this->protocol[4].value = rotationQ[2]; @@ -297,7 +297,7 @@ namespace GameLogic //#define protocol_Gameplay_ObjectEnabled 356 struct Protocol_ObjectPositionRotation :public Oyster::Network::CustomProtocolObject { - short object_ID; + short objectID; float position[3]; float rotationQ[4]; @@ -316,13 +316,13 @@ namespace GameLogic this->protocol[7].type = Oyster::Network::NetAttributeType_Float; this->protocol[8].type = Oyster::Network::NetAttributeType_Float; - this->object_ID = 0; + this->objectID = -1; memset(&this->position[0], 0, sizeof(float) * 3); memset(&this->rotationQ[0], 0, sizeof(float) * 4); } Protocol_ObjectPositionRotation(Oyster::Network::CustomNetProtocol& p) { - this->object_ID = p[1].value.netShort; + this->objectID = p[1].value.netShort; //POSITION this->position[0] = p[2].value.netFloat; this->position[1] = p[3].value.netFloat; @@ -348,13 +348,13 @@ namespace GameLogic this->protocol[7].type = Oyster::Network::NetAttributeType_Float; this->protocol[8].type = Oyster::Network::NetAttributeType_Float; - object_ID = id; + objectID = id; memcpy(&this->position[0], &p[0], sizeof(float) * 3); memcpy(&this->rotationQ[0], &r[0], sizeof(float) * 4); } Oyster::Network::CustomNetProtocol GetProtocol() override { - this->protocol[1].value = this->object_ID; + this->protocol[1].value = this->objectID; this->protocol[2].value = this->position[0]; this->protocol[3].value = this->position[1]; this->protocol[4].value = this->position[2]; @@ -406,35 +406,28 @@ namespace GameLogic struct Protocol_ObjectDisable :public Oyster::Network::CustomProtocolObject { int objectID; - float seconds; Protocol_ObjectDisable() { this->protocol[0].value = protocol_Gameplay_ObjectDisabled; this->protocol[0].type = Oyster::Network::NetAttributeType_Short; this->protocol[1].type = Oyster::Network::NetAttributeType_Int; - this->protocol[2].type = Oyster::Network::NetAttributeType_Float; - this->objectID = 0; - this->seconds = 0.0f; + this->objectID = -1; } - Protocol_ObjectDisable(int objctID, float seconds) + Protocol_ObjectDisable(int objctID) { this->protocol[0].value = protocol_Gameplay_ObjectDisabled; this->protocol[0].type = Oyster::Network::NetAttributeType_Short; this->protocol[1].type = Oyster::Network::NetAttributeType_Int; - this->protocol[2].type = Oyster::Network::NetAttributeType_Float; this->objectID = objctID; - this->seconds = seconds; } Protocol_ObjectDisable(Oyster::Network::CustomNetProtocol& p) { this->objectID = p[1].value.netInt; - this->seconds = p[2].value.netFloat; } Oyster::Network::CustomNetProtocol GetProtocol() override { this->protocol[1].value = this->objectID; - this->protocol[2].value = this->seconds; return protocol; } @@ -446,7 +439,7 @@ namespace GameLogic struct Protocol_ObjectCreate :public Oyster::Network::CustomProtocolObject { //ObjectType type; //ie player, box or whatever - int object_ID; + int objectID; std::string name; float position[3]; float rotationQ[4]; @@ -473,13 +466,13 @@ namespace GameLogic this->protocol[11].type = Oyster::Network::NetAttributeType_Float; this->protocol[12].type = Oyster::Network::NetAttributeType_Float; - this->object_ID = 0; + this->objectID = -1; memset(this->position, 0, sizeof(float) * 3); memset(this->rotationQ, 0, sizeof(float) * 4); } Protocol_ObjectCreate( Oyster::Network::CustomNetProtocol& p ) { - this->object_ID = p[1].value.netInt; + this->objectID = p[1].value.netInt; this->name.assign(p[2].value.netCharPtr); this->position[0] = p[3].value.netFloat; @@ -516,7 +509,7 @@ namespace GameLogic this->protocol[11].type = Oyster::Network::NetAttributeType_Float; this->protocol[12].type = Oyster::Network::NetAttributeType_Float; - object_ID = id; + objectID = id; this->name = path; memcpy(this->position, p, sizeof(float) * 3); @@ -526,7 +519,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol GetProtocol() override { - this->protocol[1].value = object_ID; + this->protocol[1].value = objectID; this->protocol.Set(2, name); this->protocol[3].value = this->position[0]; this->protocol[4].value = this->position[1]; @@ -546,10 +539,42 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; - //#define protocol_Gameplay_ObjectCreatePlayer 360 + //#define protocol_Gameplay_ObjectDelete 360 + struct Protocol_ObjectDelete :public Oyster::Network::CustomProtocolObject + { + int objectID; + + Protocol_ObjectDelete() + { + this->protocol[0].value = protocol_Gameplay_ObjectDelete; + this->protocol[0].type = Oyster::Network::NetAttributeType_Short; + this->protocol[1].type = Oyster::Network::NetAttributeType_Int; + this->objectID = -1; + } + Protocol_ObjectDelete(int objctID) + { + this->protocol[0].value = protocol_Gameplay_ObjectDelete; + this->protocol[0].type = Oyster::Network::NetAttributeType_Short; + this->protocol[1].type = Oyster::Network::NetAttributeType_Int; + this->objectID = objctID; + } + Protocol_ObjectDelete(Oyster::Network::CustomNetProtocol& p) + { + this->objectID = p[1].value.netInt; + } + Oyster::Network::CustomNetProtocol GetProtocol() override + { + this->protocol[1].value = this->objectID; + return protocol; + } + + private: + Oyster::Network::CustomNetProtocol protocol; + }; + //#define protocol_Gameplay_ObjectCreatePlayer 361 struct Protocol_ObjectCreatePlayer :public Oyster::Network::CustomProtocolObject { - /*1*/ int object_ID; + /*1*/ int objectID; /*2*/ int teamId; /*3*/ bool owner; /*4*/ std::string name; @@ -589,7 +614,7 @@ namespace GameLogic Protocol_ObjectCreatePlayer(Oyster::Network::CustomNetProtocol& p) { this->owner = p[1].value.netBool; - this->object_ID = p[2].value.netInt; + this->objectID = p[2].value.netInt; this->teamId = p[3].value.netInt; this->name.assign(p[4].value.netCharPtr); @@ -637,7 +662,7 @@ namespace GameLogic this->protocol[14].type = Oyster::Network::NetAttributeType_Float; this->protocol[15].type = Oyster::Network::NetAttributeType_Float; - this->object_ID = ObjectID; + this->objectID = ObjectID; this->teamId = teamID; this->owner = owner; this->name = name; @@ -649,7 +674,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol GetProtocol() override { this->protocol[1].value = this->owner; - this->protocol[2].value = this->object_ID; + this->protocol[2].value = this->objectID; this->protocol[3].value = this->teamId; this->protocol.Set(4, this->name); @@ -676,7 +701,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; - //#define protocol_Gameplay_ObjectJoinTeam 361 + //#define protocol_Gameplay_ObjectJoinTeam 362 struct Protocol_ObjectJoinTeam :public Oyster::Network::CustomProtocolObject { int objectID; @@ -716,7 +741,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; - //#define protocol_Gameplay_ObjectLeaveTeam 362 + //#define protocol_Gameplay_ObjectLeaveTeam 363 struct Protocol_ObjectLeaveTeam :public Oyster::Network::CustomProtocolObject { int objectID; @@ -748,7 +773,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; - //#define protocol_Gameplay_ObjectWeaponCooldown 363 + //#define protocol_Gameplay_ObjectWeaponCooldown 364 struct Protocol_ObjectWeaponCooldown :public Oyster::Network::CustomProtocolObject { float seconds; @@ -780,7 +805,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; - //#define protocol_Gameplay_ObjectWeaponEnergy 364 + //#define protocol_Gameplay_ObjectWeaponEnergy 365 struct Protocol_ObjectWeaponEnergy :public Oyster::Network::CustomProtocolObject { float energy; @@ -812,7 +837,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; - //#define protocol_Gameplay_ObjectRespawn 365 + //#define protocol_Gameplay_ObjectRespawn 366 struct Protocol_ObjectRespawn :public Oyster::Network::CustomProtocolObject { int objectID; @@ -864,7 +889,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; - //#define protocol_Gameplay_ObjectDie 366 + //#define protocol_Gameplay_ObjectDie 367 struct Protocol_ObjectDie :public Oyster::Network::CustomProtocolObject { int objectID; @@ -911,7 +936,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; - //#define protocol_Gameplay_ObjectDisconnectPlayer 367 + //#define protocol_Gameplay_ObjectDisconnectPlayer 368 struct Protocol_ObjectDisconnectPlayer :public Oyster::Network::CustomProtocolObject { int objectID; @@ -944,7 +969,7 @@ namespace GameLogic Oyster::Network::CustomNetProtocol protocol; }; } -//#define protocol_Gameplay_ObjectAction 368 +//#define protocol_Gameplay_ObjectAction 369 struct Protocol_ObjectAction :public Oyster::Network::CustomProtocolObject { short objectID; @@ -965,7 +990,7 @@ namespace GameLogic objectID = p[1].value.netShort; animationID = p[2].value.netInt; } - Protocol_ObjectAction( int id, float animID) + Protocol_ObjectAction( int id, int animID) { this->protocol[0].value = protocol_Gameplay_ObjectAction; this->protocol[0].type = Oyster::Network::NetAttributeType_Short; diff --git a/Code/Game/GameProtocols/ProtocolIdentificationID.h b/Code/Game/GameProtocols/ProtocolIdentificationID.h index 7aaf2eee..95e10ba1 100644 --- a/Code/Game/GameProtocols/ProtocolIdentificationID.h +++ b/Code/Game/GameProtocols/ProtocolIdentificationID.h @@ -62,15 +62,16 @@ #define protocol_Gameplay_ObjectEnabled 357 #define protocol_Gameplay_ObjectDisabled 358 #define protocol_Gameplay_ObjectCreate 359 -#define protocol_Gameplay_ObjectCreatePlayer 360 -#define protocol_Gameplay_ObjectJoinTeam 361 -#define protocol_Gameplay_ObjectLeaveTeam 362 -#define protocol_Gameplay_ObjectWeaponCooldown 363 -#define protocol_Gameplay_ObjectWeaponEnergy 364 -#define protocol_Gameplay_ObjectRespawn 365 -#define protocol_Gameplay_ObjectDie 366 -#define protocol_Gameplay_ObjectDisconnectPlayer 367 -#define protocol_Gameplay_ObjectAction 368 +#define protocol_Gameplay_ObjectDelete 360 +#define protocol_Gameplay_ObjectCreatePlayer 361 +#define protocol_Gameplay_ObjectJoinTeam 362 +#define protocol_Gameplay_ObjectLeaveTeam 363 +#define protocol_Gameplay_ObjectWeaponCooldown 364 +#define protocol_Gameplay_ObjectWeaponEnergy 365 +#define protocol_Gameplay_ObjectRespawn 366 +#define protocol_Gameplay_ObjectDie 367 +#define protocol_Gameplay_ObjectDisconnectPlayer 368 +#define protocol_Gameplay_ObjectAction 369 #define protocol_GameplayMAX 399 diff --git a/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp b/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp index 8e55f08b..fd000a0c 100644 --- a/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp +++ b/Code/Game/GameServer/Implementation/GameSession_Gameplay.cpp @@ -148,11 +148,11 @@ using namespace DanBias; } void GameSession::ObjectDisabled( GameLogic::IObjectData* movedObject ) { - //GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID()).GetProtocol()); + GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID()).GetProtocol()); } void GameSession::ObjectEnabled( GameLogic::IObjectData* movedObject ) { - //GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID()).GetProtocol()); + GameSession::gameSession->Send(Protocol_ObjectDisable(movedObject->GetID()).GetProtocol()); } void GameSession::ObjectDamaged( GameLogic::IObjectData* movedObject, float hp ) { From 4d077106dcf9195fc3822f0f0a9bd0391b3b639d Mon Sep 17 00:00:00 2001 From: Linda Andersson Date: Wed, 26 Feb 2014 08:51:56 +0100 Subject: [PATCH 11/13] Weapon action enum added --- Code/Game/LevelLoader/ObjectDefines.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Code/Game/LevelLoader/ObjectDefines.h b/Code/Game/LevelLoader/ObjectDefines.h index aadc3382..3eae71a5 100644 --- a/Code/Game/LevelLoader/ObjectDefines.h +++ b/Code/Game/LevelLoader/ObjectDefines.h @@ -99,6 +99,11 @@ namespace GameLogic PlayerAction_Walk, PlayerAction_Idle, }; + enum WeaponAction + { + WeaponAtcion_PrimaryShoot, + WeaponAction_SecondaryShoot + }; enum PickupType { From 2f19390cd252401452364e140f3d16e60a412a19 Mon Sep 17 00:00:00 2001 From: Robin Engman Date: Wed, 26 Feb 2014 10:05:18 +0100 Subject: [PATCH 12/13] Fixed player jump --- Code/Game/GameLogic/Player.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp index 5d36dbd9..68bac4e2 100644 --- a/Code/Game/GameLogic/Player.cpp +++ b/Code/Game/GameLogic/Player.cpp @@ -72,7 +72,7 @@ void Player::BeginFrame() Oyster::Math::Float maxSpeed = 30; // Rotate player accordingly - this->rigidBody->AddRotationAroundY(this->rotationUp); + this->rigidBody->AddRotationAroundY(this->rotationUp); this->rigidBody->SetUp(this->rigidBody->GetState().centerPos.GetNormalized()); // Direction data @@ -121,7 +121,7 @@ void Player::BeginFrame() } // Dampen velocity if certain keys are not pressed - if(key_jump <= 0.001 && IsWalking()) + if(key_jump <= 0.001 && IsWalking()) { if(key_forward <= 0.001 && key_backward <= 0.001) { @@ -148,7 +148,7 @@ void Player::BeginFrame() walkDirection.Normalize(); // If on the ground, accelerate normally - if(IsWalking()) + if(IsWalking()) { if(forwardSpeed < maxSpeed) { @@ -160,7 +160,7 @@ void Player::BeginFrame() } } // If in the air, accelerate slower - if(IsJumping()) + if(IsJumping()) { if(forwardSpeed < maxSpeed) { @@ -306,11 +306,11 @@ bool Player::IsWalking() } bool Player::IsJumping() { - return (this->rigidBody->GetLambda() < 1.0f); + return (this->rigidBody->GetLambda() == 1.0f); } bool Player::IsIdle() { - return (this->rigidBody->GetLambda() < 1.0f && this->rigidBody->GetLinearVelocity().GetMagnitude() < 0.0001f); + return (this->rigidBody->GetLambda() == 1.0f && this->rigidBody->GetLinearVelocity().GetMagnitude() < 0.0001f); } void Player::Inactivate() From d5cda4deaa652945b3996236702cc8c517e92556 Mon Sep 17 00:00:00 2001 From: Robin Engman Date: Wed, 26 Feb 2014 14:06:02 +0100 Subject: [PATCH 13/13] Added early triangle collisions --- .../GameClient/GameClientState/GameState.cpp | 6 +-- Code/Game/GameLogic/Level.cpp | 37 ++++++++++++++++++ Code/Game/GameLogic/Level.h | 2 + Code/Game/GameLogic/Player.cpp | 6 +-- .../Implementation/PhysicsAPI_Impl.cpp | 25 ++++-------- .../Implementation/SimpleRigidBody.cpp | 39 +++++++++++-------- .../Implementation/SimpleRigidBody.h | 3 +- Code/Physics/GamePhysics/PhysicsAPI.h | 3 +- 8 files changed, 79 insertions(+), 42 deletions(-) diff --git a/Code/Game/GameClient/GameClientState/GameState.cpp b/Code/Game/GameClient/GameClientState/GameState.cpp index 7e8a0ee7..fc6f2b2f 100644 --- a/Code/Game/GameClient/GameClientState/GameState.cpp +++ b/Code/Game/GameClient/GameClientState/GameState.cpp @@ -142,8 +142,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(); @@ -187,7 +187,7 @@ bool GameState::Render() { if(playerObject->second) { - //if( this->privData->myId != playerObject->second->GetId() ) + if( this->privData->myId != playerObject->second->GetId() ) { playerObject->second->Render(); } diff --git a/Code/Game/GameLogic/Level.cpp b/Code/Game/GameLogic/Level.cpp index 0f0ab632..446866b4 100644 --- a/Code/Game/GameLogic/Level.cpp +++ b/Code/Game/GameLogic/Level.cpp @@ -208,6 +208,38 @@ ICustomBody* Level::InitRigidBodySphere( const ObjectHeader* obj) rigidBody = API::Instance().AddCollisionSphere( rigidBodyRadius , rigidWorldRotation , rigidWorldPos , rigidBodyMass, obj->boundingVolume.sphere.restitutionCoeff , obj->boundingVolume.sphere.frictionCoeffStatic , obj->boundingVolume.sphere.frictionCoeffDynamic); return rigidBody; } +ICustomBody* Level::InitRigidBodyMesh( const ObjectHeader* obj) +{ + ICustomBody* rigidBody = NULL; + Oyster::Math::Float3 rigidWorldPos; + Oyster::Math::Float4 rigidWorldRotation; + float rigidBodyMass; + float rigidBodyRadius; + + //offset the rigidPosition from modelspace to worldspace; + rigidWorldPos = (Oyster::Math::Float3)obj->position + (Oyster::Math::Float3)obj->boundingVolume.cgMesh.position; + //scales the position so the collision geomentry is in the right place + rigidWorldPos = rigidWorldPos * obj->scale; + + //offset the rigidRotation from modelspace to worldspace; + Oyster::Math::Quaternion worldPosQuaternion = Oyster::Math::Quaternion(Oyster::Math::Float3(obj->rotation[0],obj->rotation[1],obj->rotation[2]), obj->rotation[3]); + Oyster::Math::Quaternion physicsPosQuaternion = Oyster::Math::Quaternion(Oyster::Math::Float3(obj->boundingVolume.cgMesh.rotation[0],obj->boundingVolume.cgMesh.rotation[1],obj->boundingVolume.cgMesh.rotation[2]), obj->boundingVolume.cgMesh.rotation[3]); + Oyster::Math::Quaternion rigidWorldQuaternion = worldPosQuaternion * physicsPosQuaternion; + + rigidWorldRotation = Oyster::Math::Float4(rigidWorldQuaternion); + + + //mass scaled + rigidBodyMass = obj->scale[0] * obj->scale[1] * obj->scale[2] * obj->boundingVolume.cgMesh.mass; + + //Radius scaled + //rigidBodyRadius = (obj->scale[0]) * obj->boundingVolume.sphere.radius; + //rigidBodyRadius = (obj->scale[0] * obj->scale[1] * obj->scale[2]) * obj->boundingVolume.sphere.radius; + + //create the rigid body + rigidBody = API::Instance().AddTriangleMesh(obj->boundingVolume.cgMesh.filename, rigidWorldRotation , rigidWorldPos , rigidBodyMass, obj->boundingVolume.cgMesh.restitutionCoeff , obj->boundingVolume.cgMesh.frictionCoeffStatic , obj->boundingVolume.cgMesh.frictionCoeffDynamic); + return rigidBody; +} bool Level::InitiateLevel(std::wstring levelPath) { LevelLoader ll; @@ -264,6 +296,11 @@ bool Level::InitiateLevel(std::wstring levelPath) //rigidBody_Static = InitRigidBodyCylinder(staticObjData); } + else if(staticObjData->boundingVolume.geoType == CollisionGeometryType_CG_MESH) + { + rigidBody_Static = InitRigidBodyMesh(staticObjData); + } + if(rigidBody_Static != NULL) { // create game object diff --git a/Code/Game/GameLogic/Level.h b/Code/Game/GameLogic/Level.h index 7d6c25c9..ecd51018 100644 --- a/Code/Game/GameLogic/Level.h +++ b/Code/Game/GameLogic/Level.h @@ -38,6 +38,8 @@ namespace GameLogic bool InitiateLevel(float radius); Oyster::Physics::ICustomBody* InitRigidBodyCube( const ObjectHeader* obj); Oyster::Physics::ICustomBody* InitRigidBodySphere( const ObjectHeader* obj); + Oyster::Physics::ICustomBody* InitRigidBodyMesh( const ObjectHeader* obj); + Object* CreateGameObj(ObjectHeader* obj, Oyster::Physics::ICustomBody* rigidBody); /******************************************************** diff --git a/Code/Game/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp index 68bac4e2..49babcc3 100644 --- a/Code/Game/GameLogic/Player.cpp +++ b/Code/Game/GameLogic/Player.cpp @@ -302,15 +302,15 @@ void Player::Jump() bool Player::IsWalking() { - return (this->rigidBody->GetLambda() < 0.99f); + return (this->rigidBody->GetLambdaUp() < 0.99f); } bool Player::IsJumping() { - return (this->rigidBody->GetLambda() == 1.0f); + return (this->rigidBody->GetLambdaUp() == 1.0f); } bool Player::IsIdle() { - return (this->rigidBody->GetLambda() == 1.0f && this->rigidBody->GetLinearVelocity().GetMagnitude() < 0.0001f); + return (this->rigidBody->GetLambdaUp() == 1.0f && this->rigidBody->GetLinearVelocity().GetMagnitude() < 0.0001f); } void Player::Inactivate() diff --git a/Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.cpp b/Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.cpp index b86f3821..27cd8ba5 100644 --- a/Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.cpp +++ b/Code/Physics/GamePhysics/Implementation/PhysicsAPI_Impl.cpp @@ -229,15 +229,15 @@ ICustomBody* API_Impl::AddTriangleMesh(const std::wstring fileName, ::Oyster::Ma SimpleRigidBody* body = new SimpleRigidBody; SimpleRigidBody::State state; - btBulletWorldImporter bulletFile; + btBulletWorldImporter bulletFile(0); typedef std::codecvt_utf8 convert_typeX; std::wstring_convert converterX; - std::string bulletPath = converterX.to_bytes(fileName); + //std::string bulletPath = converterX.to_bytes(); // Add collision shape - bulletFile.loadFile(bulletPath.c_str()); + bulletFile.loadFile("C:\\DV1477\\Git Repository\\Danbias\\Bin\\Content\\Worlds\\cgf\\structure_corporation.bullet"); btCollisionShape* collisionShape = bulletFile.getCollisionShapeByIndex(0); body->SetCollisionShape(collisionShape); @@ -247,8 +247,8 @@ ICustomBody* API_Impl::AddTriangleMesh(const std::wstring fileName, ::Oyster::Ma // Add rigid body btVector3 fallInertia(0, 0, 0); - collisionShape->calculateLocalInertia(mass, fallInertia); - btRigidBody::btRigidBodyConstructionInfo rigidBodyCI(mass, motionState, collisionShape, fallInertia); + //collisionShape->calculateLocalInertia(mass, fallInertia); + btRigidBody::btRigidBodyConstructionInfo rigidBodyCI(0, motionState, collisionShape, fallInertia); btRigidBody* rigidBody = new btRigidBody(rigidBodyCI); rigidBody->setFriction(staticFriction); rigidBody->setRestitution(restitution); @@ -264,7 +264,7 @@ ICustomBody* API_Impl::AddTriangleMesh(const std::wstring fileName, ::Oyster::Ma state.dynamicFrictionCoeff = dynamicFriction; state.staticFrictionCoeff = staticFriction; state.quaternion = Quaternion(Float3(rotation.xyz), rotation.w); - state.mass = mass; + state.mass = 0; body->SetState(state); @@ -291,7 +291,7 @@ void API_Impl::UpdateWorld() simpleBody->SetPreviousVelocity(simpleBody->GetLinearVelocity()); } - this->dynamicsWorld->stepSimulation(this->timeStep, 10, this->timeStep); + this->dynamicsWorld->stepSimulation(this->timeStep, 1, this->timeStep); ICustomBody::State state; @@ -314,23 +314,12 @@ void API_Impl::UpdateWorld() ICustomBody* bodyA = (ICustomBody*)obA->getUserPointer(); ICustomBody* bodyB = (ICustomBody*)obB->getUserPointer(); - - int numContacts = contactManifold->getNumContacts(); for (int j=0;jgetContactPoint(j); if (pt.getDistance()<0.f) { - if(bodyA->GetState().mass == 40 && bodyB->GetState().centerPos == Float3::null) - { - const char* breakPoint = "STOP"; - } - if(bodyB->GetState().mass == 40 && bodyA->GetState().centerPos == Float3::null) - { - const char* breakPoint = "STOP"; - } - const btVector3& ptA = pt.getPositionWorldOnA(); const btVector3& ptB = pt.getPositionWorldOnB(); const btVector3& normalOnB = pt.m_normalWorldOnB; diff --git a/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp b/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp index 9b9c7739..7fbd44e8 100644 --- a/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp +++ b/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.cpp @@ -63,7 +63,8 @@ void SimpleRigidBody::SetState( const SimpleRigidBody::State &state ) this->rigidBody->setFriction(state.staticFrictionCoeff); this->rigidBody->setRestitution(state.restitutionCoeff); btVector3 fallInertia(0, 0, 0); - collisionShape->calculateLocalInertia(state.mass, fallInertia); + if(state.mass != 0) + collisionShape->calculateLocalInertia(state.mass, fallInertia); this->rigidBody->setMassProps(state.mass, fallInertia); this->state = state; @@ -185,7 +186,8 @@ void SimpleRigidBody::SetAngularFactor(Float factor) void SimpleRigidBody::SetMass(Float mass) { btVector3 fallInertia(0, 0, 0); - collisionShape->calculateLocalInertia(mass, fallInertia); + if(mass != 0) + collisionShape->calculateLocalInertia(mass, fallInertia); this->rigidBody->setMassProps(mass, fallInertia); this->state.mass = mass; } @@ -362,29 +364,25 @@ void SimpleRigidBody::PreStep (const btCollisionWorld* collisionWorld) { btTransform xform; xform = this->rigidBody->getWorldTransform (); - Float3 normalDown = -this->state.centerPos.GetNormalized(); - btVector3 down(normalDown.x, normalDown.y, normalDown.z); - btVector3 forward = xform.getBasis()[2]; - down.normalize (); + //Float3 normalDown = -xform.getBasis().getColumn(1); + btVector3 down(-xform.getBasis().getColumn(1)); + btVector3 forward(xform.getBasis().getColumn(2)); + down.normalize(); forward.normalize(); this->raySource[0] = xform.getOrigin(); this->raySource[1] = xform.getOrigin(); - if(this->state.reach.y < 1.0f) - - - Float angle = acos(Float3(0, 1, 0).Dot(this->state.centerPos.GetNormalized())); - //down.setZ(-down.z()); - btVector3 targetPlus = down * this->state.reach.y * btScalar(1.1); - if(this->state.mass == 40) { - const char* breakpoint = "STOP"; + const char* breakPoint = "STOP!"; } + btVector3 targetPlus = down*this->state.reach.y*btScalar(1.1); + this->rayTarget[0] = this->raySource[0] + targetPlus; - this->rayTarget[1] = this->raySource[1] + forward * this->state.reach.y * btScalar(1.1); + targetPlus = this->raySource[1] + forward*this->state.reach.z*btScalar(1.1); + this->rayTarget[1] = btVector3(targetPlus.x(), targetPlus.y(), targetPlus.z()); class ClosestNotMe : public btCollisionWorld::ClosestRayResultCallback { @@ -415,6 +413,10 @@ void SimpleRigidBody::PreStep (const btCollisionWorld* collisionWorld) if (rayCallback.hasHit()) { this->rayLambda[i] = rayCallback.m_closestHitFraction; + if(i == 1 && this->state.mass == 40) + { + btVector3 hitNormal = rayCallback.m_hitNormalWorld; + } } else { @@ -423,11 +425,16 @@ void SimpleRigidBody::PreStep (const btCollisionWorld* collisionWorld) } } -float SimpleRigidBody::GetLambda() const +float SimpleRigidBody::GetLambdaUp() const { return this->rayLambda[0]; } +float SimpleRigidBody::GetLambdaForward() const +{ + return this->rayLambda[1]; +} + void SimpleRigidBody::MoveToLimbo() { this->rigidBody->setCollisionFlags(this->rigidBody->getCollisionFlags() | btCollisionObject::CF_NO_CONTACT_RESPONSE); diff --git a/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h b/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h index 65c59820..dc1158d7 100644 --- a/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h +++ b/Code/Physics/GamePhysics/Implementation/SimpleRigidBody.h @@ -68,7 +68,8 @@ namespace Oyster void PreStep(const btCollisionWorld* collisionWorld); - float GetLambda() const; + float GetLambdaUp() const; + float GetLambdaForward() const; void MoveToLimbo(); void ReleaseFromLimbo(); diff --git a/Code/Physics/GamePhysics/PhysicsAPI.h b/Code/Physics/GamePhysics/PhysicsAPI.h index a536bdce..3c2ef879 100644 --- a/Code/Physics/GamePhysics/PhysicsAPI.h +++ b/Code/Physics/GamePhysics/PhysicsAPI.h @@ -185,7 +185,8 @@ namespace Oyster ********************************************************/ virtual void SetCustomTag( void *ref ) = 0; - virtual float GetLambda() const = 0; + virtual float GetLambdaUp() const = 0; + virtual float GetLambdaForward() const = 0; }; } }