Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 22:36:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reduce interconnection between AnimGraph and SkeletonModel by removing init and having MyAvatar:initAnimGraph go directly to rig (just like destroyAnimGraph does).

Browse source
This commit is contained in:
Howard Stearns 2015-09-09 15:02:11 -07:00
parent da5bdd5641
commit c1d68e058e
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1243,7 +1243,7 @@ void MyAvatar::initAnimGraph() {
// python2 -m SimpleHTTPServer& // python2 -m SimpleHTTPServer&
//auto graphUrl = QUrl("http://localhost:8000/avatar.json"); //auto graphUrl = QUrl("http://localhost:8000/avatar.json");
auto graphUrl = QUrl("https://gist.githubusercontent.com/hyperlogic/7d6a0892a7319c69e2b9/raw/e2cb37aee601b6fba31d60eac3f6ae3ef72d4a66/avatar.json"); auto graphUrl = QUrl("https://gist.githubusercontent.com/hyperlogic/7d6a0892a7319c69e2b9/raw/e2cb37aee601b6fba31d60eac3f6ae3ef72d4a66/avatar.json");
_skeletonModel.initAnimGraph(graphUrl, _skeletonModel.getGeometry()->getFBXGeometry()); _rig->initAnimGraph(graphUrl, _skeletonModel.getGeometry()->getFBXGeometry());
} }
void MyAvatar::destroyAnimGraph() { void MyAvatar::destroyAnimGraph() {

3
interface/src/avatar/SkeletonModel.cpp
View file

@ -618,6 +618,3 @@ bool SkeletonModel::hasSkeleton() {
void SkeletonModel::onInvalidate() { void SkeletonModel::onInvalidate() {
} }
void SkeletonModel::initAnimGraph(const QUrl& url, const FBXGeometry& fbxGeometry) {
_rig->initAnimGraph(url, fbxGeometry);
}

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

@ -105,8 +105,6 @@ public:
virtual void onInvalidate() override; virtual void onInvalidate() override;
void initAnimGraph(const QUrl& url, const FBXGeometry& fbxGeometry);
signals: signals:
void skeletonLoaded(); void skeletonLoaded();