update to use ulra-violet.

Author: Lokathor

Cargo.lock

@@ -12,6 +12,7 @@ publish = false
 [dependencies]
 bytemuck = "1"
 ogl33 = { version = "0.2", features = ["debug_error_checks"]}
+ultraviolet = "0.7"
 
 # these should be dev dependencies, but i use the bin directory
 # during dev so they live here, except during a crates.io release

Cargo.toml

@@ -15,8 +15,8 @@ use learn::{
   null_str, Buffer, BufferType, Shader, ShaderProgram, ShaderType, VertexArray,
 };
 use learn_opengl as learn;
-use learn_opengl::math::*;
 use ogl33::*;
+use ultraviolet::*;
 
 type Vertex = [f32; 3 + 2];
 type TriIndexes = [u32; 3];
@@ -219,7 +219,7 @@ fn main() {
 
     // update the "world state".
     let time = sdl.get_ticks() as f32 / 1000.0_f32;
-    let transform = Mat4::rotate_z(time);
+    let transform = Mat4::from_rotation_z(time);
 
     // and then draw!
     unsafe {

examples/010-transforms-intro.rs

@@ -17,8 +17,8 @@ use learn::{
   null_str, Buffer, BufferType, Shader, ShaderProgram, ShaderType, VertexArray,
 };
 use learn_opengl as learn;
-use learn_opengl::math::*;
 use ogl33::*;
+use ultraviolet::*;
 
 type Vertex = [f32; 3 + 2];
 type TriIndexes = [u32; 3];
@@ -224,10 +224,10 @@ fn main() {
     glGetUniformLocation(shader_program.0, name)
   };
 
-  let view = Mat4::translate(vec3(0.0, 0.0, -1.0));
+  let view = Mat4::from_translation(Vec3::new(0.0, 0.0, -1.0));
   unsafe { glUniformMatrix4fv(view_loc, 1, GL_FALSE, view.as_ptr()) };
 
-  let projection = perspective_view(
+  let projection = ultraviolet::projection::lh_yup::perspective_gl(
     45.0_f32.to_radians(),
     (WINDOW_WIDTH as f32) / (WINDOW_HEIGHT as f32),
     0.1,
@@ -249,7 +249,7 @@ fn main() {
 
     // update the "world state".
     let time = sdl.get_ticks() as f32 / 1000.0_f32;
-    let model = Mat4::rotate_x(1.3) * Mat4::rotate_z(time);
+    let model = Mat4::from_rotation_x(1.3) * Mat4::from_rotation_z(time);
 
     // and then draw!
     unsafe {

examples/011-coordinate-basics.rs

@@ -17,8 +17,8 @@ use learn::{
   null_str, Buffer, BufferType, Shader, ShaderProgram, ShaderType, VertexArray,
 };
 use learn_opengl as learn;
-use learn_opengl::math::*;
 use ogl33::*;
+use ultraviolet::*;
 
 type Vertex = [f32; 3 + 2];
 /// Draw this with glDrawArrays(GL_TRIANGLES, 0, 36)
@@ -249,10 +249,10 @@ fn main() {
     glGetUniformLocation(shader_program.0, name)
   };
 
-  let view = Mat4::translate(vec3(0.0, 0.0, -2.0));
+  let view = Mat4::from_translation(Vec3::new(0.0, 0.0, -2.0));
   unsafe { glUniformMatrix4fv(view_loc, 1, GL_FALSE, view.as_ptr()) };
 
-  let projection = perspective_view(
+  let projection = ultraviolet::projection::lh_yup::perspective_gl(
     45.0_f32.to_radians(),
     (WINDOW_WIDTH as f32) / (WINDOW_HEIGHT as f32),
     0.1,
@@ -274,8 +274,9 @@ fn main() {
 
     // update the "world state".
     let time = sdl.get_ticks() as f32 / 1000.0_f32;
-    let model =
-      Mat4::rotate_y(1.0) * Mat4::rotate_x(0.5) * Mat4::rotate_z(time);
+    let model = Mat4::from_rotation_y(1.0)
+      * Mat4::from_rotation_x(0.5)
+      * Mat4::from_rotation_z(time);
 
     // and then draw!
     unsafe {

examples/012-depth-buffer-cube.rs

@@ -17,8 +17,8 @@ use learn::{
   null_str, Buffer, BufferType, Shader, ShaderProgram, ShaderType, VertexArray,
 };
 use learn_opengl as learn;
-use learn_opengl::math::*;
 use ogl33::*;
+use ultraviolet::*;
 
 type Vertex = [f32; 3 + 2];
 /// Draw this with glDrawArrays(GL_TRIANGLES, 0, 36)
@@ -262,10 +262,10 @@ fn main() {
     glGetUniformLocation(shader_program.0, name)
   };
 
-  let view = Mat4::translate(vec3(0.0, 0.0, -3.0));
+  let view = Mat4::from_translation(Vec3::new(0.0, 0.0, -3.0));
   unsafe { glUniformMatrix4fv(view_loc, 1, GL_FALSE, view.as_ptr()) };
 
-  let projection = perspective_view(
+  let projection = ultraviolet::projection::lh_yup::perspective_gl(
     45.0_f32.to_radians(),
     (WINDOW_WIDTH as f32) / (WINDOW_HEIGHT as f32),
     0.1,
@@ -293,10 +293,10 @@ fn main() {
       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
       for (i, position) in CUBE_POSITIONS.iter().copied().enumerate() {
-        let model = Mat4::translate(position)
-          * Mat4::rotate_x(3.0)
-          * Mat4::rotate_y((1.0 + i as f32) * 0.8)
-          * Mat4::rotate_z(time * (1.0 + i as f32));
+        let model = Mat4::from_translation(position)
+          * Mat4::from_rotation_x(3.0)
+          * Mat4::from_rotation_y((1.0 + i as f32) * 0.8)
+          * Mat4::from_rotation_z(time * (1.0 + i as f32));
 
         glUniformMatrix4fv(model_loc, 1, GL_FALSE, model.as_ptr());
 

examples/013-multi-cube.rs

@@ -17,8 +17,8 @@ use learn::{
   null_str, Buffer, BufferType, Shader, ShaderProgram, ShaderType, VertexArray,
 };
 use learn_opengl as learn;
-use learn_opengl::math::*;
 use ogl33::*;
+use ultraviolet::*;
 
 type Vertex = [f32; 3 + 2];
 /// Draw this with glDrawArrays(GL_TRIANGLES, 0, 36)
@@ -262,7 +262,7 @@ fn main() {
     glGetUniformLocation(shader_program.0, name)
   };
 
-  let projection = perspective_view(
+  let projection = ultraviolet::projection::lh_yup::perspective_gl(
     45.0_f32.to_radians(),
     (WINDOW_WIDTH as f32) / (WINDOW_HEIGHT as f32),
     0.1,
@@ -296,9 +296,11 @@ fn main() {
 
     // update the "world state".
     let time = sdl.get_ticks() as f32 / 10_000.0_f32;
-    let view =
-      Mat4::euler_angles(0.0, view_pitch.to_radians(), view_yaw.to_radians())
-        * Mat4::translate(vec3(0.0, 0.0, -3.0));
+    let view = Mat4::from_euler_angles(
+      0.0,
+      view_pitch.to_radians(),
+      view_yaw.to_radians(),
+    ) * Mat4::from_translation(Vec3::new(0.0, 0.0, -3.0));
 
     // and then draw!
     unsafe {
@@ -307,10 +309,10 @@ fn main() {
       glUniformMatrix4fv(view_loc, 1, GL_FALSE, view.as_ptr());
 
       for (i, position) in CUBE_POSITIONS.iter().copied().enumerate() {
-        let model = Mat4::translate(position)
-          * Mat4::rotate_x(3.0)
-          * Mat4::rotate_y((1.0 + i as f32) * 0.8)
-          * Mat4::rotate_z(time * (1.0 + i as f32));
+        let model = Mat4::from_translation(position)
+          * Mat4::from_rotation_x(3.0)
+          * Mat4::from_rotation_y((1.0 + i as f32) * 0.8)
+          * Mat4::from_rotation_z(time * (1.0 + i as f32));
 
         glUniformMatrix4fv(model_loc, 1, GL_FALSE, model.as_ptr());
 

examples/014-mouse-look.rs

@@ -17,9 +17,9 @@ use learn::{
   null_str, Buffer, BufferType, Shader, ShaderProgram, ShaderType, VertexArray,
 };
 use learn_opengl as learn;
-use learn_opengl::math::*;
 use ogl33::*;
 use std::collections::HashSet;
+use ultraviolet::*;
 
 type Vertex = [f32; 3 + 2];
 /// Draw this with glDrawArrays(GL_TRIANGLES, 0, 36)
@@ -263,7 +263,7 @@ fn main() {
     glGetUniformLocation(shader_program.0, name)
   };
 
-  let projection = perspective_view(
+  let projection = ultraviolet::projection::lh_yup::perspective_gl(
     45.0_f32.to_radians(),
     (WINDOW_WIDTH as f32) / (WINDOW_HEIGHT as f32),
     0.1,
@@ -322,10 +322,10 @@ fn main() {
       glUniformMatrix4fv(view_loc, 1, GL_FALSE, view.as_ptr());
 
       for (i, position) in CUBE_POSITIONS.iter().copied().enumerate() {
-        let model = Mat4::translate(position)
-          * Mat4::rotate_y(3.0)
-          * Mat4::rotate_x((1.0 + i as f32) * 0.8)
-          * Mat4::rotate_z(time * (1.0 + i as f32));
+        let model = Mat4::from_translation(position)
+          * Mat4::from_rotation_y(3.0)
+          * Mat4::from_rotation_x((1.0 + i as f32) * 0.8)
+          * Mat4::from_rotation_z(time * (1.0 + i as f32));
 
         glUniformMatrix4fv(model_loc, 1, GL_FALSE, model.as_ptr());
 

examples/015-fps-movement.rs

@@ -33,8 +33,6 @@ TODO:
 use core::convert::{TryFrom, TryInto};
 use ogl33::*;
 
-pub mod math;
-
 /// Takes a string literal and concatenates a null byte onto the end.
 #[macro_export]
 macro_rules! null_str {