Showing the changes to libraries/render-utils/src/AnimDebugDraw.cpp (1 of 2 files). Show all
Unified · Split
| @@ -153,30 +153,6 @@ void AnimDebugDraw::shutdown() { · 152 unmodified lines | |||
| 153 | } | 153 | } |
| 154 | } | 154 | } |
| 155 | 155 | ||
| 156 | void AnimDebugDraw::addSkeleton(const std::string& key, AnimSkeleton::ConstPointer skeleton, const AnimPose& rootPose, const glm::vec4& color) { | ||
| 157 | _skeletons[key] = SkeletonInfo(skeleton, rootPose, color); | ||
| 158 | } | ||
| 159 | |||
| 160 | void AnimDebugDraw::removeSkeleton(const std::string& key) { | ||
| 161 | _skeletons.erase(key); | ||
| 162 | } | ||
| 163 | |||
| 164 | void AnimDebugDraw::addAnimNode(const std::string& key, AnimNode::ConstPointer animNode, const AnimPose& rootPose, const glm::vec4& color) { | ||
| 165 | _animNodes[key] = AnimNodeInfo(animNode, rootPose, color); | ||
| 166 | } | ||
| 167 | |||
| 168 | void AnimDebugDraw::removeAnimNode(const std::string& key) { | ||
| 169 | _animNodes.erase(key); | ||
| 170 | } | ||
| 171 | |||
| 172 | void AnimDebugDraw::addRelativePoses(const std::string& key, AnimSkeleton::ConstPointer skeleton, const AnimPoseVec& poses, const AnimPose& rootPose, const glm::vec4& color) { | ||
| 173 | _relativePoses[key] = PosesInfo(skeleton, poses, rootPose, color); | ||
| 174 | } | ||
| 175 | |||
| 176 | void AnimDebugDraw::removeRelativePoses(const std::string& key) { | ||
| 177 | _relativePoses.erase(key); | ||
| 178 | } | ||
| 179 | |||
| 180 | void AnimDebugDraw::addAbsolutePoses(const std::string& key, AnimSkeleton::ConstPointer skeleton, const AnimPoseVec& poses, const AnimPose& rootPose, const glm::vec4& color) { | 156 | void AnimDebugDraw::addAbsolutePoses(const std::string& key, AnimSkeleton::ConstPointer skeleton, const AnimPoseVec& poses, const AnimPose& rootPose, const glm::vec4& color) { |
| 181 | _absolutePoses[key] = PosesInfo(skeleton, poses, rootPose, color); | 157 | _absolutePoses[key] = PosesInfo(skeleton, poses, rootPose, color); |
| 182 | } | 158 | } |
| @@ -347,33 +323,6 @@ void AnimDebugDraw::update() { · 164 unmodified lines | |||
| 347 | // figure out how many verts we will need. | 323 | // figure out how many verts we will need. |
| 348 | int numVerts = 0; | 324 | int numVerts = 0; |
| 349 | 325 | ||
| 350 | // AJT: FIX ME | ||
| 351 | /* | ||
| 352 | for (auto& iter : _animNodes) { | ||
| 353 | AnimNode::ConstPointer& animNode = std::get<0>(iter.second); | ||
| 354 | auto poses = animNode->getPosesInternal(); | ||
| 355 | numVerts += poses.size() * VERTICES_PER_BONE; | ||
| 356 | auto skeleton = animNode->getSkeleton(); | ||
| 357 | for (size_t i = 0; i < poses.size(); i++) { | ||
| 358 | auto parentIndex = skeleton->getParentIndex(i); | ||
| 359 | if (parentIndex >= 0) { | ||
| 360 | numVerts += VERTICES_PER_LINK; | ||
| 361 | } | ||
| 362 | } | ||
| 363 | } | ||
| 364 | |||
| 365 | for (auto& iter : _relativePoses) { | ||
| 366 | AnimSkeleton::ConstPointer& skeleton = std::get<0>(iter.second); | ||
| 367 | numVerts += skeleton->getNumJoints() * VERTICES_PER_BONE; | ||
| 368 | for (int i = 0; i < skeleton->getNumJoints(); i++) { | ||
| 369 | auto parentIndex = skeleton->getParentIndex(i); | ||
| 370 | if (parentIndex >= 0) { | ||
| 371 | numVerts += VERTICES_PER_LINK; | ||
| 372 | } | ||
| 373 | } | ||
| 374 | } | ||
| 375 | */ | ||
| 376 | |||
| 377 | for (auto& iter : _absolutePoses) { | 326 | for (auto& iter : _absolutePoses) { |
| 378 | AnimSkeleton::ConstPointer& skeleton = std::get<0>(iter.second); | 327 | AnimSkeleton::ConstPointer& skeleton = std::get<0>(iter.second); |
| 379 | numVerts += skeleton->getNumJoints() * VERTICES_PER_BONE; | 328 | numVerts += skeleton->getNumJoints() * VERTICES_PER_BONE; |
| @@ -396,88 +345,6 @@ void AnimDebugDraw::update() { · 16 unmodified lines | |||
| 396 | Vertex* verts = (Vertex*)data._vertexBuffer->editData(); | 345 | Vertex* verts = (Vertex*)data._vertexBuffer->editData(); |
| 397 | Vertex* v = verts; | 346 | Vertex* v = verts; |
| 398 | 347 | ||
| 399 | // AJT: FIXME | ||
| 400 | /* | ||
| 401 | // draw animNodes | ||
| 402 | for (auto& iter : _animNodes) { | ||
| 403 | AnimNode::ConstPointer& animNode = std::get<0>(iter.second); | ||
| 404 | AnimPose rootPose = std::get<1>(iter.second); | ||
| 405 | if (animNode->_skeleton) { | ||
| 406 | int hipsIndex = animNode->_skeleton->nameToJointIndex("Hips"); | ||
| 407 | if (hipsIndex >= 0) { | ||
| 408 | rootPose.trans -= animNode->_skeleton->getRelativeBindPose(hipsIndex).trans; | ||
| 409 | } | ||
| 410 | } | ||
| 411 | glm::vec4 color = std::get<2>(iter.second); | ||
| 412 | |||
| 413 | auto poses = animNode->getPosesInternal(); | ||
| 414 | |||
| 415 | auto skeleton = animNode->getSkeleton(); | ||
| 416 | |||
| 417 | std::vector<AnimPose> absAnimPose; | ||
| 418 | absAnimPose.resize(skeleton->getNumJoints()); | ||
| 419 | |||
| 420 | for (size_t i = 0; i < poses.size(); i++) { | ||
| 421 | |||
| 422 | auto parentIndex = skeleton->getParentIndex(i); | ||
| 423 | if (parentIndex >= 0) { | ||
| 424 | absAnimPose[i] = absAnimPose[parentIndex] * poses[i]; | ||
| 425 | } else { | ||
| 426 | absAnimPose[i] = poses[i]; | ||
| 427 | } | ||
| 428 | |||
| 429 | const float radius = BONE_RADIUS / (absAnimPose[i].scale.x * rootPose.scale.x); | ||
| 430 | addBone(rootPose, absAnimPose[i], radius, v); | ||
| 431 | |||
| 432 | if (parentIndex >= 0) { | ||
| 433 | assert((size_t)parentIndex < poses.size()); | ||
| 434 | // draw line to parent | ||
| 435 | addLink(rootPose, absAnimPose[i], absAnimPose[parentIndex], radius, color, v); | ||
| 436 | } | ||
| 437 | } | ||
| 438 | } | ||
| 439 | */ | ||
| 440 | |||
| 441 | // AJT: FIX ME | ||
| 442 | /* | ||
| 443 | // draw relative poses | ||
| 444 | for (auto& iter : _relativePoses) { | ||
| 445 | AnimSkeleton::ConstPointer& skeleton = std::get<0>(iter.second); | ||
| 446 | AnimPoseVec& poses = std::get<1>(iter.second); | ||
| 447 | AnimPose rootPose = std::get<2>(iter.second); | ||
| 448 | int hipsIndex = skeleton->nameToJointIndex("Hips"); | ||
| 449 | if (hipsIndex >= 0) { | ||
| 450 | rootPose.trans -= skeleton->getRelativeBindPose(hipsIndex).trans; | ||
| 451 | } | ||
| 452 | glm::vec4 color = std::get<3>(iter.second); | ||
| 453 | |||
| 454 | std::vector<AnimPose> absAnimPose; | ||
| 455 | absAnimPose.resize(skeleton->getNumJoints()); | ||
| 456 | |||
| 457 | for (int i = 0; i < skeleton->getNumJoints(); i++) { | ||
| 458 | const AnimPose& pose = poses[i]; | ||
| 459 | |||
| 460 | const float radius = BONE_RADIUS / (pose.scale.x * rootPose.scale.x); | ||
| 461 | |||
| 462 | auto parentIndex = skeleton->getParentIndex(i); | ||
| 463 | if (parentIndex >= 0) { | ||
| 464 | absAnimPose[i] = absAnimPose[parentIndex] * pose; | ||
| 465 | } else { | ||
| 466 | absAnimPose[i] = pose; | ||
| 467 | } | ||
| 468 | |||
| 469 | // draw bone | ||
| 470 | addBone(rootPose, absAnimPose[i], radius, v); | ||
| 471 | |||
| 472 | // draw link to parent | ||
| 473 | if (parentIndex >= 0) { | ||
| 474 | assert(parentIndex < skeleton->getNumJoints()); | ||
| 475 | addLink(rootPose, absAnimPose[i], absAnimPose[parentIndex], radius, color, v); | ||
| 476 | } | ||
| 477 | } | ||
| 478 | } | ||
| 479 | */ | ||
| 480 | |||
| 481 | // draw absolute poses | 348 | // draw absolute poses |
| 482 | for (auto& iter : _absolutePoses) { | 349 | for (auto& iter : _absolutePoses) { |
| 483 | AnimSkeleton::ConstPointer& skeleton = std::get<0>(iter.second); | 350 | AnimSkeleton::ConstPointer& skeleton = std::get<0>(iter.second); |