projectiles work in progress

Author: codenamecpp

src/Carnage3D.vcxproj

@@ -182,6 +182,7 @@
     <ClInclude Include="MapRenderer.h" />
     <ClInclude Include="GameMapManager.h" />
     <ClInclude Include="HumanCharacterController.h" />
+    <ClInclude Include="Projectile.h" />
     <ClInclude Include="RenderView.h" />
     <ClInclude Include="rtti.h" />
     <ClInclude Include="Sprite2D.h" />
@@ -264,6 +265,7 @@
     <ClCompile Include="GameMapHelpers.cpp" />
     <ClCompile Include="GameMapManager.cpp" />
     <ClCompile Include="HumanCharacterController.cpp" />
+    <ClCompile Include="Projectile.cpp" />
     <ClCompile Include="RenderView.cpp" />
     <ClCompile Include="Sprite2D.cpp" />
     <ClCompile Include="SpriteBatch.cpp" />

src/Carnage3D.vcxproj.filters

@@ -332,6 +332,9 @@
     <ClInclude Include="Box2D_Helpers.h">
       <Filter>Game\Physics</Filter>
     </ClInclude>
+    <ClInclude Include="Projectile.h">
+      <Filter>Game\GameObjects</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -519,6 +522,9 @@
     <ClCompile Include="TimeManager.cpp">
       <Filter>Application</Filter>
     </ClCompile>
+    <ClCompile Include="Projectile.cpp">
+      <Filter>Game\GameObjects</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\gamedata\config\sys_config.json.default">

src/CarnageGame.cpp

@@ -226,7 +226,7 @@ void CarnageGame::SetupHumanCharacter(int humanIndex, Pedestrian* pedestrian)
     {
         pedestrian->mRemapIndex = humanIndex - 1;
     }
-    mHumanSlot[humanIndex].mCharController.mSpawnPosition = pedestrian->mPhysicsComponent->GetPosition();
+    mHumanSlot[humanIndex].mCharController.mSpawnPosition = pedestrian->mPhysicsBody->GetPosition();
     mHumanSlot[humanIndex].mCharPedestrian = pedestrian;
     mHumanSlot[humanIndex].mCharController.SetCharacter(pedestrian);
     mHumanSlot[humanIndex].mCharView.mFollowCameraController.SetFollowTarget(pedestrian);

src/FollowCameraController.cpp

@@ -27,7 +27,7 @@ void FollowCameraController::Setup(GameCamera* gameCamera)
 
     if (mFollowPedestrian)
     {
-        glm::vec3 position = mFollowPedestrian->mPhysicsComponent->GetPosition();
+        glm::vec3 position = mFollowPedestrian->mPhysicsBody->GetPosition();
         mCamera->SetPosition({position.x, position.y + mStartupCameraHeight, position.z}); 
     }
     else
@@ -42,14 +42,14 @@ void FollowCameraController::UpdateFrame()
     if (mFollowPedestrian == nullptr)
         return;
 
