Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move getCollisionShapeURL() back to base class

Browse source
This commit is contained in:
Andrew Meadows 2019-07-09 15:45:41 -07:00
parent 2da0714e36
commit 9a6b42ec28
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -959,10 +959,6 @@ QStringList RenderableModelEntityItem::getJointNames() const {
return result;
}
QString RenderableModelEntityItem::getCollisionShapeURL() const {
return getShapeType() == SHAPE_TYPE_COMPOUND ? getCompoundShapeURL() : getModelURL();
}
scriptable::ScriptableModelBase render::entities::ModelEntityRenderer::getScriptableModel() {
auto model = resultWithReadLock<ModelPointer>([this]{ return _model; });

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

@ -113,9 +113,6 @@ public:
virtual int getJointIndex(const QString& name) const override;
virtual QStringList getJointNames() const override;
// Returns the URL used for the collision shape
QString getCollisionShapeURL() const;
private:
bool needsUpdateModelBounds() const;
void autoResizeJointArrays();

4
libraries/entities/src/ModelEntityItem.cpp
View file

@ -590,6 +590,10 @@ QString ModelEntityItem::getCompoundShapeURL() const {
return _compoundShapeURL.get();
}
QString ModelEntityItem::getCollisionShapeURL() const {
return getShapeType() == SHAPE_TYPE_COMPOUND ? getCompoundShapeURL() : getModelURL();
}
void ModelEntityItem::setColor(const glm::u8vec3& value) {
withWriteLock([&] {
_color = value;

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

@ -75,6 +75,9 @@ public:
static const QString DEFAULT_COMPOUND_SHAPE_URL;
QString getCompoundShapeURL() const;
// Returns the URL used for the collision shape
QString getCollisionShapeURL() const;
// model related properties
virtual void setModelURL(const QString& url);
virtual void setCompoundShapeURL(const QString& url);