Changeset 6111 for code/branches/presentation2/src/orxonox/worldentities

Timestamp:

Nov 21, 2009, 12:33:37 AM (15 years ago)

Author:

scheusso

Message:

made some changes in NewHumanController, Pawn, CE, Controller and WeaponMode preparing the synchronisation of clients target and aimPosition

Location:

code/branches/presentation2

Files:

• . (modified) (1 prop)
• src/orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/presentation2/src/orxonox/worldentities/ControllableEntity.h

@@ -145 +145 @@
             inline void setController(Controller* val)
                 { this->controller_ = val; }
+            
+            virtual void setTarget( WorldEntity* target )
+                { this->target_ = target; }
+            virtual WorldEntity* getTarget()
+                { return this->target_.get(); }
 
         protected:
@@ -209 +214 @@
             Controller* controller_;
             CameraPosition* reverseCamera_;
+            WeakPtr<WorldEntity> target_;
     };
 }

code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -67 +67 @@
 
         this->spawnparticleduration_ = 3.0f;
+        
+        this->aimPosition_ = Vector3::ZERO;
 
         this->getPickups().setOwner(this);

code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.h

@@ -116 +116 @@
 
             virtual void startLocalHumanControl();
+            
+            void setAimPosition( Vector3 position )
+                { this->aimPosition_ = position; }
+            Vector3 getAimPosition()
+                { return this->aimPosition_; }
 
         protected:
@@ -146 +151 @@
             inline void setWeaponSystem(WeaponSystem* weaponsystem)
                 { this->weaponSystem_ = weaponsystem; }
+            
+            Vector3 aimPosition_;
     };
 }