Integrated Enabled() function into Object

diff --git a/src/sbs/buttonpanel.cpp b/src/sbs/buttonpanel.cpp
index 05108a3..83610ac 100644 (file)
--- a/src/sbs/buttonpanel.cpp
+++ b/src/sbs/buttonpanel.cpp
@@ -250,7 +250,7 @@ void ButtonPanel::Enabled(bool value)
        if (IsEnabled == value)
                return;
 
-       mesh->Enable(value);
+       mesh->Enabled(value);
 
        for (size_t i = 0; i < controls.size(); i++)
        {

diff --git a/src/sbs/control.cpp b/src/sbs/control.cpp
index bbd9808..de2c70f 100644 (file)
--- a/src/sbs/control.cpp
+++ b/src/sbs/control.cpp
@@ -184,7 +184,7 @@ void Control::Enabled(bool value)
        if (is_enabled == value)
                return;
 
-       ControlMesh->Enable(value);
+       ControlMesh->Enabled(value);
        is_enabled = value;
 }
 

diff --git a/src/sbs/directional.cpp b/src/sbs/directional.cpp
index 2fa967b..0576188 100644 (file)
--- a/src/sbs/directional.cpp
+++ b/src/sbs/directional.cpp
@@ -337,13 +337,13 @@ void DirectionalIndicator::Enabled(bool value)
        if (value == is_enabled)
                return;
 
-       DirectionalMeshBack->Enable(value);
+       DirectionalMeshBack->Enabled(value);
        if (DirectionalMeshUp)
-               DirectionalMeshUp->Enable(value);
+               DirectionalMeshUp->Enabled(value);
        if (DirectionalMeshDown)
-               DirectionalMeshDown->Enable(value);
+               DirectionalMeshDown->Enabled(value);
        if (DirectionalMesh)
-               DirectionalMesh->Enable(value);
+               DirectionalMesh->Enabled(value);
 
        is_enabled = value;
 }

diff --git a/src/sbs/door.cpp b/src/sbs/door.cpp
index b5537e1..39ae527 100644 (file)
--- a/src/sbs/door.cpp
+++ b/src/sbs/door.cpp
@@ -241,7 +241,7 @@ void Door::Enabled(bool value)
        if (is_enabled == value)
                return;
 
-       DoorMesh->Enable(value);
+       DoorMesh->Enabled(value);
        is_enabled = value;
 }
 

diff --git a/src/sbs/dynamicmesh.cpp b/src/sbs/dynamicmesh.cpp
index 5aa1b99..3de4d27 100644 (file)
--- a/src/sbs/dynamicmesh.cpp
+++ b/src/sbs/dynamicmesh.cpp
@@ -89,7 +89,7 @@ bool DynamicMesh::LoadFromFile(const std::string &filename, const std::string &p
        return true;
 }
 
-void DynamicMesh::Enable(bool value, MeshObject *client)
+void DynamicMesh::Enabled(bool value, MeshObject *client)
 {
        if (client == 0 || meshes.size() == 1)
        {
@@ -116,7 +116,7 @@ void DynamicMesh::Enable(bool value, MeshObject *client)
 
                //enable all meshes if no client specified
                for (size_t i = 0; i < meshes.size(); i++)
-                       meshes[i]->Enable(value);
+                       meshes[i]->Enabled(value);
        }
        else if (meshes.size() > 1)
        {
@@ -125,7 +125,7 @@ void DynamicMesh::Enable(bool value, MeshObject *client)
                int index = GetClientIndex(client);
 
                if (index >= 0)
-                       meshes[index]->Enable(value);
+                       meshes[index]->Enabled(value);
        }
 }
 
@@ -606,7 +606,7 @@ DynamicMesh::Mesh::Mesh(DynamicMesh *parent, const std::string &name, SceneNode
        //create and enable movable
        Movable = sbs->mSceneManager->createEntity(MeshWrapper);
        //Movable->setCastShadows(true);
-       Enable(true);
+       Enabled(true);
 
        //set maximum render distance
        Movable->setRenderingDistance(sbs->ToRemote(max_render_distance));
@@ -627,7 +627,7 @@ DynamicMesh::Mesh::~Mesh()
        MeshWrapper.setNull();
 }
 
