Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 01:13:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #24 from birarda/atp

Browse source 
remove urlAsString from Model
This commit is contained in:
Ryan Huffman 2015-08-27 16:05:46 -07:00
commit 7d0258fe2c
3 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,7 +227,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) {
if (hasModel()) {
if (_model) {
if (getModelURL() != _model->getURLAsString()) {
if (getModelURL() != _model->getURL().toString()) {
qDebug() << "Updating model URL: " << getModelURL();
_model->setURL(getModelURL());
}

3
libraries/render-utils/src/Model.cpp
View file

@ -70,7 +70,6 @@ Model::Model(RigPointer rig, QObject* parent) :
_cauterizeBones(false),
_pupilDilation(0.0f),
_url(HTTP_INVALID_COM),
_urlAsString(HTTP_INVALID_COM),
_isVisible(true),
_blendNumber(0),
_appliedBlendNumber(0),
@ -1028,14 +1027,12 @@ int Model::getLastFreeJointIndex(int jointIndex) const {
}
void Model::setURL(const QUrl& url) {
// don't recreate the geometry if it's the same URL
if (_url == url && _geometry && _geometry->getURL() == url) {
return;
}
_url = url;
_urlAsString = _url.toString();
{
render::PendingChanges pendingChanges;

2
libraries/render-utils/src/Model.h
View file

@ -70,7 +70,6 @@ public:
/// Sets the URL of the model to render.
Q_INVOKABLE void setURL(const QUrl& url);
const QUrl& getURL() const { return _url; }
const QString& getURLAsString() const { return _urlAsString; }
// new Scene/Engine rendering support
void setVisibleInScene(bool newValue, std::shared_ptr<render::Scene> scene);
@ -314,7 +313,6 @@ private:
QVector<float> _blendshapeCoefficients;
QUrl _url;
QString _urlAsString;
QUrl _collisionUrl;
bool _isVisible;