Changeset 2533 for code/branches/bugger/src/orxonox/objects/worldentities

Timestamp:

Dec 23, 2008, 11:34:35 PM (15 years ago)

Author:

rgrieder

Message:

Merged revisions 2384-2436 from presentation branch to bugger.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/Model.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/MovableEntity.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Planet.cc (copied) (copied from code/branches/presentation/src/orxonox/objects/worldentities/Planet.cc)
• src/orxonox/objects/worldentities/Planet.h (copied) (copied from code/branches/presentation/src/orxonox/objects/worldentities/Planet.h)
• src/orxonox/objects/worldentities/PositionableEntity.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc (modified) (4 diffs)
• src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified) (4 diffs)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)

code/branches/bugger/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -16 +16 @@
   ParticleEmitter.cc
   ParticleSpawner.cc
+  Planet.cc
   SpawnPoint.cc
 )

code/branches/bugger/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -80 +80 @@
         this->server_orientation_ = Quaternion::IDENTITY;
         this->client_orientation_ = Quaternion::IDENTITY;
+        
+        this->setPriority( priority::very_high );
 
         this->setConfigValues();

code/branches/bugger/src/orxonox/objects/worldentities/Model.cc

@@ -40 +40 @@
     Model::Model(BaseObject* creator) : PositionableEntity(creator)
     {
-        static unsigned int i=10;
         RegisterObject(Model);
 
@@ -46 +45 @@
 
         this->registerVariables();
-        this->setObjectPriority(i++);
     }
 

code/branches/bugger/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -52 +52 @@
         this->overwrite_position_ = Vector3::ZERO;
         this->overwrite_orientation_ = Quaternion::IDENTITY;
+        
+        this->setPriority( priority::low );
 
         this->registerVariables();

code/branches/bugger/src/orxonox/objects/worldentities/PositionableEntity.cc

@@ -38 +38 @@
     {
         RegisterObject(PositionableEntity);
+        
+        this->setPriority( priority::very_low );
 
         this->registerVariables();

code/branches/bugger/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc

@@ -28 +28 @@
 
 /**
-    @file PlayerTrigger.cc
+    @file
     @brief
-        Implementation of the PlayerTrigger class.
+    Implementation of the PlayerTrigger class.
 */
 
@@ -38 +38 @@
 #include "core/CoreIncludes.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
     /**
     @brief
@@ -47 +47 @@
     {
         RegisterObject(PlayerTrigger);
-        
+
         this->player_ = NULL;
         this->isForPlayer_ = true;
     }
-    
+
     /**
     @brief
@@ -66 +66 @@
     void PlayerTrigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
-        SUPER(PlayerTrigger, XMLPort, xmlelement, mode);
+        SUPER(PlayerTrigger, XMLPort, xmlelement, mode);
     }
-
 }

code/branches/bugger/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

@@ -28 +28 @@
 
 /**
-    @file PlayerTrigger.h
+    @file
     @brief
-        Definition of the PlayerTrigger class.
+    Definition of the PlayerTrigger class.
 */
 
@@ -40 +40 @@
 #include "Trigger.h"
 
-namespace orxonox {
-    
+namespace orxonox
+{
     /**
     @brief
@@ -50 +50 @@
     class _OrxonoxExport PlayerTrigger : public Trigger
     {
-        public:
-            PlayerTrigger(BaseObject* creator);
-            virtual ~PlayerTrigger();
-            
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PlayerTrigger object through XML.
+    public:
+        PlayerTrigger(BaseObject* creator);
+        virtual ~PlayerTrigger();
+        
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PlayerTrigger object through XML.
+        
+        /**
+        @brief Returns the player that triggered the PlayerTrigger.
+        @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
+        */
+        inline ControllableEntity* getTriggeringPlayer(void) const
+            { return this->player_; }
+        
+        /**
+        @brief Checks whether the PlayerTrigger normally returns a ControllableEntity.
+        @return Returns true if the PlayerTrigger normally returns a ControllableEntity.
+        */
+        inline bool isForPlayer(void) const
+           { return this->isForPlayer_; }
             
-            /**
-            @brief Returns the player that triggered the PlayerTrigger.
-            @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
-            */
-            inline ControllableEntity* getTriggeringPlayer(void) const
-                { return this->player_; }
-            
-            /**
-            @brief Checks whether the PlayerTrigger normally returns a ControllableEntity.
-            @return Returns true if the PlayerTrigger normally returns a ControllableEntity.
-            */
-            inline bool isForPlayer(void) const
-               { return this->isForPlayer_; }
-            
-        protected:
-            virtual bool isTriggered(TriggerMode mode) = 0;
-            
-            /**
-            @brief Set the player that triggered the PlayerTrigger. This is normally done by classes inheriting vom PlayerTrigger.
-            @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
-            */
-            inline void setTriggeringPlayer(ControllableEntity* player)
-               { this->player_ = player; }
+    protected:
+        virtual bool isTriggered(TriggerMode mode) = 0;
+        
+        /**
+        @brief Set the player that triggered the PlayerTrigger. This is normally done by classes inheriting vom PlayerTrigger.
+        @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
+        */
+        inline void setTriggeringPlayer(ControllableEntity* player)
+           { this->player_ = player; }
 
             /**
@@ -84 +84 @@
             @param isForPlayer Should be true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities, false if not.
             */
-            inline void setForPlayer(bool isForPlayer)
-               { this->isForPlayer_ = isForPlayer; }
-            
-        private:
-            ControllableEntity* player_; //!< The player that triggered the PlayerTrigger.
-            bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities.
-        
+        inline void setForPlayer(bool isForPlayer)
+           { this->isForPlayer_ = isForPlayer; }
+        
+    private:
+        ControllableEntity* player_; //!< The player that triggered the PlayerTrigger.
+        bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities.
+    
     };