Skip to content

[feat] enable input control #115

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.

Sign up for GitHub

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

Open
yishizhennan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[feat] enable input control #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
294 changes: 147 additions & 147 deletions src/GameBall/logic/units/regular_ball.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,147 +1,147 @@
#include "GameBall/logic/units/regular_ball.h"

#include "GameBall/core/game_ball.h"
#include "GameBall/logic/world.h"

namespace GameBall::Logic::Units {
RegularBall::RegularBall(World *world,
uint64_t player_id,
const glm::vec3 &position,
float radius,
float mass)
: Unit(world, player_id) {
radius_ = radius;
mass_ = mass;
position_ = position;
auto physics_world = world_->PhysicsWorld();
sphere_id_ = physics_world->CreateSphere();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.position = position_;
sphere.SetRadiusMass(radius_, mass_);
sphere.orientation = orientation_;
sphere.velocity = velocity_;
sphere.angular_velocity = glm::vec3{0.0f};
sphere.elasticity = 1.0f;
sphere.friction = 10.0f;
sphere.gravity = glm::vec3{0.0f, -9.8f, 0.0f};
}

RegularBall::~RegularBall() {
;
}

SYNC_ACTOR_FUNC(RegularBall) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
actor->SetMass(1.0f);
actor->SetGravity(glm::vec3{0.0f, -9.8f, 0.0f});
actor->SetTransform(glm::mat3{radius_});
actor->SetMotion(position_, velocity_, orientation_, augular_momentum_);
actor->SetMomentOfInertia(sphere.inertia[0][0]);
}

void RegularBall::UpdateTick() {
float delta_time = world_->TickDeltaT();
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);

// auto owner = world_->GetPlayer(player_id_);
// if (owner) {
// if (UnitId() == owner->PrimaryUnitId()) {
// auto input = owner->TakePlayerInput();
//
// glm::vec3 forward = glm::normalize(glm::vec3{input.orientation});
// glm::vec3 right =
// glm::normalize(glm::cross(forward, glm::vec3{0.0f, 1.0f, 0.0f}));
//
// glm::vec3 moving_direction{};
//
// float angular_acceleration = glm::radians(2880.0f);
//
// if (input.move_forward) {
// moving_direction -= right;
// }
// if (input.move_backward) {
// moving_direction += right;
// }
// if (input.move_left) {
// moving_direction -= forward;
// }
// if (input.move_right) {
// moving_direction += forward;
// }
//
// if (glm::length(moving_direction) > 0.0f) {
// moving_direction = glm::normalize(moving_direction);
// sphere.angular_velocity +=
// moving_direction * angular_acceleration * delta_time;
// }
//
// if (input.brake) {
// sphere.angular_velocity = glm::vec3{0.0f};
// }
// }
// }

sphere.velocity *= std::pow(0.5f, delta_time);
sphere.angular_velocity *= std::pow(0.2f, delta_time);

position_ = sphere.position;
velocity_ = sphere.velocity;
orientation_ = sphere.orientation;
augular_momentum_ = sphere.inertia * sphere.angular_velocity;
}

void RegularBall::SetMass(float mass) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.SetRadiusMass(radius_, mass);
mass_ = mass;
}

void RegularBall::SetGravity(const glm::vec3 &gravity) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.gravity = gravity;
}

void RegularBall::SetRadius(float radius) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.SetRadiusMass(radius, mass_);
radius_ = radius;
}

void RegularBall::SetMotion(const glm::vec3 &position,
const glm::vec3 &velocity,
const glm::mat3 &orientation,
const glm::vec3 &angular_momentum) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.position = position;
sphere.velocity = velocity;
sphere.orientation = orientation;
sphere.angular_velocity = sphere.inertia_inv * angular_momentum;
position_ = position;
velocity_ = velocity;
orientation_ = orientation;
augular_momentum_ = angular_momentum;
}

glm::vec3 RegularBall::Position() const {
return position_;
}

glm::vec3 RegularBall::Velocity() const {
return velocity_;
}

glm::mat3 RegularBall::Orientation() const {
return orientation_;
}

