Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add glu includes on OS X to stopgap GLUT removal

Browse source
This commit is contained in:
Stephen Birarda 2014-12-19 10:54:00 -08:00
parent 715b3a245e
commit 115dc28c9c
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Hair.cpp
View file

@ -10,11 +10,14 @@
// //
// Creates single flexible verlet-integrated strands that can be used for hair/fur/grass // Creates single flexible verlet-integrated strands that can be used for hair/fur/grass
#include "Hair.h" #include <gpu/GPUConfig.h>
#include "Util.h" #include "Util.h"
#include "world.h" #include "world.h"
#include "Hair.h"
const float HAIR_DAMPING = 0.99f; const float HAIR_DAMPING = 0.99f;
const float CONSTRAINT_RELAXATION = 10.0f; const float CONSTRAINT_RELAXATION = 10.0f;
const float HAIR_ACCELERATION_COUPLING = 0.045f; const float HAIR_ACCELERATION_COUPLING = 0.045f;

5
interface/src/avatar/Avatar.cpp
View file

@ -13,6 +13,11 @@
#include <gpu/GPUConfig.h> #include <gpu/GPUConfig.h>
// TODO: remove calls to gluProject to remove this include
#ifdef __APPLE__
#include <OpenGL/glu.h>
#endif
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QWindow> #include <QWindow>

5
interface/src/ui/ApplicationOverlay.cpp
View file

@ -11,6 +11,11 @@
#include "InterfaceConfig.h" #include "InterfaceConfig.h"
// TODO: remove calls to gluProject to remove this include
#ifdef __APPLE__
#include <OpenGL/glu.h>
#endif
#include <QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <PathUtils.h> #include <PathUtils.h>

5
interface/src/ui/RearMirrorTools.cpp
View file

@ -11,6 +11,11 @@
#include "InterfaceConfig.h" #include "InterfaceConfig.h"
// TODO: remove calls to gluProject to remove this include
#ifdef __APPLE__
#include <OpenGL/glu.h>
#endif
#include <QMouseEvent> #include <QMouseEvent>
#include <PathUtils.h> #include <PathUtils.h>