Changeset 737

Timestamp:

06/23/09 21:13:51 (9 months ago)

Author:

hagish

Message:

Gfx3D:SetVisible changed. Now its possible to change the cascading behavior with the 2. parameter. The change is backward compatible.

Location:

trunk/lugre

Files:

• include/lugre_gfx3D.h (modified) (1 diff)
• src/lugre_gfx3D.cpp (modified) (1 diff)
• src/lugre_gfx3D_L.cpp (modified) (1 diff)

trunk/lugre/include/lugre_gfx3D.h

@@ -127 +127 @@
         void    SetScale                        (const Vector3& vScale);
         void    SetNormaliseNormals     (const bool bNormalise);
-        void    SetVisible              (const bool bVisible);
+        void    SetVisible              (const bool bVisible, const bool bCascade);
         void    SetCastShadows          (const bool bCastShadows);
         void    SetMaterial             (const char* szMat);

trunk/lugre/src/lugre_gfx3D.cpp

@@ -636 +636 @@
 void    cGfx3D::SetNormaliseNormals     (const bool bNormalise) {  PROFILE /* if (mpEntity) TODO removed in ogresvn mpEntity->setNormaliseNormals(bNormalise); */ }
 void    cGfx3D::SetOrientation  (const Quaternion& qRot)        { PROFILE if (mpSceneNode) mpSceneNode->setOrientation(qRot); }
-void    cGfx3D::SetVisible              (const bool bVisible)           { PROFILE if (mpSceneNode) mpSceneNode->setVisible(bVisible); }
+void    cGfx3D::SetVisible              (const bool bVisible, const bool bCascade)              { PROFILE if (mpSceneNode) mpSceneNode->setVisible(bVisible, bCascade); }
 void    cGfx3D::SetCastShadows          (const bool bCastShadows) { PROFILE
         if (mpEntity) mpEntity->setCastShadows(bCastShadows); 

trunk/lugre/src/lugre_gfx3D_L.cpp

@@ -478 +478 @@
                 }
                 
-                /// gfx3D:SetVisible( bool)
+                /// gfx3D:SetVisible( bool visible, bool cascade=true)
                 static int      SetVisible                              (lua_State *L) { PROFILE
-                        checkudata_alive(L)->SetVisible(lua_toboolean(L,2));
+                        bool bCascade = (lua_gettop(L) >= 3 && !lua_isnil(L,3)) ? lua_toboolean(L,3) : true;
+                        checkudata_alive(L)->SetVisible(lua_toboolean(L,2), bCascade);
                         return 0;
                 }