-void DynamicMesh::Mesh::Enable(bool value)
+void DynamicMesh::Mesh::Enabled(bool value)
 {
        //attach or detach from scenegraph
 
@@ -1071,8 +1071,8 @@ void DynamicMesh::Mesh::Prepare(bool process_vertices, int client)
                //if a mesh was attached and was empty, it needs to be reattached to be visible
                if (previous_count == 0 && enabled == true)
                {
-                       Enable(false);
-                       Enable(true);
+                       Enabled(false);
+                       Enabled(true);
                }
        }
 

diff --git a/src/sbs/dynamicmesh.h b/src/sbs/dynamicmesh.h
index ab63fa6..5b09ed8 100644 (file)
--- a/src/sbs/dynamicmesh.h
+++ b/src/sbs/dynamicmesh.h
@@ -36,7 +36,7 @@ public:
 
        DynamicMesh(Object *parent, SceneNode *node, const std::string &name, float max_render_distance = 0, bool dynamic_buffers = false);
        ~DynamicMesh();
-       void Enable(bool value, MeshObject *client = 0);
+       void Enabled(bool value, MeshObject *client = 0);
        bool ChangeTexture(const std::string &old_texture, const std::string &new_texture, MeshObject *client = 0);
        void EnableDebugView(bool value, MeshObject *client = 0);
        bool IsVisible(MeshObject *client = 0);
@@ -72,7 +72,7 @@ private:
 
                Mesh(DynamicMesh *parent, const std::string &name, SceneNode *node, float max_render_distance, const std::string &filename = "", const std::string &path = "");
                ~Mesh();
-               void Enable(bool value);
+               void Enabled(bool value);
                bool ChangeTexture(const std::string &old_texture, const std::string &new_texture);
                int FindMatchingSubMesh(const std::string &material);
                Submesh* CreateSubMesh(const std::string &material);

diff --git a/src/sbs/elevatorcar.cpp b/src/sbs/elevatorcar.cpp
index b95e443..746223f 100644 (file)
--- a/src/sbs/elevatorcar.cpp
+++ b/src/sbs/elevatorcar.cpp
@@ -792,7 +792,7 @@ void ElevatorCar::Enabled(bool value)
                        Report("disabling car");
        }
 
-       Mesh->Enable(value);
+       Mesh->Enabled(value);
        EnableDoors(value);
        IsEnabled = value;
 
@@ -854,7 +854,7 @@ void ElevatorCar::EnableObjects(bool value)
        for (size_t i = 0; i < ModelArray.size(); i++)
        {
                if (ModelArray[i])
-                       ModelArray[i]->Enable(value);
+                       ModelArray[i]->Enabled(value);
        }
 
        //panels
@@ -1591,7 +1591,7 @@ void ElevatorCar::EnableDoors(bool value)
                        door->Enabled(value);
        }
 
-       parent->DoorContainer->Enable(value);
+       parent->DoorContainer->Enabled(value);
 }
 
 void ElevatorCar::SetShaftDoors(int number, float thickness, float CenterX, float CenterZ)

diff --git a/src/sbs/elevatordoor.cpp b/src/sbs/elevatordoor.cpp
index 6aef603..a88f6e5 100644 (file)
--- a/src/sbs/elevatordoor.cpp
+++ b/src/sbs/elevatordoor.cpp
@@ -1223,7 +1223,7 @@ void ElevatorDoor::ShaftDoorsEnabled(int floor, bool value)
        if (ShaftDoorsExist(floor) == false)
                return;
 
-       ShaftDoors[index]->Enable(value);
+       ShaftDoors[index]->Enabled(value);
 }
 
 void ElevatorDoor::ShaftDoorsEnabledRange(int floor, int range)
@@ -1404,13 +1404,13 @@ void ElevatorDoor::Loop()
 
 void ElevatorDoor::Enabled(bool value)
 {
-       Doors->Enable(value);
+       Doors->Enabled(value);
 }
 
 bool ElevatorDoor::IsEnabled()
 {
        //are doors enabled?
-       return Doors->Enabled;
+       return Doors->IsEnabled;
 }
 
 int ElevatorDoor::GetWhichDoors()
