ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Marianne Gagnon 2014-05-29 20:04:10 -04:00
parent 7e9252e5b3
commit 80b8851a9a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/graphics/render.cpp
View File

@ -759,12 +759,13 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
sun_ortho_matrix.push_back(getVideoDriver()->getTransform(video::ETS_PROJECTION) * getVideoDriver()->getTransform(video::ETS_VIEW)); sun_ortho_matrix.push_back(getVideoDriver()->getTransform(video::ETS_PROJECTION) * getVideoDriver()->getTransform(video::ETS_VIEW));
} }
if (!(tick % 100))
rsm_matrix = sun_ortho_matrix[3]; if (!(tick % 100))
rh_extend = core::vector3df(128, 64, 128); rsm_matrix = sun_ortho_matrix[3];
core::vector3df campos = camnode->getAbsolutePosition(); rh_extend = core::vector3df(128, 64, 128);
core::vector3df translation(8 * floor(campos.X / 8), 8 * floor(campos.Y / 8), 8 * floor(campos.Z / 8)); core::vector3df campos = camnode->getAbsolutePosition();
rh_matrix.setTranslation(translation); core::vector3df translation(8 * floor(campos.X / 8), 8 * floor(campos.Y / 8), 8 * floor(campos.Z / 8));
rh_matrix.setTranslation(translation);
assert(sun_ortho_matrix.size() == 4); assert(sun_ortho_matrix.size() == 4);
camnode->setNearValue(oldnear); camnode->setNearValue(oldnear);
@ -773,6 +774,8 @@ void IrrDriver::computeCameraMatrix(scene::ICameraSceneNode * const camnode, siz
size_t size = irr_driver->getShadowViewProj().size(); size_t size = irr_driver->getShadowViewProj().size();
for (unsigned i = 0; i < size; i++) for (unsigned i = 0; i < size; i++)
memcpy(&tmp[16 * i + 64], irr_driver->getShadowViewProj()[i].pointer(), 16 * sizeof(float)); memcpy(&tmp[16 * i + 64], irr_driver->getShadowViewProj()[i].pointer(), 16 * sizeof(float));
}
tmp[128] = float(width); tmp[128] = float(width);
tmp[129] = float(height); tmp[129] = float(height);