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

Merge pull request #4 from sethalves/test-5452

Browse source 
fix linux build
This commit is contained in:
samcake 2015-07-30 10:16:58 -07:00
commit b84302a44a
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities/src/ParticleEffectEntityItem.cpp
View file

@ -155,9 +155,9 @@ void ParticleEffectEntityItem::computeAndUpdateDimensions() {
float yMin = std::min(yApex, yEnd); float yMin = std::min(yApex, yEnd);
// times 2 because dimensions are diameters not radii. // times 2 because dimensions are diameters not radii.
glm::vec3 dims(2.0f * std::max(fabs(xMin), fabs(xMax)), glm::vec3 dims(2.0f * std::max(fabsf(xMin), fabsf(xMax)),
2.0f * std::max(fabs(yMin), fabs(yMax)), 2.0f * std::max(fabsf(yMin), fabsf(yMax)),
2.0f * std::max(fabs(zMin), fabs(zMax))); 2.0f * std::max(fabsf(zMin), fabsf(zMax)));
EntityItem::setDimensions(dims); EntityItem::setDimensions(dims);
} }

2
libraries/gpu/src/gpu/Batch.cpp
View file

@ -8,6 +8,8 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
#include <string.h>
#include "Batch.h" #include "Batch.h"
#if defined(NSIGHT_FOUND) #if defined(NSIGHT_FOUND)

1
libraries/gpu/src/gpu/GLBackendShader.cpp
View file

@ -639,7 +639,6 @@ int makeUniformBlockSlots(GLuint glprogram, const Shader::BindingSet& slotBindin
GLchar name[NAME_LENGTH]; GLchar name[NAME_LENGTH];
GLint length = 0; GLint length = 0;
GLint size = 0; GLint size = 0;
GLenum type = 0;
GLint binding = -1; GLint binding = -1;
glGetActiveUniformBlockiv(glprogram, i, GL_UNIFORM_BLOCK_NAME_LENGTH, &length); glGetActiveUniformBlockiv(glprogram, i, GL_UNIFORM_BLOCK_NAME_LENGTH, &length);