rafactore car physics, it is completely broken now

Author: codenamecpp

src/Box2D_Helpers.h

@@ -25,6 +25,10 @@ namespace box2d
         {
             return {x, y};
         }
+        inline vec2 operator * (float scalar) const
+        {
+            return {x * scalar, y * scalar};
+        }
     };
 
 

src/GameCheatsWindow.cpp

@@ -6,6 +6,18 @@
 #include "CarnageGame.h"
 #include "Pedestrian.h"
 
+namespace ImGui
+{
+    inline void HorzSpacing(float spacingSize = 10.0f)
+    {
+        Dummy(ImVec2(0.0f, spacingSize));
+    }
+    inline void VertSpacing(float spacingSize = 10.0f)
+    {
+        Dummy(ImVec2(spacingSize, 0.0f)); 
+    }
+}
+
 GameCheatsWindow gGameCheatsWindow;
 
 GameCheatsWindow::GameCheatsWindow()
@@ -66,7 +78,7 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
     // pedestrian stats
     if (Pedestrian* pedestrian = gCarnageGame.mHumanSlot[0].mCharPedestrian)
     {
-        ImGui::Separator();
+        ImGui::HorzSpacing();
         glm::vec3 pedPosition = pedestrian->mPhysicsComponent->GetPosition();
         ImGui::Text("physical pos: %.3f, %.3f, %.3f", pedPosition.x, pedPosition.y, pedPosition.z);
         glm::vec3 logicalPosition = Convert::MetersToMapUnits(pedPosition);
@@ -76,7 +88,7 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
         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()));
-        ImGui::Separator();
+        ImGui::HorzSpacing();
 
         // get block location
         glm::ivec3 blockPosition = Convert::MetersToMapUnits(pedPosition);
@@ -88,7 +100,7 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
         ImGui::Text("b directions: %d, %d, %d, %d", currBlock->mUpDirection, currBlock->mRightDirection, 
             currBlock->mDownDirection, currBlock->mLeftDirection);
 
-        ImGui::Separator();
+        ImGui::HorzSpacing();
         ImGui::SliderInt("ped remap", &pedestrian->mRemapIndex, -1, MAX_PED_REMAPS - 1);
 
         if (pedestrian->IsCarPassenger())
@@ -131,12 +143,11 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
         ImGui::EndCombo();
     }
 
-    if (ImGui::CollapsingHeader("Physics"))
-    {
-        ImGui::Checkbox("Enable map collisions", &mEnableMapCollisions);
-        ImGui::Checkbox("Enable gravity", &mEnableGravity);
-        ImGui::Separator();
-    }
+    //if (ImGui::CollapsingHeader("Physics"))
+    //{
+    //    ImGui::Checkbox("Enable map collisions", &mEnableMapCollisions);
+    //    ImGui::Checkbox("Enable gravity", &mEnableGravity);
+    //}
 
     if (ImGui::CollapsingHeader("Map Draw"))
     {
@@ -155,6 +166,34 @@ void GameCheatsWindow::DoUI(ImGuiIO& imguiContext)
             Convert::MapUnitsToMeters(16.0f), "%.2f");
     }
 
