Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

try to fix mac errors

Browse source
This commit is contained in:
SamGondelman 2016-06-09 16:10:27 -07:00
parent 24e5000aeb
commit 8cccd5416a
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/gpu/src/gpu/Batch.h
View file

@ -14,6 +14,7 @@
#include <vector> #include <vector>
#include <mutex> #include <mutex>
#include <functional> #include <functional>
#include <glm/gtc/type_ptr.hpp>
#include <shared/NsightHelpers.h> #include <shared/NsightHelpers.h>
@ -292,8 +293,8 @@ public:
_glUniform4f(location, v.x, v.y, v.z, v.w); _glUniform4f(location, v.x, v.y, v.z, v.w);
} }
void _glUniform(int location, const glm::quat& v) { void _glUniform(int location, const glm::mat3& v) {
_glUniformMatrix3fv(location, 1, false, reinterpret_cast< const float* >(&glm::mat3_cast(v))); _glUniformMatrix3fv(location, 1, false, glm::value_ptr(v));
} }
void _glColor4f(float red, float green, float blue, float alpha); void _glColor4f(float red, float green, float blue, float alpha);

2
libraries/procedural/src/procedural/Procedural.cpp
View file

@ -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) { void Procedural::prepare(gpu::Batch& batch, const glm::vec3& position, const glm::vec3& size, const glm::quat& orientation, const glm::vec3& eyePos) {
_entityDimensions = size; _entityDimensions = size;
_entityPosition = position; _entityPosition = position;
_entityOrientation = orientation; _entityOrientation = glm::mat3_cast(orientation);
_eyePos = eyePos; _eyePos = eyePos;
if (_shaderUrl.isLocalFile()) { if (_shaderUrl.isLocalFile()) {
auto lastModified = (quint64)QFileInfo(_shaderPath).lastModified().toMSecsSinceEpoch(); auto lastModified = (quint64)QFileInfo(_shaderPath).lastModified().toMSecsSinceEpoch();

2
libraries/procedural/src/procedural/Procedural.h
View file

@ -95,7 +95,7 @@ protected:
// Entity metadata // Entity metadata
glm::vec3 _entityDimensions; glm::vec3 _entityDimensions;
glm::vec3 _entityPosition; glm::vec3 _entityPosition;
glm::quat _entityOrientation; glm::mat3 _entityOrientation;
glm::vec3 _eyePos; glm::vec3 _eyePos;
private: private: