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

Provide an option for the masked joints in the scriptable method, fix a couple

Browse source 
of annoying warnings.
This commit is contained in:
Andrzej Kapolka 2014-05-21 12:03:47 -07:00
parent d4468364f9
commit 709a9d75f6
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/avatar/MyAvatar.cpp
View file

@ -441,10 +441,10 @@ void MyAvatar::removeAnimationHandle(const AnimationHandlePointer& handle) {
_animationHandles.removeOne(handle); _animationHandles.removeOne(handle);
} }
void MyAvatar::startAnimation(const QString& url, float fps, float priority, bool loop) { void MyAvatar::startAnimation(const QString& url, float fps, float priority, bool loop, const QStringList& maskedJoints) {
if (QThread::currentThread() != thread()) { if (QThread::currentThread() != thread()) {
QMetaObject::invokeMethod(this, "startAnimation", Q_ARG(const QString&, url), QMetaObject::invokeMethod(this, "startAnimation", Q_ARG(const QString&, url),
Q_ARG(float, fps), Q_ARG(float, priority), Q_ARG(bool, loop)); Q_ARG(float, fps), Q_ARG(float, priority), Q_ARG(bool, loop), Q_ARG(const QStringList&, maskedJoints));
return; return;
} }
AnimationHandlePointer handle = _skeletonModel.createAnimationHandle(); AnimationHandlePointer handle = _skeletonModel.createAnimationHandle();
@ -452,6 +452,7 @@ void MyAvatar::startAnimation(const QString& url, float fps, float priority, boo
handle->setFPS(fps); handle->setFPS(fps);
handle->setPriority(priority); handle->setPriority(priority);
handle->setLoop(loop); handle->setLoop(loop);
handle->setMaskedJoints(maskedJoints);
handle->start(); handle->start();
} }

2
interface/src/avatar/MyAvatar.h
View file

@ -68,7 +68,7 @@ public:
/// Allows scripts to run animations. /// Allows scripts to run animations.
Q_INVOKABLE void startAnimation(const QString& url, float fps = 30.0f, Q_INVOKABLE void startAnimation(const QString& url, float fps = 30.0f,
float priority = 1.0f, bool loop = false); float priority = 1.0f, bool loop = false, const QStringList& maskedJoints = QStringList());
/// Stops an animation as identified by a URL. /// Stops an animation as identified by a URL.
Q_INVOKABLE void stopAnimation(const QString& url); Q_INVOKABLE void stopAnimation(const QString& url);

2
interface/src/ui/NodeBounds.cpp
View file

@ -133,7 +133,6 @@ void NodeBounds::draw() {
glTranslatef(selectedCenter.x, selectedCenter.y, selectedCenter.z); glTranslatef(selectedCenter.x, selectedCenter.y, selectedCenter.z);
glScalef(selectedScale, selectedScale, selectedScale); glScalef(selectedScale, selectedScale, selectedScale);
NodeType_t selectedNodeType = selectedNode->getType();
float red, green, blue; float red, green, blue;
getColorForNodeType(selectedNode->getType(), red, green, blue); getColorForNodeType(selectedNode->getType(), red, green, blue);
@ -225,7 +224,6 @@ void NodeBounds::drawOverlay() {
const int FONT = 2; const int FONT = 2;
const int PADDING = 10; const int PADDING = 10;
const int MOUSE_OFFSET = 10; const int MOUSE_OFFSET = 10;
const int BACKGROUND_OFFSET_Y = -20;
const int BACKGROUND_BEVEL = 3; const int BACKGROUND_BEVEL = 3;
int mouseX = application->getMouseX(), int mouseX = application->getMouseX(),