-

Author: codenamecpp

src/GameCamera.h

@@ -22,6 +22,26 @@ class GameCamera final
 
     Rect mViewportRect;
 
+    // projection parameters
+
+    struct PerspectiveParams
+    {
+        float mAspect = 1.0f;
+        float mFovy = 1.0f;
+        float mNearPlane = 1.0;
+        float mFarPlane = 1.0;
+    };
+    PerspectiveParams mPerspectiveParams;
+
+    struct OrthographicParams
+    {
+        float mLeftP = 1.0f;
+        float mRightP = 1.0;
+        float mBottomP = 1.0;
+        float mTopP = 1.0;
+    };
+    OrthographicParams mOrthographicParams;
+
 public:
     GameCamera();
 
@@ -75,26 +95,6 @@ class GameCamera final
 private:
     bool mProjMatrixDirty; // projection matrix need recomputation
     bool mViewMatrixDirty; // view matrix need recomputation
-
-    // projection parameters
-
-    struct PerspectiveParams
-    {
-        float mAspect = 1.0f;
-        float mFovy = 1.0f;
-        float mNearPlane = 1.0;
-        float mFarPlane = 1.0;
-    };
-    PerspectiveParams mPerspectiveParams;
-
-    struct OrthographicParams
-    {
-        float mLeftP = 1.0f;
-        float mRightP = 1.0;
-        float mBottomP = 1.0;
-        float mTopP = 1.0;
-    };
-    OrthographicParams mOrthographicParams;
 };
 
 // defines ui camera

src/MapRenderer.h

@@ -15,11 +15,10 @@ struct MapRenderStats
     void FrameEnd();
 
 public:
-    unsigned int mRenderFramesCounter = 0; // gets incremented on every frame
+    int mBlockChunksDrawnCount = 0;  // per frame
+    int mSpritesDrawnCount = 0; // per frame
 
-    // per frame
-    int mBlockChunksDrawnCount = 0; 
-    int mSpritesDrawnCount = 0;
+    unsigned int mRenderFramesCounter = 0; // gets incremented on every frame
 };
 
 // renders map mesh, peds, cars and map objects

src/Pedestrian.cpp

@@ -25,7 +25,7 @@ Pedestrian::~Pedestrian()
 
     if (mPhysicsBody)
     {
-        gPhysics.DestroyPhysicsBody(mPhysicsBody);
+        gPhysics.DestroyPhysicsObject(mPhysicsBody);
     }
 }
 
@@ -47,7 +47,7 @@ void Pedestrian::Spawn(const glm::vec3& startPosition, cxx::angle_t startRotatio
 
     if (mPhysicsBody == nullptr)
     {
-        mPhysicsBody = gPhysics.CreatePhysicsBody(this, startPosition, startRotation);
+        mPhysicsBody = gPhysics.CreatePhysicsObject(this, startPosition, startRotation);
         debug_assert(mPhysicsBody);
     }
     else
@@ -370,7 +370,7 @@ void Pedestrian::SetDead(ePedestrianDeathReason deathReason)
     }
 }
 
-void Pedestrian::ReceiveDamageFromCar(Vehicle* targetCar, float impulse)
+void Pedestrian::ReceiveDamageFromCar(Vehicle* targetCar)
 {
     debug_assert(targetCar); 
 

src/Pedestrian.h

@@ -71,7 +71,7 @@ class Pedestrian final: public GameObject
 
     // Get damage from vehicle, it may be ignored depending on its current state
     // @param impulse: Impact value
-    void ReceiveDamageFromCar(Vehicle* targetCar, float impulse);
+    void ReceiveDamageFromCar(Vehicle* targetCar);
 
     // check if pedestrian entering/exiting or driving car at this moment
     bool IsCarPassenger() const;

src/PhysicsComponents.cpp

@@ -104,6 +104,20 @@ glm::vec2 PhysicsBody::GetLinearVelocity() const
     return { b2velocity.x, b2velocity.y };
 }
 
+glm::vec2 PhysicsBody::GetLinearVelocityFromWorldPoint(const glm::vec2& worldPosition) const
+{
+    box2d::vec2 b2point = worldPosition;
+    box2d::vec2 b2vec = mPhysicsBody->GetLinearVelocityFromWorldPoint(b2point);
+    return b2vec;
+}
+
+glm::vec2 PhysicsBody::GetLinearVelocityFromLocalPoint(const glm::vec2& localPosition) const
+{
+    box2d::vec2 b2point = localPosition;
+    box2d::vec2 b2vec = mPhysicsBody->GetLinearVelocityFromLocalPoint(b2point);
+    return b2vec;
+}
+
 cxx::angle_t PhysicsBody::GetAngularVelocity() const
 {
     cxx::angle_t angularVelocity = cxx::angle_t::from_radians(mPhysicsBody->GetAngularVelocity());
@@ -352,6 +366,7 @@ CarPhysicsBody::CarPhysicsBody(b2World* physicsWorld, Vehicle* object)
     fixtureDef.shape = &shapeDef;
     fixtureDef.density = 1.0f;
     fixtureDef.friction = 0.0f;
+    fixtureDef.restitution = 0.4f;
     fixtureDef.filter.categoryBits = PHYSICS_OBJCAT_CAR;
 
     mChassisFixture = mPhysicsBody->CreateFixture(&fixtureDef);
@@ -417,6 +432,17 @@ void CarPhysicsBody::GetChassisCorners(glm::vec2 corners[4]) const
     }
 }
 
+void CarPhysicsBody::GetLocalChassisCorners(glm::vec2 corners[4]) const
+{
+    const b2PolygonShape* shape = (const b2PolygonShape*) mChassisFixture->GetShape();
+    debug_assert(shape->m_count == 4);
+    for (int icorner = 0; icorner < 4; ++icorner)
+    {
+        box2d::vec2 point = shape->m_vertices[icorner];
+        corners[icorner] = point;
+    }
+}
+
 void CarPhysicsBody::GetWheelCorners(eCarWheel wheelID, glm::vec2 corners[4]) const
 {
     debug_assert(wheelID < eCarWheel_COUNT);

src/PhysicsComponents.h

@@ -56,6 +56,8 @@ class PhysicsBody: public cxx::noncopyable
 	/// @param velocity: New linear velocity of the center of mass, meters per second
     void SetLinearVelocity(const glm::vec2& velocity);
     glm::vec2 GetLinearVelocity() const;
+    glm::vec2 GetLinearVelocityFromWorldPoint(const glm::vec2& worldPosition) const;
+    glm::vec2 GetLinearVelocityFromLocalPoint(const glm::vec2& localPosition) const;
     glm::vec2 GetSignVector() const;
 
     // Convert coordinate from local to world space and vice versa
@@ -161,6 +163,7 @@ class CarPhysicsBody: public PhysicsBody
     void HandleWaterContact();
 
     void GetChassisCorners(glm::vec2 corners[4]) const;
+    void GetLocalChassisCorners(glm::vec2 corners[4]) const;
     void GetWheelCorners(eCarWheel wheelID, glm::vec2 corners[4]) const;
 
     // steering
@@ -198,6 +201,7 @@ class CarPhysicsBody: public PhysicsBody
     b2Vec2 b2GetWheelLocalPoint(eCarWheel wheelID) const;
     b2Vec2 b2GetWheelLocalForwardVector(eCarWheel wheelID) const;
     b2Vec2 b2GetWheelLocalLateralVector(eCarWheel wheelID) const;
+
 private:
     CarStyle* mCarDesc = nullptr;
     b2Fixture* mChassisFixture = nullptr;