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

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

Browse source
This commit is contained in:
Andrzej Kapolka 2014-09-04 17:42:33 -07:00
parent b275af48ed
commit c340445f33
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/MetavoxelSystem.cpp
View file

@ -207,7 +207,7 @@ void MetavoxelSystem::render() {
glm::vec4 nearClipPlane, farClipPlane; glm::vec4 nearClipPlane, farClipPlane;
Application::getInstance()->computeOffAxisFrustum( Application::getInstance()->computeOffAxisFrustum(
left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane); left, right, bottom, top, nearVal, farVal, nearClipPlane, farClipPlane);
program->setUniformValue(locations->near, nearVal); program->setUniformValue(locations->nearLocation, nearVal);
program->setUniformValue(locations->depthScale, (farVal - nearVal) / farVal); program->setUniformValue(locations->depthScale, (farVal - nearVal) / farVal);
float nearScale = -1.0f / nearVal; float nearScale = -1.0f / nearVal;
program->setUniformValue(locations->depthTexCoordOffset, left * nearScale, bottom * nearScale); program->setUniformValue(locations->depthTexCoordOffset, left * nearScale, bottom * nearScale);
@ -630,7 +630,7 @@ void MetavoxelSystem::loadLightProgram(const char* name, ProgramObject& program,
program.setUniformValue("shadowMap", 3); program.setUniformValue("shadowMap", 3);
locations.shadowDistances = program.uniformLocation("shadowDistances"); locations.shadowDistances = program.uniformLocation("shadowDistances");
locations.shadowScale = program.uniformLocation("shadowScale"); locations.shadowScale = program.uniformLocation("shadowScale");
locations.near = program.uniformLocation("near"); locations.nearLocation = program.uniformLocation("near");
locations.depthScale = program.uniformLocation("depthScale"); locations.depthScale = program.uniformLocation("depthScale");
locations.depthTexCoordOffset = program.uniformLocation("depthTexCoordOffset"); locations.depthTexCoordOffset = program.uniformLocation("depthTexCoordOffset");
locations.depthTexCoordScale = program.uniformLocation("depthTexCoordScale"); locations.depthTexCoordScale = program.uniformLocation("depthTexCoordScale");

2
interface/src/MetavoxelSystem.h
View file

@ -70,7 +70,7 @@ private:
public: public:
int shadowDistances; int shadowDistances;
int shadowScale; int shadowScale;
int near; int nearLocation;
int depthScale; int depthScale;
int depthTexCoordOffset; int depthTexCoordOffset;
int depthTexCoordScale; int depthTexCoordScale;