OSDN Git Service
(root)
/
skyscrapersim
/
skyscraper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9fdeb18
)
Properly initialize step objects
author
ryan
<>
Tue, 27 Dec 2016 03:37:10 +0000
(
03:37
+0000)
committer
ryan
<>
Tue, 27 Dec 2016 03:37:10 +0000
(
03:37
+0000)
src/sbs/escalator.cpp
patch
|
blob
|
history
src/sbs/escalator.h
patch
|
blob
|
history
diff --git
a/src/sbs/escalator.cpp
b/src/sbs/escalator.cpp
index
9662944
..
b233577
100644
(file)
--- a/
src/sbs/escalator.cpp
+++ b/
src/sbs/escalator.cpp
@@
-395,6
+395,12
@@
void Escalator::OnClick(Ogre::Vector3 &position, bool shift, bool ctrl, bool alt
}
}
}
}
+Escalator::Step::Step(Object* parent, const std::string &name, DynamicMesh* wrapper) : MeshObject(parent, name, wrapper)
+{
+ vector = Ogre::Vector3::ZERO;
+ speed = 0;
+}
+
void Escalator::Step::Move(const Ogre::Vector3 &vector, float speed)
{
MeshObject::Move(vector, speed);
void Escalator::Step::Move(const Ogre::Vector3 &vector, float speed)
{
MeshObject::Move(vector, speed);
diff --git
a/src/sbs/escalator.h
b/src/sbs/escalator.h
index
3e51c4f
..
caf4302
100644
(file)
--- a/
src/sbs/escalator.h
+++ b/
src/sbs/escalator.h
@@
-56,7
+56,7
@@
private:
class Step : public MeshObject
{
public:
class Step : public MeshObject
{
public:
- Step(Object* parent, const std::string &name, DynamicMesh* wrapper)
: MeshObject(parent, name, wrapper) {}
+ Step(Object* parent, const std::string &name, DynamicMesh* wrapper)
;
~Step() {}
void Move(const Ogre::Vector3 &vector, float speed = 1.0f);
void OnHit();
~Step() {}
void Move(const Ogre::Vector3 &vector, float speed = 1.0f);
void OnHit();