Changeset 10751

Timestamp:

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

Author:

meierman

Message:

working cpp object generation

Location:

code/branches/hoverHS15

Files:

• data/levels/Hover.oxw (modified) (2 diffs)
• src/modules/hover/CMakeLists.txt (modified) (1 diff)
• src/modules/hover/Hover.cc (modified) (3 diffs)
• src/modules/hover/Hover.h (modified) (2 diffs)
• src/modules/hover/HoverOrigin.cc (added)
• src/modules/hover/HoverOrigin.h (added)
• src/modules/hover/HoverPrereqs.h (modified) (1 diff)
• src/modules/hover/HoverWall.cc (added)
• src/modules/hover/HoverWall.h (added)

code/branches/hoverHS15/data/levels/Hover.oxw

@@ -42 +42 @@
     </attached> 
     <collisionShapes>
-      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,0" halfExtents="500, 30, 2" />
-      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,1000" halfExtents="500, 30, 2" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="500,0,0" halfExtents="500, 30, 2" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="500,0,1000" halfExtents="500, 30, 2" />
       <BoxCollisionShape yaw="0" pitch="0" roll="0" position="0,0,500" halfExtents="2, 30, 500" />
-      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="1000,500,0" halfExtents="2, 30, 500" />
+      <BoxCollisionShape yaw="0" pitch="0" roll="0" position="1000,0,500" halfExtents="2, 30, 500" />
 
     </collisionShapes>
@@ -60 +60 @@
 
 
+    <MovableEntity>
+      <attached>
+        <HoverOrigin>
+
+          <attached>
+
+          </attached>
+        </HoverOrigin>
+      </attached>
+    </MovableEntity>
+
+
+
     
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>

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;
 }