Changeset 11243 for code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypoint.h

Timestamp:

Oct 24, 2016, 4:01:11 PM (8 years ago)

Author:

ooguz

Message:

Waypointarrow und Waypoint Klassen

File:

• code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypoint.h (modified) (3 diffs)

code/branches/QuestGuide_HS16/src/orxonox/worldentities/Waypoint.h

@@ -6 +6 @@
 #include "OrxonoxPrereqs.h"
 #include "StaticEntity.h"
-#include "overlays/OverlaysPrereqs.h"
+#include "graphics/Model.h"
 
 #include <map>
@@ -13 +13 @@
 #include "util/OgreForwardRefs.h"
 #include "tools/interfaces/Tickable.h"
-#include "interfaces/RadarListener.h"
-#include "overlays/OrxonoxOverlay.h"
 
 namespace orxonox
@@ -30 +28 @@
     */
 
-    class _OrxonoxExport Waypoint : public StaticEntity, public RadarListener
-    {
+    class _OrxonoxExport Waypoint : public StaticEntity {
+        
         public:
+
             Waypoint(Context* context);
             virtual ~Waypoint();
 
-            virtual void addObject(RadarViewable* object) override;
-            virtual void removeObject(RadarViewable* viewable) override;
-            virtual void objectChanged(RadarViewable* viewable) override;
 
-            using StaticEntity::setPosition;
-            using StaticEntity::setOrientation;
-
-            virtual void setPosition(const Vector3& position) override;
-            virtual void setOrientation(const Quaternion& orientation) override;
-
-            virtual void positionChanged() override { }
-            virtual void radarTick(float dt) override {}
-
-            virtual inline float getRadarSensitivity() const override
-                { return 1.0f; }
-
-            inline unsigned int getMarkerLimit() const
-                { return this->markerLimit_; }
-
-            static void selectClosestTarget();
-            static void selectNextTarget();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
 
 
         private:
-            void registerVariables();
+    
             //virtual bool isCollisionTypeLegal(CollisionType type) const override;
-
+            Model* model;
+            
             // network callbacks
-            inline void positionChanged()
-                { this->setPosition(this->getPosition()); }
-            inline void orientationChanged()
-                { this->setOrientation(this->getOrientation()); }
-
-            // Bullet btMotionState related
-            virtual void setWorldTransform(const btTransform& worldTrans) override;
-            virtual void getWorldTransform(btTransform& worldTrans) const override;
     };
 }
 
-#endif /* _StaticEntity_H__ */
+#endif /* _Waypoint_H__ */