From 4c9e43a42c15ce93ffded21dfcaa171f63d20d69 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Thu, 11 Jun 2026 14:07:27 +0200
Subject: Fixing deduction issues from constexpr values

---
 lib/core/c++/particle/particle.hpp | 68 ++++++--------------------------------
 1 file changed, 11 insertions(+), 57 deletions(-)

(limited to 'lib/core/c++/particle/particle.hpp')

diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp
index 1a99dcd..13ed37b 100644
--- a/lib/core/c++/particle/particle.hpp
+++ b/lib/core/c++/particle/particle.hpp
@@ -6,68 +6,22 @@
 
 #include "../iterator.hpp"
 
+#include "schema.hpp"
+#include "aabb.hpp"
+
 namespace kel {
 namespace lbm {
-namespace coll {
-struct Spheroid{};
-}
-namespace sch {
-using namespace saw::schema;
-
-namespace impl {
-template<typename T,uint64_t D>
-struct rotation_type_helper;
-
-template<typename T>
-struct rotation_type_helper<T,2u> {
-	using Schema = Scalar<T>;
-};
-
-template<typename T>
-struct rotation_type_helper<T,3u> {
-	using Schema = Vector<T,3u>;
-};
-}
-
-template<typename T, uint64_t D>
-using ParticleRigidBody = Struct<
-	Member<Vector<T,D>, "position">,
-	Member<Vector<T,D>, "position_old">,
-	Member<typename impl::rotation_type_helper<T,D>::Schema, "rotation">,
-	Member<typename impl::rotation_type_helper<T,D>::Schema, "rotation_old">,
-
-	Member<Vector<T,D>, "acceleration">,
-	Member<typename impl::rotation_type_helper<T,D>::Schema, "angular_acceleration">
->;
-
-template<typename T, typename saw::native_data_type<T>::type radius = 1.0f>
-using ParticleCollisionSpheroid = Struct<
->;
 
 template<typename T, uint64_t D>
-using Particle = Struct<
-	Member<ParticleRigidBody<T,D>, "rigid_body">
-	// Problem is that dynamic data would two layered
-	// Member<Array<Float64,D>, "mask">, 
->;
-
-template<typename T, uint64_t D, typename CollisionType = ParticleCollisionSpheroid<T>>
-using ParticleGroup = Struct<
-	Member<Array<T,D>, "mask">,
-	Member<FixedArray<Scalar<T>,1u>, "mask_step">,
-	Member<FixedArray<Scalar<T>,1u>, "density">,
-	Member<FixedArray<Vector<T,D>,1u>, "center_of_mass">,
-	Member<FixedArray<Scalar<T>,1u>, "total_mass">,
-	Member<Array<Particle<T,D>,1u>, "particles">
->;
-}
-
-template<typename T, uint64_t D, typename saw::native_data_type<T>::type radius>
-saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T,radius>>> create_spheroid_particle_group(
+saw::data<sch::ParticleGroup<T,D, coll::Spheroid<T>>> create_spheroid_particle_group(
+		saw::data<sch::Scalar<T>> radius_p,
 		saw::data<sch::Scalar<T>> density_p,
 		const saw::data<sch::UInt64>& mask_resolution
 ){
-	saw::data<sch::ParticleGroup<T,D,sch::ParticleCollisionSpheroid<T,radius>>> part;
+	saw::data<sch::ParticleGroup<T,D,coll::Spheroid<T>>> part;
+
+	auto& rad_s = part.template get<"collision">().at({0u}).template get<"radius">();
+	rad_s = radius_p;
 
 	auto& mask = part.template get<"mask">();
 	auto& density = part.template get<"density">().at({{0u}});
@@ -83,7 +37,7 @@ saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T,radius>>> cre
 	for(uint64_t i = 0u; i < D; ++i){
 		mask_dims.at({i}) = mask_resolution;
 	}
-	saw::data<T> rad_d{radius};
+	saw::data<T> rad_d = radius_p.at({});
 	saw::data<T> dia_d = rad_d * 2;
 
 	mask = {mask_dims};
@@ -104,7 +58,7 @@ saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T,radius>>> cre
 
 	saw::data<sch::Vector<T,D>> center;
 	for(uint64_t i = 0u; i < D; ++i){
-		center.at({{i}}).set(radius);
+		center.at({{i}}) = rad_d;
 	}
 
 	iterator<D>::apply([&](const auto& index){
-- 
cgit v1.2.3


From 7a7d681ce70133ef0bc47a701f5b8448b15b3a29 Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Sun, 28 Jun 2026 19:17:52 +0200
Subject: Dangling

---
 lib/core/c++/particle/particle.hpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/core/c++/particle/particle.hpp')

diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp
index 13ed37b..8e75e5a 100644
--- a/lib/core/c++/particle/particle.hpp
+++ b/lib/core/c++/particle/particle.hpp
@@ -8,6 +8,7 @@
 
 #include "schema.hpp"
 #include "aabb.hpp"
+#include "particle_opa.hpp"
 
 namespace kel {
 namespace lbm {
-- 
cgit v1.2.3