Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 15:49:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added missing AnimClip parameters. Needs checking if the values are sane.

Browse source
This commit is contained in:
Dale Glass 2022-06-06 23:19:50 +02:00
parent b814e69ebb
commit 6146544f2b
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/animation/src/AnimTests.cpp
View file

@ -53,8 +53,11 @@ void AnimTests::testClipInternalState() {
float timeScale = 1.1f; float timeScale = 1.1f;
bool loopFlag = true; bool loopFlag = true;
bool mirrorFlag = false; bool mirrorFlag = false;
AnimBlendType blendType = AnimBlendType_Normal;
QString baseUrl = "";
float baseFrame = 0.0f;
AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag); AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag, blendType, baseUrl, baseFrame);
QVERIFY(clip.getID() == id); QVERIFY(clip.getID() == id);
QVERIFY(clip.getType() == AnimNode::Type::Clip); QVERIFY(clip.getType() == AnimNode::Type::Clip);
@ -81,11 +84,15 @@ void AnimTests::testClipEvaulate() {
float timeScale = 1.0f; float timeScale = 1.0f;
bool loopFlag = true; bool loopFlag = true;
bool mirrorFlag = false; bool mirrorFlag = false;
AnimBlendType blendType = AnimBlendType_Normal;
QString baseUrl = "";
float baseFrame = 0.0f;
auto vars = AnimVariantMap(); auto vars = AnimVariantMap();
vars.set("FalseVar", false); vars.set("FalseVar", false);
AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag); AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag, blendType, baseUrl, baseFrame);
AnimVariantMap triggers; AnimVariantMap triggers;
clip.evaluate(vars, context, framesToSec(10.0f), triggers); clip.evaluate(vars, context, framesToSec(10.0f), triggers);
@ -112,12 +119,16 @@ void AnimTests::testClipEvaulate() {
void AnimTests::testClipEvaulateWithVars() { void AnimTests::testClipEvaulateWithVars() {
AnimContext context(false, false, false, glm::mat4(), glm::mat4(), 0); AnimContext context(false, false, false, glm::mat4(), glm::mat4(), 0);
QString id = "myClipNode"; QString id = "myClipNode";
QString url = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, "/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx"; QString url = ExternalResource::getInstance()->getUrl(ExternalResource::Bucket::HF_Content, "/ozan/support/FightClubBotTest1/Animations/standard_idle.fbx");
float startFrame = 2.0f; float startFrame = 2.0f;
float endFrame = 22.0f; float endFrame = 22.0f;
float timeScale = 1.0f; float timeScale = 1.0f;
bool loopFlag = true; bool loopFlag = true;
bool mirrorFlag = false; bool mirrorFlag = false;
AnimBlendType blendType = AnimBlendType_Normal;
QString baseUrl = "";
float baseFrame = 0.0f;
float startFrame2 = 22.0f; float startFrame2 = 22.0f;
float endFrame2 = 100.0f; float endFrame2 = 100.0f;
@ -130,7 +141,7 @@ void AnimTests::testClipEvaulateWithVars() {
vars.set("timeScale2", timeScale2); vars.set("timeScale2", timeScale2);
vars.set("loopFlag2", loopFlag2); vars.set("loopFlag2", loopFlag2);
AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag); AnimClip clip(id, url, startFrame, endFrame, timeScale, loopFlag, mirrorFlag, blendType, baseUrl, baseFrame);
clip.setStartFrameVar("startFrame2"); clip.setStartFrameVar("startFrame2");
clip.setEndFrameVar("endFrame2"); clip.setEndFrameVar("endFrame2");
clip.setTimeScaleVar("timeScale2"); clip.setTimeScaleVar("timeScale2");