Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New level (experimental) #48

Merged
merged 18 commits into from
Mar 24, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix order of declarations in header for proper compilation
  • Loading branch information
dylanleclair committed Mar 23, 2023
commit 3994184babcd2100946bc7c8abb130c345943efd
2 changes: 1 addition & 1 deletion code/client/systems/PhysicsSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct PhysicsSystem : ecs::ISystem
PxRigidStatic* gGroundPlane;

// Gravitational acceleration
const PxVec3 m_Gravity{0.0f, -27.81f, 0.0f};
const PxVec3 m_Gravity{0.0f, -9.81f, 0.0f};

void Update(ecs::Scene& scene, Timestep timestep);
void Update(ecs::Scene& scene, float deltaTime);
Expand Down
13 changes: 7 additions & 6 deletions code/client/systems/RaceSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@
#include "core/ecs.h"
#include <map>

struct Contestant {
Guid carGuid;
glm::vec3 worldPosition;
float curveIndex;
// other data if needed I guess
};

/**
* A RaceTracker will compute the ranking of each individual in the race!
*/
Expand All @@ -20,9 +27,3 @@ struct RaceTracker : ecs::ISystem {
std::map<Guid,int> m_rankings;
};

struct Contestant {
Guid carGuid;
glm::vec3 worldPosition;
float curveIndex;
// other data if needed I guess
};