Merge pull request #6 from bwasty/pbr_refactor

Finish basic PBR integration

.travis.yml

@@ -17,16 +17,16 @@ matrix:
     - env: TARGET=x86_64-unknown-linux-gnu
     #- env: TARGET=x86_64-unknown-linux-musl
 
-    # # OSX
-    # - env: TARGET=x86_64-apple-darwin
-    #   os: osx
+    # OSX
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
 
     # Testing other channels
     - env: TARGET=x86_64-unknown-linux-gnu
       rust: nightly
-    # - env: TARGET=x86_64-apple-darwin
-    #   os: osx
-    #   rust: nightly
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: nightly
 
 before_install: set -e
 

Cargo.toml

@@ -13,7 +13,7 @@ license = "Unlicense"
 name = "gltf-viewer"
 readme = "README.md"
 repository = "https://github.com/bwasty/gltf-viewer"
-version = "0.0.4-pre"
+version = "0.1.0-pre"
 
 [badges]
 
@@ -36,18 +36,18 @@ simplelog = "0.4.2"
 itertools = "0.6.1"
 
 [dependencies.gltf]
-version = "0.9.0"
+version = "0.9.2"
 # git = "https://github.com/alteous/gltf"
 # branch = "simplify"
 features = ["names"]
 
 [dependencies.gltf-importer]
-version = "0.9.0"
+version = "0.9.2"
 # git = "https://github.com/alteous/gltf"
 # branch = "simplify"
 
 [dependencies.gltf-utils]
-version = "0.1.0"
+version = "0.9.2"
 # git = "https://github.com/alteous/gltf"
 # branch = "simplify"
 

src/camera.rs

@@ -1,5 +1,5 @@
 use cgmath;
-use cgmath::vec3;
+use cgmath::{vec3, Deg, perspective};
 use cgmath::prelude::*;
 
 type Point3 = cgmath::Point3<f32>;
@@ -31,7 +31,6 @@ pub struct Camera {
     pub position: Point3,
 
     /// mutually exlusive: if center is set, it is used
-    // TODO!!!: consider this (center) for navigation
     pub front: Vector3,
     pub center: Option<Point3>,
 
@@ -45,6 +44,7 @@ pub struct Camera {
     pub movement_speed: f32,
     pub mouse_sensitivity: f32,
     pub zoom: f32,
+    pub aspect_ratio: f32,
 
     // pub moving_up: bool,
     pub moving_left: bool,
@@ -68,6 +68,7 @@ impl Default for Camera {
             movement_speed: SPEED,
             mouse_sensitivity: SENSITIVTY,
             zoom: ZOOM,
+            aspect_ratio: 1.0,
 
             // moving_up: false,
             moving_left: false,
@@ -76,15 +77,16 @@ impl Default for Camera {
             moving_forward: false,
             moving_backward: false,
         };
+        // TODO!!: overriding default order...? -> NO!
         camera.update_camera_vectors();
         camera
     }
 }
 
 impl Camera {
+    // TODO!: cache matrices? doesn't change every frame...
     /// Returns the view matrix calculated using Eular Angles and the LookAt Matrix
-    pub fn get_view_matrix(&self) -> Matrix4 {
-        // TODO!: cache? doesn't change every frame...
+    pub fn view_matrix(&self) -> Matrix4 {
         if let Some(center) = self.center {
             Matrix4::look_at(self.position, center, self.up)
         }
@@ -93,6 +95,11 @@ impl Camera {
         }
     }
 
+    // TODO!!: cache + avoid repeatedly setting same uniform
+    pub fn projection_matrix(&self) -> Matrix4 {
+        perspective(Deg(self.zoom), self.aspect_ratio, 0.01, 1000.0)
+    }
+
     pub fn update(&mut self, delta_time: f64) {
         let velocity = self.movement_speed * delta_time as f32;
         if self.moving_forward {
@@ -156,6 +163,10 @@ impl Camera {
 
     /// Calculates the front vector from the Camera's (updated) Eular Angles
     fn update_camera_vectors(&mut self) {
+        if let Some(center) = self.center {
+            self.front = center - self.position; // TODO!!!: overwritten again immediately...
+            self.center = None;
+        }
         // Calculate the new front vector
         let front = Vector3 {
             x: self.yaw.to_radians().cos() * self.pitch.to_radians().cos(),