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

remove calls to glut in entities

Browse source
This commit is contained in:
ZappoMan 2014-12-17 14:07:26 -08:00
parent 881119ebf3
commit 7db350eac2
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -11,8 +11,6 @@
#include <gpu/GPUConfig.h> #include <gpu/GPUConfig.h>
#include <gpu/GLUTConfig.h> // TODO - we need to get rid of this ASAP
#include <glm/gtx/quaternion.hpp> #include <glm/gtx/quaternion.hpp>
#include <QEventLoop> #include <QEventLoop>
@ -20,6 +18,7 @@
#include <AbstractScriptingServicesInterface.h> #include <AbstractScriptingServicesInterface.h>
#include <AbstractViewStateInterface.h> #include <AbstractViewStateInterface.h>
#include <DeferredLightingEffect.h>
#include <GlowEffect.h> #include <GlowEffect.h>
#include <Model.h> #include <Model.h>
#include <NetworkAccessManager.h> #include <NetworkAccessManager.h>
@ -358,7 +357,7 @@ void EntityTreeRenderer::renderElementProxy(EntityTreeElement* entityTreeElement
glColor3f(1.0f, 0.0f, 0.0f); glColor3f(1.0f, 0.0f, 0.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x, elementCenter.y, elementCenter.z); glTranslatef(elementCenter.x, elementCenter.y, elementCenter.z);
glutWireCube(elementSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(elementSize);
glPopMatrix(); glPopMatrix();
if (_displayElementChildProxies) { if (_displayElementChildProxies) {
@ -368,49 +367,49 @@ void EntityTreeRenderer::renderElementProxy(EntityTreeElement* entityTreeElement
glColor3f(1.0f, 1.0f, 0.0f); glColor3f(1.0f, 1.0f, 0.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x - quarterSize, elementCenter.y - quarterSize, elementCenter.z - quarterSize); glTranslatef(elementCenter.x - quarterSize, elementCenter.y - quarterSize, elementCenter.z - quarterSize);
glutWireCube(halfSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(halfSize);
glPopMatrix(); glPopMatrix();
glColor3f(1.0f, 0.0f, 1.0f); glColor3f(1.0f, 0.0f, 1.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x + quarterSize, elementCenter.y - quarterSize, elementCenter.z - quarterSize); glTranslatef(elementCenter.x + quarterSize, elementCenter.y - quarterSize, elementCenter.z - quarterSize);
glutWireCube(halfSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(halfSize);
glPopMatrix(); glPopMatrix();
glColor3f(0.0f, 1.0f, 0.0f); glColor3f(0.0f, 1.0f, 0.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x - quarterSize, elementCenter.y + quarterSize, elementCenter.z - quarterSize); glTranslatef(elementCenter.x - quarterSize, elementCenter.y + quarterSize, elementCenter.z - quarterSize);
glutWireCube(halfSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(halfSize);
glPopMatrix(); glPopMatrix();
glColor3f(0.0f, 0.0f, 1.0f); glColor3f(0.0f, 0.0f, 1.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x - quarterSize, elementCenter.y - quarterSize, elementCenter.z + quarterSize); glTranslatef(elementCenter.x - quarterSize, elementCenter.y - quarterSize, elementCenter.z + quarterSize);
glutWireCube(halfSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(halfSize);
glPopMatrix(); glPopMatrix();
glColor3f(1.0f, 1.0f, 1.0f); glColor3f(1.0f, 1.0f, 1.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x + quarterSize, elementCenter.y + quarterSize, elementCenter.z + quarterSize); glTranslatef(elementCenter.x + quarterSize, elementCenter.y + quarterSize, elementCenter.z + quarterSize);
glutWireCube(halfSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(halfSize);
glPopMatrix(); glPopMatrix();
glColor3f(0.0f, 0.5f, 0.5f); glColor3f(0.0f, 0.5f, 0.5f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x - quarterSize, elementCenter.y + quarterSize, elementCenter.z + quarterSize); glTranslatef(elementCenter.x - quarterSize, elementCenter.y + quarterSize, elementCenter.z + quarterSize);
glutWireCube(halfSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(halfSize);
glPopMatrix(); glPopMatrix();
glColor3f(0.5f, 0.0f, 0.0f); glColor3f(0.5f, 0.0f, 0.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x + quarterSize, elementCenter.y - quarterSize, elementCenter.z + quarterSize); glTranslatef(elementCenter.x + quarterSize, elementCenter.y - quarterSize, elementCenter.z + quarterSize);
glutWireCube(halfSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(halfSize);
glPopMatrix(); glPopMatrix();
glColor3f(0.0f, 0.5f, 0.0f); glColor3f(0.0f, 0.5f, 0.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(elementCenter.x + quarterSize, elementCenter.y + quarterSize, elementCenter.z - quarterSize); glTranslatef(elementCenter.x + quarterSize, elementCenter.y + quarterSize, elementCenter.z - quarterSize);
glutWireCube(halfSize); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(halfSize);
glPopMatrix(); glPopMatrix();
} }
} }
@ -437,14 +436,14 @@ void EntityTreeRenderer::renderProxies(const EntityItem* entity, RenderArgs* arg
glColor4f(1.0f, 1.0f, 0.0f, 1.0f); glColor4f(1.0f, 1.0f, 0.0f, 1.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(maxCenter.x, maxCenter.y, maxCenter.z); glTranslatef(maxCenter.x, maxCenter.y, maxCenter.z);
glutWireCube(maxCube.getScale()); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(maxCube.getScale());
glPopMatrix(); glPopMatrix();
// draw the min bounding cube // draw the min bounding cube
glColor4f(0.0f, 1.0f, 0.0f, 1.0f); glColor4f(0.0f, 1.0f, 0.0f, 1.0f);
glPushMatrix(); glPushMatrix();
glTranslatef(minCenter.x, minCenter.y, minCenter.z); glTranslatef(minCenter.x, minCenter.y, minCenter.z);
glutWireCube(minCube.getScale()); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(minCube.getScale());
glPopMatrix(); glPopMatrix();
// draw the entityBox bounding box // draw the entityBox bounding box
@ -452,7 +451,7 @@ void EntityTreeRenderer::renderProxies(const EntityItem* entity, RenderArgs* arg
glPushMatrix(); glPushMatrix();
glTranslatef(entityBoxCenter.x, entityBoxCenter.y, entityBoxCenter.z); glTranslatef(entityBoxCenter.x, entityBoxCenter.y, entityBoxCenter.z);
glScalef(entityBoxScale.x, entityBoxScale.y, entityBoxScale.z); glScalef(entityBoxScale.x, entityBoxScale.y, entityBoxScale.z);
glutWireCube(1.0f); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(1.0f);
glPopMatrix(); glPopMatrix();
@ -470,7 +469,7 @@ void EntityTreeRenderer::renderProxies(const EntityItem* entity, RenderArgs* arg
glm::vec3 positionToCenter = center - position; glm::vec3 positionToCenter = center - position;
glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z); glTranslatef(positionToCenter.x, positionToCenter.y, positionToCenter.z);
glScalef(dimensions.x, dimensions.y, dimensions.z); glScalef(dimensions.x, dimensions.y, dimensions.z);
glutWireCube(1.0f); DependencyManager::get<DeferredLightingEffect>()->renderWireCube(1.0f);
glPopMatrix(); glPopMatrix();
glPopMatrix(); glPopMatrix();
} }