do not step physics on mouse input, only update pos (overwriting previous pos)

fix angles
accumulate deltas
2023-09-21 00:42:09 -07:00 · 2023-09-21 00:42:09 -07:00 · 2023-09-21 00:42:09 -07:00 · 2023-09-21 00:42:09 -07:00 · 2023-09-21 00:42:09 -07:00 · 2023-09-21 00:25:41 -07:00
12 changed files with 2031 additions and 527 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -157,6 +157,12 @@ dependencies = [
 "rustc-demangle",
 ]

+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@ -184,12 +190,35 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"

+[[package]]
+name = "blake3"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
+dependencies = [
+ "arrayref",
+ "arrayvec",
+ "cc",
+ "cfg-if",
+ "constant_time_eq",
+ "digest",
+]
+
 [[package]]
 name = "block"
 version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"

+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "block-sys"
 version = "0.1.0-beta.1"
@ -302,6 +331,12 @@ dependencies = [
 "crossbeam-utils",
 ]

+[[package]]
+name = "constant_time_eq"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.3"
@ -360,6 +395,16 @@ dependencies = [
 "cfg-if",
 ]

+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
 [[package]]
 name = "d3d12"
 version = "0.7.0"
@ -382,6 +427,17 @@ dependencies = [
 "enum_primitive",
 ]

+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
 [[package]]
 name = "dispatch"
 version = "0.2.0"
@ -555,6 +611,16 @@ dependencies = [
 "waker-fn",
 ]

+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@ -822,6 +888,26 @@ version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"

+[[package]]
+name = "lz4"
+version = "1.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+dependencies = [
+ "libc",
+ "lz4-sys",
+]
+
+[[package]]
+name = "lz4-sys"
+version = "1.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "malloc_buf"
 version = "0.0.6"
@ -1198,6 +1284,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"

+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
 [[package]]
 name = "proc-macro-crate"
 version = "1.3.1"
@ -1222,6 +1314,19 @@ name = "profiling"
 version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46b2164ebdb1dfeec5e337be164292351e11daf63a05174c6776b2f47460f0c9"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74c55e9e629af5298a40e0fa106435b2da30484c4ec76b41d19bc4d00dd8b903"
+dependencies = [
+ "quote",
+ "syn 2.0.29",
+]

 [[package]]
 name = "quote"
@ -1232,6 +1337,36 @@ dependencies = [
 "proc-macro2",
 ]

+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "range-alloc"
 version = "0.1.3"
@ -1244,6 +1379,69 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9"