@@ -1531,7 +1531,7 @@ ElevatorDoor::DoorWrapper::DoorWrapper(Object *parent_obj, ElevatorDoor *door_ob
 {
        parent = door_object;
        Open = false;
-       Enabled = true;
+       IsEnabled = true;
        Width = 0;
        Height = 0;
        Thickness = 0;
@@ -1575,17 +1575,17 @@ ElevatorDoor::DoorObject* ElevatorDoor::DoorWrapper::CreateDoor(const std::strin
        return door;
 }
 
-void ElevatorDoor::DoorWrapper::Enable(bool value)
+void ElevatorDoor::DoorWrapper::Enabled(bool value)
 {
        //enable/disable door meshes
 
-       if (value == Enabled)
+       if (value == IsEnabled)
                return;
 
        for (size_t i = 0; i < doors.size(); i++)
-               doors[i]->mesh->Enable(value);
+               doors[i]->mesh->Enabled(value);
 
-       Enabled = value;
+       IsEnabled = value;
 }
 
 void ElevatorDoor::DoorObject::MoveDoors(bool open, bool manual)

diff --git a/src/sbs/elevatordoor.h b/src/sbs/elevatordoor.h
index 05993ff..e7b6af6 100644 (file)
--- a/src/sbs/elevatordoor.h
+++ b/src/sbs/elevatordoor.h
@@ -74,7 +74,7 @@ public:
                ~DoorWrapper();
 
                DoorObject* CreateDoor(const std::string &doorname, const std::string &Direction, float OpenSpeed, float CloseSpeed);
-               void Enable(bool value);
+               void Enabled(bool value);
                bool CheckDoorsOpen();
                bool IsFinished();
                void ResetFinished();
@@ -87,7 +87,7 @@ public:
                std::vector<DoorObject*> doors;
                std::string name;
                bool Open;
-               bool Enabled;
+               bool IsEnabled;
                float Width;
                float Height;
                float Thickness;

diff --git a/src/sbs/escalator.cpp b/src/sbs/escalator.cpp
index ac33cdf..96612ef 100644 (file)
--- a/src/sbs/escalator.cpp
+++ b/src/sbs/escalator.cpp
@@ -115,7 +115,7 @@ void Escalator::Enabled(bool value)
        EnableLoop(value);
 
        for (size_t i = 0; i < Steps.size(); i++)
-               Steps[i]->Enable(value);
+               Steps[i]->Enabled(value);
 
        if (value == false && sound->IsPlaying() == true)
                sound->Stop();

diff --git a/src/sbs/floor.cpp b/src/sbs/floor.cpp
index e17348d..186e572 100644 (file)
--- a/src/sbs/floor.cpp
+++ b/src/sbs/floor.cpp
@@ -327,7 +327,7 @@ void Floor::Enabled(bool value)
                return;
 
        SBS_PROFILE("Floor::Enabled");
-       Level->Enable(value);
+       Level->Enabled(value);
        IsEnabled = value;
 
        EnableLoop(value);
@@ -421,7 +421,7 @@ void Floor::Enabled(bool value)
        for (size_t i = 0; i < ModelArray.size(); i++)
        {
                if (ModelArray[i])
-                       ModelArray[i]->Enable(value);
+                       ModelArray[i]->Enabled(value);
        }
 
        //call buttons
@@ -437,7 +437,7 @@ void Floor::Enabled(bool value)
                if (DoorArray[i])
                        DoorArray[i]->Enabled(value);
        }
-       DoorWrapper->Enable(value);
+       DoorWrapper->Enabled(value);
 
        //turn on/off directional indicators
        for (size_t i = 0; i < DirIndicatorArray.size(); i++)
@@ -749,14 +749,14 @@ bool Floor::CalculateAltitude()
 void Floor::EnableColumnFrame(bool value)
 {
        //enable/disable columnframe mesh
-       ColumnFrame->Enable(value);
+       ColumnFrame->Enabled(value);
        IsColumnFrameEnabled = value;
 }
 
 void Floor::EnableInterfloor(bool value)
 {
        //enable/disable interfloor mesh
-       Interfloor->Enable(value);
+       Interfloor->Enabled(value);
        IsInterfloorEnabled = value;
 }
 

diff --git a/src/sbs/floorindicator.cpp b/src/sbs/floorindicator.cpp
index 8bef0c7..068ca12 100644 (file)
--- a/src/sbs/floorindicator.cpp
+++ b/src/sbs/floorindicator.cpp
@@ -116,7 +116,7 @@ void FloorIndicator::Enabled(bool value)
        if (is_enabled == value)
                return;
 
-       FloorIndicatorMesh->Enable(value);
+       FloorIndicatorMesh->Enabled(value);
        is_enabled = value;
 }
 

