From 9ca2f0a1949f64c0829987db1bc9e00324f808ee Mon Sep 17 00:00:00 2001
From: Quaternions <krakow20@gmail.com>
Date: Thu, 12 Oct 2023 17:12:58 -0700
Subject: [PATCH] split out model

---
 src/model.rs          | 60 +++++++++++++------------------------------
 src/model_graphics.rs | 35 +++++++++++++++++++++++++
 src/model_physics.rs  |  1 +
 3 files changed, 54 insertions(+), 42 deletions(-)
 create mode 100644 src/model_graphics.rs
 create mode 100644 src/model_physics.rs

diff --git a/src/model.rs b/src/model.rs
index 3040a61..45a68e9 100644
--- a/src/model.rs
+++ b/src/model.rs
@@ -1,11 +1,12 @@
-use bytemuck::{Pod, Zeroable};
-#[derive(Clone, Copy, Pod, Zeroable)]
-#[repr(C)]
-pub struct Vertex {
-	pub pos: [f32; 3],
-	pub tex: [f32; 2],
-	pub normal: [f32; 3],
-	pub color: [f32; 4],
+use crate::integer::{Unit32Vec3,Planar64,Planar64Vec3,Planar64Affine3};
+pub struct TextureCoordinate([f32;2]);
+pub struct Color4(glam::Vec4);
+
+pub struct ModelVertex {
+	pub pos:Planar64Vec3,
+	pub normal:Unit32Vec3,
+	pub tex:TextureCoordinate,
+	pub color:Color4,
 }
 #[derive(Clone,Hash,PartialEq,Eq)]
 pub struct IndexedVertex{
@@ -30,42 +31,17 @@ pub struct IndexedModel{
 	pub groups: Vec<IndexedGroup>,
 	pub instances:Vec<ModelInstance>,
 }
-pub struct IndexedGroupFixedTexture{
-	pub polys:Vec<IndexedPolygon>,
-}
-pub struct IndexedModelSingleTexture{
-	pub unique_pos:Vec<[f32; 3]>,
-	pub unique_tex:Vec<[f32; 2]>,
-	pub unique_normal:Vec<[f32; 3]>,
-	pub unique_color:Vec<[f32; 4]>,
-	pub unique_vertices:Vec<IndexedVertex>,
-	pub texture:Option<u32>,//RenderPattern? material/texture/shader/flat color
-	pub groups: Vec<IndexedGroupFixedTexture>,
-	pub instances:Vec<ModelGraphicsInstance>,
-}
-pub struct ModelSingleTexture{
-	pub instances: Vec<ModelGraphicsInstance>,
-	pub vertices: Vec<Vertex>,
-	pub entities: Vec<Vec<u16>>,
-	pub texture: Option<u32>,
-}
-#[derive(Clone)]
-pub struct ModelGraphicsInstance{
-	pub transform:glam::Mat4,
-	pub normal_transform:glam::Mat3,
-	pub color:glam::Vec4,
-}
 pub struct ModelInstance{
 	//pub id:u64,//this does not actually help with map fixes resimulating bots, they must always be resimulated
-	pub transform:glam::Affine3A,
-	pub color:glam::Vec4,//transparency is in here
+	pub transform:Planar64Affine3,
+	pub color:Color4,//transparency is in here
 	pub attributes:CollisionAttributes,
 	pub temp_indexing:Vec<TempIndexedAttributes>,
 }
 impl std::default::Default for ModelInstance{
 	fn default() -> Self {
 		Self{
-			color:glam::Vec4::ONE,
+			color:Color4(glam::Vec4::ONE),
 			transform:Default::default(),
 			attributes:Default::default(),
 			temp_indexing:Default::default(),
@@ -77,7 +53,7 @@ pub struct IndexedModelInstances{
 	pub models:Vec<IndexedModel>,
 	//may make this into an object later.
 	pub modes:Vec<ModeDescription>,
-	pub spawn_point:glam::Vec3,
+	pub spawn_point:Planar64Vec3,
 }
 //stage description referencing flattened ids is spooky, but the map loading is meant to be deterministic.
 pub struct ModeDescription{
@@ -131,13 +107,13 @@ pub struct ContactingLadder{
 //you have this effect while intersecting
 #[derive(Clone)]
 pub struct IntersectingWater{
-	pub viscosity:i64,
-	pub density:i64,
-	pub current:glam::Vec3,
+	pub viscosity:Planar64,
+	pub density:Planar64,
+	pub current:Planar64Vec3,
 }
 #[derive(Clone)]
 pub struct IntersectingAccelerator{
-	pub acceleration:glam::Vec3
+	pub acceleration:Planar64Vec3
 }
 //All models can be given these attributes
 #[derive(Clone)]
@@ -146,7 +122,7 @@ pub struct GameMechanicJumpLimit{
 }
 #[derive(Clone)]
 pub struct GameMechanicBooster{
-	pub velocity:glam::Vec3,
+	pub velocity:Planar64Vec3,
 }
 #[derive(Clone)]
 pub enum ZoneBehaviour{
diff --git a/src/model_graphics.rs b/src/model_graphics.rs
new file mode 100644
index 0000000..57bbdd8
--- /dev/null
+++ b/src/model_graphics.rs
@@ -0,0 +1,35 @@
+use bytemuck::{Pod, Zeroable};
+use crate::model::{IndexedVertex,IndexedPolygon};
+#[derive(Clone, Copy, Pod, Zeroable)]
+#[repr(C)]
+pub struct GraphicsVertex {
+	pub pos: [f32; 3],
+	pub tex: [f32; 2],
+	pub normal: [f32; 3],
+	pub color: [f32; 4],
+}
+pub struct IndexedGroupFixedTexture{
+	pub polys:Vec<IndexedPolygon>,
+}
+pub struct IndexedModelGraphicsSingleTexture{
+	pub unique_pos:Vec<[f32; 3]>,
+	pub unique_tex:Vec<[f32; 2]>,
+	pub unique_normal:Vec<[f32; 3]>,
+	pub unique_color:Vec<[f32; 4]>,
+	pub unique_vertices:Vec<IndexedVertex>,
+	pub texture:Option<u32>,//RenderPattern? material/texture/shader/flat color
+	pub groups: Vec<IndexedGroupFixedTexture>,
+	pub instances:Vec<ModelGraphicsInstance>,
+}
+pub struct ModelGraphicsSingleTexture{
+	pub instances: Vec<ModelGraphicsInstance>,
+	pub vertices: Vec<GraphicsVertex>,
+	pub entities: Vec<Vec<u16>>,
+	pub texture: Option<u32>,
+}
+#[derive(Clone)]
+pub struct ModelGraphicsInstance{
+	pub transform:glam::Mat4,
+	pub normal_transform:glam::Mat3,
+	pub color:glam::Vec4,
+}
\ No newline at end of file
diff --git a/src/model_physics.rs b/src/model_physics.rs
new file mode 100644
index 0000000..ab0c014
--- /dev/null
+++ b/src/model_physics.rs
@@ -0,0 +1 @@
+//
\ No newline at end of file