Changeset 6448 for code/branches/network2/src/orxonox
- Timestamp:
- Jan 17, 2010, 11:37:48 AM (15 years ago)
- Location:
- code/branches/network2/src/orxonox
- Files:
-
- 27 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/network2/src/orxonox/CMakeLists.txt
r6417 r6448 32 32 PlayerManager.cc 33 33 Radar.cc 34 Test.cc 34 35 COMPILATION_BEGIN SceneCompilation.cc 35 36 CameraManager.cc -
code/branches/network2/src/orxonox/Level.h
r5929 r6448 46 46 47 47 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 48 void registerVariables();49 48 50 49 inline void setDescription(const std::string& description) … … 57 56 58 57 private: 58 void registerVariables(); 59 59 void addObject(BaseObject* object); 60 60 BaseObject* getObject(unsigned int index) const; -
code/branches/network2/src/orxonox/Test.h
r6417 r6448 49 49 50 50 void setConfigValues(); 51 void registerVariables();52 51 53 52 static void call(unsigned int clientID); … … 86 85 87 86 private: 87 void registerVariables(); 88 88 89 UTYPE u1; 89 90 UTYPE u2; -
code/branches/network2/src/orxonox/collisionshapes/CollisionShape.h
r5781 r6448 45 45 46 46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 47 void registerVariables();48 47 49 48 inline void setPosition(const Vector3& position) … … 88 87 89 88 private: 89 void registerVariables(); 90 90 91 Vector3 position_; 91 92 Quaternion orientation_; -
code/branches/network2/src/orxonox/graphics/Backlight.h
r5781 r6448 45 45 46 46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 47 void registerVariables();48 47 49 48 virtual void tick(float dt); … … 81 80 82 81 private: 82 void registerVariables(); 83 83 virtual void startturnonoff(); 84 84 virtual void stopturnonoff(); -
code/branches/network2/src/orxonox/graphics/Billboard.h
r5781 r6448 46 46 47 47 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 48 void registerVariables();49 48 50 49 virtual void changedVisibility(); … … 78 77 79 78 private: 79 void registerVariables(); 80 80 void changedMaterial(); 81 81 // void changedRotation(); -
code/branches/network2/src/orxonox/graphics/BlinkingBillboard.h
r5781 r6448 45 45 46 46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 47 void registerVariables();48 47 49 48 virtual void tick(float dt); … … 70 69 71 70 private: 71 void registerVariables(); 72 72 73 float amplitude_; 73 74 float frequency_; -
code/branches/network2/src/orxonox/graphics/FadingBillboard.h
r5929 r6448 46 46 47 47 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 48 void registerVariables();49 48 50 49 virtual void tick(float dt); … … 66 65 67 66 protected: 67 void registerVariables(); 68 68 virtual void startturnonoff(); 69 69 virtual void stopturnonoff(); -
code/branches/network2/src/orxonox/graphics/GlobalShader.h
r5781 r6448 45 45 46 46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 47 void registerVariables();48 47 49 48 virtual void changedVisibility(); … … 53 52 54 53 private: 54 void registerVariables(); 55 55 void changedCompositor(); 56 56 -
code/branches/network2/src/orxonox/graphics/Light.h
r5781 r6448 57 57 58 58 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 59 void registerVariables();60 59 61 60 virtual void changedVisibility(); … … 132 131 133 132 private: 133 void registerVariables(); 134 134 void setTypeString(const std::string& type); 135 135 std::string getTypeString() const; -
code/branches/network2/src/orxonox/graphics/Model.h
r5781 r6448 45 45 46 46 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 47 void registerVariables();48 47 49 48 virtual void changedVisibility(); … … 63 62 64 63 private: 64 void registerVariables(); 65 65 void changedMesh(); 66 66 void changedShadows(); -
code/branches/network2/src/orxonox/graphics/ParticleEmitter.h
r5781 r6448 44 44 45 45 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 46 void registerVariables();47 46 48 47 virtual void changedVisibility(); … … 74 73 std::string source_; 75 74 LODParticle::Value LOD_; 75 76 private: 77 void registerVariables(); 76 78 }; 77 79 } -
code/branches/network2/src/orxonox/infos/GametypeInfo.h
r5781 r6448 45 45 virtual ~GametypeInfo(); 46 46 47 void registerVariables();48 49 47 inline bool hasStarted() const 50 48 { return this->bStarted_; } … … 70 68 71 69 private: 70 void registerVariables(); 71 72 72 bool bStarted_; 73 73 bool bEnded_; -
code/branches/network2/src/orxonox/infos/HumanPlayer.h
r5781 r6448 43 43 virtual ~HumanPlayer(); 44 44 45 void registerVariables();46 45 void setConfigValues(); 47 46 … … 101 100 std::string gametypeHudTemplate_; 102 101 OverlayGroup* gametypeHud_; 102 private: 103 void registerVariables(); 103 104 }; 104 105 } -
code/branches/network2/src/orxonox/infos/PlayerInfo.h
r6417 r6448 42 42 PlayerInfo(BaseObject* creator); 43 43 virtual ~PlayerInfo(); 44 45 void registerVariables();46 44 47 45 virtual void changedName(); … … 91 89 92 90 private: 91 void registerVariables(); 93 92 void networkcallback_changedcontrollableentityID(); 94 93 void networkcallback_changedgtinfoID(); -
code/branches/network2/src/orxonox/items/Engine.h
r6417 r6448 44 44 45 45 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 46 void registerVariables();47 46 void setConfigValues(); 48 47 … … 107 106 108 107 private: 108 void registerVariables(); 109 109 void networkcallback_shipID(); 110 110 -
code/branches/network2/src/orxonox/items/MultiStateEngine.h
r6417 r6448 53 53 54 54 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 55 void registerVariables();56 55 57 56 virtual void tick(float dt); … … 68 67 69 68 private: 69 void registerVariables(); 70 70 71 int state_; 71 72 int oldState_; -
code/branches/network2/src/orxonox/worldentities/BigExplosion.h
r5929 r6448 45 45 46 46 virtual void tick(float dt); 47 void registerVariables();48 47 49 48 inline void setLOD(LODParticle::Value level) … … 53 52 54 53 private: 54 void registerVariables(); 55 55 56 56 void LODchanged(); -
code/branches/network2/src/orxonox/worldentities/ControllableEntity.h
r6417 r6448 49 49 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 50 50 virtual void tick(float dt); 51 void registerVariables();52 51 void setConfigValues(); 53 52 … … 163 162 164 163 private: 164 void registerVariables(); 165 165 void setXMLController(Controller* controller); 166 166 -
code/branches/network2/src/orxonox/worldentities/ExplosionChunk.h
r5929 r6448 44 44 45 45 virtual void tick(float dt); 46 void registerVariables();47 46 48 47 inline void setLOD(LODParticle::Value level) … … 52 51 53 52 private: 53 void registerVariables(); 54 54 void LODchanged(); 55 55 void checkStop(); -
code/branches/network2/src/orxonox/worldentities/MobileEntity.cc
r5781 r6448 46 46 this->angularAcceleration_ = Vector3::ZERO; 47 47 this->angularVelocity_ = Vector3::ZERO; 48 49 this->registerVariables();50 48 } 51 49 -
code/branches/network2/src/orxonox/worldentities/MovableEntity.h
r6417 r6448 48 48 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 49 49 virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint); 50 void registerVariables();51 50 52 51 using WorldEntity::setPosition; … … 79 78 80 79 private: 80 void registerVariables(); 81 81 void clientConnected(unsigned int clientID); 82 82 void clientDisconnected(unsigned int clientID); -
code/branches/network2/src/orxonox/worldentities/StaticEntity.h
r5781 r6448 42 42 virtual ~StaticEntity(); 43 43 44 void registerVariables();45 46 44 using WorldEntity::setPosition; 47 45 using WorldEntity::setOrientation; … … 51 49 52 50 private: 51 void registerVariables(); 53 52 bool isCollisionTypeLegal(CollisionType type) const; 54 53 -
code/branches/network2/src/orxonox/worldentities/WorldEntity.h
r6417 r6448 95 95 96 96 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 97 void registerVariables();98 97 99 98 inline const Ogre::SceneNode* getNode() const … … 212 211 213 212 private: 213 void registerVariables(); 214 214 215 inline void lookAt_xmlport(const Vector3& target) 215 216 { this->lookAt(target); } -
code/branches/network2/src/orxonox/worldentities/pawns/Pawn.h
r6417 r6448 49 49 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 50 50 virtual void tick(float dt); 51 void registerVariables();52 51 53 52 inline bool isAlive() const … … 151 150 152 151 private: 152 void registerVariables(); 153 153 inline void setWeaponSystem(WeaponSystem* weaponsystem) 154 154 { this->weaponSystem_ = weaponsystem; } -
code/branches/network2/src/orxonox/worldentities/pawns/SpaceShip.h
r5781 r6448 47 47 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 48 48 virtual void tick(float dt); 49 void registerVariables();50 49 void setConfigValues(); 51 50 … … 98 97 99 98 private: 99 void registerVariables(); 100 100 virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const; 101 101 102 private:103 102 void loadEngineTemplate(); 104 103 -
code/branches/network2/src/orxonox/worldentities/pawns/Spectator.h
r6417 r6448 44 44 45 45 void setConfigValues(); 46 void registerVariables();47 46 virtual void tick(float dt); 48 47 … … 63 62 64 63 private: 64 void registerVariables(); 65 65 void changedGreeting(); 66 66 void changedFlareVisibility();
Note: See TracChangeset
for help on using the changeset viewer.