Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 15 files). Show all
Unified · Split
| @@ -21,6 +21,7 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include <glm/gtx/transform.hpp> | 22 | #include <glm/gtx/transform.hpp> |
| 23 | 23 | ||
| 24 | #include <DeferredLightingEffect.h> | ||
| 24 | #include <GeometryUtil.h> | 25 | #include <GeometryUtil.h> |
| 25 | #include <SharedUtil.h> | 26 | #include <SharedUtil.h> |
| 26 | 27 | ||
| @@ -470,7 +471,7 @@ void MetavoxelSystem::render() { · 443 unmodified lines | |||
| 470 | glColor4f(1.0f, 1.0f, 1.0f, 1.0f); | 471 | glColor4f(1.0f, 1.0f, 1.0f, 1.0f); |
| 471 | glNormal3f(0.0f, 1.0f, 0.0f); | 472 | glNormal3f(0.0f, 1.0f, 0.0f); |
| 472 | 473 | ||
| 473 | Application::getInstance()->getDeferredLightingEffect()->bindSimpleProgram(); | 474 | DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(); |
| 474 | 475 | ||
| 475 | foreach (const HermiteBatch& batch, _hermiteBatches) { | 476 | foreach (const HermiteBatch& batch, _hermiteBatches) { |
| 476 | batch.vertexBuffer->bind(); | 477 | batch.vertexBuffer->bind(); |
| @@ -482,7 +483,7 @@ void MetavoxelSystem::render() { · 5 unmodified lines | |||
| 482 | batch.vertexBuffer->release(); | 483 | batch.vertexBuffer->release(); |
| 483 | } | 484 | } |
| 484 | 485 | ||
| 485 | Application::getInstance()->getDeferredLightingEffect()->releaseSimpleProgram(); | 486 | DependencyManager::get<DeferredLightingEffect>()->releaseSimpleProgram(); |
| 486 | 487 | ||
| 487 | glDisableClientState(GL_VERTEX_ARRAY); | 488 | glDisableClientState(GL_VERTEX_ARRAY); |
| 488 | 489 | ||
| @@ -1981,7 +1982,7 @@ void SphereRenderer::render(const MetavoxelLOD& lod, bool contained, bool cursor · 1492 unmodified lines | |||
| 1981 | glm::vec3 axis = glm::axis(rotation); | 1982 | glm::vec3 axis = glm::axis(rotation); |
| 1982 | glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z); | 1983 | glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z); |
| 1983 | 1984 | ||
| 1984 | Application::getInstance()->getDeferredLightingEffect()->renderSolidSphere(sphere->getScale(), 32, 32); | 1985 | DependencyManager::get<DeferredLightingEffect>()->renderSolidSphere(sphere->getScale(), 32, 32); |
| 1985 | 1986 | ||
| 1986 | glPopMatrix(); | 1987 | glPopMatrix(); |
| 1987 | } | 1988 | } |
| @@ -2002,7 +2003,7 @@ void CuboidRenderer::render(const MetavoxelLOD& lod, bool contained, bool cursor · 14 unmodified lines | |||
| 2002 | glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z); | 2003 | glRotatef(glm::degrees(glm::angle(rotation)), axis.x, axis.y, axis.z); |
| 2003 | glScalef(1.0f, cuboid->getAspectY(), cuboid->getAspectZ()); | 2004 | glScalef(1.0f, cuboid->getAspectY(), cuboid->getAspectZ()); |
| 2004 | 2005 | ||
| 2005 | Application::getInstance()->getDeferredLightingEffect()->renderSolidCube(cuboid->getScale() * 2.0f); | 2006 | DependencyManager::get<DeferredLightingEffect>()->renderSolidCube(cuboid->getScale() * 2.0f); |
| 2006 | 2007 | ||
| 2007 | glPopMatrix(); | 2008 | glPopMatrix(); |
| 2008 | } | 2009 | } |