[Orxonox-commit 1730] r6448 - in code/branches/network2/src: modules/objects modules/objects/collisionshapes modules/pong orxonox orxonox/collisionshapes orxonox/graphics orxonox/infos orxonox/items orxonox/worldentities orxonox/worldentities/pawns
scheusso at orxonox.net
scheusso at orxonox.net
Sun Jan 17 11:37:49 CET 2010
Author: scheusso
Date: 2010-01-17 11:37:48 +0100 (Sun, 17 Jan 2010)
New Revision: 6448
Modified:
code/branches/network2/src/modules/objects/Planet.h
code/branches/network2/src/modules/objects/collisionshapes/BoxCollisionShape.h
code/branches/network2/src/modules/objects/collisionshapes/ConeCollisionShape.h
code/branches/network2/src/modules/objects/collisionshapes/PlaneCollisionShape.h
code/branches/network2/src/modules/objects/collisionshapes/SphereCollisionShape.h
code/branches/network2/src/modules/pong/PongBall.h
code/branches/network2/src/modules/pong/PongBat.h
code/branches/network2/src/orxonox/CMakeLists.txt
code/branches/network2/src/orxonox/Level.h
code/branches/network2/src/orxonox/Test.h
code/branches/network2/src/orxonox/collisionshapes/CollisionShape.h
code/branches/network2/src/orxonox/graphics/Backlight.h
code/branches/network2/src/orxonox/graphics/Billboard.h
code/branches/network2/src/orxonox/graphics/BlinkingBillboard.h
code/branches/network2/src/orxonox/graphics/FadingBillboard.h
code/branches/network2/src/orxonox/graphics/GlobalShader.h
code/branches/network2/src/orxonox/graphics/Light.h
code/branches/network2/src/orxonox/graphics/Model.h
code/branches/network2/src/orxonox/graphics/ParticleEmitter.h
code/branches/network2/src/orxonox/infos/GametypeInfo.h
code/branches/network2/src/orxonox/infos/HumanPlayer.h
code/branches/network2/src/orxonox/infos/PlayerInfo.h
code/branches/network2/src/orxonox/items/Engine.h
code/branches/network2/src/orxonox/items/MultiStateEngine.h
code/branches/network2/src/orxonox/worldentities/BigExplosion.h
code/branches/network2/src/orxonox/worldentities/ControllableEntity.h
code/branches/network2/src/orxonox/worldentities/ExplosionChunk.h
code/branches/network2/src/orxonox/worldentities/MobileEntity.cc
code/branches/network2/src/orxonox/worldentities/MovableEntity.h
code/branches/network2/src/orxonox/worldentities/StaticEntity.h
code/branches/network2/src/orxonox/worldentities/WorldEntity.h
code/branches/network2/src/orxonox/worldentities/pawns/Pawn.h
code/branches/network2/src/orxonox/worldentities/pawns/SpaceShip.h
code/branches/network2/src/orxonox/worldentities/pawns/Spectator.h
Log:
made registerVariables always private. otherwise bad things may happen with variables registered twice or even 3 times (as has happened in ControllableEntity until now)
Modified: code/branches/network2/src/modules/objects/Planet.h
===================================================================
--- code/branches/network2/src/modules/objects/Planet.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/modules/objects/Planet.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -93,9 +93,9 @@
}
protected:
- void registerVariables();
private:
+ void registerVariables();
void changedMesh();
void changedShadows();
Modified: code/branches/network2/src/modules/objects/collisionshapes/BoxCollisionShape.h
===================================================================
--- code/branches/network2/src/modules/objects/collisionshapes/BoxCollisionShape.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/modules/objects/collisionshapes/BoxCollisionShape.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -42,7 +42,6 @@
BoxCollisionShape(BaseObject* creator);
virtual ~BoxCollisionShape();
- void registerVariables();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
inline void setHalfExtents(const Vector3& extents)
@@ -66,6 +65,8 @@
{ return this->halfExtents_.x * 2; }
private:
+ void registerVariables();
+
btCollisionShape* createNewShape() const;
Vector3 halfExtents_;
Modified: code/branches/network2/src/modules/objects/collisionshapes/ConeCollisionShape.h
===================================================================
--- code/branches/network2/src/modules/objects/collisionshapes/ConeCollisionShape.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/modules/objects/collisionshapes/ConeCollisionShape.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -40,7 +40,6 @@
ConeCollisionShape(BaseObject* creator);
virtual ~ConeCollisionShape();
- void registerVariables();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
inline void setRadius(float value)
@@ -54,6 +53,8 @@
{ return this->height_; }
private:
+ void registerVariables();
+
btCollisionShape* createNewShape() const;
float radius_;
Modified: code/branches/network2/src/modules/objects/collisionshapes/PlaneCollisionShape.h
===================================================================
--- code/branches/network2/src/modules/objects/collisionshapes/PlaneCollisionShape.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/modules/objects/collisionshapes/PlaneCollisionShape.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -42,7 +42,6 @@
PlaneCollisionShape(BaseObject* creator);
virtual ~PlaneCollisionShape();
- void registerVariables();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
inline void setNormal(const Vector3& normal)
@@ -56,6 +55,8 @@
{ return this->offset_;}
private:
+ void registerVariables();
+
btCollisionShape* createNewShape()const;
Vector3 normal_;
Modified: code/branches/network2/src/modules/objects/collisionshapes/SphereCollisionShape.h
===================================================================
--- code/branches/network2/src/modules/objects/collisionshapes/SphereCollisionShape.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/modules/objects/collisionshapes/SphereCollisionShape.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -40,7 +40,6 @@
SphereCollisionShape(BaseObject* creator);
virtual ~SphereCollisionShape();
- void registerVariables();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
inline void setRadius(float radius)
@@ -49,6 +48,8 @@
{ return this->radius_; }
private:
+ void registerVariables();
+
btCollisionShape* createNewShape() const;
float radius_;
Modified: code/branches/network2/src/modules/pong/PongBall.h
===================================================================
--- code/branches/network2/src/modules/pong/PongBall.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/modules/pong/PongBall.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -44,8 +44,6 @@
virtual void tick(float dt);
- void registerVariables();
-
void setFieldDimension(float width, float height)
{ this->fieldWidth_ = width; this->fieldHeight_ = height; }
void setFieldDimension(const Vector2& dimension)
@@ -73,6 +71,8 @@
static const float MAX_REL_Z_VELOCITY;
private:
+ void registerVariables();
+
float fieldWidth_;
float fieldHeight_;
float speed_;
Modified: code/branches/network2/src/modules/pong/PongBat.h
===================================================================
--- code/branches/network2/src/modules/pong/PongBat.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/modules/pong/PongBat.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -40,7 +40,6 @@
PongBat(BaseObject* creator);
virtual ~PongBat() {}
- void registerVariables();
virtual void tick(float dt);
virtual void moveFrontBack(const Vector2& value);
@@ -64,6 +63,8 @@
{ return this->length_; }
private:
+ void registerVariables();
+
float movement_;
bool bMoveLocal_;
float speed_;
Modified: code/branches/network2/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/network2/src/orxonox/CMakeLists.txt 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/CMakeLists.txt 2010-01-17 10:37:48 UTC (rev 6448)
@@ -31,6 +31,7 @@
PawnManager.cc
PlayerManager.cc
Radar.cc
+ Test.cc
COMPILATION_BEGIN SceneCompilation.cc
CameraManager.cc
Scene.cc
Modified: code/branches/network2/src/orxonox/Level.h
===================================================================
--- code/branches/network2/src/orxonox/Level.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/Level.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -45,7 +45,6 @@
virtual ~Level();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
inline void setDescription(const std::string& description)
{ this->description_ = description; }
@@ -56,6 +55,7 @@
void playerLeft(PlayerInfo* player);
private:
+ void registerVariables();
void addObject(BaseObject* object);
BaseObject* getObject(unsigned int index) const;
Modified: code/branches/network2/src/orxonox/Test.h
===================================================================
--- code/branches/network2/src/orxonox/Test.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/Test.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -48,7 +48,6 @@
virtual ~Test();
void setConfigValues();
- void registerVariables();
static void call(unsigned int clientID);
void call2(unsigned int clientID, std::string s1, std::string s2, std::string s3, std::string s4);
@@ -85,6 +84,8 @@
void printBlaBla(std::string s1, std::string s2, std::string s3, std::string s4, std::string s5);
private:
+ void registerVariables();
+
UTYPE u1;
UTYPE u2;
UTYPE u3;
Modified: code/branches/network2/src/orxonox/collisionshapes/CollisionShape.h
===================================================================
--- code/branches/network2/src/orxonox/collisionshapes/CollisionShape.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/collisionshapes/CollisionShape.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -44,7 +44,6 @@
virtual ~CollisionShape();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
inline void setPosition(const Vector3& position)
{ this->position_ = position; this->updateParent(); }
@@ -87,6 +86,8 @@
unsigned int parentID_;
private:
+ void registerVariables();
+
Vector3 position_;
Quaternion orientation_;
Vector3 scale_;
Modified: code/branches/network2/src/orxonox/graphics/Backlight.h
===================================================================
--- code/branches/network2/src/orxonox/graphics/Backlight.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/graphics/Backlight.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -44,7 +44,6 @@
virtual ~Backlight();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void tick(float dt);
virtual void changedVisibility();
@@ -80,6 +79,7 @@
virtual void changedTimeFactor(float factor_new, float factor_old);
private:
+ void registerVariables();
virtual void startturnonoff();
virtual void stopturnonoff();
virtual void poststopturnonoff();
Modified: code/branches/network2/src/orxonox/graphics/Billboard.h
===================================================================
--- code/branches/network2/src/orxonox/graphics/Billboard.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/graphics/Billboard.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -45,7 +45,6 @@
virtual ~Billboard();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void changedVisibility();
@@ -77,6 +76,7 @@
virtual void changedColour();
private:
+ void registerVariables();
void changedMaterial();
// void changedRotation();
Modified: code/branches/network2/src/orxonox/graphics/BlinkingBillboard.h
===================================================================
--- code/branches/network2/src/orxonox/graphics/BlinkingBillboard.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/graphics/BlinkingBillboard.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -44,7 +44,6 @@
virtual ~BlinkingBillboard();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void tick(float dt);
@@ -69,6 +68,8 @@
{ return this->bQuadratic_; }
private:
+ void registerVariables();
+
float amplitude_;
float frequency_;
Degree phase_;
Modified: code/branches/network2/src/orxonox/graphics/FadingBillboard.h
===================================================================
--- code/branches/network2/src/orxonox/graphics/FadingBillboard.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/graphics/FadingBillboard.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -45,7 +45,6 @@
virtual ~FadingBillboard();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void tick(float dt);
virtual void changedActivity();
@@ -65,6 +64,7 @@
{ return this->fadedColour_; }
protected:
+ void registerVariables();
virtual void startturnonoff();
virtual void stopturnonoff();
virtual void poststopturnonoff();
Modified: code/branches/network2/src/orxonox/graphics/GlobalShader.h
===================================================================
--- code/branches/network2/src/orxonox/graphics/GlobalShader.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/graphics/GlobalShader.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -44,7 +44,6 @@
virtual ~GlobalShader();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void changedVisibility();
@@ -52,6 +51,7 @@
{ return this->shader_; }
private:
+ void registerVariables();
void changedCompositor();
Shader shader_;
Modified: code/branches/network2/src/orxonox/graphics/Light.h
===================================================================
--- code/branches/network2/src/orxonox/graphics/Light.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/graphics/Light.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -56,7 +56,6 @@
virtual ~Light();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void changedVisibility();
@@ -131,6 +130,7 @@
{ return this->spotlightRange_; }
private:
+ void registerVariables();
void setTypeString(const std::string& type);
std::string getTypeString() const;
Modified: code/branches/network2/src/orxonox/graphics/Model.h
===================================================================
--- code/branches/network2/src/orxonox/graphics/Model.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/graphics/Model.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -44,7 +44,6 @@
virtual ~Model();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void changedVisibility();
@@ -62,6 +61,7 @@
{ return this->bCastShadows_; }
private:
+ void registerVariables();
void changedMesh();
void changedShadows();
Modified: code/branches/network2/src/orxonox/graphics/ParticleEmitter.h
===================================================================
--- code/branches/network2/src/orxonox/graphics/ParticleEmitter.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/graphics/ParticleEmitter.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -43,7 +43,6 @@
~ParticleEmitter();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void changedVisibility();
virtual void changedActivity();
@@ -73,6 +72,9 @@
ParticleInterface* particles_;
std::string source_;
LODParticle::Value LOD_;
+
+ private:
+ void registerVariables();
};
}
Modified: code/branches/network2/src/orxonox/infos/GametypeInfo.h
===================================================================
--- code/branches/network2/src/orxonox/infos/GametypeInfo.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/infos/GametypeInfo.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -44,8 +44,6 @@
GametypeInfo(BaseObject* creator);
virtual ~GametypeInfo();
- void registerVariables();
-
inline bool hasStarted() const
{ return this->bStarted_; }
inline bool hasEnded() const
@@ -69,6 +67,8 @@
void dispatchDeathMessage(const std::string& message);
private:
+ void registerVariables();
+
bool bStarted_;
bool bEnded_;
bool bStartCountdownRunning_;
Modified: code/branches/network2/src/orxonox/infos/HumanPlayer.h
===================================================================
--- code/branches/network2/src/orxonox/infos/HumanPlayer.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/infos/HumanPlayer.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -42,7 +42,6 @@
HumanPlayer(BaseObject* creator);
virtual ~HumanPlayer();
- void registerVariables();
void setConfigValues();
bool isInitialized() const;
@@ -100,6 +99,8 @@
OverlayGroup* humanHud_;
std::string gametypeHudTemplate_;
OverlayGroup* gametypeHud_;
+ private:
+ void registerVariables();
};
}
Modified: code/branches/network2/src/orxonox/infos/PlayerInfo.h
===================================================================
--- code/branches/network2/src/orxonox/infos/PlayerInfo.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/infos/PlayerInfo.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -42,8 +42,6 @@
PlayerInfo(BaseObject* creator);
virtual ~PlayerInfo();
- void registerVariables();
-
virtual void changedName();
virtual void changedGametype();
@@ -90,6 +88,7 @@
unsigned int clientID_;
private:
+ void registerVariables();
void networkcallback_changedcontrollableentityID();
void networkcallback_changedgtinfoID();
void updateGametypeInfo();
Modified: code/branches/network2/src/orxonox/items/Engine.h
===================================================================
--- code/branches/network2/src/orxonox/items/Engine.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/items/Engine.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -43,7 +43,6 @@
virtual ~Engine();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
void setConfigValues();
virtual void tick(float dt);
@@ -106,6 +105,7 @@
virtual const Vector3& getDirection() const;
private:
+ void registerVariables();
void networkcallback_shipID();
SpaceShip* ship_;
Modified: code/branches/network2/src/orxonox/items/MultiStateEngine.h
===================================================================
--- code/branches/network2/src/orxonox/items/MultiStateEngine.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/items/MultiStateEngine.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -52,7 +52,6 @@
virtual ~MultiStateEngine();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
virtual void tick(float dt);
@@ -67,6 +66,8 @@
const std::string& getDefEngSndBoost();
private:
+ void registerVariables();
+
int state_;
int oldState_;
LuaState* lua_;
Modified: code/branches/network2/src/orxonox/worldentities/BigExplosion.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/BigExplosion.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/BigExplosion.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -44,7 +44,6 @@
virtual ~BigExplosion();
virtual void tick(float dt);
- void registerVariables();
inline void setLOD(LODParticle::Value level)
{ this->LOD_ = level; this->LODchanged(); }
@@ -52,6 +51,7 @@
{ return this->LOD_; }
private:
+ void registerVariables();
void LODchanged();
void checkStop();
Modified: code/branches/network2/src/orxonox/worldentities/ControllableEntity.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/ControllableEntity.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/ControllableEntity.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -48,7 +48,6 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual void tick(float dt);
- void registerVariables();
void setConfigValues();
virtual void changedPlayer() {}
@@ -162,6 +161,7 @@
{ this->hudtemplate_ = name; }
private:
+ void registerVariables();
void setXMLController(Controller* controller);
void overwrite();
Modified: code/branches/network2/src/orxonox/worldentities/ExplosionChunk.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/ExplosionChunk.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/ExplosionChunk.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -43,7 +43,6 @@
virtual ~ExplosionChunk();
virtual void tick(float dt);
- void registerVariables();
inline void setLOD(LODParticle::Value level)
{ this->LOD_ = level; this->LODchanged(); }
@@ -51,6 +50,7 @@
{ return this->LOD_; }
private:
+ void registerVariables();
void LODchanged();
void checkStop();
void stop();
Modified: code/branches/network2/src/orxonox/worldentities/MobileEntity.cc
===================================================================
--- code/branches/network2/src/orxonox/worldentities/MobileEntity.cc 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/MobileEntity.cc 2010-01-17 10:37:48 UTC (rev 6448)
@@ -45,8 +45,6 @@
this->linearVelocity_ = Vector3::ZERO;
this->angularAcceleration_ = Vector3::ZERO;
this->angularVelocity_ = Vector3::ZERO;
-
- this->registerVariables();
}
MobileEntity::~MobileEntity()
Modified: code/branches/network2/src/orxonox/worldentities/MovableEntity.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/MovableEntity.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/MovableEntity.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -47,7 +47,6 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
- void registerVariables();
using WorldEntity::setPosition;
using WorldEntity::setOrientation;
@@ -78,6 +77,7 @@
{ return this->enableCollisionDamage_; }
private:
+ void registerVariables();
void clientConnected(unsigned int clientID);
void clientDisconnected(unsigned int clientID);
void resynchronize();
Modified: code/branches/network2/src/orxonox/worldentities/StaticEntity.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/StaticEntity.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/StaticEntity.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -41,8 +41,6 @@
StaticEntity(BaseObject* creator);
virtual ~StaticEntity();
- void registerVariables();
-
using WorldEntity::setPosition;
using WorldEntity::setOrientation;
@@ -50,6 +48,7 @@
void setOrientation(const Quaternion& orientation);
private:
+ void registerVariables();
bool isCollisionTypeLegal(CollisionType type) const;
// network callbacks
Modified: code/branches/network2/src/orxonox/worldentities/WorldEntity.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/WorldEntity.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/WorldEntity.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -94,7 +94,6 @@
virtual ~WorldEntity();
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
- void registerVariables();
inline const Ogre::SceneNode* getNode() const
{ return this->node_; }
@@ -211,6 +210,8 @@
Ogre::SceneNode* node_;
private:
+ void registerVariables();
+
inline void lookAt_xmlport(const Vector3& target)
{ this->lookAt(target); }
inline void setDirection_xmlport(const Vector3& direction)
Modified: code/branches/network2/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/pawns/Pawn.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/pawns/Pawn.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -48,7 +48,6 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual void tick(float dt);
- void registerVariables();
inline bool isAlive() const
{ return this->bAlive_; }
@@ -150,6 +149,7 @@
unsigned int numexplosionchunks_;
private:
+ void registerVariables();
inline void setWeaponSystem(WeaponSystem* weaponsystem)
{ this->weaponSystem_ = weaponsystem; }
Modified: code/branches/network2/src/orxonox/worldentities/pawns/SpaceShip.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/pawns/SpaceShip.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/pawns/SpaceShip.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -46,7 +46,6 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
virtual void tick(float dt);
- void registerVariables();
void setConfigValues();
virtual void moveFrontBack(const Vector2& value);
@@ -97,9 +96,9 @@
btVector3 localAngularAcceleration_;
private:
+ void registerVariables();
virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
- private:
void loadEngineTemplate();
std::string enginetemplate_;
Modified: code/branches/network2/src/orxonox/worldentities/pawns/Spectator.h
===================================================================
--- code/branches/network2/src/orxonox/worldentities/pawns/Spectator.h 2010-01-04 15:15:46 UTC (rev 6447)
+++ code/branches/network2/src/orxonox/worldentities/pawns/Spectator.h 2010-01-17 10:37:48 UTC (rev 6448)
@@ -43,7 +43,6 @@
virtual ~Spectator();
void setConfigValues();
- void registerVariables();
virtual void tick(float dt);
virtual void moveFrontBack(const Vector2& value);
@@ -62,6 +61,7 @@
virtual void startLocalHumanControl();
private:
+ void registerVariables();
void changedGreeting();
void changedFlareVisibility();
More information about the Orxonox-commit
mailing list