Changeset 1055 for GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreRenderable.cpp

Timestamp:

06/26/06 09:52:08 (18 years ago)

Author:

szirmay

Message:

 

File:

• GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreRenderable.cpp (modified) (2 diffs)

GTP/trunk/Lib/Illum/IllumModule/OgreIllumModule/src/OgreRenderable.cpp

@@ -29 +29 @@
 }
 
-OgreRenderable::OgreRenderable(BillboardSet* billboardset)
+OgreRenderable::OgreRenderable(BillboardSet* billboardset, ParticleSystem* sys)
 {
         renderableType = OGRE_RENDERABLETYPE_BILLBOARDSET;
         billboardSetRenderable = billboardset;
+        parentParticleSystem = sys;
         updateBounds();
         name = billboardset->getName();
@@ -47 +48 @@
         {
          case OGRE_RENDERABLETYPE_SUBENTITY: 
-                 subEntityRenderable->setVisible(visible);
+//               subEntityRenderable->setVisible(visible);
+                 parentEntity->setVisible(visible);
                  break;
          case OGRE_RENDERABLETYPE_BILLBOARDSET:
-                 billboardSetRenderable->setVisible(visible);
+                 if(parentParticleSystem != 0)
+                         parentParticleSystem->setVisible(visible);
+                 else
+                         billboardSetRenderable->setVisible(visible);
                  break;
           default: