Showing the changes to interface/src/ParticleTreeRenderer.cpp (1 of 1 file). Show all
Unified · Split
| @@ -43,19 +43,6 @@ void ParticleTreeRenderer::render() { · 42 unmodified lines | ||
| 43 | 43 | OctreeRenderer::render(); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | −//_testModel->setURL(QUrl("http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/lotus.fbx")); | |
| 47 | −//_testModel->setURL(QUrl("http://www.fungibleinsight.com/faces/tie.fbx")); | |
| 48 | −//_testModel->setURL(QUrl("http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Angie1.fbx")); | |
| 49 | −//_testModel->setURL(QUrl("http://public.highfidelity.io/meshes/orb_model.fbx")); | |
| 50 | −//_testModel->setURL(QUrl("http://public.highfidelity.io/meshes/space_frigate_6.FBX")); | |
| 51 | −//_testModel->setURL(QUrl("http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/soccer_ball.fbx")); | |
| 52 | −//_testModel->setURL(QUrl("http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/top%20fbx.FBX")); | |
| 53 | −//_testModel->setURL(QUrl("http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/golfball_FBX2010.fbx")); | |
| 54 | −//_testModel->setURL(QUrl("http://public.highfidelity.io/meshes/Combat_tank_V01.FBX")); | |
| 55 | − | |
| 56 | −//_testModel->setURL(QUrl("http://public.highfidelity.io/meshes/orc.fbx")); | |
| 57 | −//_testModel->setURL(QUrl("http://highfidelity-public.s3-us-west-1.amazonaws.com/meshes/Feisar_Ship.FBX")); | |
| 58 | − | |
| 59 | 46 | Model* ParticleTreeRenderer::getModel(const QString& url) { |
| 60 | 47 | Model* model = NULL; |
| 61 | 48 | |
| @@ -63,9 +50,8 @@ Model* ParticleTreeRenderer::getModel(const QString& url) { · 1 unmodified line | ||
| 63 | 50 | if (_particleModels.find(url) == _particleModels.end()) { |
| 64 | 51 | model = new Model(); |
| 65 | 52 | model->init(); |
| 66 | − qDebug() << "calling model->setURL()"; | |
| 67 | 53 | model->setURL(QUrl(url)); |
| 68 | − qDebug() << "after calling setURL()"; | |
| 54 | + _particleModels[url] = model; | |
| 69 | 55 | } else { |
| 70 | 56 | model = _particleModels[url]; |
| 71 | 57 | } |