From 31dd89f30eed0357d1e9c28977e7f41730abda8b Mon Sep 17 00:00:00 2001
From: unknown <sonofgrendel@gmail.com>
Date: Tue, 6 May 2014 16:36:46 -0430
Subject: [PATCH] Assorted edits. Created new shaders.

---
 .../shaders/bckg/{bckg.frag => bckg_frag.glsl}  |  0
 .../shaders/bckg/{bckg.vert => bckg_vert.glsl}  |  0
 .../singleDiffuseLight_frag.glsl                | 17 +++++++++++++++++
 .../singleDiffuseLight_vert.glsl                |  9 +++++++++
 jni/cv_proc.cpp                                 |  2 +-
 jni/marker.cpp                                  |  2 +-
 jni/marker.hpp                                  |  4 ++--
 7 files changed, 30 insertions(+), 4 deletions(-)
 rename assets/shaders/bckg/{bckg.frag => bckg_frag.glsl} (100%)
 rename assets/shaders/bckg/{bckg.vert => bckg_vert.glsl} (100%)
 create mode 100644 assets/shaders/singleDiffuseLight/singleDiffuseLight_frag.glsl
 create mode 100644 assets/shaders/singleDiffuseLight/singleDiffuseLight_vert.glsl

diff --git a/assets/shaders/bckg/bckg.frag b/assets/shaders/bckg/bckg_frag.glsl
similarity index 100%
rename from assets/shaders/bckg/bckg.frag
rename to assets/shaders/bckg/bckg_frag.glsl
diff --git a/assets/shaders/bckg/bckg.vert b/assets/shaders/bckg/bckg_vert.glsl
similarity index 100%
rename from assets/shaders/bckg/bckg.vert
rename to assets/shaders/bckg/bckg_vert.glsl
diff --git a/assets/shaders/singleDiffuseLight/singleDiffuseLight_frag.glsl b/assets/shaders/singleDiffuseLight/singleDiffuseLight_frag.glsl
new file mode 100644
index 0000000..d1cb398
--- /dev/null
+++ b/assets/shaders/singleDiffuseLight/singleDiffuseLight_frag.glsl
@@ -0,0 +1,17 @@
+#ifdef GL_ES
+precision mediump float;
+#endif
+
+// Light color.
+uniform vec3 u_lightColor;
+// Diffuse surface color.
+uniform vec3 u_diffColor;
+// Specular color.
+uniform vec3 u_specColor;
+// Ambient light color.
+uniform vec3 u_ambColor;
+
+void main(){
+	// TODO: Implement per pixel diffuse lighting.
+	gl_FragColor = vec4(u_diffColor, 1.0);
+}
diff --git a/assets/shaders/singleDiffuseLight/singleDiffuseLight_vert.glsl b/assets/shaders/singleDiffuseLight/singleDiffuseLight_vert.glsl
new file mode 100644
index 0000000..7098fe7
--- /dev/null
+++ b/assets/shaders/singleDiffuseLight/singleDiffuseLight_vert.glsl
@@ -0,0 +1,9 @@
+// Model-view matrix.
+uniform mat4 u_projTrans;
+
+// Vertex position in world coordinates.
+attribute vec4 a_position;
+
+void main(){
+	gl_Position = u_projTrans * a_position;
+}
diff --git a/jni/cv_proc.cpp b/jni/cv_proc.cpp
index d42eaa9..5d6b631 100644
--- a/jni/cv_proc.cpp
+++ b/jni/cv_proc.cpp
@@ -143,4 +143,4 @@ JNIEXPORT jdouble JNICALL Java_ve_ucv_ciens_ccg_nxtar_MainActivity_calibrateCame
 	return error;
 }
 
-}
+} // extern "C"
diff --git a/jni/marker.cpp b/jni/marker.cpp
index 660b4dc..f2a4618 100644
--- a/jni/marker.cpp
+++ b/jni/marker.cpp
@@ -500,4 +500,4 @@ float perimeter(points_vector & p){
 Marker::~Marker(){
 	points.clear();
 }
-}
+} // namespace nxtar
diff --git a/jni/marker.hpp b/jni/marker.hpp
index 001e825..2f0c02b 100644
--- a/jni/marker.hpp
+++ b/jni/marker.hpp
@@ -51,6 +51,6 @@ bool findCalibrationPattern(points_vector &, cv::Mat &);
  */
 double getCameraParameters(cv::Mat &, cv::Mat &, std::vector<points_vector> &, cv::Size);
 
-}
+} // namespace nxtar
 
-#endif
+#endif // MARKER_HPP