corrected look at update.

RicardoEPRodrigues · Oct 26, 2017 · 9e8172e · 9e8172e
1 parent 09111fb
commit 9e8172e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/shaders/Color3D/vertex.glsl b/shaders/Color3D/vertex.glsl
@@ -18,5 +18,8 @@ void main(void)
 
     float zMixer = clamp((in_Position).z, 0.3, 1.0);
     float xMixer = clamp((in_Position).x, 0.3, 0.5);
-    ex_Color = vec4(ModelColor.x * zMixer + xMixer, ModelColor.y * zMixer + xMixer, ModelColor.z * zMixer + xMixer, ModelColor.w);
+    ex_Color = vec4(ModelColor.x * zMixer + xMixer,
+                    ModelColor.y * zMixer + xMixer,
+                    ModelColor.z * zMixer + xMixer,
+                    ModelColor.w);
 }
diff --git a/src/Tangram3D/CameraController.cpp b/src/Tangram3D/CameraController.cpp
@@ -107,7 +107,7 @@ namespace ThreeEngine {
                           Matrix::TranslationMatrix(-lookAt->eye)) * Vector4(lookAt->center);
 
             }
-            lookAt->Set(lookAt->eye, lookAt->center, lookAt->u);
+            lookAt->Set(lookAt->eye, lookAt->center, lookAt->up);
 
             previousMouseLocation = mouse;
         }