photo texture load fixed

vicrucann · May 10, 2016 · 61d799a · 61d799a
1 parent 29e7298
commit 61d799a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/libSGControls/AddEntityCommand.cpp b/src/libSGControls/AddEntityCommand.cpp
@@ -89,6 +89,7 @@ AddPhotoCommand::AddPhotoCommand(entity::UserScene* scene, const std::string& fn
     m_photo->setName(ename);
     m_photo->loadImage(fname);
 
+    m_photo->getOrCreateStateSet()->setTextureAttributeAndModes(0, m_photo->getTextureAsAttribute());
 //    m_canvas->getGeodeData()->getOrCreateStateSet()->setTextureAttributeAndModes(0, m_photo->getTextureAsAttribute() );
 
     this->setText(QObject::tr("Add photo to %1")
@@ -113,8 +114,6 @@ void AddPhotoCommand::undo()
 
 void AddPhotoCommand::redo()
 {
-    m_photo->getOrCreateStateSet()->setTextureAttributeAndModes(0, m_photo->getTextureAsAttribute());
-
     if (!m_canvas->getGeodeData()->addDrawable(m_photo.get()))
         outErrMsg("Could not add photo to current canvas");
 

diff --git a/src/libSGEntities/RootScene.cpp b/src/libSGEntities/RootScene.cpp
@@ -139,13 +139,20 @@ bool RootScene::loadSceneFromFile()
     /* update pointer */
     m_userScene = newscene.get();
 
-    /* load the construction tools */
+    /* load the construction tools and set photo textures */
     for (unsigned int i=0; i<m_userScene->getNumChildren(); ++i){
         entity::Canvas* cnv = m_userScene->getCanvas(i);
         if (!cnv){
             continue;
         }
         cnv->initializeTools();
+
+        /* photo textures */
+        for (size_t i=0; i<cnv->getGeodeData()->getNumChildren(); ++i){
+            entity::Photo* photo = dynamic_cast<entity::Photo*>(cnv->getGeodeData()->getChild(i));
+            if (!photo) continue;
+            photo->getOrCreateStateSet()->setTextureAttributeAndModes(0, photo->getTextureAsAttribute());
+        }
     }
 
     /* update current/previous canvases */