+    if (Pedestrian* pedestrian = gCarnageGame.mHumanSlot[0].mCharPedestrian)
+    {
+        if (Vehicle* currCar = pedestrian->mCurrentCar)
+        {
+            CarStyle* carInformation = currCar->mCarStyle;
+
+            if (ImGui::CollapsingHeader("Vehicle Info"))
+            {
+                ImVec4 physicsPropsColor(0.75f, 0.75f, 0.75f, 1.0f);
+                ImGui::Text("VType - %s", cxx::enum_to_string(carInformation->mVType));
+                ImGui::HorzSpacing();
+                ImGui::TextColored(physicsPropsColor, "Turning : %d", carInformation->mTurning);
+                ImGui::TextColored(physicsPropsColor, "Turn Ratio : %d", carInformation->mTurnRatio);
+                ImGui::TextColored(physicsPropsColor, "Moment : %d", carInformation->mMoment);
+                ImGui::TextColored(physicsPropsColor, "Mass : %.3f", carInformation->mMass);
+                ImGui::TextColored(physicsPropsColor, "Thurst : %.3f", carInformation->mThrust);
+                ImGui::TextColored(physicsPropsColor, "Tyre Adhesion X/Y : %.3f / %.3f", carInformation->mTyreAdhesionX, carInformation->mTyreAdhesionY);
+                ImGui::HorzSpacing();
+                ImGui::TextColored(physicsPropsColor, "Handbrake Friction : %.3f", carInformation->mHandbrakeFriction);
+                ImGui::TextColored(physicsPropsColor, "Footbrake Friction : %.3f", carInformation->mFootbrakeFriction);
+                ImGui::TextColored(physicsPropsColor, "Front Brake Bias : %.3f", carInformation->mFrontBrakeBias);
+                ImGui::HorzSpacing();
+
+                ImGui::Text("Current velocity : %.3f", currCar->mPhysicsComponent->GetCurrentVelocity());
+            }
+        }
+    }
+
     if (ImGui::CollapsingHeader("Graphics"))
     {
         if (ImGui::Checkbox("Enable vsync", &gSystem.mConfig.mEnableVSync))

src/GameDefs.h

@@ -22,6 +22,8 @@
 #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 CAR_WHEEL_SIZE_W_PX         6
+#define CAR_WHEEL_SIZE_H_PX         12
 
 // in original gta1 map height levels is counting from top to bottom - 
 // 0 is highest and 5 is lowest level
@@ -565,30 +567,42 @@ struct CarStyle
 public:
     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
-    short mWeight;	
-    short mMaxSpeed, mMinSpeed;
-    short mAcceleration, mBraking;
-    short mGrip, mHandling;
+
+    struct // specs, usage is unknown
+    { 
+        short mWeight;	
+        short mMaxSpeed, mMinSpeed;
+        short mAcceleration, mBraking;
+        short mGrip, mHandling;
+    };
+
     short mRemapsBaseIndex;
     HLSRemap mRemap[MAX_CAR_REMAPS];
     eCarVType mVType; // is a descriptor of the type of car / vehicle
     eCarModel mModelId;
+
     int mTurning;
+
     int mDamagable;
     int mValue[4];
-    char mCx, mCy; // pixel co-ordinates of the centre of mass of the car, relative to the graphical centre
-    int mMoment;
-    float mRbpMass;
-    float mG1Thrust;
-    float mTyreAdhesionX, mTyreAdhesionY;
-    float mHandbrakeFriction;
-    float mFootbrakeFriction;
-    float mFrontBrakeBias;
-    short mTurnRatio;
-    short mDriveWheelOffset;
-    short mSteeringWheelOffset;
-    float mBackEndSlideValue;
-    float mHandbrakeSlideValue;
+
+    struct // physics props
+    {
+        char mCx, mCy; // pixel co-ordinates of the centre of mass of the car, relative to the graphical centre
+        int mMoment; // moment of inertia
+        float mMass;
+        float mThrust; // 1st gear thrust
+        float mTyreAdhesionX, mTyreAdhesionY;
+        float mHandbrakeFriction;
+        float mFootbrakeFriction;
+        float mFrontBrakeBias;
+        short mTurnRatio;
+        short mDriveWheelOffset;
+        short mSteeringWheelOffset;
+        float mBackEndSlideValue;
+        float mHandbrakeSlideValue;
+    };
+
     eCarConvertible mConvertible;
     int mEngine;
     int mRadio;

src/Pedestrian.cpp

@@ -116,11 +116,12 @@ void Pedestrian::DrawFrame(SpriteBatch& spriteBatch)
 
 void Pedestrian::DrawDebug(DebugRenderer& debugRender)
 {
-    glm::vec3 position = mPhysicsComponent->GetPosition();
-
-    glm::vec2 signVector = mPhysicsComponent->GetSignVector() * gGameParams.mPedestrianSpotTheCarDistance;
-
-    debugRender.DrawLine(position, position + glm::vec3(signVector.x, 0.0f, signVector.y), Color32_White, false);
+    if (mCurrentCar == nullptr)
+    {
+        glm::vec3 position = mPhysicsComponent->GetPosition();
+        glm::vec2 signVector = mPhysicsComponent->GetSignVector() * gGameParams.mPedestrianSpotTheCarDistance;
+        debugRender.DrawLine(position, position + glm::vec3(signVector.x, 0.0f, signVector.y), Color32_White, false);
+    }
 }
 
 void Pedestrian::ComputeDrawHeight(const glm::vec3& position)