BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disabled final model matrix caching for now, since it doesn't seem to work in all cases. (CP_Rocky2 pickup platforms and ceiling doens't get updated for some reason?!?)

Browse Source
This commit is contained in:
sippeangelo
2016-03-13 00:57:54 +01:00
parent a1fda82d3a
commit 993e56ec59
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Engine/Core/TransformSystem.cpp
+8 -8
View File
@@ -144,16 +144,16 @@ glm::mat4 TransformSystem::ModelMatrix(EntityID entityID, World* world)
glm::mat4 TransformSystem::ModelMatrix(EntityWrapper entity) glm::mat4 TransformSystem::ModelMatrix(EntityWrapper entity)
{ {
auto cacheIt = MatrixCache.find(entity); //auto cacheIt = MatrixCache.find(entity);
ComponentWrapper cTransform = entity["Transform"]; //ComponentWrapper cTransform = entity["Transform"];
bool isDirty = cTransform["Position"].Dirty(DirtySetType::Transform) || cTransform["Orientation"].Dirty(DirtySetType::Transform) || cTransform["Scale"].Dirty(DirtySetType::Transform); //bool isDirty = cTransform["Position"].Dirty(DirtySetType::Transform) || cTransform["Orientation"].Dirty(DirtySetType::Transform) || cTransform["Scale"].Dirty(DirtySetType::Transform);
if (cacheIt != MatrixCache.end() && !isDirty && false) { //if (cacheIt != MatrixCache.end() && !isDirty && false) {
return cacheIt->second; // return cacheIt->second;
} else { //} else {
glm::mat4 matrix = glm::translate(AbsolutePosition(entity)) * glm::toMat4(AbsoluteOrientation(entity)) * glm::scale(AbsoluteScale(entity)); glm::mat4 matrix = glm::translate(AbsolutePosition(entity)) * glm::toMat4(AbsoluteOrientation(entity)) * glm::scale(AbsoluteScale(entity));
MatrixCache[entity] = matrix; // MatrixCache[entity] = matrix;
return matrix; return matrix;
} //}
} }
glm::vec3 TransformSystem::TransformPoint(const glm::vec3& point, const glm::mat4& matrix) glm::vec3 TransformSystem::TransformPoint(const glm::vec3& point, const glm::mat4& matrix)