History

Hopefully, a fix for the Windows build; looks like "near" is a keyword.

Andrzej Kapolka committed 12 years ago

Commit c3404451 parent b275af42 files · +3 −3Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 2 files). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+2−2
@@ -207,7 +207,7 @@ void MetavoxelSystem::render() { · 206 unmodified lines
207 glm::vec4 nearClipPlane, farClipPlane;207 glm::vec4 nearClipPlane, farClipPlane;
208 Application::getInstance()->computeOffAxisFrustum(208 Application::getInstance()->computeOffAxisFrustum(
209 left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);209 left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
210 program->setUniformValue(locations->near, nearVal);210 program->setUniformValue(locations->nearLocation, nearVal);
211 program->setUniformValue(locations->depthScale, (farVal - nearVal) / farVal);211 program->setUniformValue(locations->depthScale, (farVal - nearVal) / farVal);
212 float nearScale = -1.0f / nearVal;212 float nearScale = -1.0f / nearVal;
213 program->setUniformValue(locations->depthTexCoordOffset, left * nearScale, bottom * nearScale);213 program->setUniformValue(locations->depthTexCoordOffset, left * nearScale, bottom * nearScale);
@@ -630,7 +630,7 @@ void MetavoxelSystem::loadLightProgram(const char* name, ProgramObject& program, · 416 unmodified lines
630 program.setUniformValue("shadowMap", 3);630 program.setUniformValue("shadowMap", 3);
631 locations.shadowDistances = program.uniformLocation("shadowDistances");631 locations.shadowDistances = program.uniformLocation("shadowDistances");
632 locations.shadowScale = program.uniformLocation("shadowScale");632 locations.shadowScale = program.uniformLocation("shadowScale");
633 locations.near = program.uniformLocation("near");633 locations.nearLocation = program.uniformLocation("near");
634 locations.depthScale = program.uniformLocation("depthScale");634 locations.depthScale = program.uniformLocation("depthScale");
635 locations.depthTexCoordOffset = program.uniformLocation("depthTexCoordOffset");635 locations.depthTexCoordOffset = program.uniformLocation("depthTexCoordOffset");
636 locations.depthTexCoordScale = program.uniformLocation("depthTexCoordScale");636 locations.depthTexCoordScale = program.uniformLocation("depthTexCoordScale");