glm::vec3 RegularBall::AngularMomentum() const {
return augular_momentum_;
}

} // namespace GameBall::Logic::Units
#include "GameBall/logic/units/regular_ball.h"
#include "GameBall/core/game_ball.h"
#include "GameBall/logic/world.h"
namespace GameBall::Logic::Units {
RegularBall::RegularBall(World *world,
uint64_t player_id,
const glm::vec3 &position,
float radius,
float mass)
: Unit(world, player_id) {
radius_ = radius;
mass_ = mass;
position_ = position;
auto physics_world = world_->PhysicsWorld();
sphere_id_ = physics_world->CreateSphere();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.position = position_;
sphere.SetRadiusMass(radius_, mass_);
sphere.orientation = orientation_;
sphere.velocity = velocity_;
sphere.angular_velocity = glm::vec3{0.0f};
sphere.elasticity = 1.0f;
sphere.friction = 10.0f;
sphere.gravity = glm::vec3{0.0f, -9.8f, 0.0f};
}
RegularBall::~RegularBall() {
;
}
SYNC_ACTOR_FUNC(RegularBall) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
actor->SetMass(1.0f);
actor->SetGravity(glm::vec3{0.0f, -9.8f, 0.0f});
actor->SetTransform(glm::mat3{radius_});
actor->SetMotion(position_, velocity_, orientation_, augular_momentum_);
actor->SetMomentOfInertia(sphere.inertia[0][0]);
}
void RegularBall::UpdateTick() {
float delta_time = world_->TickDeltaT();
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
auto owner = world_->GetPlayer(player_id_);
if (owner) {
if (UnitId() == owner->PrimaryUnitId()) {
auto input = owner->TakePlayerInput();
glm::vec3 forward = glm::normalize(glm::vec3{input.orientation});
glm::vec3 right =
glm::normalize(glm::cross(forward, glm::vec3{0.0f, 1.0f, 0.0f}));
glm::vec3 moving_direction{};
float angular_acceleration = glm::radians(2880.0f);
if (input.move_forward) {
moving_direction -= right;
}
if (input.move_backward) {
moving_direction += right;
}
if (input.move_left) {
moving_direction -= forward;
}
if (input.move_right) {
moving_direction += forward;
}
if (glm::length(moving_direction) > 0.0f) {
moving_direction = glm::normalize(moving_direction);
sphere.angular_velocity +=
moving_direction * angular_acceleration * delta_time;
}
if (input.brake) {
sphere.angular_velocity = glm::vec3{0.0f};
}
}
}
sphere.velocity *= std::pow(0.5f, delta_time);
sphere.angular_velocity *= std::pow(0.2f, delta_time);
position_ = sphere.position;
velocity_ = sphere.velocity;
orientation_ = sphere.orientation;
augular_momentum_ = sphere.inertia * sphere.angular_velocity;
}
void RegularBall::SetMass(float mass) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.SetRadiusMass(radius_, mass);
mass_ = mass;
}
void RegularBall::SetGravity(const glm::vec3 &gravity) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.gravity = gravity;
}
void RegularBall::SetRadius(float radius) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.SetRadiusMass(radius, mass_);
radius_ = radius;
}
void RegularBall::SetMotion(const glm::vec3 &position,
const glm::vec3 &velocity,
const glm::mat3 &orientation,
const glm::vec3 &angular_momentum) {
auto physics_world = world_->PhysicsWorld();
auto &sphere = physics_world->GetSphere(sphere_id_);
sphere.position = position;
sphere.velocity = velocity;
sphere.orientation = orientation;
sphere.angular_velocity = sphere.inertia_inv * angular_momentum;
position_ = position;
velocity_ = velocity;
orientation_ = orientation;
augular_momentum_ = angular_momentum;
}
glm::vec3 RegularBall::Position() const {
return position_;
}
glm::vec3 RegularBall::Velocity() const {
return velocity_;
}
glm::mat3 RegularBall::Orientation() const {
return orientation_;
}
glm::vec3 RegularBall::AngularMomentum() const {
return augular_momentum_;
}
} // namespace GameBall::Logic::Units