-    glm::vec3 position = mFollowPedestrian->mPhysicsComponent->GetPosition();
+    glm::vec3 position = mFollowPedestrian->mPhysicsBody->GetPosition();
     position.y = position.y + (mFollowPedCameraHeight + mScrollHeightOffset);
 
     float catchSpeed = mFollowPedCameraCatchSpeed;
     // todo: temporary implementation
     if (mFollowPedestrian->IsCarPassenger())
     {
-        glm::vec2 carVelocity = mFollowPedestrian->mCurrentCar->mPhysicsComponent->GetLinearVelocity();
+        glm::vec2 carVelocity = mFollowPedestrian->mCurrentCar->mPhysicsBody->GetLinearVelocity();
         float carSpeed = glm::length(carVelocity);
         carVelocity = glm::normalize(carVelocity);
         position.x += (carVelocity.x * carSpeed * 0.35f);

src/GameCheatsWindow.cpp

@@ -79,12 +79,12 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
     if (Pedestrian* pedestrian = gCarnageGame.mHumanSlot[0].mCharPedestrian)
     {
         ImGui::HorzSpacing();
-        glm::vec3 pedPosition = pedestrian->mPhysicsComponent->GetPosition();
+        glm::vec3 pedPosition = pedestrian->mPhysicsBody->GetPosition();
         ImGui::Text("physical pos: %.3f, %.3f, %.3f", pedPosition.x, pedPosition.y, pedPosition.z);
         glm::vec3 logicalPosition = Convert::MetersToMapUnits(pedPosition);
         ImGui::Text("logical pos: %.3f, %.3f, %.3f", logicalPosition.x, logicalPosition.y, logicalPosition.z);
 
-        cxx::angle_t pedHeading = pedestrian->mPhysicsComponent->GetRotationAngle();
+        cxx::angle_t pedHeading = pedestrian->mPhysicsBody->GetRotationAngle();
         ImGui::Text("heading: %f", pedHeading.mDegrees);
         ImGui::Text("weapon: %s", cxx::enum_to_string(pedestrian->mCurrentWeapon));
         ImGui::Text("state: %s", cxx::enum_to_string(pedestrian->GetCurrentStateID()));
@@ -189,10 +189,10 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
                 ImGui::TextColored(physicsPropsColor, "Front Brake Bias : %.3f", carInformation->mFrontBrakeBias);
                 ImGui::HorzSpacing();
 
-                ImGui::Text("Current velocity : %.3f", currCar->mPhysicsComponent->GetCurrentSpeed());
+                ImGui::Text("Current velocity : %.3f", currCar->mPhysicsBody->GetCurrentSpeed());
                 if (ImGui::Button("Clear forces"))
                 {
-                    currCar->mPhysicsComponent->ClearForces();
+                    currCar->mPhysicsBody->ClearForces();
                 }
             }
         }
@@ -219,7 +219,7 @@ void GameCheatsWindow::CreateCarNearby(CarStyle* carStyle, Pedestrian* pedestria
     if (carStyle == nullptr || pedestrian == nullptr)
         return;
 
-    glm::vec3 currPosition = pedestrian->mPhysicsComponent->GetPosition();
+    glm::vec3 currPosition = pedestrian->mPhysicsBody->GetPosition();
     currPosition.x += 0.5f;
     currPosition.z += 0.5f;
 

src/GameDefs.h

@@ -61,8 +61,10 @@
 #define CANONICAL_FPS 25 // gta1 game speed
 
 // forwards
+
 class Pedestrian;
 class Vehicle;
+class Projectile;
 
 // some game objects has null identifier, they are dacals, projectiles and short-lived effects
 #define GAMEOBJECT_ID_NULL 0
@@ -716,6 +718,11 @@ enum eSpriteAnimID
     eSpriteAnimID_Ped_ShootRPGWhileRunning,
     // cops
 
+    // projectiles
+    eSpriteAnimID_Projectile_Rocket,
+    eSpriteAnimID_Projectile_Bullet,
+    eSpriteAnimID_Projectile_Flame,
+
     eSpriteAnimID_COUNT
 };
 
@@ -813,4 +820,28 @@ enum ePedestrianDeathReason
     ePedestrianDeathReason_HitByCar,
 };
 
-decl_enum_strings(ePedestrianDeathReason);
+decl_enum_strings(ePedestrianDeathReason);
+
+enum eProjectileType
+{
+    eProjectileType_Bullet, // pistol, machinegun
+    eProjectileType_Flame, // flamethrower
+    eProjectileType_Rocket, // rocket launcher, tank rocket
+    eProjectileType_COUNT
+};
+decl_enum_strings(eProjectileType);
+
+// projectile type info
+struct ProjectileStyle
+{
+public:
+    eProjectileType mTypeID;
+    eSpriteAnimID mAnimID;
+    float mBaseDistance; // how far projectile can fly, meters
+    float mProjectileRadius; // size, meters
+    float mSpeed; // how fast projectile moves, meters
+    float mBasePrimaryDamageRadius; // how far projectile can impact, meters
+    float mBaseSecondaryDamageRadius; // // how far projectile can impact, meters
+    // todo: damage
+    // todo: impact type
+};

