From 99e25af0936a2539043df21cafe321328491c190 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 23 Apr 2025 00:43:10 +0300
Subject: [PATCH] Miscellaneous minor cleanups

---
 source/game/landscape.cpp     | 2 +-
 source/game/physicssystem.cpp | 5 ++---
 source/game/pool.cpp          | 1 -
 source/game/transform.h       | 2 +-
 source/gameview/application.h | 1 +
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/source/game/landscape.cpp b/source/game/landscape.cpp
index 564443f..7be0fd1 100644
--- a/source/game/landscape.cpp
+++ b/source/game/landscape.cpp
@@ -49,7 +49,7 @@ void Landscape::generate(const Geometry::BoundingBox<float, 2> &bounds)
 		{
 			auto i = lower_bound(blocks, LinAl::Vector<int, 2>(x, y), block_index_compare);
 			if(i==blocks.end() || (*i)->index.y!=y || (*i)->index.x!=x)
-				spawner.spawn<TerrainBlock>(string(), LinAl::Vector<float, 3>(x*block_size, y*block_size, 0.0f));
+				spawner.spawn<TerrainBlock>(string(), {{ x*block_size, y*block_size, 0.0f }});
 		}
 }
 
diff --git a/source/game/physicssystem.cpp b/source/game/physicssystem.cpp
index 8464f1f..a5de19d 100644
--- a/source/game/physicssystem.cpp
+++ b/source/game/physicssystem.cpp
@@ -6,7 +6,6 @@
 #include "rigidbody.h"
 #include "shape.h"
 #include "transform.h"
-#include "transformpropagator.h"
 #include "weld.h"
 
 using namespace std;
@@ -167,12 +166,12 @@ void PhysicsSystem::tick(Time::TimeDelta dt)
 		if(transform_changed)
 		{
 			TransformValues tv = TransformValues::from_matrix(transform->get_world_transform().get_matrix());
-			if(b.body->is_kinematic() && !motion_changed)
+			if(kinematic && !motion_changed)
 				b.physics_body->move_kinematic(tv.position, tv.rotation, dt);
 			else
 				b.physics_body->set_transform(tv.position, tv.rotation);
 
-			if(b.body->is_kinematic() || !b.motion)
+			if(kinematic || !b.motion)
 				b.transform_generation = transform->get_read_generation();
 		}
 
diff --git a/source/game/pool.cpp b/source/game/pool.cpp
index 427ea4f..5a0291e 100644
--- a/source/game/pool.cpp
+++ b/source/game/pool.cpp
@@ -160,7 +160,6 @@ void PoolBase::destroy(void *obj)
 		throw invalid_argument("PoolBase::destroy");
 }
 
-
 int PoolBase::_destroy(void *obj)
 {
 	unsigned block_index = 0;
diff --git a/source/game/transform.h b/source/game/transform.h
index 12bd8ab..495334b 100644
--- a/source/game/transform.h
+++ b/source/game/transform.h
@@ -20,7 +20,7 @@ struct MSPGAME_API TransformValues
 	TransformValues() = default;
 	TransformValues(const LinAl::Vector<float, 3> &p): position(p) { }
 	TransformValues(const LinAl::Vector<float, 3> &p, const Geometry::Quaternion<float> &r,
-		const LinAl::Vector<float, 3> &s = LinAl::Vector<float, 3>(1.0f, 1.0f, 1.0f)):
+		const LinAl::Vector<float, 3> &s = { 1.0f, 1.0f, 1.0f }):
 		position(p), rotation(r), scale(s)
 	{ }
 
diff --git a/source/gameview/application.h b/source/gameview/application.h
index 9eeac84..752885e 100644
--- a/source/gameview/application.h
+++ b/source/gameview/application.h
@@ -43,6 +43,7 @@ public:
 protected:
 	static GL::DeviceOptions create_gl_device_options(VR::System * = nullptr);
 
+public:
 	int main() override;
 protected:
 	void tick() override;
-- 
2.45.2