Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-15 08:57:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

load scripts once on rigReady

Browse source
This commit is contained in:
luiscuenca 2018-05-01 09:37:01 -07:00
parent 50ca09b3b4
commit 2ac7fcadd2
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -124,8 +124,14 @@ MyAvatar::MyAvatar(QThread* thread) :
connect(_skeletonModel.get(), &Model::setURLFinished, this, [this](bool success) {
if (success) {
qApp->unloadAvatarScripts();
_shouldLoadScripts = true;
}
});
connect(_skeletonModel.get(), &Model::rigReady, this, [this]() {
if (_shouldLoadScripts) {
auto geometry = getSkeletonModel()->getFBXGeometry();
qApp->loadAvatarScripts(geometry.scripts);
_shouldLoadScripts = false;
}
});
connect(_skeletonModel.get(), &Model::rigReady, this, &Avatar::rigReady);

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

@ -904,6 +904,9 @@ private:
// max unscaled forward movement speed
ThreadSafeValueCache<float> _walkSpeed { DEFAULT_AVATAR_MAX_WALKING_SPEED };
float _walkSpeedScalar { AVATAR_WALK_SPEED_SCALAR };
// load avatar scripts once when rig is ready
bool _shouldLoadScripts { false };
};
QScriptValue audioListenModeToScriptValue(QScriptEngine* engine, const AudioListenerMode& audioListenerMode);