Skip to content

Commit

Permalink
Update assets
Browse files Browse the repository at this point in the history
  • Loading branch information
LazyJazz committed Dec 30, 2023
1 parent b3ff09f commit 0452ac5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion assets
Submodule assets updated 1 files
+45 −0 models/cube.obj
3 changes: 3 additions & 0 deletions src/GameBall/core/game_ball.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,11 @@ void GameBall::OnInit() {
directional_light_->SetLight(glm::vec3{1.0f}, glm::vec3{3.0f, 2.0f, 1.0f});

auto primary_player = world->CreatePlayer();
auto enemy_player = world->CreatePlayer();
auto primary_unit = world->CreateUnit<Logic::Units::RegularBall>(
primary_player->PlayerId(), glm::vec3{0.0f, 1.0f, 0.0f}, 1.0f, 1.0f);
auto enemy_unit = world->CreateUnit<Logic::Units::RegularBall>(
enemy_player->PlayerId(), glm::vec3{-5.0f, 1.0f, 0.0f}, 1.0f, 1.0f);
auto primary_obstacle = world->CreateObstacle<Logic::Obstacles::Block>(
glm::vec3{0.0f, -10.0f, 0.0f}, std::numeric_limits<float>::infinity(),
false, 20.0f);
Expand Down
2 changes: 1 addition & 1 deletion src/GameBall/logic/units/regular_ball.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RegularBall::RegularBall(World *world,
sphere.orientation = orientation_;
sphere.velocity = velocity_;
sphere.angular_velocity = glm::vec3{0.0f};
sphere.elasticity = 0.5f;
sphere.elasticity = 0.0f;
sphere.friction = 0.5f;
sphere.gravity = glm::vec3{0.0f, -9.8f, 0.0f};
}
Expand Down

0 comments on commit 0452ac5

Please sign in to comment.