From f11589229323a6919a26f07b2f74bb9ffdd94fb5 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 27 Nov 2022 23:39:34 +0200
Subject: [PATCH] Pass bullet's initial transform values directly to the
 constructor

---
 examples/bassteroids/source/bullet.cpp           | 4 ++--
 examples/bassteroids/source/bullet.h             | 2 +-
 examples/bassteroids/source/playercontroller.cpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/examples/bassteroids/source/bullet.cpp b/examples/bassteroids/source/bullet.cpp
index 260601b..957a039 100644
--- a/examples/bassteroids/source/bullet.cpp
+++ b/examples/bassteroids/source/bullet.cpp
@@ -2,7 +2,7 @@
 
 using namespace Msp;
 
-Bullet::Bullet(Game::Handle<Game::Entity> p, const Setup &s):
-	PhysicalEntity(p, s.physical),
+Bullet::Bullet(Game::Handle<Game::Entity> p, const Setup &s, const Game::TransformValues &tv):
+	PhysicalEntity(p, s.physical, tv),
 	mesh(*this, s.mesh)
 { }
diff --git a/examples/bassteroids/source/bullet.h b/examples/bassteroids/source/bullet.h
index 825125f..44c9d80 100644
--- a/examples/bassteroids/source/bullet.h
+++ b/examples/bassteroids/source/bullet.h
@@ -18,7 +18,7 @@ private:
 public:
 	using Setup = BulletSetup;
 
-	Bullet(Msp::Game::Handle<Msp::Game::Entity>, const Setup &);
+	Bullet(Msp::Game::Handle<Msp::Game::Entity>, const Setup &, const Msp::Game::TransformValues & = Msp::Game::TransformValues());
 };
 
 #endif
diff --git a/examples/bassteroids/source/playercontroller.cpp b/examples/bassteroids/source/playercontroller.cpp
index 65a879d..066b5f2 100644
--- a/examples/bassteroids/source/playercontroller.cpp
+++ b/examples/bassteroids/source/playercontroller.cpp
@@ -60,11 +60,11 @@ void PlayerController::fire()
 	Game::Handle<Game::Transform> player_tf = player_ship->get_transform();
 	Game::Handle<RigidBody> player_body = player_ship->get_body();
 
-	bullets.emplace_back(stage.get_root(), bullet_setup);
+	Game::TransformValues tv;
+	tv.position = (player_tf->get_world_matrix()*LinAl::Vector<float, 4>(2.0f, 0.0f, 0.0f, 1.0f)).slice<3>(0);
+	tv.rotation = player_tf->get_rotation()*Geometry::Quaternion<float>::rotation(Geometry::Angle<float>::from_degrees(10), LinAl::Vector<float, 3>(0.0f, 0.0f, 1.0f));
+	bullets.emplace_back(stage.get_root(), bullet_setup, tv);
 	Game::Handle<Bullet> bullet = bullets.back();
-	Game::Handle<Game::Transform> bullet_tf = bullet->get_transform();
-	bullet_tf->set_position((player_tf->get_world_matrix()*LinAl::Vector<float, 4>(2.0f, 0.0f, 0.0f, 1.0f)).slice<3>(0));
-	bullet_tf->set_rotation(player_tf->get_rotation()*Geometry::Quaternion<float>::rotation(Geometry::Angle<float>::from_degrees(10), LinAl::Vector<float, 3>(0.0f, 0.0f, 1.0f)));
 	Game::Handle<RigidBody> bullet_body = bullet->get_body();
 	bullet_body->set_velocity(player_body->get_velocity()+(player_tf->get_world_matrix()*LinAl::Vector<float, 4>(20.0f, 0.0f, 0.0f, 0.0f)).slice<2>(0));
 }
-- 
2.43.0