diff --git a/src/sbs/manager.cpp b/src/sbs/manager.cpp
index 5089b84..938f9b3 100644 (file)
--- a/src/sbs/manager.cpp
+++ b/src/sbs/manager.cpp
@@ -205,9 +205,9 @@ void FloorManager::EnableAll(bool value)
                Array[i].object->Enabled(value);
 
        //enable/disable dynamic meshes
-       floors->Enable(value);
-       interfloors->Enable(value);
-       columnframes->Enable(value);
+       floors->Enabled(value);
+       interfloors->Enabled(value);
+       columnframes->Enabled(value);
 }
 
 void FloorManager::Loop()

diff --git a/src/sbs/mesh.cpp b/src/sbs/mesh.cpp
index 07e35d0..892e8cd 100644 (file)
--- a/src/sbs/mesh.cpp
+++ b/src/sbs/mesh.cpp
@@ -645,7 +645,7 @@ MeshObject::~MeshObject()
        Bounds = 0;
 }
 
-void MeshObject::Enable(bool value)
+void MeshObject::Enabled(bool value)
 {
        //enables or disables the mesh
 
@@ -663,7 +663,7 @@ void MeshObject::Enable(bool value)
 
        SBS_PROFILE("MeshObject::Enable");
 
-       MeshWrapper->Enable(value, this);
+       MeshWrapper->Enabled(value, this);
 
        EnableCollider(value);
 
@@ -1449,8 +1449,8 @@ void MeshObject::CreateCollider()
                                revert = true;
                        }
 
-                       Enable(false);
-                       Enable(true);
+                       Enabled(false);
+                       Enabled(true);
 
                        if (revert == true)
                                remove_on_disable = false;

diff --git a/src/sbs/mesh.h b/src/sbs/mesh.h
index d48f5e9..5446b54 100644 (file)
--- a/src/sbs/mesh.h
+++ b/src/sbs/mesh.h
@@ -72,7 +72,7 @@ public:
 
        MeshObject(Object* parent, const std::string &name, DynamicMesh* wrapper = 0, const std::string &filename = "", float max_render_distance = 0, float scale_multiplier = 1, bool enable_physics = false, float restitution = 0, float friction = 0, float mass = 0);
        ~MeshObject();
-       void Enable(bool value);
+       void Enabled(bool value);
        void EnableCollider(bool value);
        bool IsEnabled();
        Wall* CreateWallObject(const std::string &name);

diff --git a/src/sbs/model.cpp b/src/sbs/model.cpp
index 3db7d03..ec6652f 100644 (file)
--- a/src/sbs/model.cpp
+++ b/src/sbs/model.cpp
@@ -84,9 +84,9 @@ Model::~Model()
                RemoveFromParent();
 }
 
-void Model::Enable(bool value)
+void Model::Enabled(bool value)
 {
-       mesh->Enable(value);
+       mesh->Enabled(value);
        EnableLoop(value);
 }
 

diff --git a/src/sbs/model.h b/src/sbs/model.h
index fe8cce2..5e9415c 100644 (file)
--- a/src/sbs/model.h
+++ b/src/sbs/model.h
@@ -37,7 +37,7 @@ public:
        Model(Object *parent, const std::string &name, const std::string &filename, bool center, const Ogre::Vector3 &position, const Ogre::Vector3 &rotation, float max_render_distance = 0, float scale_multiplier = 1, bool enable_physics = false, float restitution = 0, float friction = 0, float mass = 0);
        ~Model();
        bool IsEnabled();
-       void Enable(bool value);
+       void Enabled(bool value);
        bool IsKey();
        int GetKeyID();
        void SetKey(int keyid);

diff --git a/src/sbs/object.h b/src/sbs/object.h
index ee125c7..3bc5412 100644 (file)
--- a/src/sbs/object.h
+++ b/src/sbs/object.h
@@ -108,6 +108,7 @@ public:
        virtual void Loop() {} //object runloop
        void RegisterLoop(Object *object);
        void UnregisterLoop(Object *object);
+       virtual void Enabled(bool value) {}
 
        template <typename T> bool IsType()
        {

diff --git a/src/sbs/revolvingdoor.cpp b/src/sbs/revolvingdoor.cpp
index 0ba5b0d..97fe544 100644 (file)
--- a/src/sbs/revolvingdoor.cpp
+++ b/src/sbs/revolvingdoor.cpp
@@ -170,7 +170,7 @@ void RevolvingDoor::Enabled(bool value)
        if (is_enabled == value)
                return;
 
-       DoorMesh->Enable(value);
+       DoorMesh->Enabled(value);
        is_enabled = value;
 }
 

