Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 109 files). Show all
Unified · Split
| @@ -339,7 +339,7 @@ void SkeletonModel::renderJointConstraints(int jointIndex) { · 338 unmodified lines | ||
| 339 | 339 | glScalef(fanScale, fanScale, fanScale); |
| 340 | 340 | const int AXIS_COUNT = 3; |
| 341 | 341 | |
| 342 | − GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>(); | |
| 342 | + auto geometryCache = DependencyManager::get<GeometryCache>(); | |
| 343 | 343 | |
| 344 | 344 | for (int i = 0; i < AXIS_COUNT; i++) { |
| 345 | 345 | if (joint.rotationMin[i] <= -PI + EPSILON && joint.rotationMax[i] >= PI - EPSILON) { |
| @@ -381,7 +381,7 @@ void SkeletonModel::renderJointConstraints(int jointIndex) { · 35 unmodified lines | ||
| 381 | 381 | } |
| 382 | 382 | |
| 383 | 383 | void SkeletonModel::renderOrientationDirections(int jointIndex, glm::vec3 position, const glm::quat& orientation, float size) { |
| 384 | − GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>(); | |
| 384 | + auto geometryCache = DependencyManager::get<GeometryCache>(); | |
| 385 | 385 | |
| 386 | 386 | if (!_jointOrientationLines.contains(jointIndex)) { |
| 387 | 387 | OrientationLineIDs jointLineIDs; |
| @@ -594,7 +594,7 @@ void SkeletonModel::renderRagdoll() { · 206 unmodified lines | ||
| 594 | 594 | float radius1 = 0.008f; |
| 595 | 595 | float radius2 = 0.01f; |
| 596 | 596 | glm::vec3 simulationTranslation = _ragdoll->getTranslationInSimulationFrame(); |
| 597 | − GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>(); | |
| 597 | + auto geometryCache = DependencyManager::get<GeometryCache>(); | |
| 598 | 598 | for (int i = 0; i < numPoints; ++i) { |
| 599 | 599 | glPushMatrix(); |
| 600 | 600 | // NOTE: ragdollPoints are in simulation-frame but we want them to be model-relative |
| @@ -951,7 +951,7 @@ void SkeletonModel::renderBoundingCollisionShapes(float alpha) { · 350 unmodified lines | ||
| 951 | 951 | _boundingShape.getEndPoint(endPoint); |
| 952 | 952 | endPoint = endPoint - _translation; |
| 953 | 953 | glTranslatef(endPoint.x, endPoint.y, endPoint.z); |
| 954 | − GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>(); | |
| 954 | + auto geometryCache = DependencyManager::get<GeometryCache>(); | |
| 955 | 955 | geometryCache->renderSphere(_boundingShape.getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS, glm::vec4(0.6f, 0.6f, 0.8f, alpha)); |
| 956 | 956 | |
| 957 | 957 | // draw a yellow sphere at the capsule startpoint |
| @@ -985,7 +985,7 @@ void SkeletonModel::renderJointCollisionShapes(float alpha) { · 27 unmodified lines | ||
| 985 | 985 | continue; |
| 986 | 986 | } |
| 987 | 987 | |
| 988 | − GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>(); | |
| 988 | + auto geometryCache = DependencyManager::get<GeometryCache>(); | |
| 989 | 989 | |
| 990 | 990 | glPushMatrix(); |
| 991 | 991 | // shapes are stored in simulation-frame but we want position to be model-relative |