src/GameObject.cpp

@@ -17,4 +17,9 @@ GameObject::GameObject(eGameObjectType objectTypeID, GameObjectID uniqueID)
 
 GameObject::~GameObject()
 {
-}
+}
+
+void GameObject::MarkForDeletion()
+{
+    gGameObjectsManager.MarkForDeletion(this);
+}

src/GameObject.h

@@ -30,11 +30,21 @@ class GameObject: public cxx::noncopyable
     {
     }
 
+    // schedule object to despawn
+    void MarkForDeletion();
+
+    // shortcuts
+    inline bool IsPedestrianObject() const { return mObjectTypeID == eGameObjectType_Pedestrian; }
+    inline bool IsProjectileObject() const { return mObjectTypeID == eGameObjectType_Projectile; }
+    inline bool IsDecorationObject() const { return mObjectTypeID == eGameObjectType_Decoration; }
+    inline bool IsCarObject() const { return mObjectTypeID == eGameObjectType_Car; }
+    inline bool IsPowerupObject() const { return mObjectTypeID == eGameObjectType_Powerup; }
+    inline bool IsObstacleObject() const { return mObjectTypeID == eGameObjectType_Obstacle; }
+
 protected:
     GameObject(eGameObjectType objectTypeID, GameObjectID uniqueID);
 
 private:
-    // internal stuff that can be touched only by PedestrianManager
     cxx::intrusive_node<GameObject> mObjectsNode; // updatable and drawable entities
     cxx::intrusive_node<GameObject> mDeleteObjectsNode; // to remove queue
 };

src/GameObjectsManager.cpp

@@ -4,6 +4,7 @@
 #include "Pedestrian.h"
 #include "PhysicsComponents.h"
 #include "GameMapManager.h"
+#include "Projectile.h"
 
 GameObjectsManager gGameObjectsManager;
 
@@ -40,29 +41,38 @@ void GameObjectsManager::UpdateFrame()
     DestroyPendingObjects();
 
     // update pedestrians
-    for (Pedestrian* currentPed: mPedestriansList) // warning: dont add or remove peds during this loop
+    for (Pedestrian* currObject: mPedestriansList) // warning: dont add or remove peds during this loop
     {
-        if (mDeleteList.contains(&currentPed->mDeleteObjectsNode))
+        if (mDeleteList.contains(&currObject->mDeleteObjectsNode))
             continue;
 
-        currentPed->UpdateFrame();
+        currObject->UpdateFrame();
     }
 
     // update cars    
-    for (Vehicle* currentCar: mCarsList) // warning: dont add or remove cars during this loop
+    for (Vehicle* currObject: mCarsList) // warning: dont add or remove cars during this loop
     {
-        if (mDeleteList.contains(&currentCar->mDeleteObjectsNode))
+        if (mDeleteList.contains(&currObject->mDeleteObjectsNode))
             continue;
 
-        currentCar->UpdateFrame();
+        currObject->UpdateFrame();
+    }
+
+    // update projectiles    
+    for (Projectile* currObject: mProjectilesList) // warning: dont add or remove cars during this loop
+    {
+        if (mDeleteList.contains(&currObject->mDeleteObjectsNode))
+            continue;
+
+        currObject->UpdateFrame();
     }
 }
 
 void GameObjectsManager::DebugDraw()
 {
 }
 
