From 93b790fe8e893704b90f0780220db5f2e759bf4d Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Mon, 24 Aug 2020 02:07:50 -0400
Subject: [PATCH] Textures kind of work...

---
 src/assets/positionable_object.rs             |  4 +-
 src/assets/renderable_object.rs               | 39 +++++++++++++------
 src/point_cloud/point_cloud_renderer.rs       |  2 +
 .../shaders/point_cloud_fragment_shader.glsl  |  5 ++-
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/src/assets/positionable_object.rs b/src/assets/positionable_object.rs
index d31fdd35a4..bdf55c61f2 100644
--- a/src/assets/positionable_object.rs
+++ b/src/assets/positionable_object.rs
@@ -121,10 +121,12 @@ impl PositionableObject {
 
     let mat_ptr = transformation.as_ptr();
 
+    self.renderable_object.vao.bind();
+
     unsafe {
       gl::UniformMatrix4fv(model_transform_id.id(), 1, gl::FALSE, mat_ptr);
     }
 
-    self.renderable_object.draw();
+    self.renderable_object.draw(true);
   }
 }
diff --git a/src/assets/renderable_object.rs b/src/assets/renderable_object.rs
index ca3e173533..6d95e0c4b8 100644
--- a/src/assets/renderable_object.rs
+++ b/src/assets/renderable_object.rs
@@ -10,7 +10,7 @@ use std::mem::size_of;
 use std::os::raw::c_char;
 use std::path::Path;
 use std::ptr::null;
-use image::DynamicImage;
+use image::{DynamicImage, Pixel, Rgba, RgbaImage, ImageBuffer};
 use crate::opengl::wrapper::uniform::Uniform;
 
 /// A collection of all the graphics-related data to render: vertices, normals, etc.
@@ -137,7 +137,20 @@ impl RenderableObject {
   pub fn load_texture(&mut self, filename: &str, texture_uniform: &Uniform) -> AnyhowResult<()> {
     let img = image::open(&filename)?;
 
-    let rgba_image= img.to_rgba();
+    let mut rgba_image= img.to_rgba();
+    //let mut rgba_image : RgbaImage = ImageBuffer::new(200, 200);
+
+    /*let mut rgba_image = ImageBuffer::from_fn(200, 200, |x, y| {
+      image::Rgba([255u8, 255u8, 0u8, 255u8])
+    });*/
+
+    // This should change the texture to translucent red.
+    /*for pixel in rgba_image.pixels_mut() {
+      pixel.0[0] = 255;
+      pixel.0[1] = 0;
+      pixel.0[2] = 0;
+      pixel.0[3] = 127;
+    }*/
 
     let width = rgba_image.width();
     let height = rgba_image.height();
@@ -153,18 +166,18 @@ impl RenderableObject {
     println!("Loading texture into OpenGL {}x{}...", width, height);
 
     unsafe {
-      gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::LINEAR as i32);
-      gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::LINEAR as i32);
+      //gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::LINEAR as i32);
+      //gl::TexParameteri(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::LINEAR as i32);
 
       gl::TexImage2D(
         gl::TEXTURE_2D,
-        0,
-        gl::RGBA as i32,
+        0, // image level (mipmap); 0 is base
+        gl::RGBA as i32, // internal format
         width as i32,
         height as i32,
-        0,
-        gl::RGBA,
-        gl::UNSIGNED_BYTE,
+        0, // border; "must be 0"
+        gl::RGBA, // format of pixels
+        gl::UNSIGNED_BYTE, // pixel data type
         pixel_data,
       );
 
@@ -181,9 +194,13 @@ impl RenderableObject {
     Ok(())
   }
 
-  pub fn draw(&self) {
-    self.vao.bind();
+  pub fn draw(&self, vao_already_bound: bool) {
+    if !vao_already_bound {
+      self.vao.bind();
+    }
     unsafe {
+      gl::BindTexture(gl::TEXTURE_2D, self.texture.id());
+
       gl::DrawArrays(gl::TRIANGLES, 0, self.num_vertices as i32);
     }
   }
diff --git a/src/point_cloud/point_cloud_renderer.rs b/src/point_cloud/point_cloud_renderer.rs
index c10c956414..b5cef48838 100644
--- a/src/point_cloud/point_cloud_renderer.rs
+++ b/src/point_cloud/point_cloud_renderer.rs
@@ -275,6 +275,7 @@ impl PointCloudRenderer {
         &path, self.shader_program_id)?;
 
 
+      let filename = "/home/bt/dev/storyteller/assets/gamecube_ssbm_pichu/Pichu/singletex/pichu.png";
       let filename = "/home/bt/dev/storyteller/assets/n64_mario64/yoshi_grp.png";
 
       renderable_object.load_texture(filename, &self.object_texture_uniform)?;
@@ -326,6 +327,7 @@ impl PointCloudRenderer {
       let mut renderable_object = RenderableObject::from_wavefront(
         &path, self.shader_program_id)?;
 
+      let filename = "/home/bt/dev/storyteller/assets/n64_mario64/yoshi_grp.png";
       let filename = "/home/bt/dev/storyteller/assets/gamecube_ssbm_pichu/Pichu/singletex/pichu.png";
 
       renderable_object.load_texture(filename, &self.object_texture_uniform)?;
diff --git a/src/point_cloud/shaders/point_cloud_fragment_shader.glsl b/src/point_cloud/shaders/point_cloud_fragment_shader.glsl
index 420f64045c..9515e7eb3e 100644
--- a/src/point_cloud/shaders/point_cloud_fragment_shader.glsl
+++ b/src/point_cloud/shaders/point_cloud_fragment_shader.glsl
@@ -18,6 +18,9 @@ void main()
         discard;
     }
 
-    fragmentColor = texture2D(objTexture, texCoord); // * 0.80 + color * 0.20;
+    //fragmentColor = vec4(texCoord.r, texCoord.g, 127, 255);
+    //fragmentColor = texture2D(objTexture, texCoord); // * 0.80 + color * 0.20;
+    //fragmentColor = 0.5 * texture2D(objTexture, texCoord) + 0.01 * vec4(texCoord.r, texCoord.g, 0, 255);
+    fragmentColor = texture2D(objTexture, texCoord);
     //fragmentColor = vertexColor;
 }