Changeset 11169

Timestamp:

Apr 17, 2016, 8:40:05 PM (8 years ago)

Author:

fvultier

Message:

Fixed errors with pickups.

Location:

code/branches/tgidronFS16

Files:

• data/levels/Hover.oxw (modified) (5 diffs)
• data/overlays/HoverHUD.oxo (modified) (1 diff)
• src/modules/hover/Hover.cc (modified) (5 diffs)
• src/modules/hover/Hover.h (modified) (2 diffs)
• src/modules/hover/HoverOrigin.cc (modified) (2 diffs)
• src/modules/hover/HoverOrigin.h (modified) (2 diffs)

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

@@ -25 +25 @@
 ?>
 
-<?lua
-    include("templates/pickupRepresentationTemplates.oxt") 
-    include("includes/pickups.oxi") 
- ?>
-
 <Template name=destroyhoverpickupRepresentation>
     <PickupRepresentation>
@@ -46 +41 @@
 </Template>
 
-<Template name=destroymetapickup baseclass=MetaPickup>
-  <MetaPickup representation="destroy" metaType="destroy" />
+<Template name=destroyhoverpickup baseclass=MetaPickup>
+  <MetaPickup representation="destroyhover" metaType="destroy" />
 </Template>
-
-<PickupRepresentation
-    name = "destroyhover"
-    pickupName = "Destroy Carrier Pickup"
-    pickupDescription = "destroys you."
-    spawnerTemplate = "destroyhoverpickupRepresentation"
-    inventoryRepresentation = "destroyCarrierPickup"
-/>
-
 
 <Level
@@ -66 +52 @@
     <Template link=lodtemplate_default />
   </templates>
+
   <?lua include("includes/notifications.oxi") ?>
 
@@ -77 +64 @@
   >
 
+    <PickupRepresentation
+      name = "destroyhover"
+      pickupName = "Destroy Hover Pickup"
+      pickupDescription = "destroys you."
+      spawnerTemplate = "destroyhoverpickupRepresentation"
+      inventoryRepresentation = "destroyHoverPickup"
+    />
+
     <StaticEntity position="0,0,0" collisionType="static">
       <attached>
@@ -83 +78 @@
           cellSize="<?lua print(MAZE_CELL_SIZE)?>"
           cellHeight="<?lua print(MAZE_CELL_HEIGHT)?>"
-          pickuptemplate=destroyhoverpickupRepresentation
-          pickupbase=destroymetapickup
+          pickuptemplate=destroyhoverpickup
+          pickuprepresentationtemplate=destroyhoverpickupRepresentation
         />
         <Model

code/branches/tgidronFS16/data/overlays/HoverHUD.oxo

@@ -76 +76 @@
      showpoints     = true
     />
-
-    
   </OverlayGroup>
-
- </OverlayGroup>
-
 
 </Template>

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

@@ -98 +98 @@
             for(int y=0; y<numCells; y++){
                 for(int x=0; x<numCells; x++){
-                    switch(levelcode[ y * numCells + x ]){
+                    switch(levelcode[ y * numCells + x ])
+                    {
                         case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
-                                break;
+                            break;
                         case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
                         case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0);
-                        default: break;
+                        default:
+                            break;
                     }
-                }   
+                }
             }
 
@@ -120 +122 @@
             for (int i = 0; i<5; i++)
             {
-                PickupSpawner* pickup = new PickupSpawner(origin_->getContext());
-                pickup->setPosition(rand()%numCells, rand()%numCells, cellSize);
-                //pickup->setPickupTemplateName(origin_->getPickupMeta());
-                //pickup->setPickupTemplateName("destroymetapickup");
-                pickup->setMaxSpawnedItems(5);
-                pickup->setRespawnTime(30);
-                pickup->setTriggerDistance(5);
-                //pickup->createDroppedPickup(this->getContext(), pickup , this, 5);
-                pickups_.push_back(pickup);
-            }
-
-
+                PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
+
+                pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
+                pickupSpawner->setPickupTemplateName(origin_->getPickupTemplate());
+                pickupSpawner->setMaxSpawnedItems(5);
+                pickupSpawner->setRespawnTime(30);
+                pickupSpawner->setTriggerDistance(5);
+                // Add pickup spawner to the pickup spawner list
+                pickupSpawners_.push_back(pickupSpawner);
+            }
+
+            orxout() << this->origin_->getPickupTemplate() << endl;
+            orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
         } 
     }
 
 
