History

Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing

ZappoMan committed 11 years ago

Commit db949492 parents 2f549c7 89967fb109 files · +681 −487Browse files

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

Unified · Split

interface/src/avatar/SkeletonModel.cpp+5−5
@@ -339,7 +339,7 @@ void SkeletonModel::renderJointConstraints(int jointIndex) { · 338 unmodified lines
339339 glScalef(fanScale, fanScale, fanScale);
340340 const int AXIS_COUNT = 3;
341341
342− GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
342+ auto geometryCache = DependencyManager::get<GeometryCache>();
343343
344344 for (int i = 0; i < AXIS_COUNT; i++) {
345345 if (joint.rotationMin[i] <= -PI + EPSILON && joint.rotationMax[i] >= PI - EPSILON) {
@@ -381,7 +381,7 @@ void SkeletonModel::renderJointConstraints(int jointIndex) { · 35 unmodified lines
381381 }
382382
383383 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>();
385385
386386 if (!_jointOrientationLines.contains(jointIndex)) {
387387 OrientationLineIDs jointLineIDs;
@@ -594,7 +594,7 @@ void SkeletonModel::renderRagdoll() { · 206 unmodified lines
594594 float radius1 = 0.008f;
595595 float radius2 = 0.01f;
596596 glm::vec3 simulationTranslation = _ragdoll->getTranslationInSimulationFrame();
597− GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
597+ auto geometryCache = DependencyManager::get<GeometryCache>();
598598 for (int i = 0; i < numPoints; ++i) {
599599 glPushMatrix();
600600 // 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
951951 _boundingShape.getEndPoint(endPoint);
952952 endPoint = endPoint - _translation;
953953 glTranslatef(endPoint.x, endPoint.y, endPoint.z);
954− GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
954+ auto geometryCache = DependencyManager::get<GeometryCache>();
955955 geometryCache->renderSphere(_boundingShape.getRadius(), BALL_SUBDIVISIONS, BALL_SUBDIVISIONS, glm::vec4(0.6f, 0.6f, 0.8f, alpha));
956956
957957 // draw a yellow sphere at the capsule startpoint
@@ -985,7 +985,7 @@ void SkeletonModel::renderJointCollisionShapes(float alpha) { · 27 unmodified lines
985985 continue;
986986 }
987987
988− GeometryCache::SharedPointer geometryCache = DependencyManager::get<GeometryCache>();
988+ auto geometryCache = DependencyManager::get<GeometryCache>();
989989
990990 glPushMatrix();
991991 // shapes are stored in simulation-frame but we want position to be model-relative

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