-use separate meshes for escalator steps

-use maximum rendering distance of 100 for escalator steps

diff --git a/src/sbs/escalator.cpp b/src/sbs/escalator.cpp
index 1306bd0..b6a6c49 100644 (file)
--- a/src/sbs/escalator.cpp
+++ b/src/sbs/escalator.cpp
@@ -63,15 +63,13 @@ Escalator::Escalator(Object *parent, const std::string &name, int run, float spe
        end = 0;
        buffer_zone_steps = 2;
 
-       StepContainer = new DynamicMesh(this, GetSceneNode(), name + " Step Container", 0, true);
-
        //move object
        Move(CenterX, voffset, CenterZ);
 
        //create step meshes
        for (int i = 0; i < num_steps; i++)
        {
-               Step *mesh = new Step(this, "Step " + ToString(i + 1), StepContainer);
+               Step *mesh = new Step(this, "Step " + ToString(i + 1), 0, 100);
                Steps.push_back(mesh);
        }
 
@@ -104,10 +102,6 @@ Escalator::~Escalator()
                Steps[i] = 0;
        }
 
-       if (StepContainer)
-               delete StepContainer;
-       StepContainer = 0;
-
        //unregister from parent
        if (sbs->FastDelete == false)
        {

diff --git a/src/sbs/escalator.h b/src/sbs/escalator.h
index 8cd8c48..18f5df1 100644 (file)
--- a/src/sbs/escalator.h
+++ b/src/sbs/escalator.h
@@ -46,7 +46,6 @@ public:
        int GetRun() { return Run; }
 
 private:
-       DynamicMesh* StepContainer;
        Sound *sound; //sound object
        int Run; //-1 is reverse, 0 is stop, 1 is forward
        bool is_enabled;

diff --git a/src/sbs/step.cpp b/src/sbs/step.cpp
index 6f87105..21a6162 100644 (file)
--- a/src/sbs/step.cpp
+++ b/src/sbs/step.cpp
@@ -30,7 +30,7 @@
 
 namespace SBS {
 
-Step::Step(Object* parent, const std::string &name, DynamicMesh* wrapper) : MeshObject(parent, name, wrapper)
+Step::Step(Object* parent, const std::string &name, DynamicMesh* wrapper, int max_render_distance) : MeshObject(parent, name, wrapper, "", max_render_distance)
 {
        vector = Ogre::Vector3::ZERO;
        speed = 0;

diff --git a/src/sbs/step.h b/src/sbs/step.h
index c087063..48fe3a5 100644 (file)
--- a/src/sbs/step.h
+++ b/src/sbs/step.h
@@ -33,7 +33,7 @@ namespace SBS {
 class SBSIMPEXP Step : public MeshObject
 {
 public:
-       Step(Object* parent, const std::string &name, DynamicMesh* wrapper);
+       Step(Object* parent, const std::string &name, DynamicMesh* wrapper, int max_render_distance = 0);
        ~Step() {}
        void Move(const Ogre::Vector3 &vector, float speed = 1.0f);
        void OnHit();