History

merge from upstream

Seth Alves committed 11 years ago

Commit fecdc082 parents cdc2652 cf88bce73 files · +370 −457Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 73 files). Show all

Unified · Split

interface/src/avatar/SkeletonModel.cpp+2−3
@@ -791,12 +791,11 @@ void SkeletonModel::renderBoundingCollisionShapes(gpu::Batch& batch, float alpha · 790 unmodified lines
791 // so no need to render it791 // so no need to render it
792 return;792 return;
793 }793 }
794 Application::getInstance()->loadTranslatedViewMatrix(_translation);
795 794
796 // draw a blue sphere at the capsule endpoint795 // draw a blue sphere at the capsule endpoint
797 glm::vec3 endPoint;796 glm::vec3 endPoint;
798 _boundingShape.getEndPoint(endPoint);797 _boundingShape.getEndPoint(endPoint);
799 endPoint = endPoint - _translation;798 endPoint = endPoint + _translation;
800 Transform transform = Transform();799 Transform transform = Transform();
801 transform.setTranslation(endPoint);800 transform.setTranslation(endPoint);
802 batch.setModelTransform(transform);801 batch.setModelTransform(transform);
@@ -807,7 +806,7 @@ void SkeletonModel::renderBoundingCollisionShapes(gpu::Batch& batch, float alpha · 4 unmodified lines
807 // draw a yellow sphere at the capsule startpoint806 // draw a yellow sphere at the capsule startpoint
808 glm::vec3 startPoint;807 glm::vec3 startPoint;
809 _boundingShape.getStartPoint(startPoint);808 _boundingShape.getStartPoint(startPoint);
810 startPoint = startPoint - _translation;809 startPoint = startPoint + _translation;
811 glm::vec3 axis = endPoint - startPoint;810 glm::vec3 axis = endPoint - startPoint;
812 Transform axisTransform = Transform();811 Transform axisTransform = Transform();
813 axisTransform.setTranslation(-axis);812 axisTransform.setTranslation(-axis);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t