aboutsummaryrefslogtreecommitdiff
path: root/stockton-contrib
diff options
context:
space:
mode:
authortcmal <me@aria.rip>2024-08-25 17:44:22 +0100
committertcmal <me@aria.rip>2024-08-25 17:44:22 +0100
commit1a0ac4464c2053e8b08e867c3abb77b89d951d9c (patch)
treeca00435d5b6ab24d01f19da970f13654a3f7eb27 /stockton-contrib
parent7be602f38f9ba5067de8fa8f3a004ce4e5200ade (diff)
feat(contrib): add deltatime and flycam implementations
Diffstat (limited to 'stockton-contrib')
-rw-r--r--stockton-contrib/Cargo.toml18
-rw-r--r--stockton-contrib/src/delta_time.rs42
-rw-r--r--stockton-contrib/src/flycam.rs55
-rw-r--r--stockton-contrib/src/lib.rs25
4 files changed, 140 insertions, 0 deletions
diff --git a/stockton-contrib/Cargo.toml b/stockton-contrib/Cargo.toml
new file mode 100644
index 0000000..b06afc1
--- /dev/null
+++ b/stockton-contrib/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "stockton-contrib"
+version = "0.1.0"
+authors = ["Oscar Shrimpton <oscar.shrimpton.personal@gmail.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+stockton-input = { path = "../stockton-input" }
+stockton-types = { path = "../stockton-types" }
+legion = { version = "^0.3" }
+
+[features]
+default = []
+
+delta_time = []
+flycam = [] \ No newline at end of file
diff --git a/stockton-contrib/src/delta_time.rs b/stockton-contrib/src/delta_time.rs
new file mode 100644
index 0000000..4684e79
--- /dev/null
+++ b/stockton-contrib/src/delta_time.rs
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) Oscar Shrimpton 2020
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use std::time::Instant;
+
+#[derive(Debug, Clone)]
+pub struct Timing {
+ pub delta_time: f32,
+
+ pub(crate) last_frame_start: Instant,
+}
+
+impl Default for Timing {
+ fn default() -> Self {
+ Timing {
+ delta_time: 0.0,
+
+ last_frame_start: Instant::now(),
+ }
+ }
+}
+
+#[system]
+pub fn update_deltatime(#[resource] timing: &mut Timing) {
+ let now = Instant::now();
+ timing.delta_time = now.duration_since(timing.last_frame_start).as_secs_f32();
+ timing.last_frame_start = now;
+}
diff --git a/stockton-contrib/src/flycam.rs b/stockton-contrib/src/flycam.rs
new file mode 100644
index 0000000..7b82c4f
--- /dev/null
+++ b/stockton-contrib/src/flycam.rs
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) Oscar Shrimpton 2020
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+use stockton_input::{Axis, InputManager};
+use stockton_types::components::Transform;
+use stockton_types::Vector3;
+
+use crate::delta_time::Timing;
+
+pub trait FlycamInput {
+ fn get_x_axis(&self) -> &Axis;
+ fn get_y_axis(&self) -> &Axis;
+ fn get_z_axis(&self) -> &Axis;
+}
+
+pub struct FlycamControlled {
+ pub speed: f32,
+}
+
+#[system(for_each)]
+pub fn flycam_move<T>(
+ #[resource] manager: &T,
+ #[resource] timing: &Timing,
+ transform: &mut Transform,
+ flycam: &FlycamControlled,
+) where
+ T: 'static + InputManager,
+ T::Inputs: FlycamInput,
+{
+ // TODO: Deal with looking around
+
+ let inputs = manager.get_inputs();
+ let speed = flycam.speed;
+ let impulse = Vector3::new(
+ **inputs.get_x_axis() as f32 * speed * timing.delta_time,
+ **inputs.get_y_axis() as f32 * speed * timing.delta_time,
+ **inputs.get_z_axis() as f32 * speed * timing.delta_time,
+ );
+
+ transform.position += impulse;
+}
diff --git a/stockton-contrib/src/lib.rs b/stockton-contrib/src/lib.rs
new file mode 100644
index 0000000..13f1ea1
--- /dev/null
+++ b/stockton-contrib/src/lib.rs
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) Oscar Shrimpton 2020
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation, either version 3 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#[macro_use]
+extern crate legion;
+
+#[cfg(feature = "delta_time")]
+pub mod delta_time;
+
+#[cfg(feature = "flycam")]
+pub mod flycam;