+[[package]]
+name = "rbx_binary"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e50573021d04b680018955662eba7dc4aac3de92219231798f6c9b41e38ab01"
+dependencies = [
+ "log",
+ "lz4",
+ "profiling",
+ "rbx_dom_weak",
+ "rbx_reflection",
+ "rbx_reflection_database",
+ "thiserror",
+]
+
+[[package]]
+name = "rbx_dom_weak"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161729449bbb0cfa657ce7bcca6a160d0af06d8b8d9efdc9abe14735dccacdb9"
+dependencies = [
+ "rbx_types",
+ "serde",
+]
+
+[[package]]
+name = "rbx_reflection"
+version = "4.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bd48487192046fec8f805f3fa29f3d7d5beb9890b0859b1a92bd8aff580343"
+dependencies = [
+ "rbx_types",
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "rbx_reflection_database"
+version = "0.2.7+roblox-588"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1be6cf674182806f11ad4899dd1feafe977591f1ae035ae05a58d4b74e487276"
+dependencies = [
+ "lazy_static",
+ "rbx_reflection",
+ "rmp-serde",
+ "serde",
+]
+
+[[package]]
+name = "rbx_types"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "070106e926b8ae54c7bc443e5db4d868d7f0af51c1d7cfd7efe1364c1753d8a3"
+dependencies = [
+ "base64",
+ "bitflags 1.3.2",
+ "blake3",
+ "lazy_static",
+ "rand",
+ "serde",
+ "thiserror",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.3.5"
@ -1288,6 +1486,28 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b"

+[[package]]
+name = "rmp"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20"
+dependencies = [
+ "byteorder",
+ "num-traits 0.2.16",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@ -1338,6 +1558,26 @@ dependencies = [
 "tiny-skia",
 ]

+[[package]]
+name = "serde"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@ -1405,7 +1645,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"

 [[package]]
 name = "strafe-client"
-version = "0.2.0"
+version = "0.4.0"
 dependencies = [
 "async-executor",
 "bytemuck",
@ -1415,6 +1655,9 @@ dependencies = [
 "log",
 "obj",
 "pollster",
+ "rbx_binary",
+ "rbx_dom_weak",
+ "rbx_reflection_database",
 "wgpu",
 "winit",
 ]
@ -1425,6 +1668,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"

+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@ -1524,6 +1773,12 @@ version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33"

+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.11"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "strafe-client"
-version = "0.2.0"
+version = "0.4.0"
 edition = "2021"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@ -14,6 +14,9 @@ glam = "0.24.1"
 log = "0.4.20"
 obj = "0.10.2"
 pollster = "0.3.0"
+rbx_binary = "0.7.1"
+rbx_dom_weak = "2.5.0"
+rbx_reflection_database = "0.2.7"
 wgpu = "0.17.0"
 winit = "0.28.6"

--- a/images/squid.dds
+++ b/images/squid.dds
--- a/src/body.rs
+++ b/src/body.rs
--- a/src/framework.rs
+++ b/src/framework.rs
@ -1,12 +1,10 @@
 use std::future::Future;
 #[cfg(target_arch = "wasm32")]
 use std::str::FromStr;
-#[cfg(not(target_arch = "wasm32"))]
-use std::time::Instant;
 #[cfg(target_arch = "wasm32")]
 use web_sys::{ImageBitmapRenderingContext, OffscreenCanvas};
 use winit::{
-	event::{self, WindowEvent},
+	event::{self, WindowEvent, DeviceEvent},
 	event_loop::{ControlFlow, EventLoop},
 };

@ -53,8 +51,8 @@ pub trait Example: 'static + Sized {
 		device: &wgpu::Device,
 		queue: &wgpu::Queue,
 	);
-	fn update(&mut self, event: WindowEvent);
-	fn move_mouse(&mut self, delta: (f64,f64));
+	fn update(&mut self, device: &wgpu::Device, event: WindowEvent);
+	fn device_event(&mut self, event: DeviceEvent);
 	fn render(
 		&mut self,
 		view: &wgpu::TextureView,
@ -279,11 +277,6 @@ fn start<E: Example>(
 	log::info!("Initializing the example...");
 	let mut example = E::init(&config, &adapter, &device, &queue);

-	#[cfg(not(target_arch = "wasm32"))]
-	let mut last_frame_inst = Instant::now();
-	#[cfg(not(target_arch = "wasm32"))]
-	let (mut frame_count, mut accum_time) = (0, 0.0);
-
 	log::info!("Entering render loop...");
 	event_loop.run(move |event, _, control_flow| {
 		let _ = (&instance, &adapter); // force ownership by the closure
@ -351,33 +344,16 @@ fn start<E: Example>(
 					println!("{:#?}", instance.generate_report());
 				}
 				_ => {
-					example.update(event);
+					example.update(&device,event);
 				}
 			},
 			event::Event::DeviceEvent {
-				event:
-					winit::event::DeviceEvent::MouseMotion {
-						delta,
-					},
+				event,
 				..
 			} => {
-				example.move_mouse(delta);
+				example.device_event(event);
 			},
 			event::Event::RedrawRequested(_) => {
-				#[cfg(not(target_arch = "wasm32"))]
-				{
-					accum_time += last_frame_inst.elapsed().as_secs_f32();
-					last_frame_inst = Instant::now();
-					frame_count += 1;
-					if frame_count == 100 {
-						println!(
-							"Avg frame time {}ms",
-							accum_time * 1000.0 / frame_count as f32
-						);
-						accum_time = 0.0;
-						frame_count = 0;
-					}
-				}

 				let frame = match surface.get_current_texture() {
 					Ok(frame) => frame,
--- a/src/instruction.rs
+++ b/src/instruction.rs
@ -0,0 +1,48 @@
+#[derive(Debug)]
+pub struct TimedInstruction<I> {
+	pub time: crate::body::TIME,
+	pub instruction: I,
+}
+
+pub trait InstructionEmitter<I> {
+	fn next_instruction(&self, time_limit:crate::body::TIME) -> Option<TimedInstruction<I>>;
+}
+pub trait InstructionConsumer<I> {
+	fn process_instruction(&mut self, instruction:TimedInstruction<I>);
+}
+
+//PROPER PRIVATE FIELDS!!!
+pub struct InstructionCollector<I> {
+	time: crate::body::TIME,
+	instruction: Option<I>,
+}
+impl<I> InstructionCollector<I> {
+	pub fn new(time:crate::body::TIME) -> Self {
+		Self{
+			time,
+			instruction:None
+		}
+	}
+
+	pub fn collect(&mut self,instruction:Option<TimedInstruction<I>>){
+		match instruction {
+			Some(unwrap_instruction) => {
+				if unwrap_instruction.time<self.time {
+					self.time=unwrap_instruction.time;
+					self.instruction=Some(unwrap_instruction.instruction);
+				}
+			},
+			None => (),
+		}
+	}
+	pub fn instruction(self) -> Option<TimedInstruction<I>> {
+		//STEAL INSTRUCTION AND DESTROY INSTRUCTIONCOLLECTOR
+		match self.instruction {
+			Some(instruction)=>Some(TimedInstruction{
+				time:self.time,
+				instruction
+			}),
+			None => None,
+		}
+	}
+}
--- a/src/lib.rs
+++ b/src/lib.rs
@ -1 +1,5 @@
 pub mod framework;
+pub mod body;
+pub mod zeroes;
+pub mod instruction;
+pub mod load_roblox;
--- a/src/load_roblox.rs
+++ b/src/load_roblox.rs
@ -0,0 +1,27 @@
+fn class_is_a(class: &str, superclass: &str) -> bool {
+	if class==superclass {
+		return true
+	}
+	let class_descriptor=rbx_reflection_database::get().classes.get(class);
+	if let Some(descriptor) = &class_descriptor {
+		if let Some(class_super) = &descriptor.superclass {
+			return class_is_a(&class_super, superclass)
+		}
+	}
+	return false
+}
+pub fn get_objects<R: std::io::Read>(buf_thing: R, superclass: &str) -> Result<std::vec::Vec<rbx_dom_weak::Instance>, Box<dyn std::error::Error>> {
+	// Using buffered I/O is recommended with rbx_binary
+	let dom = rbx_binary::from_reader(buf_thing)?;
+
+	let mut objects = std::vec::Vec::<rbx_dom_weak::Instance>::new();
+	//move matching instances into objects
+	let (_,mut instances) = dom.into_raw();
+	for (_,instance) in instances.drain() {
+		if class_is_a(instance.class.as_str(), superclass) {
+			objects.push(instance);
+		}
+	}
+
+	return Ok(objects)
+}
--- a/src/main.rs
+++ b/src/main.rs
--- a/src/shader.wgsl
+++ b/src/shader.wgsl
@ -1,9 +1,4 @@
-struct SkyOutput {
-	@builtin(position) position: vec4<f32>,
-	@location(0) sampledir: vec3<f32>,
-};
-
-struct Data {
+struct Camera {
 	// from camera to screen
 	proj: mat4x4<f32>,
 	// from screen to camera
@ -13,9 +8,16 @@ struct Data {
 	// camera position
 	cam_pos: vec4<f32>,
 };
+
+//group 0 is the camera
@group(0)
@binding(0)
-var<uniform> r_data: Data;
+var<uniform> camera: Camera;
+
+struct SkyOutput {
+	@builtin(position) position: vec4<f32>,
+	@location(0) sampledir: vec3<f32>,
+};

@vertex
 fn vs_sky(@builtin(vertex_index) vertex_index: u32) -> SkyOutput {
@ -30,8 +32,8 @@ fn vs_sky(@builtin(vertex_index) vertex_index: u32) -> SkyOutput {
 	);

 	// transposition = inversion for this orthonormal matrix
-	let inv_model_view = transpose(mat3x3<f32>(r_data.view[0].xyz, r_data.view[1].xyz, r_data.view[2].xyz));
-	let unprojected = r_data.proj_inv * pos;
+	let inv_model_view = transpose(mat3x3<f32>(camera.view[0].xyz, camera.view[1].xyz, camera.view[2].xyz));
+	let unprojected = camera.proj_inv * pos;

 	var result: SkyOutput;
 	result.sampledir = inv_model_view * unprojected.xyz;
@ -39,93 +41,65 @@ fn vs_sky(@builtin(vertex_index) vertex_index: u32) -> SkyOutput {
 	return result;
 }

-struct GroundOutput {
-	@builtin(position) position: vec4<f32>,
-	@location(4) pos: vec3<f32>,
-};
+const MAX_ENTITY_INSTANCES=1024;
+//group 1 is the model
+@group(1)
+@binding(0)
+var<uniform> entity_transforms: array<mat4x4<f32>,MAX_ENTITY_INSTANCES>;
+//var<uniform> entity_texture_transforms: array<mat3x3<f32>,MAX_ENTITY_INSTANCES>;
+//my fancy idea is to create a megatexture for each model that includes all the textures each intance will need
+//the texture transform then maps the texture coordinates to the location of the specific texture
+//how to do no texture?
+@group(1)
+@binding(1)
+var model_texture: texture_2d<f32>;
+@group(1)
+@binding(2)
+var model_sampler: sampler;

-@vertex
-fn vs_ground(@builtin(vertex_index) vertex_index: u32) -> GroundOutput {
-	// hacky way to draw two triangles that make a square
-	let tmp1 = i32(vertex_index)/2-i32(vertex_index)/3;
-	let tmp2 = i32(vertex_index)&1;
-	let pos = vec3<f32>(
-		f32(tmp1) * 2.0 - 1.0,
-		0.0,
-		f32(tmp2) * 2.0 - 1.0
-	) * 160.0;
-
-	var result: GroundOutput;
-	result.pos = pos;
-	result.position = r_data.proj * r_data.view * vec4<f32>(pos, 1.0);
-	return result;
-}
-
-struct EntityOutput {
+struct EntityOutputTexture {
 	@builtin(position) position: vec4<f32>,
 	@location(1) texture: vec2<f32>,
 	@location(2) normal: vec3<f32>,
 	@location(3) view: vec3<f32>,
 };
-
-@group(1)
-@binding(0)
-var<uniform> r_EntityTransform: mat4x4<f32>;
-
@vertex
-fn vs_entity(
+fn vs_entity_texture(
+	@builtin(instance_index) instance: u32,
 	@location(0) pos: vec3<f32>,
 	@location(1) texture: vec2<f32>,
 	@location(2) normal: vec3<f32>,
-) -> EntityOutput {
-	var position: vec4<f32> = r_EntityTransform * vec4<f32>(pos, 1.0);
-	var result: EntityOutput;
-	result.normal = (r_EntityTransform * vec4<f32>(normal, 0.0)).xyz;
-	result.texture=texture;
-	result.view = position.xyz - r_data.cam_pos.xyz;
-	result.position = r_data.proj * r_data.view * position;
+) -> EntityOutputTexture {
+	var position: vec4<f32> = entity_transforms[instance] * vec4<f32>(pos, 1.0);
+	var result: EntityOutputTexture;
+	result.normal = (entity_transforms[instance] * vec4<f32>(normal, 0.0)).xyz;
+	result.texture=texture;//(entity_texture_transforms[instance] * vec3<f32>(texture, 1.0)).xy;
+	result.view = position.xyz - camera.cam_pos.xyz;
+	result.position = camera.proj * camera.view * position;
 	return result;
 }

-@group(0)
+//group 2 is the skybox texture
+@group(2)
+@binding(0)
+var cube_texture: texture_cube<f32>;
+@group(2)
@binding(1)
-var r_texture: texture_cube<f32>;
-@group(0)
-@binding(2)
-var r_sampler: sampler;
+var cube_sampler: sampler;

@fragment
 fn fs_sky(vertex: SkyOutput) -> @location(0) vec4<f32> {
-	return textureSample(r_texture, r_sampler, vertex.sampledir);
+	return textureSample(cube_texture, model_sampler, vertex.sampledir);
 }

@fragment
-fn fs_entity(vertex: EntityOutput) -> @location(0) vec4<f32> {
+fn fs_entity_texture(vertex: EntityOutputTexture) -> @location(0) vec4<f32> {
 	let incident = normalize(vertex.view);
 	let normal = normalize(vertex.normal);
 	let d = dot(normal, incident);
 	let reflected = incident - 2.0 * d * normal;

-	let dir = vec3<f32>(-1.0)+2.0*vec3<f32>(vertex.texture.x,0.0,vertex.texture.y);
-	let texture_color = textureSample(r_texture, r_sampler, dir).rgb;
-	let reflected_color = textureSample(r_texture, r_sampler, reflected).rgb;
-	return vec4<f32>(mix(vec3<f32>(0.1) + 0.5 * reflected_color,texture_color,1.0-pow(1.0-abs(d),2.0)), 1.0);
-}
-
-fn modulo_euclidean (a: f32, b: f32) -> f32 {
-	var m = a % b;
-	if (m < 0.0) {
-		if (b < 0.0) {
-			m -= b;
-		} else {
-			m += b;
-		}
-	}
-	return m;
-}
-
-@fragment
-fn fs_ground(vertex: GroundOutput) -> @location(0) vec4<f32> {
-	let dir = vec3<f32>(-1.0)+vec3<f32>(modulo_euclidean(vertex.pos.x/16.,1.0),0.0,modulo_euclidean(vertex.pos.z/16.,1.0))*2.0;
-	return vec4<f32>(textureSample(r_texture, r_sampler, dir).rgb, 1.0);
+	let fragment_color = textureSample(model_texture, model_sampler, vertex.texture).rgb;
+	let reflected_color = textureSample(cube_texture, cube_sampler, reflected).rgb;
+	return vec4<f32>(mix(vec3<f32>(0.1) + 0.5 * reflected_color,fragment_color,1.0-pow(1.0-abs(d),2.0)), 1.0);
 }
--- a/src/sweep.rs
+++ b/src/sweep.rs
@ -0,0 +1,8 @@
+
+//something that implements body + hitbox + transform can predict collision
+impl crate::sweep::PredictCollision for Model {
+	fn predict_collision(&self,other:&Model) -> Option<crate::event::EventStruct> {
+		//math!
+		None
+	}
+}
--- a/src/zeroes.rs
+++ b/src/zeroes.rs
@ -0,0 +1,27 @@
+//find roots of polynomials
+pub fn zeroes2(a0:f32,a1:f32,a2:f32) -> Vec<f32>{
+	if a2==0f32{
+		return zeroes1(a0, a1);
+	}
+	let mut radicand=a1*a1-4f32*a2*a0;
+	if 0f32<radicand {
+		radicand=radicand.sqrt();
+		if 0f32<a2 {
+			return vec![(-a1-radicand)/(2f32*a2),(-a1+radicand)/(2f32*a2)];
+		} else {
+			return vec![(-a1+radicand)/(2f32*a2),(-a1-radicand)/(2f32*a2)];
+		}
+	} else if radicand==0f32 {
+		return vec![-a1/(2f32*a2)];
+	} else {
+		return vec![];
+	}
+}
+#[inline]
+pub fn zeroes1(a0:f32,a1:f32) -> Vec<f32> {
+	if a1==0f32{
+		return vec![];
+	} else {
+		return vec![-a0/a1];
+	}
+}
Author	SHA1	Message	Date
Quaternions	c8e4a5d2aa	do not step physics on mouse input, only update pos (overwriting previous pos)	2023-09-21 00:42:09 -07:00
Quaternions	005d0fdd58	fix angles	2023-09-21 00:42:09 -07:00
Quaternions	c28b5177f8	accumulate deltas	2023-09-21 00:42:09 -07:00
Quaternions	8a3918deb9	implement jump() + remove jump_trying + prevent air jumping	2023-09-21 00:42:09 -07:00
Quaternions	6c99e493c6	wip 2	2023-09-21 00:42:09 -07:00
Quaternions	b727736152	wip	2023-09-21 00:25:41 -07:00
Quaternions	bc8f2bd566	finalize physics models	2023-09-21 00:03:14 -07:00
Quaternions	eed932212d	comment code that will be deleted soon and cause merge conflicts for no reason	2023-09-20 23:45:55 -07:00
Quaternions	73edb9ff95	drag & drop to load roblox map	2023-09-20 23:45:55 -07:00
Quaternions	ae0c9e73ee	make handy unit cube	2023-09-20 23:44:12 -07:00
Quaternions	953d424a57	load_roblox module	2023-09-20 23:44:12 -07:00
Quaternions	ca919b92fd	add roblox deps	2023-09-20 23:44:12 -07:00
Quaternions	1de3501e89	no default transform	2023-09-20 22:29:46 -07:00
Quaternions	0135b17917	make proper model data and stop passing device into add_obj	2023-09-20 22:29:33 -07:00
Quaternions	1878528a4f	v0.4.0 instanced rendering + model textures	2023-09-20 17:45:39 -07:00
Quaternions	25e80a7c17	scope skybox	2023-09-20 17:13:08 -07:00
Quaternions	21835d13f6	load squid texture	2023-09-20 17:13:08 -07:00
Quaternions	91f6a5261f	move camera_uniforms and skybox_texture	2023-09-20 17:13:08 -07:00
Quaternions	fb4a5efa14	split main bind group, rename everything, organize GraphicsData	2023-09-20 17:13:08 -07:00
Quaternions	acb658f3e9	goal: repeating ground texture	2023-09-20 14:07:11 -07:00
Quaternions	7e427b3879	instanced rendering	2023-09-20 13:48:07 -07:00
Quaternions	d16485ae6d	replace visual ground with custom ground model!	2023-09-20 13:37:46 -07:00
Quaternions	cdf695ee6e	label bind group	2023-09-20 13:02:47 -07:00
Quaternions	5fc4044284	small physics opti	2023-09-19 18:14:24 -07:00
Quaternions	6f4fda8cc0	clip walk target velocity in RefreshWalkTarget	2023-09-19 17:54:43 -07:00
Quaternions	d58f915082	v0.3.0 physics + walking	2023-09-19 01:21:00 -07:00
Quaternions	8e95fe484a	unnecessary cast	2023-09-19 00:58:35 -07:00
Quaternions	5854128164	edit comments	2023-09-19 00:00:14 -07:00
Quaternions	db5b3328bd	update time for extern instructions	2023-09-19 00:00:06 -07:00
Quaternions	4951d1513d	stop skipping over time	2023-09-18 23:57:42 -07:00
Quaternions	17e71d884f	SetControlDir + contact constrain + walk.state enum instead of hash	2023-09-18 23:36:14 -07:00
Quaternions	1dc98d9c2d	stupid mistake	2023-09-18 23:33:52 -07:00
Quaternions	fd38502e07	only walk if grounded	2023-09-18 21:28:09 -07:00
Quaternions	0632e322cf	implement walk with hashing lole!!	2023-09-18 21:10:07 -07:00
Quaternions	7544c6e6ef	fix roblox camera offset	2023-09-18 19:47:15 -07:00
Quaternions	2f0a073fd5	fix aabb normals + face_mesh	2023-09-18 19:04:32 -07:00
Quaternions	21dc425fc2	edit comments	2023-09-18 19:04:32 -07:00
Quaternions	ca141c800c	debug print instructions	2023-09-18 19:04:32 -07:00
Quaternions	63ce06f069	syntactic sugar	2023-09-18 18:31:15 -07:00
Quaternions	fe14d5e0fa	worthless opti	2023-09-18 18:31:04 -07:00
Quaternions	bffc254a0d	put -t back	2023-09-18 18:27:02 -07:00
Quaternions	a5f203484b	comment on CollisionEnd handling	2023-09-18 18:08:03 -07:00
Quaternions	e67479a9bd	TEMP: move jump out	2023-09-18 18:08:03 -07:00
Quaternions	ad7abbdf1c	rework predict_collision_end	2023-09-18 18:08:03 -07:00
Quaternions	3a0b3900ec	fix falling	2023-09-18 16:04:55 -07:00
Quaternions	765ed42b9d	start in air	2023-09-18 16:04:55 -07:00
Quaternions	8137a26f81	standardize vec init	2023-09-18 16:04:55 -07:00
Quaternions	21ae7a0e4f	use pva for init	2023-09-18 16:04:55 -07:00
Quaternions	5a886b76d1	comment about processed_time	2023-09-18 16:04:55 -07:00
Quaternions	f1e26cb07a	don't print frame delta	2023-09-18 16:04:55 -07:00
Quaternions	14a74c6e1e	consume vec	2023-09-18 16:04:55 -07:00
Quaternions	5b55873bd5	halfsize	2023-09-18 16:04:55 -07:00
Quaternions	fd5d71e1af	use hashset for contacts	2023-09-18 16:04:55 -07:00
Quaternions	28c3f21736	implement aabb collision	2023-09-18 16:04:55 -07:00
Quaternions	a58464efb0	how will I do this	2023-09-18 15:49:09 -07:00
Quaternions	b070b9706f	InputState	2023-09-18 15:49:09 -07:00
Quaternions	dcfbee8de1	MouseInterpolationState	2023-09-18 15:49:09 -07:00
Quaternions	c5636f7fcd	delete unused	2023-09-18 15:26:21 -07:00
Quaternions	a5aa89064b	next_instruction non-optional time_limit	2023-09-18 15:26:21 -07:00
Quaternions	0fe14749d3	wip: tickless physics	2023-09-18 15:26:21 -07:00
Quaternions	8daf432991	zeroes	2023-09-18 15:26:21 -07:00
Quaternions	4f5c9afed3	comments on implementing game mechanics	2023-09-08 20:18:31 -07:00
Quaternions	53605746d4	rename best to collector	2023-09-08 20:18:31 -07:00
Quaternions	cead05b08b	rename event.rs to instruction.rs	2023-09-08 20:18:31 -07:00
Quaternions	949897a558	rename EventStruct to TimedInstruction	2023-09-08 20:18:31 -07:00
Quaternions	a4ed50fc38	EventConsumer	2023-09-08 20:15:36 -07:00
Quaternions	846f681648	generic events	2023-09-08 20:15:36 -07:00
Quaternions	ff54a03487	happy compiler happy programmer	2023-09-08 20:15:36 -07:00
Quaternions	8c2dda5205	bad data normalization	2023-09-08 16:06:17 -07:00
Quaternions	addde65caa	fix up next_event lsp errors	2023-09-08 16:06:17 -07:00
Quaternions	2c4e6f642b	boilerplate	2023-09-08 16:06:17 -07:00
Quaternions	f11742ef3b	RelativeCollision concept	2023-09-08 16:06:17 -07:00
Quaternions	e6862b5bad	rename Model to ModelGRaphics + move model graphics gen code	2023-09-08 16:06:17 -07:00
Quaternions	e18e8a9a7d	walk event	2023-09-08 16:06:17 -07:00
Quaternions	f600092f13	LETS GET RUSTY	2023-09-08 16:06:17 -07:00
Quaternions	1f1ef5d3ad	there is no model	2023-09-08 12:28:16 -07:00
Quaternions	54bf0358d6	can't stand the idea of 10 nanoseconds less than 66 ticks per second	2023-09-08 12:27:45 -07:00
Quaternions	6caa273623	jump implementation details	2023-09-08 12:04:30 -07:00
Quaternions	101f0f8d12	localize EventStruct	2023-09-08 12:03:32 -07:00
Quaternions	fc751a9fe8	stage sweep	2023-09-08 11:38:47 -07:00
Quaternions	5391b635fb	reorder elements	2023-09-08 11:38:47 -07:00
Quaternions	230469496e	brainstorm tickless events	2023-09-08 11:38:47 -07:00
Quaternions	ea3134de51	move physics into its own module	2023-09-08 11:35:40 -07:00