Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 23:49:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removing dead code

Browse source
This commit is contained in:
Sam Gateau 2015-07-20 17:09:11 -07:00
parent 9d9142c274
commit ad1771c738
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/avatar/SkeletonModel.cpp
View file

@ -789,12 +789,11 @@ void SkeletonModel::renderBoundingCollisionShapes(gpu::Batch& batch, float alpha
// so no need to render it // so no need to render it
return; return;
} }
// Application::getInstance()->loadTranslatedViewMatrix(_translation);
// draw a blue sphere at the capsule endpoint // draw a blue sphere at the capsule endpoint
glm::vec3 endPoint; glm::vec3 endPoint;
_boundingShape.getEndPoint(endPoint); _boundingShape.getEndPoint(endPoint);
endPoint = endPoint - _translation; endPoint = endPoint + _translation;
Transform transform = Transform(); Transform transform = Transform();
transform.setTranslation(endPoint); transform.setTranslation(endPoint);
batch.setModelTransform(transform); batch.setModelTransform(transform);
@ -805,7 +804,7 @@ void SkeletonModel::renderBoundingCollisionShapes(gpu::Batch& batch, float alpha
// draw a yellow sphere at the capsule startpoint // draw a yellow sphere at the capsule startpoint
glm::vec3 startPoint; glm::vec3 startPoint;
_boundingShape.getStartPoint(startPoint); _boundingShape.getStartPoint(startPoint);
startPoint = startPoint - _translation; startPoint = startPoint + _translation;
glm::vec3 axis = endPoint - startPoint; glm::vec3 axis = endPoint - startPoint;
Transform axisTransform = Transform(); Transform axisTransform = Transform();
axisTransform.setTranslation(-axis); axisTransform.setTranslation(-axis);

1
interface/src/ui/ApplicationCompositor.cpp
View file

@ -370,7 +370,6 @@ QPoint ApplicationCompositor::getPalmClickLocation(const PalmData *palm) const {
} else { } else {
MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar(); MyAvatar* myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
glm::mat4 projection; glm::mat4 projection;
// qApp->getProjectionMatrix(&projection);
qApp->getDisplayViewFrustum()->evalProjectionMatrix(projection); qApp->getDisplayViewFrustum()->evalProjectionMatrix(projection);
glm::quat invOrientation = glm::inverse(myAvatar->getOrientation()); glm::quat invOrientation = glm::inverse(myAvatar->getOrientation());
glm::vec3 eyePos = myAvatar->getDefaultEyePosition(); glm::vec3 eyePos = myAvatar->getDefaultEyePosition();