diff --git a/src/sbs/sbs.cpp b/src/sbs/sbs.cpp
index 7246f09..adb652f 100644 (file)
--- a/src/sbs/sbs.cpp
+++ b/src/sbs/sbs.cpp
@@ -1394,21 +1394,21 @@ Wall* SBS::AddTriangleWall(MeshObject* mesh, const std::string &name, const std:
 void SBS::EnableBuildings(bool value)
 {
        //turns buildings on/off
-       Buildings->Enable(value);
+       Buildings->Enabled(value);
        IsBuildingsEnabled = value;
 }
 
 void SBS::EnableLandscape(bool value)
 {
        //turns landscape on/off
-       Landscape->Enable(value);
+       Landscape->Enabled(value);
        IsLandscapeEnabled = value;
 }
 
 void SBS::EnableExternal(bool value)
 {
        //turns external on/off
-       External->Enable(value);
+       External->Enabled(value);
        IsExternalEnabled = value;
 }
 
@@ -1417,7 +1417,7 @@ void SBS::EnableSkybox(bool value)
        //turns skybox on/off
        if (SkyBox)
        {
-               SkyBox->Enable(value);
+               SkyBox->Enabled(value);
                IsSkyboxEnabled = value;
        }
        else

diff --git a/src/sbs/shaft.cpp b/src/sbs/shaft.cpp
index 4989d24..df06249 100644 (file)
--- a/src/sbs/shaft.cpp
+++ b/src/sbs/shaft.cpp
@@ -277,7 +277,7 @@ void Shaft::Enabled(int floor, bool value, bool EnableShaftDoors)
        {
                //turns shaft on/off for a specific floor
 
-               GetMeshObject(floor)->Enable(value);
+               GetMeshObject(floor)->Enabled(value);
                EnableArray[floor - startfloor] = value;
 
                //doors
@@ -305,7 +305,7 @@ void Shaft::Enabled(int floor, bool value, bool EnableShaftDoors)
                for (size_t i = 0; i < ModelArray[floor - startfloor].size(); i++)
                {
                        if (ModelArray[floor - startfloor][i])
-                               ModelArray[floor - startfloor][i]->Enable(value);
+                               ModelArray[floor - startfloor][i]->Enabled(value);
                }
 
                if (EnableShaftDoors == true)
@@ -352,9 +352,9 @@ void Shaft::EnableWholeShaft(bool value, bool EnableShaftDoors, bool force)
        }
 
        //enable/disable dynamic meshes
-       dynamic_mesh->Enable(value);
-       ShaftDoorContainer->Enable(value);
-       DoorWrapper->Enable(value);
+       dynamic_mesh->Enabled(value);
+       ShaftDoorContainer->Enabled(value);
+       DoorWrapper->Enabled(value);
 
        IsEnabled = value;
        if (ShowFullShaft == true)

diff --git a/src/sbs/stairs.cpp b/src/sbs/stairs.cpp
index 1dd19fb..9db25c9 100644 (file)
--- a/src/sbs/stairs.cpp
+++ b/src/sbs/stairs.cpp
@@ -351,7 +351,7 @@ void Stairs::Enabled(int floor, bool value)
        SBS_PROFILE("Stairs::Enabled");
        if (IsEnabledFloor(floor) != value && floor >= startfloor && floor <= endfloor)
        {
-               GetMeshObject(floor)->Enable(value);
+               GetMeshObject(floor)->Enabled(value);
                EnableArray[floor - startfloor] = value;
 
                //doors
@@ -379,7 +379,7 @@ void Stairs::Enabled(int floor, bool value)
                for (size_t i = 0; i < ModelArray[floor - startfloor].size(); i++)
                {
                        if (ModelArray[floor - startfloor][i])
-                               ModelArray[floor - startfloor][i]->Enable(value);
+                               ModelArray[floor - startfloor][i]->Enabled(value);
                }
        }
 }
@@ -405,8 +405,8 @@ void Stairs::EnableWholeStairwell(bool value, bool force)
        }
 
        //enable/disable dynamic meshes
-       dynamic_mesh->Enable(value);
-       DoorWrapper->Enable(value);
+       dynamic_mesh->Enabled(value);
+       DoorWrapper->Enabled(value);
 
        IsEnabled = value;
 }