Changeset 10785 for code/branches/hoverHS15/src

Timestamp:

Nov 9, 2015, 2:14:47 PM (9 years ago)

Author:

meierman

Message:

Placing Walls works

Location:

code/branches/hoverHS15/src/modules/hover

Files:

• Hover.cc (modified) (1 diff)
• HoverWall.cc (modified) (2 diffs)
• HoverWall.h (modified) (1 diff)

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

@@ -59 +59 @@
         {
             firstTick = false;
-            new HoverWall(origin_->getContext(), 1, 2);
-            new HoverWall(origin_->getContext(), 2, 6);
+            new HoverWall(origin_->getContext(), 1, 2, 1);
+            new HoverWall(origin_->getContext(), 2, 6, 1);
         }      
 

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

@@ -54 +54 @@
     }
 
-    HoverWall::HoverWall(Context* context, int x, int y) : StaticEntity(context)
+    HoverWall::HoverWall(Context* context, int x, int y, int orientation) : StaticEntity(context)
     {
         RegisterObject(HoverWall);
 
+        int xSize_, zSize_, xPos_, zPos_;
+
+        if(orientation == 1){
+            xSize_ = 50;
+            zSize_ = 2;
+            xPos_ = x*100;
+            zPos_ = y*100-50;
+        }
+        else{
+            xSize_ = 2;
+            zSize_ = 50;
+            xPos_ = x*100-50;
+            zPos_ = y*100;
+        }
+
+
         model_ = new Model(context);
         model_->setMeshSource("cube.mesh");
-        model_->setScale3D(Vector3(100, 30, 2));
-        model_->setPosition(Vector3(x*100-50,0,y*100-50));
+        model_->setScale3D(Vector3(xSize_, 30, zSize_));
+        model_->setPosition(Vector3(xPos_,0,zPos_));
 
         this->attach(model_);
@@ -70 +86 @@
 
         cs_ = new BoxCollisionShape(context);
-        cs_->setHalfExtents(Vector3(100, 30, 2));
-        cs_->setPosition(Vector3(x*100-50,0,y*100-50));
+        cs_->setHalfExtents(Vector3(xSize_, 30, zSize_));
+        cs_->setPosition(Vector3(xPos_,0,zPos_));
 
         this->attachCollisionShape(cs_);

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

@@ -49 +49 @@
         public:
             HoverWall(Context* context);            
-            HoverWall(Context* context, int x, int y);
+            HoverWall(Context* context, int x, int y, int orientation);
             virtual ~HoverWall();
             virtual void tick(float dt);