mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-05-20 22:01:46 +02:00
936c55a94e
JavaScript changes: * removed MyAvatar.playAnimation * removed MyAvatar.stopAnimation * removed MyAVatar.getGetAnimationDetails * removed MyAvatar.startAnimationByRole * removed MyAvatar.stopAnimationByRole * removed MyAVatar.getGetAnimationDetailsByRole * removed MyAVatar.clearJointPriorities * added MyAvatar.overrideAnimation(url, fps, loop, firstFrame, lastFrame) * added MyAvatar.restoreAnimation() * added MyAvatar.getAnimationRoles() * added MyAvatar.overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame) * added MyAvatar.restoreRoleAnimation(role) * added MyAvatar.prefetchAnimation(url) * update kneel.js with new api. * added theBird.js to test role override api. C++ changes: * Added getParent() and replaceChild() to AnimNode * Added findByName() and traverse() to AnimNode * Changed AnimStateMachine to hold nodes by childIndex instead of smart pointer. This allows script to replace nodes dynamically via overrideRoleAnimation
60 lines
1.6 KiB
C++
60 lines
1.6 KiB
C++
//
|
|
// AnimNode.cpp
|
|
//
|
|
// Created by Anthony J. Thibault on 9/2/15.
|
|
// Copyright (c) 2015 High Fidelity, Inc. All rights reserved.
|
|
//
|
|
// Distributed under the Apache License, Version 2.0.
|
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
//
|
|
|
|
#include <QtGlobal>
|
|
#include "AnimNode.h"
|
|
|
|
AnimNode::Pointer AnimNode::getParent() {
|
|
return _parent.lock();
|
|
}
|
|
|
|
void AnimNode::addChild(Pointer child) {
|
|
_children.push_back(child);
|
|
child->_parent = shared_from_this();
|
|
}
|
|
|
|
void AnimNode::removeChild(Pointer child) {
|
|
auto iter = std::find(_children.begin(), _children.end(), child);
|
|
if (iter != _children.end()) {
|
|
_children.erase(iter);
|
|
child->_parent.reset();
|
|
}
|
|
}
|
|
|
|
void AnimNode::replaceChild(Pointer oldChild, Pointer newChild) {
|
|
auto iter = std::find(_children.begin(), _children.end(), oldChild);
|
|
if (iter != _children.end()) {
|
|
oldChild->_parent.reset();
|
|
newChild->_parent = shared_from_this();
|
|
if (_skeleton) {
|
|
newChild->setSkeleton(_skeleton);
|
|
}
|
|
*iter = newChild;
|
|
}
|
|
}
|
|
|
|
AnimNode::Pointer AnimNode::getChild(int i) const {
|
|
assert(i >= 0 && i < (int)_children.size());
|
|
return _children[i];
|
|
}
|
|
|
|
void AnimNode::setSkeleton(AnimSkeleton::ConstPointer skeleton) {
|
|
setSkeletonInternal(skeleton);
|
|
for (auto&& child : _children) {
|
|
child->setSkeleton(skeleton);
|
|
}
|
|
}
|
|
|
|
void AnimNode::setCurrentFrame(float frame) {
|
|
setCurrentFrameInternal(frame);
|
|
for (auto&& child : _children) {
|
|
child->setCurrentFrameInternal(frame);
|
|
}
|
|
}
|