-
-    void Hover::startLevel(){
+    // Rename/delete this function.
+    void Hover::startLevel()
+    {
         //Generate 5 flags randomly (test only 1 flag)
             for ( int i = 0; i < 5; i++ )
@@ -152 +156 @@
                 //PickupSpawner->setPosition(rand()%numCells, rand()%numCells, cellSize);
                 //pickup->createDroppedPickup(this->getContext(), pickup , this, 5);
-                pickups_.push_back(pickup);
-            }
-
+                pickupSpawners_.push_back(pickup);
+            }
+
+            
     }
 
@@ -163 +168 @@
 
         // Check if ship collided with one of the flags
-        for ( unsigned int i = 0; i < flags_.size(); i++ ){
-            if(flags_[i]->getCollided()){
+        for ( unsigned int i = 0; i < flags_.size(); i++ )
+        {
+            if(flags_[i]->getCollided())
+            {
                 flags_[i]->destroyLater();
                 flags_.erase (flags_.begin()+i);
@@ -186 +193 @@
 
     }
+
+    Vector3 Hover::get3dCoordinates(int x, int y, float heightOffset)
+    {
+        return Vector3(x*cellSize*1.0f + cellSize/2, heightOffset, y*cellSize*1.0f + cellSize/2);
+    }
 }

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

@@ -61 +61 @@
             void endLevel();
 
-
-
             inline int getNumberOfFlags() const
                 { return this->numberOfFlags_; }
+
+            virtual Vector3 get3dCoordinates(int x, int y, float heightOffset);
 
         private:
@@ -81 +81 @@
             int totFlags;
 
-            std::vector<PickupSpawner*> pickups_;
+            std::vector<PickupSpawner*> pickupSpawners_;
     };
 }

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

@@ -45 +45 @@
         RegisterObject(HoverOrigin);
         checkGametype();
+
+        pickupTemplate_ = "";
+        pickupRepresentationTemplate_ = "";
     }
 
@@ -54 +57 @@
         XMLPortParam(HoverOrigin, "cellSize", setCellSize, getCellSize, xmlelement, mode);
         XMLPortParam(HoverOrigin, "cellHeight", setCellHeight, getCellHeight, xmlelement, mode);
-        XMLPortParam(HoverOrigin, "pickuptemplate", setPickup, getPickup, xmlelement, mode);
-        XMLPortParam(HoverOrigin, "pickupbase", setPickupMeta, getPickupMeta, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "pickuptemplate", setPickupTemplate, getPickupTemplate, xmlelement, mode);
+        XMLPortParam(HoverOrigin, "pickuprepresentationtemplate", setPickupRepresentationTemplate, getPickupRepresentationTemplate, xmlelement, mode);
     }
 

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

@@ -66 +66 @@
                 { return this->cellHeight_; }
 
-            inline void setPickup(std::string pickuptemplate)
-                { this->pickupTemplate_ = pickuptemplate; }
-            inline std::string getPickup() const
+            inline void setPickupTemplate(std::string pickupTemplate)
+                { this->pickupTemplate_ = pickupTemplate; }
+            inline std::string getPickupTemplate() const
                 { return this->pickupTemplate_; }
 
-            inline void setPickupMeta(std::string pickupbase)
-                { this->pickupMeta_ = pickupbase; }
-            inline std::string getPickupMeta() const
-                { return this->pickupMeta_; }
+            inline void setPickupRepresentationTemplate(std::string pickupRepresenationaTemplate)
+                { this->pickupRepresentationTemplate_ = pickupRepresenationaTemplate; }
+            inline std::string getPickupRepresentationTemplate() const
+                { return this->pickupRepresentationTemplate_; }
 
         private:
@@ -82 +82 @@
             int cellSize_;
             int cellHeight_;
+
+            // Tempaltes for the destroy hover pickup
             std::string pickupTemplate_;
-            std::string pickupMeta_;
+            std::string pickupRepresentationTemplate_;
     };
 }