Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-22 22:34:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
ZappoMan 2015-06-12 09:04:16 -07:00
parent 2fc0233096
commit c17ae593f0
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/render-utils/src/Model.cpp
View file

@ -1019,7 +1019,7 @@ AABox Model::calculateScaledOffsetAABox(const AABox& box) const {
glm::vec3 Model::calculateScaledOffsetPoint(const glm::vec3& point) const { glm::vec3 Model::calculateScaledOffsetPoint(const glm::vec3& point) const {
// we need to include any fst scaling, translation, and rotation, which is captured in the offset matrix // we need to include any fst scaling, translation, and rotation, which is captured in the offset matrix
glm::vec3 offsetPoint = glm::vec3(_geometry->getFBXGeometry().offset * glm::vec4(point, 1.0f)); /// should this be point??? glm::vec3 offsetPoint = glm::vec3(_geometry->getFBXGeometry().offset * glm::vec4(point, 1.0f));
glm::vec3 scaledPoint = ((offsetPoint + _offset) * _scale); glm::vec3 scaledPoint = ((offsetPoint + _offset) * _scale);
glm::vec3 rotatedPoint = _rotation * scaledPoint; glm::vec3 rotatedPoint = _rotation * scaledPoint;
glm::vec3 translatedPoint = rotatedPoint + _translation; glm::vec3 translatedPoint = rotatedPoint + _translation;
@ -1840,11 +1840,11 @@ void Model::renderPart(RenderArgs* args, int meshIndex, int partIndex, bool tran
glm::vec4 cubeColor; glm::vec4 cubeColor;
if (isSkinned) { if (isSkinned) {
cubeColor = glm::vec4(0.0f,1.0f,1.0f,1.0f); cubeColor = glm::vec4(0.0f, 1.0f, 1.0f, 1.0f);
} else if (inView) { } else if (inView) {
cubeColor = glm::vec4(1.0f,0.0f,1.0f,1.0f); cubeColor = glm::vec4(1.0f, 0.0f, 1.0f, 1.0f);
} else { } else {
cubeColor = glm::vec4(1.0f,1.0f,0.0f,1.0f); cubeColor = glm::vec4(1.0f, 1.0f, 0.0f, 1.0f);
} }
Transform transform; Transform transform;