-

Author: codenamecpp

src/Carnage3D.vcxproj

@@ -159,7 +159,6 @@
     <ClInclude Include="Convert.h" />
     <ClInclude Include="Decoration.h" />
     <ClInclude Include="Explosion.h" />
-    <ClInclude Include="GameObjectDefs.h" />
     <ClInclude Include="game_version.h" />
     <ClInclude Include="GtaFontData.h" />
     <ClInclude Include="HUD.h" />

src/Carnage3D.vcxproj.filters

@@ -338,9 +338,6 @@
     <ClInclude Include="Projectile.h">
       <Filter>Game\GameObjects</Filter>
     </ClInclude>
-    <ClInclude Include="GameObjectDefs.h">
-      <Filter>Game\GameObjects</Filter>
-    </ClInclude>
     <ClInclude Include="Decoration.h">
       <Filter>Game\GameObjects</Filter>
     </ClInclude>

src/CarnageGame.cpp

@@ -319,7 +319,7 @@ bool CarnageGame::StartScenario(const std::string& mapName)
         {
             for (int zBlock = MAP_LAYERS_COUNT - 1; zBlock > -1; --zBlock)
             {
-                BlockStyle* currBlock = gGameMap.GetBlock(xBlock, yBlock, zBlock);
+                MapBlockInfo* currBlock = gGameMap.GetBlock(xBlock, yBlock, zBlock);
                 if (currBlock->mGroundType == eGroundType_Field ||
                     currBlock->mGroundType == eGroundType_Pawement ||
                     currBlock->mGroundType == eGroundType_Road)

src/Decoration.cpp

@@ -3,7 +3,7 @@
 #include "TimeManager.h"
 #include "SpriteManager.h"
 
-Decoration::Decoration(GameObjectID id, GameObjectStyle* desc) 
+Decoration::Decoration(GameObjectID id, GameObjectInfo* desc) 
     : GameObject(eGameObjectClass_Decoration, id)
     , mGameObjectDesc(desc)
 {

src/Decoration.h

@@ -7,7 +7,7 @@ class Decoration final: public GameObject
     friend class GameObjectsManager;
 
 public:
-    Decoration(GameObjectID id, GameObjectStyle* desc);
+    Decoration(GameObjectID id, GameObjectInfo* desc);
     ~Decoration();
 
     // override GameObject
@@ -22,7 +22,7 @@ class Decoration final: public GameObject
 
 private:
     SpriteAnimation mAnimationState;
-    GameObjectStyle* mGameObjectDesc = nullptr;
+    GameObjectInfo* mGameObjectDesc = nullptr;
 
     int mLifeDuration = 0; // number of animation cycles before decoration will be deleted, or 0 for endless lifetime
 };

src/GameCheatsWindow.cpp

@@ -171,7 +171,7 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
     {
         if (Vehicle* currCar = pedestrian->mCurrentCar)
         {
-            CarStyle* carInformation = currCar->mCarStyle;
+            VehicleInfo* carInformation = currCar->mCarStyle;
 
             if (ImGui::CollapsingHeader("Vehicle Info"))
             {
@@ -240,7 +240,7 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
     ImGui::End();
 }
 
-void GameCheatsWindow::CreateCarNearby(CarStyle* carStyle, Pedestrian* pedestrian)
+void GameCheatsWindow::CreateCarNearby(VehicleInfo* carStyle, Pedestrian* pedestrian)
 {
     if (carStyle == nullptr || pedestrian == nullptr)
         return;

src/GameCheatsWindow.h

@@ -23,7 +23,7 @@ class GameCheatsWindow: public DebugWindow
     // @param deltaTime: Time since last frame
     void DoUI(ImGuiIO& imguiContext) override;
 
-    void CreateCarNearby(CarStyle* carStyle, Pedestrian* pedestrian);
+    void CreateCarNearby(VehicleInfo* carStyle, Pedestrian* pedestrian);
 };
 
 extern GameCheatsWindow gGameCheatsWindow;

src/GameDefs.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "GameObjectDefs.h"
-
 // most of game constants is mapped to GTA files format so don't change
 
 // side length of block cube, do not change
@@ -24,10 +22,10 @@
 #define SPRITE_ZERO_ANGLE 90.0f // all sprites in game are rotated at 90 degrees
 #define MAP_SPRITE_SCALE (METERS_PER_MAP_UNIT / PIXELS_PER_MAP_UNIT)
 #define PED_SPRITE_DRAW_BOX_SIZE_PX 24 // with, height
-#define CAR_WHEEL_SIZE_W_PX         6
-#define CAR_WHEEL_SIZE_H_PX         12
+#define CAR_WHEEL_SIZE_W_PX 6
+#define CAR_WHEEL_SIZE_H_PX 12
 
-#define GTA_CYCLES_PER_FRAME        24
+#define GTA_CYCLES_PER_FRAME 24
 
 // in original gta1 map height levels is counting from top to bottom - 
 // 0 is highest and 5 is lowest level
@@ -62,13 +60,68 @@
 
 #define CAR_DELTA_ANIMS_SPEED 10.0f
 
-// define generic gameobject information
-struct GameObjectStyle
+// forwards
+class GameObject;
+class Pedestrian;
+class Vehicle;
+class Projectile;
+class Decoration;
+class Obstacle;
+class Explosion;
+
+// some game objects has null identifier, they are dacals, projectiles and short-lived effects
+#define GAMEOBJECT_ID_NULL 0
+
+using GameObjectID = unsigned int; // unique id of gameobject instance in world
+
+// gameobject class identifiers
+enum eGameObjectClass
+{
+    eGameObjectClass_Car,
+    eGameObjectClass_Pedestrian,
+    eGameObjectClass_Projectile,
+    eGameObjectClass_Powerup,
+    eGameObjectClass_Decoration,
+    eGameObjectClass_Obstacle,
+    eGameObjectClass_Explosion,
+    eGameObjectClass_COUNT,
+};
+
+decl_enum_strings(eGameObjectClass);
+
+enum eGameObjectFlags: unsigned short
+{
+    eGameObjectFlags_None = 0,
+    eGameObjectFlags_Invisible = BIT(0),
+    eGameObjectFlags_CarObject = BIT(1),
+};
+
+decl_enum_as_flags(eGameObjectFlags);
+
+// game object type indices
+enum
+{
+    GameObjectType_Null = 0,
+
+    GameObjectType_FirstBlood = 63,
+    GameObjectType_Body = 64,
+    // todo...
+    GameObjectType_MissileProjectile = 31,
+    GameObjectType_BulletProjectile = 74,
+    GameObjectType_FireballProjectile = 75,
+
+    // todo...
+    GameObjectType_MAX = 102
+};
+
+// define gameobject type information
+struct GameObjectInfo
 {
     eGameObjectClass mClassID = eGameObjectClass_COUNT;
     eGameObjectFlags mFlags = eGameObjectFlags_None;
 
-    int mGameObjectIndex = 0; // index within loaded styles
+    // index in the gameobject types table that are loaded with the style data
+    int mObjectType = GameObjectType_Null;
 
     // width, height and depth store the dimensions of the object with respect to collision checking
     // specified in meters
@@ -374,7 +427,7 @@ struct HLSRemap
 };
 
 // define map block information
-struct BlockStyle
+struct MapBlockInfo
 {
     unsigned char mRemap;
 
@@ -408,10 +461,10 @@ struct BlockStyle
     bool mIsRailway : 1;
 };
 
-const unsigned int Sizeof_BlockStyle = sizeof(BlockStyle);
+const unsigned int Sizeof_BlockInfo = sizeof(MapBlockInfo);
 
 // define map block anim information
-struct BlockAnimationStyle
+struct BlockAnimationInfo
 {
     int mBlock = 0; // the block number
     int mWhich = 0; // the area type ( 0 for side, 1 for lid )
@@ -421,7 +474,7 @@ struct BlockAnimationStyle
 };
 
 // define car door information
-struct CarDoorStyle
+struct CarDoorInfo
 {
 	short mRpx, mRpy;
 	short mObject;
@@ -525,11 +578,12 @@ enum eCarConvertible
 };
 decl_enum_strings(eCarConvertible);
 
-// define car class information
-struct CarStyle
+// define vehicle type information
+struct VehicleInfo
 {
-    short mWidth, mHeight, mDepth;  // dimensions of the car with respect to collision checking, x, y, z
-    short mSprNum; // first sprite number offset for this car
+    glm::vec3 mDimensions; // dimensions of the car with respect to collision checking, meters
+
+    int mSpriteIndex;
 
     struct // specs, usage is unknown
     { 
@@ -572,12 +626,12 @@ struct CarStyle
     int mHorn;
     int mSoundFunction;
     int mFastChangeFlag;
-    short mDoorsCount;
-    CarDoorStyle mDoors[MAX_CAR_DOORS];
+    int mDoorsCount;
+    CarDoorInfo mDoors[MAX_CAR_DOORS];
 };
 
 // define sprite information
-struct SpriteStyle
+struct SpriteInfo
 {
     int mWidth;
     int mHeight;

src/GameMapHelpers.cpp

@@ -15,7 +15,7 @@ bool GameMapHelpers::BuildMapMesh(GameMapManager& cityScape, const Rect& area, i
     for (int tiley = 0; tiley < area.h; ++tiley)
     for (int tilex = 0; tilex < area.w; ++tilex)
     {
-        if (BlockStyle* blockInfo = cityScape.GetBlockClamp(tilex + area.x, tiley + area.y, layerIndex))
+        if (MapBlockInfo* blockInfo = cityScape.GetBlockClamp(tilex + area.x, tiley + area.y, layerIndex))
         {
             for (int iface = 0; iface < eBlockFace_COUNT; ++iface)
             {
@@ -41,7 +41,7 @@ bool GameMapHelpers::BuildMapMesh(GameMapManager& cityScape, const Rect& area, M
     for (int tiley = 0; tiley < area.h; ++tiley)
     for (int tilex = 0; tilex < area.w; ++tilex)
     {
-        if (BlockStyle* blockInfo = cityScape.GetBlockClamp(tilex + area.x, tiley + area.y, tilez))
+        if (MapBlockInfo* blockInfo = cityScape.GetBlockClamp(tilex + area.x, tiley + area.y, tilez))
         {
             for (int iface = 0; iface < eBlockFace_COUNT; ++iface)
             {
@@ -56,7 +56,7 @@ bool GameMapHelpers::BuildMapMesh(GameMapManager& cityScape, const Rect& area, M
     return true;
 }
 
-void GameMapHelpers::PutBlockFace(GameMapManager& cityScape, MapMeshData& meshData, int x, int y, int z, eBlockFace face, BlockStyle* blockInfo)
+void GameMapHelpers::PutBlockFace(GameMapManager& cityScape, MapMeshData& meshData, int x, int y, int z, eBlockFace face, MapBlockInfo* blockInfo)
 {
     assert(blockInfo && blockInfo->mFaces[face]);
     eBlockType blockType = (face == eBlockFace_Lid) ? eBlockType_Lid : eBlockType_Side;

src/GameMapHelpers.h

@@ -22,5 +22,5 @@ class GameMapHelpers final
 
 private:
     // internals
-    static void PutBlockFace(GameMapManager& city, MapMeshData& meshData, int x, int y, int z, eBlockFace face, BlockStyle* blockInfo);
+    static void PutBlockFace(GameMapManager& city, MapMeshData& meshData, int x, int y, int z, eBlockFace face, MapBlockInfo* blockInfo);
 };