Changeset 12398 for code/branches/Boxhead_FS19/src/modules

Timestamp:

May 17, 2019, 4:29:11 PM (6 years ago)

Author:

cwaupoti

Message:

temorary

Location:

code/branches/Boxhead_FS19/src/modules/hover

Files:

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

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

@@ -51 +51 @@
 
 
-
 namespace orxonox
 {
@@ -65 +64 @@
         this->setHUDTemplate("HoverHUD");
     }
-
+    // void Hover::spawnZombie(std::string id)
+    // {
+    //     Identifier *identifier = ClassByString("SpaceShip");
+
+    //       if(!identifier)
+    //     {
+    //         orxout(user_error) << "Script tried to spawn unknown object" << std::endl;
+    //         return;
+    //     }
+
+    //     if(!identifier->isLoadable())
+    //     {
+    //         orxout(user_error) << "Script tried to spawn unloadable object" << std::endl;
+    //         return;
+    //     }
+        
+    
+    //     WorldEntity *entity;
+    //     Identifiable *obj = identifier->fabricate(this->controller_->getWorldEntityByID("Player")->getContext());
+
+
+
+    //     orxout(user_status) << "First hit!" << std::endl;
+
+    //    if(obj->isA(ClassIdentifier<WorldEntity>::getIdentifier()))
+    //     {
+    //         orxout(user_status) << "Is WorldEntity!" << std::endl;
+    //         entity = orxonox_cast<WorldEntity*>(obj);
+    //     }
+    //     else if(obj->isA(ClassIdentifier<PlayerInfo>::getIdentifier()))
+    //     {
+    //         // TODO This does not work yet because somehow the controllable entity is not set
+    //         // yet at this stage.
+    // //        entity = orxonox_cast<PlayerInfo*>(obj)->getControllableEntity();
+
+    //         orxout(user_status) << "Is PlayerInfo!" << std::endl;
+
+    //         //use TEMPLATES in the map to define objects that are not present on the map yet
+    //         return;
+    //     }
+    //     else
+    //     {
+    //         orxout(user_warning) << "Script tried to spawn an object that is neither a WorldEntity, nor a PlayerInfo" << std::endl;
+            
+    //         return;
+    //     }
+       
+    //     if(entity->isA(ClassIdentifier<MobileEntity>::getIdentifier())) {
+    //         orxout(user_status) << "Is MobileEntity!" << std::endl;
+    //         this->controller_->registerMobileEntity(id, orxonox_cast<MobileEntity*>(entity));
+    //     }
+
+        
+
+    //     if(entity->isA(ClassIdentifier<Pawn>::getIdentifier())) {
+    //         orxout(user_status) << "Is Pawn!" << std::endl;
+    //         this->controller_->registerPawn(id, orxonox_cast<Pawn*>(entity));
+    //     }
+        
+    //     this->controller_->registerWorldEntity(id, orxonox_cast<WorldEntity*>(entity));
+
+
+    //     ///////////////GOLD!!!!!!!!!!!!!!!////////////////////////
+    //     Pawn* pawn = this->controller_->getPawnByID(id);
+
+    //     //Attach to pawn
+    //     SpaceShip* drone = new SpaceShip(pawn->getContext()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)
+        
+    //     drone->addTemplate("spaceshipzombie"); //ScriptableControllerDroneTemplate spaceshipescort
+
+    //     Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(500,20,500);
+    //     drone->setPosition(spawnPosition);
+    // }
 
     void Hover::tick(float dt)
@@ -132 +203 @@
 
         //Spawn Zombies
-        //spawnZombie(1);
+        //spawnZombie(z1);
 
 

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

@@ -62 +62 @@
                 { return this->numberOfFlags_; }
 
-             void spawnZombie(std::string id);
-
-            /**
-             * @brief Set the position of an object
-             * @param id The ID of the object
-             * @param x The position on the x-axis
-             * @param y The position on the y-axis
-             * @param z The position on the z-axis
-             */
 
         private:

code/branches/Boxhead_FS19/src/modules/hover/HoverShip.cc

@@ -113 +113 @@
         if(otherObject->isA(Class(SpaceShip)))
         {
-            removeHealth(0.1);
+            removeHealth(0.2);
         }
 

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

@@ -109 +109 @@
 
         cs_ = new BoxCollisionShape(this->getContext());
-        cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight*1.0f, zSize_*1.0f));
+        cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight*100000.0f, zSize_*1.0f));
         cs_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f));