From 8cccd5416a3f6a66933979dcc24330fd77fd0f2f Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@brown.edu>
Date: Thu, 9 Jun 2016 16:10:27 -0700
Subject: [PATCH] try to fix mac errors

---
 libraries/gpu/src/gpu/Batch.h                      | 5 +++--
 libraries/procedural/src/procedural/Procedural.cpp | 2 +-
 libraries/procedural/src/procedural/Procedural.h   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/gpu/src/gpu/Batch.h b/libraries/gpu/src/gpu/Batch.h
index f8b447975c..e0a0e057f7 100644
--- a/libraries/gpu/src/gpu/Batch.h
+++ b/libraries/gpu/src/gpu/Batch.h
@@ -14,6 +14,7 @@
 #include <vector>
 #include <mutex>
 #include <functional>
+#include <glm/gtc/type_ptr.hpp>
 
 #include <shared/NsightHelpers.h>
 
@@ -292,8 +293,8 @@ public:
         _glUniform4f(location, v.x, v.y, v.z, v.w);
     }
 
-    void _glUniform(int location, const glm::quat& v) {
-        _glUniformMatrix3fv(location, 1, false, reinterpret_cast< const float* >(&glm::mat3_cast(v)));
+    void _glUniform(int location, const glm::mat3& v) {
+        _glUniformMatrix3fv(location, 1, false, glm::value_ptr(v));
     }
 
     void _glColor4f(float red, float green, float blue, float alpha);
diff --git a/libraries/procedural/src/procedural/Procedural.cpp b/libraries/procedural/src/procedural/Procedural.cpp
index 4f308e0812..ed3d5712e3 100644
--- a/libraries/procedural/src/procedural/Procedural.cpp
+++ b/libraries/procedural/src/procedural/Procedural.cpp
@@ -207,7 +207,7 @@ bool Procedural::ready() {
 void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm::vec3& size, const glm::quat& orientation, const glm::vec3& eyePos) {
     _entityDimensions = size;
     _entityPosition = position;
-    _entityOrientation = orientation;
+    _entityOrientation = glm::mat3_cast(orientation);
     _eyePos = eyePos;
     if (_shaderUrl.isLocalFile()) {
         auto lastModified = (quint64)QFileInfo(_shaderPath).lastModified().toMSecsSinceEpoch();
diff --git a/libraries/procedural/src/procedural/Procedural.h b/libraries/procedural/src/procedural/Procedural.h
index e27f8ade44..45dcfd7bf6 100644
--- a/libraries/procedural/src/procedural/Procedural.h
+++ b/libraries/procedural/src/procedural/Procedural.h
@@ -95,7 +95,7 @@ protected:
     // Entity metadata
     glm::vec3 _entityDimensions;
     glm::vec3 _entityPosition;
-    glm::quat _entityOrientation;
+    glm::mat3 _entityOrientation;
     glm::vec3 _eyePos;
 
 private: