physics refactore in progress, things are broken and nothing works properly

Author: codenamecpp

src/Box2D_Helpers.h

@@ -0,0 +1,35 @@
+#pragma once
+
+namespace box2d
+{
+    // simple wrapper for seamlessly cast between math libraries
+    struct vec2: public b2Vec2
+    {
+    public:
+        vec2() = default;
+        vec2(float xIn, float yIn): b2Vec2(xIn, yIn) 
+        {
+        }
+        template<typename TVec2>
+        vec2(const TVec2& in_vec2): b2Vec2(in_vec2.x, in_vec2.y) 
+        { 
+        }
+        template<typename TVec2>
+        inline vec2& operator = (const TVec2& in_vec2)
+        {
+            x = in_vec2.x;
+            y = in_vec2.y;
+            return *this;
+        }
+        inline operator glm::vec2 () const
+        {
+            return {x, y};
+        }
+    };
+
+
+    static const vec2 NullVector { 0.0f, 0.0f };
+    static const vec2 ForwardVector (1.0f, 0.0f);
+    static const vec2 LateralVector (0.0f, 1.0f);
+
+} // namespace box2d

src/Carnage3D.vcxproj

@@ -154,6 +154,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="AiCharacterController.h" />
+    <ClInclude Include="Box2D_Helpers.h" />
     <ClInclude Include="common_utils.h" />
     <ClInclude Include="Convert.h" />
     <ClInclude Include="game_version.h" />

src/Carnage3D.vcxproj.filters

@@ -329,6 +329,9 @@
     <ClInclude Include="math_utils.h">
       <Filter>Lib</Filter>
     </ClInclude>
+    <ClInclude Include="Box2D_Helpers.h">
+      <Filter>Game\Physics</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">

src/CarnageGame.cpp

@@ -344,7 +344,7 @@ bool CarnageGame::StartScenario(const std::string& mapName)
             {
                 pos[currFindPosIter].x += 0.5f;
                 pos[currFindPosIter].z += 0.5f;
-                pos[currFindPosIter].y = currHeight;
+                pos[currFindPosIter].y = currHeight * 4;
                 ++currFindPosIter;
             }
         }

src/Convert.h

@@ -90,6 +90,52 @@ class Convert
             MapUnitsToPixels(units.z)
         };
     }
+
+    // Convert pixels directly to meters
+    static float PixelsToMeters(int pixels)
+    {
+        return ((1.0f * pixels) / PIXELS_PER_MAP_UNIT) * METERS_PER_MAP_UNIT;
+    }
+
+    // Convert meters directly to pixels
+    static int MetersToPixels(float meters)
+    {
+        return (int) ((meters / METERS_PER_MAP_UNIT) * PIXELS_PER_MAP_UNIT);
+    }
+
+    // Convert pixels directly to meters
+    static glm::vec2 PixelsToMeters(const glm::ivec2& pixels)
+    {
+        return {
+            PixelsToMeters(pixels.x),
+            PixelsToMeters(pixels.y)
+        };
+    }
+    static glm::vec3 PixelsToMeters(const glm::ivec3& pixels)
+    {
+        return {
+            PixelsToMeters(pixels.x),
+            PixelsToMeters(pixels.y),
+            PixelsToMeters(pixels.z)
+        };
+    }
+
+    // Convert meters directly to pixels
+    static glm::ivec2 MetersToPixels(const glm::vec2& meters)
+    {
+        return {
+            MetersToPixels(meters.x),
+            MetersToPixels(meters.y)
+        };
+    }
+    static glm::ivec3 MetersToPixels(const glm::vec3& meters)
+    {
+        return {
+            MetersToPixels(meters.x),
+            MetersToPixels(meters.y),
+            MetersToPixels(meters.z)
+        };
+    }
 };
 
 // in original gta1 map height levels is counting from top to bottom - 

src/FollowCameraController.cpp

@@ -6,9 +6,9 @@
 #include "TimeManager.h"
 
 FollowCameraController::FollowCameraController()
-    : mStartupCameraHeight(8.0f)
-    , mFollowPedCameraHeight(5.0f)
-    , mFollowPedCameraCatchSpeed(5.0f)
+    : mStartupCameraHeight(32.0f)
+    , mFollowPedCameraHeight(20.0f)
+    , mFollowPedCameraCatchSpeed(20.0f)
     , mScrollHeightOffset()
 {
 }

src/FollowCameraController.h

@@ -24,10 +24,10 @@ class FollowCameraController final: public CameraController
 
 private:
     // parameters
-    float mStartupCameraHeight;
-    float mFollowPedCameraHeight;
-    float mScrollHeightOffset;
-    float mFollowPedCameraCatchSpeed;
+    float mStartupCameraHeight; // meters
+    float mFollowPedCameraHeight; // meters
+    float mScrollHeightOffset; // meters
+    float mFollowPedCameraCatchSpeed; // meters per second
 
     Pedestrian* mFollowPedestrian = nullptr;
 };

src/FreeLookCameraController.cpp

@@ -49,7 +49,7 @@ void FreeLookCameraController::UpdateFrame()
         {
             moveDirection -= mCamera->mRightDirection;
         }
-        moveDirection = glm::normalize(moveDirection) * 5.0f * deltaTime;
+        moveDirection = glm::normalize(moveDirection) * mMoveSpeed * deltaTime;
         mCamera->Translate(moveDirection);
     }
 

src/FreeLookCameraController.h

@@ -24,4 +24,5 @@ class FreeLookCameraController final: public CameraController
     int mLastMouseX, mLastMouseY;
     int mRotateDeltaX, mRotateDeltaY;
     bool mMouseDragCamera;
+    float mMoveSpeed = 20.0f; // meters per second
 };

src/GameDefs.h

@@ -5,6 +5,7 @@
 // side length of block cube, do not change
 #define MAP_BLOCK_TEXTURE_DIMS 64
 #define MAP_BLOCK_TEXTURE_AREA (MAP_BLOCK_TEXTURE_DIMS * MAP_BLOCK_TEXTURE_DIMS)
+
 #define MAX_MAP_BLOCK_ANIM_FRAMES 32
 #define MAX_CAR_DOORS 4
 #define MAX_CAR_REMAPS 12
@@ -19,7 +20,7 @@
 #define METERS_PER_MAP_UNIT (4.0f)
 
 #define SPRITE_ZERO_ANGLE 90.0f // all sprites in game are rotated at 90 degrees
-#define SPRITE_SCALE (1.0f / PIXELS_PER_MAP_UNIT)
+#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)