-

Author: codenamecpp

src/Convert.h

@@ -137,13 +137,3 @@ class Convert
         };
     }
 };
-
-// in original gta1 map height levels is counting from top to bottom - 
-// 0 is highest and 5 is lowest level
-inline int ConvertMapLevel(int tileLayer)
-{
-    tileLayer = MAP_LAYERS_COUNT - tileLayer - 1;
-    debug_assert(tileLayer > -1 && tileLayer < MAP_LAYERS_COUNT);
-
-    return tileLayer;
-}

src/GameDefs.h

@@ -21,9 +21,11 @@
 
 #define SPRITE_ZERO_ANGLE 90.0f // all sprites in game are rotated at 90 degrees
 #define SPRITE_SCALE (METERS_PER_MAP_UNIT / PIXELS_PER_MAP_UNIT)
-
 #define PED_SPRITE_DRAW_BOX_SIZE_PX 24 // with, height
-#define PED_SPRITE_DRAW_BOX_SIZE ((1.0f * PED_SPRITE_DRAW_BOX_SIZE_PX) / MAP_BLOCK_TEXTURE_DIMS)
+
+// in original gta1 map height levels is counting from top to bottom - 
+// 0 is highest and 5 is lowest level
+#define INVERT_MAP_LAYER(index) (MAP_LAYERS_COUNT - (index) - 1)
 
 #define GAME_MAX_PLAYERS 4
 

src/GameMapManager.cpp

@@ -225,8 +225,11 @@ void GameMapManager::FixShiftedBits()
 float GameMapManager::GetHeightAtPosition(const glm::vec3& position, bool excludeWater) const
 {
     // get map block position in which we are located
-    glm::ivec3 mapBlock = Convert::MetersToMapUnits(position);
-
+    glm::ivec3 mapBlock {
+        Convert::MetersToMapUnits(position.x),
+        Convert::MetersToMapUnits(position.y) + 0.5f,
+        Convert::MetersToMapUnits(position.z)
+    };
     float currentHeight = (float) mapBlock.y; // set current height to ground, map units
     for (; currentHeight > 0.0f;)
     {

src/GameObjectsManager.cpp

@@ -248,13 +248,13 @@ bool GameObjectsManager::CreateStartupObjects()
                 debug_assert(false);
                 continue;
             }
-            int mapBlock = (int) Convert::PixelsToMapUnits(currObject.mZ);
-            int mapLevel = ConvertMapLevel(mapBlock);
+            int mapLevel = (int) Convert::PixelsToMapUnits(currObject.mZ);
+            mapLevel = INVERT_MAP_LAYER(mapLevel);
             glm::vec3 carPosition 
             { 
-                Convert::PixelsToMapUnits(currObject.mX),
-                mapLevel * 1.0f,
-                Convert::PixelsToMapUnits(currObject.mY) 
+                Convert::PixelsToMeters(currObject.mX),
+                Convert::MapUnitsToMeters(mapLevel * 1.0f),
+                Convert::PixelsToMeters(currObject.mY) 
             };
 
             cxx::angle_t rotationDegrees = Convert::Fix16ToAngle(currObject.mRotation);

src/Pedestrian.cpp

@@ -144,7 +144,7 @@ void Pedestrian::ComputeDrawHeight(const glm::vec3& position)
     float maxHeight = position.y;
     if (!mPhysicsComponent->mFalling)
     {
-        float halfBox = PED_SPRITE_DRAW_BOX_SIZE * 0.5f;
+        float halfBox = Convert::PixelsToMeters(PED_SPRITE_DRAW_BOX_SIZE_PX) * 0.5f;
         //glm::vec3 points[4] = {
         //    { 0.0f,     position.y + 0.01f, -halfBox },
         //    { halfBox,  position.y + 0.01f, 0.0f },

src/PhysicsManager.cpp

@@ -325,6 +325,7 @@ void PhysicsManager::PreSolve(b2Contact* contact, const b2Manifold* oldManifold)
             b2FixtureData_map fxdata = fixtureMapSolidBlock->GetUserData();
             PhysicsComponent* physicsObject = (PhysicsComponent*) fixturePed->GetBody()->GetUserData();
             debug_assert(physicsObject);
+
             // detect height
             float height = gGameMap.GetHeightAtPosition(physicsObject->GetPosition());
             hasCollision = HasCollisionPedestrianVsMap(fxdata.mX, fxdata.mZ, height);
@@ -406,7 +407,7 @@ void PhysicsManager::FixedStepGravity()
         // process fall
         float newHeight = gGameMap.GetHeightAtPosition(position, false);
 
-        bool onTheGround = newHeight > (position.y - 0.01f);
+        bool onTheGround = newHeight > (position.y - 0.00f);
         if (physicsComponent->mFalling)
         {
             if (onTheGround)
@@ -452,23 +453,24 @@ bool PhysicsManager::CollidePedVsPed(b2Contact* contact, PedPhysicsComponent* pe
 
 bool PhysicsManager::HasCollisionPedestrianVsMap(int mapx, int mapz, float height) const
 {
-    int map_layer = (int) (height + 0.5f);
+    int mapLayer = (int) (Convert::MetersToMapUnits(height) + 0.5f);
 
     // todo: temporary implementation
 
-    BlockStyle* blockData = gGameMap.GetBlockClamp(mapx, mapz, map_layer);
+    BlockStyle* blockData = gGameMap.GetBlockClamp(mapx, mapz, mapLayer);
     return (blockData->mGroundType == eGroundType_Building);
 }
 
 bool PhysicsManager::HasCollisionCarVsMap(b2Contact* contact, b2Fixture* fixtureCar, int mapx, int mapz) const
 {
     CarPhysicsComponent* carPhysicsComponent = (CarPhysicsComponent*) fixtureCar->GetBody()->GetUserData();
     debug_assert(carPhysicsComponent);
-    int map_layer = (int) (carPhysicsComponent->mHeight + 0.5f);
+
+    int mapLayer = (int) (Convert::MetersToMapUnits(carPhysicsComponent->mHeight) + 0.5f);
 
     // todo: temporary implementation
 
-    BlockStyle* blockData = gGameMap.GetBlockClamp(mapx, mapz, map_layer);
+    BlockStyle* blockData = gGameMap.GetBlockClamp(mapx, mapz, mapLayer);
     return (blockData->mGroundType == eGroundType_Building);
 }