mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-19 10:18:43 +02:00
Merge pull request #12528 from hyperlogic/bug-fix/fix-anim-tests
Animation Unit Tests build and pass
This commit is contained in:
Anthony Thibault
GitHub
commit
d888e7fd95
4 changed files with 104 additions and 231 deletions
|
|
@ -93,6 +93,9 @@ void makeTestFBXJoints(FBXGeometry& geometry) {
|
|||
}
|
||||
|
||||
void AnimInverseKinematicsTests::testSingleChain() {
|
||||
|
||||
AnimContext context(false, false, false, glm::mat4(), glm::mat4());
|
||||
|
||||
FBXGeometry geometry;
|
||||
makeTestFBXJoints(geometry);
|
||||
|
||||
|
|
@ -108,14 +111,14 @@ void AnimInverseKinematicsTests::testSingleChain() {
|
|||
//
|
||||
// A------>B------>C------>D
|
||||
AnimPose pose;
|
||||
pose.scale = glm::vec3(1.0f);
|
||||
pose.rot = identity;
|
||||
pose.trans = origin;
|
||||
pose.scale() = glm::vec3(1.0f);
|
||||
pose.rot() = identity;
|
||||
pose.trans() = origin;
|
||||
|
||||
AnimPoseVec poses;
|
||||
poses.push_back(pose);
|
||||
|
||||
pose.trans = xAxis;
|
||||
pose.trans() = xAxis;
|
||||
for (int i = 1; i < (int)geometry.joints.size(); ++i) {
|
||||
poses.push_back(pose);
|
||||
}
|
||||
|
|
@ -133,8 +136,13 @@ void AnimInverseKinematicsTests::testSingleChain() {
|
|||
AnimVariantMap varMap;
|
||||
varMap.set("positionD", targetPosition);
|
||||
varMap.set("rotationD", targetRotation);
|
||||
varMap.set("targetType", (int)IKTarget::Type::RotationAndPosition);
|
||||
ikDoll.setTargetVars(QString("D"), QString("positionD"), QString("rotationD"), QString("targetType"));
|
||||
varMap.set("targetTypeD", (int)IKTarget::Type::RotationAndPosition);
|
||||
varMap.set("poleVectorEnabledD", false);
|
||||
|
||||
std::vector<float> flexCoefficients = {1.0f, 1.0f, 1.0f, 1.0f};
|
||||
ikDoll.setTargetVars(QString("D"), QString("positionD"), QString("rotationD"), QString("targetTypeD"),
|
||||
QString("weightD"), 1.0f, flexCoefficients, QString("poleVectorEnabledD"),
|
||||
QString("poleReferenceVectorD"), QString("poleVectorD"));
|
||||
AnimNode::Triggers triggers;
|
||||
|
||||
// the IK solution should be:
|
||||
|
|
@ -147,14 +155,12 @@ void AnimInverseKinematicsTests::testSingleChain() {
|
|||
|
||||
// iterate several times
|
||||
float dt = 1.0f;
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
const AnimPoseVec& relativePoses = ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
const int NUM_FRAMES = 10;
|
||||
for (int i = 0; i < NUM_FRAMES; i++) {
|
||||
poses = ikDoll.overlay(varMap, context, dt, triggers, poses);
|
||||
}
|
||||
const AnimPoseVec& relativePoses = ikDoll.overlay(varMap, context, dt, triggers, poses);
|
||||
|
||||
// verify absolute results
|
||||
// NOTE: since we expect this solution to converge very quickly (one loop)
|
||||
|
|
@ -164,28 +170,30 @@ void AnimInverseKinematicsTests::testSingleChain() {
|
|||
absolutePoses.push_back(pose);
|
||||
}
|
||||
ikDoll.computeAbsolutePoses(absolutePoses);
|
||||
|
||||
const float acceptableAngleError = 0.001f;
|
||||
QCOMPARE_QUATS(absolutePoses[0].rot, identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(absolutePoses[1].rot, identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(absolutePoses[2].rot, quaterTurnAroundZ, acceptableAngleError);
|
||||
QCOMPARE_QUATS(absolutePoses[3].rot, quaterTurnAroundZ, acceptableAngleError);
|
||||
QCOMPARE_QUATS(absolutePoses[0].rot(), identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(absolutePoses[1].rot(), identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(absolutePoses[2].rot(), quaterTurnAroundZ, acceptableAngleError);
|
||||
QCOMPARE_QUATS(absolutePoses[3].rot(), quaterTurnAroundZ, acceptableAngleError);
|
||||
|
||||
const float acceptableTranslationError = 0.025f;
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[0].trans, origin, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[1].trans, xAxis, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[2].trans, 2.0f * xAxis, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[3].trans, targetPosition, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[0].trans(), origin, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[1].trans(), xAxis, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[2].trans(), 2.0f * xAxis, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[3].trans(), targetPosition, acceptableTranslationError);
|
||||
|
||||
// verify relative results
|
||||
QCOMPARE_QUATS(relativePoses[0].rot, identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(relativePoses[1].rot, identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(relativePoses[2].rot, quaterTurnAroundZ, acceptableAngleError);
|
||||
QCOMPARE_QUATS(relativePoses[3].rot, identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(relativePoses[0].rot(), identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(relativePoses[1].rot(), identity, acceptableAngleError);
|
||||
QCOMPARE_QUATS(relativePoses[2].rot(), quaterTurnAroundZ, acceptableAngleError);
|
||||
QCOMPARE_QUATS(relativePoses[3].rot(), identity, acceptableAngleError);
|
||||
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[0].trans(), origin, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[1].trans(), xAxis, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[2].trans(), xAxis, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[3].trans(), xAxis, acceptableTranslationError);
|
||||
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[0].trans, origin, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[1].trans, xAxis, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[2].trans, xAxis, acceptableTranslationError);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[3].trans, xAxis, acceptableTranslationError);
|
||||
}
|
||||
{ // hard test IK of joint C
|
||||
// load intial poses that look like this:
|
||||
|
|
@ -196,15 +204,15 @@ void AnimInverseKinematicsTests::testSingleChain() {
|
|||
// A------>B
|
||||
//
|
||||
AnimPose pose;
|
||||
pose.scale = glm::vec3(1.0f);
|
||||
pose.rot = identity;
|
||||
pose.trans = origin;
|
||||
pose.scale() = glm::vec3(1.0f);
|
||||
pose.rot() = identity;
|
||||
pose.trans() = origin;
|
||||
|
||||
AnimPoseVec poses;
|
||||
poses.push_back(pose);
|
||||
pose.trans = xAxis;
|
||||
pose.trans() = xAxis;
|
||||
|
||||
pose.rot = quaterTurnAroundZ;
|
||||
pose.rot() = quaterTurnAroundZ;
|
||||
poses.push_back(pose);
|
||||
poses.push_back(pose);
|
||||
poses.push_back(pose);
|
||||
|
|
@ -222,8 +230,12 @@ void AnimInverseKinematicsTests::testSingleChain() {
|
|||
AnimVariantMap varMap;
|
||||
varMap.set("positionD", targetPosition);
|
||||
varMap.set("rotationD", targetRotation);
|
||||
varMap.set("targetType", (int)IKTarget::Type::RotationAndPosition);
|
||||
ikDoll.setTargetVars(QString("D"), QString("positionD"), QString("rotationD"), QString("targetType"));
|
||||
varMap.set("targetTypeD", (int)IKTarget::Type::RotationAndPosition);
|
||||
varMap.set("poleVectorEnabledD", false);
|
||||
std::vector<float> flexCoefficients = {1.0f, 1.0f, 1.0f, 1.0f};
|
||||
ikDoll.setTargetVars(QString("D"), QString("positionD"), QString("rotationD"), QString("targetTypeD"),
|
||||
QString("weightD"), 1.0f, flexCoefficients, QString("poleVectorEnabledD"),
|
||||
QString("poleReferenceVectorD"), QString("poleVectorD"));
|
||||
AnimNode::Triggers triggers;
|
||||
|
||||
// the IK solution should be:
|
||||
|
|
@ -233,15 +245,11 @@ void AnimInverseKinematicsTests::testSingleChain() {
|
|||
|
||||
// iterate several times
|
||||
float dt = 1.0f;
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
const AnimPoseVec& relativePoses = ikDoll.overlay(varMap, dt, triggers, poses);
|
||||
const int NUM_FRAMES = 50;
|
||||
for (int i = 0; i < NUM_FRAMES; i++) {
|
||||
poses = ikDoll.overlay(varMap, context, dt, triggers, poses);
|
||||
}
|
||||
const AnimPoseVec& relativePoses = ikDoll.overlay(varMap, context, dt, triggers, poses);
|
||||
|
||||
// verify absolute results
|
||||
// NOTE: the IK algorithm doesn't converge very fast for full-reach targets,
|
||||
|
|
@ -255,28 +263,29 @@ void AnimInverseKinematicsTests::testSingleChain() {
|
|||
absolutePoses.push_back(pose);
|
||||
}
|
||||
ikDoll.computeAbsolutePoses(absolutePoses);
|
||||
float acceptableAngle = 0.01f; // radians
|
||||
QCOMPARE_QUATS(absolutePoses[0].rot, identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(absolutePoses[1].rot, identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(absolutePoses[2].rot, identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(absolutePoses[3].rot, identity, acceptableAngle);
|
||||
|
||||
float acceptableDistance = 0.03f;
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[0].trans, origin, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[1].trans, xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[2].trans, 2.0f * xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[3].trans, 3.0f * xAxis, acceptableDistance);
|
||||
float acceptableAngle = 0.01f; // radians
|
||||
QCOMPARE_QUATS(absolutePoses[0].rot(), identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(absolutePoses[1].rot(), identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(absolutePoses[2].rot(), identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(absolutePoses[3].rot(), identity, acceptableAngle);
|
||||
|
||||
float acceptableDistance = 0.1f;
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[0].trans(), origin, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[1].trans(), xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[2].trans(), 2.0f * xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(absolutePoses[3].trans(), 3.0f * xAxis, acceptableDistance);
|
||||
|
||||
// verify relative results
|
||||
QCOMPARE_QUATS(relativePoses[0].rot, identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(relativePoses[1].rot, identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(relativePoses[2].rot, identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(relativePoses[3].rot, identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(relativePoses[0].rot(), identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(relativePoses[1].rot(), identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(relativePoses[2].rot(), identity, acceptableAngle);
|
||||
QCOMPARE_QUATS(relativePoses[3].rot(), identity, acceptableAngle);
|
||||
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[0].trans, origin, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[1].trans, xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[2].trans, xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[3].trans, xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[0].trans(), origin, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[1].trans(), xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[2].trans(), xAxis, acceptableDistance);
|
||||
QCOMPARE_WITH_ABS_ERROR(relativePoses[3].trans(), xAxis, acceptableDistance);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -293,6 +302,6 @@ void AnimInverseKinematicsTests::testBar() {
|
|||
AnimPose poseC = poseA * poseB;
|
||||
|
||||
glm::vec3 expectedTransC = transA + transB;
|
||||
QCOMPARE_WITH_ABS_ERROR(expectedTransC, poseC.trans, EPSILON);
|
||||
QCOMPARE_WITH_ABS_ERROR(expectedTransC, poseC.trans(), EPSILON);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,11 @@
|
|||
#include <AnimVariant.h>
|
||||
#include <AnimExpression.h>
|
||||
#include <AnimUtil.h>
|
||||
|
||||
#include <NodeList.h>
|
||||
#include <AddressManager.h>
|
||||
#include <AccountManager.h>
|
||||
#include <ResourceManager.h>
|
||||
#include <StatTracker.h>
|
||||
#include <../QTestExtensions.h>
|
||||
|
||||
QTEST_MAIN(AnimTests)
|
||||
|
|
@ -23,12 +27,18 @@ QTEST_MAIN(AnimTests)
|
|||
const float EPSILON = 0.001f;
|
||||
|
||||
void AnimTests::initTestCase() {
|
||||
auto animationCache = DependencyManager::set<AnimationCache>();
|
||||
auto resourceCacheSharedItems = DependencyManager::set<ResourceCacheSharedItems>();
|
||||
DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
|
||||
DependencyManager::set<AccountManager>();
|
||||
DependencyManager::set<AddressManager>();
|
||||
DependencyManager::set<NodeList>(NodeType::Agent);
|
||||
DependencyManager::set<ResourceManager>();
|
||||
DependencyManager::set<AnimationCache>();
|
||||
DependencyManager::set<ResourceCacheSharedItems>();
|
||||
DependencyManager::set<StatTracker>();
|
||||
}
|
||||
|
||||
void AnimTests::cleanupTestCase() {
|
||||
DependencyManager::destroy<AnimationCache>();
|
||||
//DependencyManager::destroy<AnimationCache>();
|
||||
}
|
||||
|
||||
void AnimTests::testClipInternalState() {
|
||||
|
|
@ -59,6 +69,7 @@ static float framesToSec(float secs) {
|
|||
}
|
||||
|
||||
void AnimTests::testClipEvaulate() {
|
||||
AnimContext context(false, false, false, glm::mat4(), glm::mat4());
|
||||
QString id = "myClipNode";
|
||||
QString url = "https://hifi-public.s3.amazonaws.com/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx";
|
||||
float startFrame = 2.0f;
|
||||
|
|
@ -73,12 +84,12 @@ void AnimTests::testClipEvaulate() {
|
|||
AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag);
|
||||
|
||||
AnimNode::Triggers triggers;
|
||||
clip.evaluate(vars, framesToSec(10.0f), triggers);
|
||||
clip.evaluate(vars, context, framesToSec(10.0f), triggers);
|
||||
QCOMPARE_WITH_ABS_ERROR(clip._frame, 12.0f, EPSILON);
|
||||
|
||||
// does it loop?
|
||||
triggers.clear();
|
||||
clip.evaluate(vars, framesToSec(12.0f), triggers);
|
||||
clip.evaluate(vars, context, framesToSec(12.0f), triggers);
|
||||
QCOMPARE_WITH_ABS_ERROR(clip._frame, 3.0f, EPSILON); // Note: frame 3 and not 4, because extra frame between start and end.
|
||||
|
||||
// did we receive a loop trigger?
|
||||
|
|
@ -87,7 +98,7 @@ void AnimTests::testClipEvaulate() {
|
|||
// does it pause at end?
|
||||
triggers.clear();
|
||||
clip.setLoopFlagVar("FalseVar");
|
||||
clip.evaluate(vars, framesToSec(20.0f), triggers);
|
||||
clip.evaluate(vars, context, framesToSec(20.0f), triggers);
|
||||
QCOMPARE_WITH_ABS_ERROR(clip._frame, 22.0f, EPSILON);
|
||||
|
||||
// did we receive a done trigger?
|
||||
|
|
@ -95,6 +106,7 @@ void AnimTests::testClipEvaulate() {
|
|||
}
|
||||
|
||||
void AnimTests::testClipEvaulateWithVars() {
|
||||
AnimContext context(false, false, false, glm::mat4(), glm::mat4());
|
||||
QString id = "myClipNode";
|
||||
QString url = "https://hifi-public.s3.amazonaws.com/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx";
|
||||
float startFrame = 2.0f;
|
||||
|
|
@ -121,7 +133,7 @@ void AnimTests::testClipEvaulateWithVars() {
|
|||
clip.setLoopFlagVar("loopFlag2");
|
||||
|
||||
AnimNode::Triggers triggers;
|
||||
clip.evaluate(vars, framesToSec(0.1f), triggers);
|
||||
clip.evaluate(vars, context, framesToSec(0.1f), triggers);
|
||||
|
||||
// verify that the values from the AnimVariantMap made it into the clipNode's
|
||||
// internal state
|
||||
|
|
@ -132,7 +144,7 @@ void AnimTests::testClipEvaulateWithVars() {
|
|||
}
|
||||
|
||||
void AnimTests::testLoader() {
|
||||
auto url = QUrl("https://gist.githubusercontent.com/hyperlogic/857129fe04567cbe670f/raw/0c54500f480fd7314a5aeb147c45a8a707edcc2e/test.json");
|
||||
auto url = QUrl("https://gist.githubusercontent.com/hyperlogic/756e6b7018c96c9778dba4ffb959c3c7/raw/4b37f10c9d2636608916208ba7b415c1a3f842ff/test.json");
|
||||
// NOTE: This will warn about missing "test01.fbx", "test02.fbx", etc. if the resource loading code doesn't handle relative pathnames!
|
||||
// However, the test will proceed.
|
||||
AnimNodeLoader loader(url);
|
||||
|
|
@ -173,14 +185,22 @@ void AnimTests::testLoader() {
|
|||
QVERIFY(nodes[2]->getChildCount() == 0);
|
||||
|
||||
auto test01 = std::static_pointer_cast<AnimClip>(nodes[0]);
|
||||
QVERIFY(test01->_url == "test01.fbx");
|
||||
|
||||
QUrl relativeUrl01("test01.fbx");
|
||||
QString url01 = url.resolved(relativeUrl01).toString();
|
||||
|
||||
QVERIFY(test01->_url == url01);
|
||||
QVERIFY(test01->_startFrame == 1.0f);
|
||||
QVERIFY(test01->_endFrame == 20.0f);
|
||||
QVERIFY(test01->_timeScale == 1.0f);
|
||||
QVERIFY(test01->_loopFlag == false);
|
||||
|
||||
auto test02 = std::static_pointer_cast<AnimClip>(nodes[1]);
|
||||
QVERIFY(test02->_url == "test02.fbx");
|
||||
|
||||
QUrl relativeUrl02("test02.fbx");
|
||||
QString url02 = url.resolved(relativeUrl02).toString();
|
||||
|
||||
QVERIFY(test02->_url == url02);
|
||||
QVERIFY(test02->_startFrame == 2.0f);
|
||||
QVERIFY(test02->_endFrame == 21.0f);
|
||||
QVERIFY(test02->_timeScale == 0.9f);
|
||||
|
|
|
|||
|
|
@ -1,101 +0,0 @@
|
|||
//
|
||||
// RigTests.cpp
|
||||
// tests/rig/src
|
||||
//
|
||||
// Created by Howard Stearns on 6/16/15
|
||||
// Copyright 2015 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
/* FIXME/TBD:
|
||||
|
||||
The following lower level functionality might be separated out into a separate class, covered by a separate test case class:
|
||||
- With no input, initial pose is standing, arms at side
|
||||
- Some single animation produces correct results at a given keyframe time.
|
||||
- Some single animation produces correct results at a given interpolated time.
|
||||
- Blend between two animations, started at separate times, produces correct result at a given interpolated time.
|
||||
- Head orientation can be overridden to produce change that doesn't come from the playing animation.
|
||||
- Hand position/orientation can be overridden to produce change that doesn't come from the playing animation.
|
||||
- Hand position/orientation can be overrridden to produce elbow change that doesn't come from the playing animation.
|
||||
- Respect scaling? (e.g., so that MyAvatar.increase/decreaseSize can alter rig, such that anti-scating and footfalls-on-stairs works)
|
||||
|
||||
Higher level functionality:
|
||||
- start/stopAnimation adds the animation to that which is playing, blending/fading as needed.
|
||||
- thrust causes walk role animation to be used.
|
||||
- turning causes turn role animation to be used. (two tests, correctly symmetric left & right)
|
||||
- walk/turn do not skate (footfalls match over-ground velocity)
|
||||
- (Later?) walk up stairs / hills have proper footfall for terrain
|
||||
- absence of above causes return to idle role animation to be used
|
||||
- (later?) The lower-level head/hand placements respect previous state. E.g., actual hand movement can be slower than requested.
|
||||
- (later) The lower-level head/hand placements can move whole skeleton. E.g., turning head past a limit may turn whole body. Reaching up can move shoulders and hips.
|
||||
|
||||
Backward-compatability operations. We should think of this behavior as deprecated:
|
||||
- clearJointData return to standing. TBD: presumably with idle and all other animations NOT playing, until explicitly reenabled with a new TBD method?
|
||||
- setJointData applies the given data. Same TBD.
|
||||
These can be defined true or false, but the tests document the behavior and tells us if something's changed:
|
||||
- An external change to the original skeleton IS/ISN'T seen by the rig.
|
||||
- An external change to the original skeleton's head orientation IS/ISN'T seen by the rig.
|
||||
- An external change to the original skeleton's hand orientiation IS/ISN'T seen by the rig.
|
||||
*/
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "FBXReader.h"
|
||||
#include "OBJReader.h"
|
||||
|
||||
#include <Rig.h>
|
||||
#include "RigTests.h"
|
||||
|
||||
static void reportJoint(const Rig& rig, int index) { // Handy for debugging
|
||||
std::cout << "\n";
|
||||
std::cout << index << " " << rig->getAnimSkeleton()->getJointName(index).toUtf8().data() << "\n";
|
||||
glm::vec3 pos;
|
||||
rig->getJointPosition(index, pos);
|
||||
glm::quat rot;
|
||||
rig->getJointRotation(index, rot);
|
||||
std::cout << " pos:" << pos << "\n";
|
||||
std::cout << " rot:" << safeEulerAngles(rot) << "\n";
|
||||
std::cout << "\n";
|
||||
}
|
||||
static void reportByName(const Rig& rig, const QString& name) {
|
||||
int jointIndex = rig->indexOfJoint(name);
|
||||
reportJoint(rig, jointIndex);
|
||||
}
|
||||
static void reportAll(const Rig& rig) {
|
||||
for (int i = 0; i < rig->getJointStateCount(); i++) {
|
||||
reportJoint(rig, i);
|
||||
}
|
||||
}
|
||||
static void reportSome(const Rig& rig) {
|
||||
QString names[] = {"Head", "Neck", "RightShoulder", "RightArm", "RightForeArm", "RightHand", "Spine2", "Spine1", "Spine", "Hips", "RightUpLeg", "RightLeg", "RightFoot", "RightToeBase", "RightToe_End"};
|
||||
for (auto name : names) {
|
||||
reportByName(rig, name);
|
||||
}
|
||||
}
|
||||
|
||||
QTEST_MAIN(RigTests)
|
||||
|
||||
void RigTests::initTestCase() {
|
||||
//#define FROM_FILE "/Users/howardstearns/howardHiFi/Zack.fbx"
|
||||
#ifdef FROM_FILE
|
||||
QFile file(FROM_FILE);
|
||||
QCOMPARE(file.open(QIODevice::ReadOnly), true);
|
||||
FBXGeometry* geometry = readFBX(file.readAll(), QVariantHash());
|
||||
#else
|
||||
QUrl fbxUrl("https://s3.amazonaws.com/hifi-public/models/skeletons/Zack/Zack.fbx");
|
||||
QNetworkReply* reply = OBJReader().request(fbxUrl, false); // Just a convenience hack for synchronoud http request
|
||||
auto fbxHttpCode = !reply->isFinished() ? -1 : reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
|
||||
QCOMPARE(fbxHttpCode, 200);
|
||||
FBXGeometry* geometry = readFBX(reply->readAll(), QVariantHash());
|
||||
#endif
|
||||
QVERIFY((bool)geometry);
|
||||
|
||||
_rig.initJointStates(*geometry, glm::mat4());
|
||||
std::cout << "Rig is ready " << geometry->joints.count() << " joints " << std::endl;
|
||||
reportAll(_rig);
|
||||
}
|
||||
|
||||
void RigTests::initialPoseArmsDown() {
|
||||
reportSome(_rig);
|
||||
}
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
//
|
||||
// RigTests.h
|
||||
// tests/rig/src
|
||||
//
|
||||
// Created by Howard Stearns on 6/16/15
|
||||
// Copyright 2015 High Fidelity, Inc.
|
||||
//
|
||||
// Distributed under the Apache License, Version 2.0.
|
||||
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||
//
|
||||
|
||||
#ifndef hifi_RigTests_h
|
||||
#define hifi_RigTests_h
|
||||
|
||||
#include <QtTest/QtTest>
|
||||
#include <Rig.h>
|
||||
|
||||
//#include "../QTestExtensions.h"
|
||||
|
||||
|
||||
// The QTest terminology is not consistent with itself or with industry:
|
||||
// The whole directory, and the rig-tests target, doesn't seem to be a QTest concept, an corresponds roughly to a toplevel suite of suites.
|
||||
// The directory can contain any number of classes like this one. (Don't forget to wipe your build dir, and rerun cmake when you add one.):
|
||||
// QTest doc (http://doc.qt.io/qt-5/qtest-overview.html) calls this a "test case".
|
||||
// The output of QTest's 'ctest' runner calls this a "test" when run in the whole directory (e.g., when reporting success/failure counts).
|
||||
// The test case (like this class) can contain any number of test slots:
|
||||
// QTest doc calls these "test functions"
|
||||
// When you run a single test case executable (e.g., "rig-RigTests"), the (unlabeled) count includes these test functions and also the before method, which is auto generated as initTestCase.
|
||||
|
||||
// To build and run via make:
|
||||
// make help | grep tests # shows all test targets, including all-tests and rig-tests.
|
||||
// make all-tests # will compile and then die as soon as any test case dies, even if its not in your directory
|
||||
// make rig-tests # will compile and run `ctest .` in the tests/rig directory, running all the test cases found there.
|
||||
// Alas, only summary output is shown on stdout. The real results, including any stdout that your code does, is in tests/rig/Testing/Temporary/LastTest.log, or...
|
||||
// tests/rig/rig-RigTests (or the executable corresponding to any test case you define here) will run just that case and give output directly.
|
||||
//
|
||||
// To build and run via Xcode:
|
||||
// On some machines, xcode can't find cmake on the path it uses. I did, effectively: sudo ln -s `which cmake` /usr/bin
|
||||
// Note the above make instructions.
|
||||
// all-tests, rig-tests, and rig-RigTests are all targets:
|
||||
// The first two of these show no output at all, but if there's a failure you can see it by clicking on the red failure in the "issue navigator" (or by externally viewing the .log above).
|
||||
// The last (or any other individual test case executable) does show output in the Xcode output display.
|
||||
|
||||
class RigTests : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
private slots:
|
||||
void initTestCase();
|
||||
void initialPoseArmsDown();
|
||||
|
||||
private:
|
||||
Rig _rig;
|
||||
};
|
||||
|
||||
#endif // hifi_RigTests_h
|
||||
Loading…
Reference in a new issue