Changeset 10751 for code/branches/hoverHS15/src

Timestamp:

Nov 2, 2015, 3:19:00 PM (9 years ago)

Author:

meierman

Message:

working cpp object generation

Location:

code/branches/hoverHS15/src/modules/hover

Files:

• CMakeLists.txt (modified) (1 diff)
• Hover.cc (modified) (3 diffs)
• Hover.h (modified) (2 diffs)
• HoverOrigin.cc (added)
• HoverOrigin.h (added)
• HoverPrereqs.h (modified) (1 diff)
• HoverWall.cc (added)
• HoverWall.h (added)

code/branches/hoverHS15/src/modules/hover/CMakeLists.txt

@@ -3 +3 @@
 HoverShip.cc
 HoverWall.cc
+HoverOrigin.cc
 )
 

code/branches/hoverHS15/src/modules/hover/Hover.cc

@@ -40 +40 @@
 namespace orxonox
 {
+    bool firstTick = true;
     RegisterUnloadableClass(Hover);
 
@@ -46 +47 @@
         
         RegisterObject(Hover);
-        new HoverWall(context);
         //this->setHUDTemplate("HoverHUD");
     }
@@ -55 +55 @@
     {
         SUPER(Hover, tick, dt);
+
+        if(firstTick){
+            firstTick = false;
+            new HoverWall(origin_->getContext(), 1, 2);
+        }      
+
+
     }
 

code/branches/hoverHS15/src/modules/hover/Hover.h

@@ -37 +37 @@
 
 #include "HoverPrereqs.h"
-//#include "HoverCenterPoint.h" // Necessary for WeakPointer??
+#include "HoverOrigin.h" // Necessary for WeakPointer
 //#include "HoverShip.h"        DO NOT include in Header. Will cause forward declaration issues
 
@@ -71 +71 @@
             virtual void tick(float dt);
 
- //           void setCenterpoint(HoverCenterPoint* center)
-  //                     { this->center_ = center; }
+            // void setOrigin(HoverOrigin* center)
+            //    { center_ = center; }           
 
+            void setOrigin(HoverOrigin* origin)
+                       { this->origin_ = origin; }
+
+
+            WeakPtr<HoverOrigin> origin_;
 
     };

code/branches/hoverHS15/src/modules/hover/HoverPrereqs.h

@@ -71 +71 @@
     class HoverShip;
     class HoverWall;
+    class HoverOrigin;
 }