Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 01:36:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove deprecated cruft; stub setAnimationURL() override

Browse source
This commit is contained in:
Andrew Meadows 2018-09-17 13:58:00 -07:00
parent 148944814b
commit 0c61779331
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -975,14 +975,8 @@ QStringList RenderableModelEntityItem::getJointNames() const {
return result;
}
// FIXME: deprecated; remove >= RC67
bool RenderableModelEntityItem::getMeshes(MeshProxyList& result) {
auto model = getModel();
if (!model || !model->isLoaded()) {
return false;
}
BLOCKING_INVOKE_METHOD(model.get(), "getMeshes", Q_RETURN_ARG(MeshProxyList, result));
return !result.isEmpty();
void RenderableModelEntityItem::setAnimationURL(const QString& url) {
ModelEntityItem::setAnimationURL(url);
}
scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel() {

8
libraries/entities-renderer/src/RenderableModelEntityItem.h
View file

@ -114,20 +114,20 @@ public:
virtual int getJointIndex(const QString& name) const override;
virtual QStringList getJointNames() const override;
bool getMeshes(MeshProxyList& result) override; // deprecated
void setAnimationURL(const QString& url) override;
private:
bool needsUpdateModelBounds() const;
void autoResizeJointArrays();
void copyAnimationJointDataToModel();
bool readyToAnimate() const;
void getCollisionGeometryResource();
GeometryResource::Pointer _compoundShapeResource;
bool _jointMapCompleted { false };
bool _originalTexturesRead { false };
std::vector<int> _jointMap;
QVariantMap _originalTextures;
bool _jointMapCompleted { false };
bool _originalTexturesRead { false };
bool _dimensionsInitialized { true };
bool _needsJointSimulation { false };
};

2
libraries/entities/src/ModelEntityItem.h
View file

@ -86,7 +86,7 @@ public:
// TODO: audit and remove unused Animation accessors
bool hasAnimation() const;
QString getAnimationURL() const;
void setAnimationURL(const QString& url);
virtual void setAnimationURL(const QString& url);
void setAnimationCurrentFrame(float value);
void setAnimationIsPlaying(bool value);