src/scene.rs

@@ -1,7 +1,6 @@
 
 use crate::model::Model;
 use crate::camera::Camera;
-use crate::camera::Camera_Movement;
 use crate::shader::shader;
 use std::sync::Arc;
 use std::rc::Rc;
@@ -10,7 +9,6 @@ use glow::*;
 use imgui_glow_renderer::AutoRenderer;
 use imgui_sdl2_support::SdlPlatform;
 use crate::debug;
-mod objects;
 use cgmath::{Matrix4, vec3, Point3, Deg, perspective};
 use cgmath::prelude::*;
 
@@ -23,6 +21,7 @@ const SCR_HEIGHT: u32 = 900;
 const MODELS: [&str; 3]= ["resources/models/TestCarModel/CarW4.obj", "resources/models/TestCarModel/CarW1.obj",
 "resources/models/TestCarModel/CarW0.obj"];
 
+
 /// XXX this is temporary, thus the name
 pub struct tempData {
     pub projection: Matrix4<f32>,
@@ -45,7 +44,7 @@ pub enum SceneEnum {
 
 pub struct Scene {
     gl: Arc<glow::Context>,
-    pub Car: objects::Player,
+    pub Car: Model,
     camera: Camera,
     debug: Debug,
     shaders: Vec<Rc<shader>>,
@@ -56,7 +55,7 @@ pub struct Scene {
 impl Scene{
     pub fn new(gl: Arc<glow::Context>) -> Scene
         {
-            let Car = objects::Player::new(Arc::clone(&gl));
+            let Car = Model::new(MODELS[0], Arc::clone(&gl));
 
             let shader = Rc::new(shader::new("model", Arc::clone(&gl)));
 
@@ -97,13 +96,12 @@ impl Scene{
             self.tempData.currentFrame = self.time.elapsed().as_secs_f32();
             self.tempData.deltaTime = self.tempData.currentFrame - self.tempData.lastFrame;
             self.tempData.lastFrame = self.tempData.currentFrame;
+            self.tempData.current_rad += self.tempData.spinSpeed/15.0;
             let mut ret = SceneEnum::Resume;
+
             unsafe {
                 self.gl.enable(glow::DEPTH_TEST);
                 self.gl.clear(glow::COLOR_BUFFER_BIT | glow::DEPTH_BUFFER_BIT);
-            }
-            /*
-            unsafe {
 
                 self.shaders[0].Use();
                 self.tempData.projection = perspective(Deg(self.camera.Zoom), SCR_WIDTH as f32 /SCR_HEIGHT as f32, 0.1, 100.0);
@@ -112,16 +110,12 @@ impl Scene{
                 self.shaders[0].setMat4("view", &view);
 
                 let mut model: Matrix4<f32> = Matrix4::from_axis_angle(vec3(0.0, -1.0, 0.0).normalize(),
-                cgmath::Rad(1.0));
+                cgmath::Rad(self.tempData.current_rad));
 
                 model = model * Matrix4::from_scale(0.2);
                 self.shaders[0].setMat4("model", &model);
             }
-            */
+            self.Car.Draw(&self.shaders[0]);
-            self.Car.update();
-            self.Car.turn(self.tempData.spinSpeed);
-            self.Car.Draw(&self.shaders[0], &self.camera);
-
 
             if self.tempData.DebugMode{
                 self.handleDebug(events_loop, window, &mut ret)
@@ -143,10 +137,7 @@ impl Scene{
                     }
                     Event::KeyDown {keycode: Some(Keycode::M), ..} => {
                         self.debug.addWindow(debug::OpenWindows::ModelInfo)
-                    },
+                    }
-                    Event::KeyDown {keycode: Some(Keycode::W), ..} => {
-                        self.camera.ProcessKeyboard(Camera_Movement::FORWARD, self.tempData.deltaTime);
-                    },
                         _ => {}
                     }
 
@@ -162,7 +153,7 @@ impl Scene{
         for (id, window) in windows
         {
             match window {
-                debug::OpenWindows::ModelInfo => Callbacks.push(debug::ModelInfo(&self.Car.Model)),
+                debug::OpenWindows::ModelInfo => Callbacks.push(debug::ModelInfo(&self.Car)),
                 debug::OpenWindows::TestWind => Callbacks.push(debug::TestWind(self.tempData.spinSpeed, self.tempData.selectedModel)),
                 debug::OpenWindows::MainMenu => Callbacks.push(debug::Callback::MainMenu),
 
@@ -176,7 +167,7 @@ impl Scene{
             match command
             {
                 dEvent::exit => *ret = SceneEnum::Exit,
-                dEvent::loadModel(i) => self.Car.Model = Model::new(MODELS[i as usize], Arc::clone(&self.gl)),
+                dEvent::loadModel(i) => self.Car = Model::new(MODELS[i as usize], Arc::clone(&self.gl)),
                 dEvent::setTest(a, b) => {
                     self.tempData.spinSpeed = a;
                     self.tempData.selectedModel = b;

src/scene/objects.rs

@@ -1,74 +0,0 @@
-//! an Object Module for defining Objects
-const SCR_WIDTH: u32 = 1600;
-const SCR_HEIGHT: u32 = 900;
-
-use cgmath::{Vector3, Quaternion, Rotation3};
-use cgmath::prelude::*;
-use crate::model::Model;
-use crate::camera::Camera;
-
-pub struct Transform {
-    Position: Vector3<f32>,
-    Rotation: Quaternion<f32>,
-    Velocity: Vector3<f32>,
-    Scale: f32,
-}
-
-impl Default for Transform {
-    fn default() -> Transform
-        {
-            Transform {
-                Position: Vector3::<f32>::new(0.0, 0.0, 0.0),
-                Rotation: Quaternion::from_angle_y(cgmath::Deg(0.0)),
-                Velocity: Vector3::<f32>::new(0.0, 0.0, 0.0),
-                Scale: 0.2,
-            }
-
-        }
-
-}
-
-pub struct Player {
-    pub Transform: Transform,
-    pub Model: Model
-}
-
-impl Player {
-    pub fn new(gl: std::sync::Arc<glow::Context>) -> Self {
-        Player {
-            Transform: Transform::default(),
-            Model: Model::new("resources/models/TestCarModel/CarW4.obj", gl),
-        }
-    }
-
-    pub fn update(&mut self)
-        {
-            self.Transform.Position += self.Transform.Velocity;
-            self.Transform.Rotation = self.Transform.Rotation.normalize();
-        }
-
-    pub fn turn(&mut self, amount: f32)
-        {
-            let up = Vector3::<f32>::unit_y();
-            let delta_rotation = Quaternion::from_axis_angle(up, cgmath::Deg(amount));
-            self.Transform.Rotation = self.Transform.Rotation * delta_rotation;
-        }
-    pub fn Draw(&self, shader: &crate::shader::shader, camera: &Camera)
-        {
-            shader.Use();
-
-            let translation = cgmath::Matrix4::from_translation(self.Transform.Position);
-            let rotation = cgmath::Matrix4::from(self.Transform.Rotation);
-            let scale = cgmath::Matrix4::from_scale(self.Transform.Scale);
-            let model = translation * rotation * scale;
-
-            let projection = cgmath::perspective(cgmath::Deg(camera.Zoom), SCR_WIDTH as f32 /SCR_HEIGHT as f32, 0.1, 100.0 );
-            let view = camera.GetViewMatrix();
-            shader.setMat4("projection", &projection);
-            shader.setMat4("view", &view);
-
-            shader.setMat4("model", &model);
-
-            self.Model.Draw(shader);
-        }
-}