delete editor.rs

game/src/editor.rs

@@ -1,190 +0,0 @@
-#![allow(dead_code)]
-
-use std::f64::consts::PI;
-use std::{collections::HashSet, time::Duration};
-
-use crate::engine::{Color, Key, Renderer, Scene, Shape, V3};
-
-use crate::engine;
-
-enum MutExcKey {
-    Lhs,
-    Rhs,
-    None,
-}
-
-struct Editor {
-    objects: Vec<Object>,
-    next_object_id: u32,
-    keys_pressed: HashSet<Key>,
-    camera_pos: V3,
-    camera_rot: V3,
-}
-
-impl Editor {
-    fn new() -> Self {
-        Self {
-            objects: Vec::new(),
-            next_object_id: 0,
-            keys_pressed: HashSet::new(),
-            camera_pos: V3(0.0, 0.0, -1.0),
-            camera_rot: V3(0.0, 0.0, 0.0),
-        }
-    }
-
-    fn spawn(&mut self, object_kind: ObjectKind) {
-        let object = Object {
-            kind: object_kind,
-            id: self.next_object_id,
-        };
-        self.objects.push(object);
-        self.next_object_id += 1
-    }
-
-    fn despawn(&mut self, id: u32) {
-        let index = self
-            .objects
-            .iter()
-            .position(|o| o.id == id)
-            .expect("doesn't exist");
-        self.objects.remove(index);
-    }
-
-    pub fn mut_exc_keys(&self, lhs: Key, rhs: Key) -> MutExcKey {
-        match (
-            self.keys_pressed.contains(&lhs),
-            self.keys_pressed.contains(&rhs),
-        ) {
-            (true, false) => MutExcKey::Lhs,
-            (false, true) => MutExcKey::Rhs,
-            _ => MutExcKey::None,
-        }
-    }
-}
-
-impl<R: Renderer> engine::Game<R> for Editor {
-    fn update(&mut self, delta_time: Duration) {
-        for object in &mut self.objects {
-            object.update(delta_time);
-        }
-        match self.mut_exc_keys(Key::A, Key::D) {
-            MutExcKey::Lhs => {
-                self.camera_pos +=
-                    V3(-delta_time.as_secs_f64() * 2.0, 0.0, 0.0).rotate(self.camera_rot * -1.0);
-            }
-            MutExcKey::Rhs => {
-                self.camera_pos +=
-                    V3(delta_time.as_secs_f64() * 2.0, 0.0, 0.0).rotate(self.camera_rot * -1.0);
-            }
-            _ => {}
-        }
-        match self.mut_exc_keys(Key::LShift, Key::LCtrl) {
-            MutExcKey::Lhs => {
-                self.camera_pos +=
-                    V3(0.0, delta_time.as_secs_f64() * 2.0, 0.0).rotate(self.camera_rot * -1.0);
-            }
-            MutExcKey::Rhs => {
-                self.camera_pos +=
-                    V3(0.0, -delta_time.as_secs_f64() * 2.0, 0.0).rotate(self.camera_rot * -1.0);
-            }
-            _ => {}
-        }
-        match self.mut_exc_keys(Key::W, Key::S) {
-            MutExcKey::Lhs => {
-                self.camera_pos +=
-                    V3(0.0, 0.0, delta_time.as_secs_f64() * 2.0).rotate(self.camera_rot * -1.0);
-            }
-            MutExcKey::Rhs => {
-                self.camera_pos +=
-                    V3(0.0, 0.0, -delta_time.as_secs_f64() * 2.0).rotate(self.camera_rot * -1.0);
-            }
-            _ => {}
-        }
-        match self.mut_exc_keys(Key::Up, Key::Down) {
-            MutExcKey::Lhs => {
-                self.camera_rot.0 += PI * delta_time.as_secs_f64() * 1.0;
-            }
-            MutExcKey::Rhs => {
-                self.camera_rot.0 -= PI * delta_time.as_secs_f64() * 1.0;
-            }
-            _ => {}
-        }
-        match self.mut_exc_keys(Key::Left, Key::Right) {
-            MutExcKey::Lhs => {
-                self.camera_rot.1 += PI * delta_time.as_secs_f64() * 1.0;
-            }
-            MutExcKey::Rhs => {
-                self.camera_rot.1 -= PI * delta_time.as_secs_f64() * 1.0;
-            }
-            _ => {}
-        }
-    }
-
-    fn render(&mut self, r: &mut R) {
-        let mut scene = Scene::new();
-        for object in &self.objects {
-            object.render(&mut scene);
-        }
-        scene.render(r, self.camera_pos, self.camera_rot);
-    }
-
-    fn event(&mut self, event: engine::Event) {
-        match event {
-            engine::Event::KeyDown { key } => self.keys_pressed.insert(key),
-            engine::Event::KeyUp { key } => self.keys_pressed.remove(&key),
-        };
-    }
-}
-
-struct Object {
-    kind: ObjectKind,
-    id: u32,
-}
-
-enum ObjectKind {
-    Box { pos: V3, vel: V3 },
-}
-
-impl Object {
-    fn update(&mut self, delta_time: Duration) {
-        match &mut self.kind {
-            ObjectKind::Box { pos, vel } => {}
-        }
-    }
-
-    fn render(&self, scene: &mut Scene) {
-        match self.kind {
-            ObjectKind::Box { pos, .. } => {
-                scene.draw_shape(
-                    pos,
-                    &Shape::new_cube(V3(1.0, 1.0, 1.0)),
-                    Color::Green,
-                    Color::Black,
-                );
-                scene.draw_shape(
-                    pos + V3(0.0, -0.5, 0.0),
-                    &Shape::new_cube(V3(0.5, 0.5, 0.5)),
-                    Color::Green,
-                    Color::Black,
-                );
-            }
-        }
-    }
-}
-
-pub fn editor_main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut sdl_io = engine::SdlIo::new()?;
-    let mut editor = Editor::new();
-
-    let objects = [ObjectKind::Box {
-        pos: V3(0.0, 0.0, 0.0),
-        vel: V3(0.0, 0.0, 0.0),
-    }];
-
-    for object in objects {
-        editor.spawn(object)
-    }
-
-    sdl_io.run(&mut editor);
-    Ok(())
-}

game/src/main.rs

@@ -1,6 +1,5 @@
 #![allow(dead_code)]
 
-pub mod editor;
 mod engine;
 mod event_queue;
 pub mod vermiparous;