faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Fixing lights not respecting ignoreHeightmap setting.

Browse Source
This commit is contained in:
Faerbit 2015-03-15 20:12:55 +01:00
parent d58ba7c1c7
commit 6bb9624908
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
game/loader.cc
View File

@ -374,10 +374,17 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
float compYOffset = queryFloat(thisComposition, "yOffset"); float compYOffset = queryFloat(thisComposition, "yOffset");
float compZPos = queryFloat(thisComposition, "zPos"); float compZPos = queryFloat(thisComposition, "zPos");
float lightIntensity = queryFloat(xmlLight, "intensity"); float lightIntensity = queryFloat(xmlLight, "intensity");
glm::vec3 compPos = glm::vec3(compXPos, bool ignoreHeightmap = queryBool(composition, "ignoreHeightmap");
compYOffset+level->getTerrain()->getHeightmap()[int(compXPos-0.5+0.5*level->getTerrain()->getHeightmapHeight())] glm::vec3 compPos = glm::vec3(0.0f);
if (!ignoreHeightmap) {
compPos = glm::vec3(compXPos,
compYOffset+level->getTerrain()->getHeightmap()[int(compXPos-0.5+0.5*level->getTerrain()->getHeightmapHeight())]
[int(compZPos-0.5+0.5*level->getTerrain()->getHeightmapWidth())], [int(compZPos-0.5+0.5*level->getTerrain()->getHeightmapWidth())],
compZPos); compZPos);
}
else {
compPos = glm::vec3(compXPos, compYOffset, compZPos);
}
lightOffset = lightOffset * compScale; lightOffset = lightOffset * compScale;
glm::vec4 rotatedLightOffset = glm::rotate(compRot.x, glm::vec3(1.0f, 0.0f, 0.0f)) glm::vec4 rotatedLightOffset = glm::rotate(compRot.x, glm::vec3(1.0f, 0.0f, 0.0f))
* glm::rotate(compRot.y, glm::vec3(0.0f, 1.0f, 0.0f)) * glm::rotate(compRot.y, glm::vec3(0.0f, 1.0f, 0.0f))