History

remove non-batch versions of GeometryCache renderXYZ() methods

ZappoMan committed 11 years ago

Commit c2113ea1 parent 36f63e412 files · +13 −203Browse files

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

Unified · Split

interface/src/avatar/SkeletonModel.cpp+7−5
@@ -375,13 +375,15 @@ void SkeletonModel::renderJointConstraints(gpu::Batch& batch, int jointIndex) { · 374 unmodified lines
375375
376376 }
377377
378− renderOrientationDirections(jointIndex, position, _rotation * jointState.getRotation(), directionSize);
378+ renderOrientationDirections(batch, jointIndex, position, _rotation * jointState.getRotation(), directionSize);
379379 jointIndex = joint.parentIndex;
380380
381381 } while (jointIndex != -1 && geometry.joints.at(jointIndex).isFree);
382382 }
383383
384−void SkeletonModel::renderOrientationDirections(int jointIndex, glm::vec3 position, const glm::quat& orientation, float size) {
384+void SkeletonModel::renderOrientationDirections(gpu::Batch& batch, int jointIndex,
385+ glm::vec3 position, const glm::quat& orientation, float size) {
386+
385387 auto geometryCache = DependencyManager::get<GeometryCache>();
386388
387389 if (!_jointOrientationLines.contains(jointIndex)) {
@@ -398,13 +400,13 @@ void SkeletonModel::renderOrientationDirections(int jointIndex, glm::vec3 positi · 10 unmodified lines
398400 glm::vec3 pFront = position + orientation * IDENTITY_FRONT * size;
399401
400402 glm::vec3 red(1.0f, 0.0f, 0.0f);
401− geometryCache->renderLine(position, pRight, red, jointLineIDs._right);
403+ geometryCache->renderLine(batch, position, pRight, red, jointLineIDs._right);
402404
403405 glm::vec3 green(0.0f, 1.0f, 0.0f);
404− geometryCache->renderLine(position, pUp, green, jointLineIDs._up);
406+ geometryCache->renderLine(batch, position, pUp, green, jointLineIDs._up);
405407
406408 glm::vec3 blue(0.0f, 0.0f, 1.0f);
407− geometryCache->renderLine(position, pFront, blue, jointLineIDs._front);
409+ geometryCache->renderLine(batch, position, pFront, blue, jointLineIDs._front);
408410 }
409411
410412

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