-Pedestrian* GameObjectsManager::CreatePedestrian(const glm::vec3& startPosition, cxx::angle_t startRotation)
+Pedestrian* GameObjectsManager::CreatePedestrian(const glm::vec3& position, cxx::angle_t heading)
 {
     GameObjectID pedestrianID = GenerateUniqueID();
 
@@ -73,15 +83,14 @@ Pedestrian* GameObjectsManager::CreatePedestrian(const glm::vec3& startPosition,
     mObjectsList.insert(&instance->mObjectsNode);
 
     // init
-    instance->Spawn(startPosition, startRotation);
+    instance->Spawn(position, heading);
     return instance;
 }
 
-Vehicle* GameObjectsManager::CreateCar(const glm::vec3& startPosition, cxx::angle_t carRotation, CarStyle* carStyle)
+Vehicle* GameObjectsManager::CreateCar(const glm::vec3& position, cxx::angle_t heading, CarStyle* carStyle)
 {
-    StyleData& styleData = gGameMap.mStyleData;
-
-    debug_assert(styleData.IsLoaded());
+    debug_assert(gGameMap.mStyleData.IsLoaded());
+    debug_assert(carStyle);
     GameObjectID carID = GenerateUniqueID();
 
     Vehicle* instance = mCarsPool.create(carID);
@@ -92,22 +101,53 @@ Vehicle* GameObjectsManager::CreateCar(const glm::vec3& startPosition, cxx::angl
 
     // init
     instance->mCarStyle = carStyle;
-    instance->Spawn(startPosition, carRotation);
+    instance->Spawn(position, heading);
     return instance;
 }
 
-Vehicle* GameObjectsManager::CreateCar(const glm::vec3& position, cxx::angle_t carRotation, eCarModel carModel)
+Vehicle* GameObjectsManager::CreateCar(const glm::vec3& position, cxx::angle_t heading, eCarModel carModel)
 {
-    StyleData& styleData = gGameMap.mStyleData;
-    debug_assert(styleData.IsLoaded());
-
-    for (CarStyle& currStyle: styleData.mCars)
+    Vehicle* vehicle = nullptr;
+    for (CarStyle& currStyle: gGameMap.mStyleData.mCars)
     {
         if (currStyle.mModelId == carModel)
-            return CreateCar(position, carRotation, &currStyle);
+        {
+            vehicle = CreateCar(position, heading, &currStyle);
+            break;
+        }
     }
-    debug_assert(false);
-    return nullptr;
+    debug_assert(vehicle);
+    return vehicle;
+}
+
+Projectile* GameObjectsManager::CreateProjectile(const glm::vec3& position, cxx::angle_t heading, eProjectileType typeID)
+{
+    Projectile* projectile = nullptr;
+    debug_assert(typeID < eProjectileType_COUNT);
+    for (ProjectileStyle& currStyle: gGameMap.mStyleData.mProjectiles)
+    {
+        if (currStyle.mTypeID == typeID)
+        {
+            projectile = CreateProjectile(position, heading, &currStyle);
+            break;
+        }
+    }
+    debug_assert(projectile);
+    return projectile;
+}
+
+Projectile* GameObjectsManager::CreateProjectile(const glm::vec3& position, cxx::angle_t heading, ProjectileStyle* desc)
+{
+    debug_assert(gGameMap.mStyleData.IsLoaded());
+    debug_assert(desc);
+
+    Projectile* instance = mProjectilesPool.create(desc);
+    debug_assert(instance);
+    mObjectsList.insert(&instance->mObjectsNode);
+    mProjectilesList.insert(&instance->mProjectilesListNode);
+    // init
+    instance->Spawn(position, heading);
+    return instance;
 }
 
 Vehicle* GameObjectsManager::GetCarByID(GameObjectID objectID) const
@@ -185,14 +225,21 @@ void GameObjectsManager::DestroyGameObject(GameObject* object)
 
         case eGameObjectType_Car:
         {
-            Vehicle* car = static_cast<Vehicle*>(object);
+            Vehicle* vehicle = static_cast<Vehicle*>(object);
 
-            mCarsList.remove(&car->mCarsListNode);
-            mCarsPool.destroy(car);
+            mCarsList.remove(&vehicle->mCarsListNode);
+            mCarsPool.destroy(vehicle);
         }
         break;
 
         case eGameObjectType_Projectile:
+        {
+            Projectile* projectile = static_cast<Projectile*>(object);
+
+            mProjectilesList.remove(&projectile->mProjectilesListNode);
+            mProjectilesPool.destroy(projectile);
+        }
+        break;
         case eGameObjectType_Powerup:
         case eGameObjectType_Decoration:
         case eGameObjectType_Obstacle: