Changeset 11184 for code/branches/tgidronFS16/src/modules/hover

Timestamp:

May 12, 2016, 4:02:21 PM (9 years ago)

Author:

tgidron

Message:

New Pickup + try to create ground from separate tiles

Location:

code/branches/tgidronFS16

Files:

• . (modified) (1 prop)
• src/modules/hover/Hover.cc (modified) (1 diff)
• src/modules/hover/HoverFlag.cc (modified) (1 diff)
• src/modules/hover/HoverOrigin.cc (modified) (2 diffs)

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

@@ -169 +169 @@
             Pawn* crate = new Pawn(origin_->getContext());
 
+            
+            crate->addTemplate(origin_->getObstacleTemplate());  
             crate->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
-            crate->addTemplate(origin_->getObstacleTemplate());  
-            crate->setInitialHealth(100.0f);
+            //ate->setInitialHealth(100.0f);
             
 

code/branches/tgidronFS16/src/modules/hover/HoverFlag.cc

@@ -87 +87 @@
         model_ = new Model(this->getContext());
         model_->setMeshSource("ss_flag_eu.mesh");
-        model_->setScale3D(Vector3(5, 5, 5));
-        model_->setPosition(Vector3(xCoordinate*cellSize*1.0f + cellSize/2,10.0f,yCoordinate*cellSize*1.0f + cellSize/2));
+        model_->setScale3D(Vector3(30, 30, 30));
+        model_->setPosition(Vector3(xCoordinate*cellSize*1.0f + cellSize/2,50.0f,yCoordinate*cellSize*1.0f + cellSize/2));
 
         this->attach(model_);
 
         cs_ = new BoxCollisionShape(this->getContext());
-        cs_->setHalfExtents(Vector3(5, 5, 5));
+        cs_->setHalfExtents(Vector3(30, 30, 30));
         cs_->setPosition(Vector3(xCoordinate*cellSize*1.0f + cellSize/2,0.0f,yCoordinate*cellSize*1.0f + cellSize/2));
 

code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc

@@ -48 +48 @@
         //not needed
 
-        /*pickupTemplate_ = "";
+        pickupTemplate_ = "";
         pickupRepresentationTemplate_ = "";
 
@@ -56 +56 @@
 
         pickupTemplateShrink_ = "";
-        pickupRepresentationTemplateShrink_ = "";*/
+        pickupRepresentationTemplateShrink_ = "";
     }