Commit a4cbc993 authored by Michele Bosi's avatar Michele Bosi

Fixed Actor::enabled() -> Actor::isEnabled()

parent 7d0bdb66
......@@ -273,7 +273,7 @@ namespace vl
/** A disabled Actor should behave as if it had EnableMask == 0. */
void setEnabled(bool enabled) { mEnabled = enabled; }
/** A disabled Actor should behave as if it had EnableMask == 0. */
bool enabled() const { return mEnabled; }
bool isEnabled() const { return mEnabled; }
// uniforms methods
......
......@@ -78,7 +78,7 @@ void ActorTreeAbstract::extractVisibleActors(ActorCollection& list, const Camera
// cull Actor by Actor
for(int i=0; i<actors()->size(); ++i)
{
if (actors()->at(i)->enabled() && (enable_mask & actors()->at(i)->enableMask()))
if (actors()->at(i)->isEnabled() && (enable_mask & actors()->at(i)->enableMask()))
{
VL_CHECK(actors()->at(i)->lod(0))
actors()->at(i)->computeBounds();
......
......@@ -90,7 +90,7 @@ namespace vl
const std::vector<RenderStateSlot>& overriddenDefaultRenderStates() const { return mOverriddenDefaultRenderStates; }
bool isEnabled(unsigned int mask) { return (mask & mEnableMask) != 0; }
bool isEnabled(const Actor* actor) { return actor->enabled() && (actor->enableMask() & mEnableMask) != 0; }
bool isEnabled(const Actor* actor) { return actor->isEnabled() && (actor->enableMask() & mEnableMask) != 0; }
/** The Framebuffer on which the rendering is performed. */
void setFramebuffer(Framebuffer* framebuffer) { mFramebuffer = framebuffer; }
......
......@@ -82,7 +82,7 @@ namespace vl
unsigned int enableMask() const { return mEnableMask; }
bool isEnabled(unsigned int mask) { return (mask & mEnableMask) != 0; }
bool isEnabled(const Actor* actor) { return actor->enabled() && (actor->enableMask() & mEnableMask) != 0; }
bool isEnabled(const Actor* actor) { return actor->isEnabled() && (actor->enableMask() & mEnableMask) != 0; }
//! The update time of the current rendering frame.
void setFrameClock(real cur_time) { mFrameClock = cur_time; }
......
......@@ -83,6 +83,6 @@ void SceneManager::computeBounds()
//-----------------------------------------------------------------------------
bool SceneManager::isEnabled(Actor*a) const
{
return a->enabled() && (a->enableMask() & enableMask()) != 0;
return a->isEnabled() && (a->enableMask() & enableMask()) != 0;
}
//-----------------------------------------------------------------------------
......@@ -2130,7 +2130,7 @@ namespace vl
*vlx << "RenderBlock" << (long long)obj->renderBlock();
*vlx << "RenderRank" << (long long)obj->renderRank();
*vlx << "IsOccludee" << obj->isOccludee();
*vlx << "Enabled" << obj->enabled();
*vlx << "Enabled" << obj->isEnabled();
VLXValue renderables;
renderables.setList( new VLXList );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment