Changeset 9154 for code/branches

Timestamp:

May 4, 2012, 2:51:44 PM (13 years ago)

Author:

mentzerf

Message:

• Fixed size of oxw stuff.

+ Added tileScale to TowerDefenseCenterpoint to store the scale of the oxw

• Removed WaypointController debug prints

Location:

code/branches/newlevel2012

Files:

• data/levels/towerDefense.oxw (modified) (5 diffs)
• src/modules/towerdefense/TowerDefense.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefenseCenterpoint.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseCenterpoint.h (modified) (2 diffs)
• src/orxonox/controllers/WaypointController.cc (modified) (1 diff)

code/branches/newlevel2012/data/levels/towerDefense.oxw

@@ -25 +25 @@
   <Pawn>
     <camerapositions>
-      <CameraPosition position="0,0,20"/>
+      <CameraPosition position="0,0,2000"/>
     </camerapositions>
   </Pawn>
@@ -44 +44 @@
   <Tower>
     <attached>
-      <Model position="0,0,0" scale=0.25 mesh="Tower_ME.mesh" />
+      <Model position="0,0,0" scale=2.5 mesh="Tower_ME.mesh" />
     </attached>
   </Tower>
@@ -70 +70 @@
         <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
         
-        <!--SpaceShip position="-10,0,20" lookat="0,0,0" scale=0.3>
+        <SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=10>
       <templates>
         <Template link=spaceshipassff />
       </templates>
       <controller>
-        <WaypointController accuracy=3>
+        <WaypointController accuracy=40>
           <waypoints>
-            <Model mesh="cube.mesh" scale=0.2 position="-8,-8,3" />
-            <Model mesh="cube.mesh" scale=0.2 position="8,8,3" />
-            <Model mesh="cube.mesh" scale=0.2 position="8,-8,3" />
-            <Model mesh="cube.mesh" scale=0.2 position="-8,8,3" />
+                          <!-- 1,3 10,3 10,11, 13,11 -->
+            <Model mesh="cube.mesh" scale=1 position="-700,-500, 100" />
+            <Model mesh="cube.mesh" scale=1 position=" 200,-500, 100" />
+            <Model mesh="cube.mesh" scale=1 position=" 200, 300, 100" />
+            <Model mesh="cube.mesh" scale=1 position=" 500, 300, 100" />
           </waypoints>
         </WaypointController>
       </controller>
-    </SpaceShip-->
+    </SpaceShip>
     
 
@@ -91 +92 @@
         name=towerdefensecenter 
         width=16 
-        height=16 
+        height=16
+        tileScale=100
         towerTemplate=towertemplate 
         position="0,0,0" 
@@ -99 +101 @@
                  
                  <attached>
-                        <Model position="-0.5,-0.5,0" mesh="Playfield_ME.mesh" scale=0.8 />
+                        <Model position="-50,-50,0" mesh="Playfield_ME.mesh" scale=80 />
             <!--Model position="0,0,0" mesh="crate.mesh" scale3D="3,3,3" /--> <!-- Only temporary needed to help align the collisionshape -->
                         <!-- This was used to mark the playfield, let's let it be here for now -->

code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc

@@ -153 +153 @@
         void TowerDefense::addTower(int x, int y)
         {
-                if (x > 15 || y > 15 || x < 0 || y < 0)//Hard coded: TODO: let this depend on the centerpoint's height, width and fieldsize (fieldsize doesn't exist yet)
+                unsigned int width = this->center_->getWidth();
+                unsigned int height = this->center_->getHeight();
+                int tileScale = (int) this->center_->getTileScale();
+                
+                orxout() << "tile scale = " << tileScale << endl;
+                
+                if (x > 15 || y > 15 || x < 0 || y < 0)
                 {
+                        //Hard coded: TODO: let this depend on the centerpoint's height, width and fieldsize (fieldsize doesn't exist yet)
                         orxout() << "Can not add Tower: x and y should be between 0 and 15" << endl;
                         return;
                 }
                 
-                orxout()<< "Will add tower at (" << x << "," << y << ")" << endl;
+                orxout() << "Will add tower at (" << (x-8) * tileScale << "," << (y-8) * tileScale << ")" << endl;
                 
                 Tower* newTower = new Tower(this->center_);
@@ -166 +173 @@
                 this->center_->attach(newTower);
                 
-                newTower->setPosition(x-8,y-8,0);
+                newTower->setPosition((x-8) * tileScale, (y-8) * tileScale, 0);
                 newTower->setGame(this);
                 //TODO: Save the Tower in a Vector. I would suggest std::vector< std::vector<Tower*> > towers_ as a protected member variable;

code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.cc

@@ -67 +67 @@
 
         XMLPortParam(TowerDefenseCenterpoint, "width", setWidth, getWidth, xmlelement, mode);
-        XMLPortParam(TowerDefenseCenterpoint, "height", setHeight, setWidth, xmlelement, mode);
+        XMLPortParam(TowerDefenseCenterpoint, "height", setHeight, getHeight, xmlelement, mode);
+                XMLPortParam(TowerDefenseCenterpoint, "tileScale", setTileScale, getTileScale, xmlelement, mode);
         XMLPortParam(TowerDefenseCenterpoint, "towerTemplate", setTowerTemplate, getTowerTemplate, xmlelement, mode);
+                
         //TODO: add XMLPortObject(TowerDefenseCenterpoint, WorldEntity, "waypoints", addWaypoint, getWaypoint,  xmlelement, mode);
         // This was copied and shightly modified from WaypointController.cc ; there are no getters and setters and no membervariable yet

code/branches/newlevel2012/src/modules/towerdefense/TowerDefenseCenterpoint.h

@@ -69 +69 @@
                         unsigned int getHeight(void) const
                 { return this->height_; }
+                        
+                        /**
+                        @brief How to convert to world coordinates, e.g. that 0,15 is not at -8,-8 but at -80,-80 (if scale would be 10)
+                        */
+                        void setTileScale(unsigned int tileScale)
+                                { this->tileScale_ = tileScale; }
+                        
+                        unsigned int getTileScale(void) const
+                                { return this->tileScale_; }
                 
             /**
@@ -85 +94 @@
             unsigned int width_;
             unsigned int height_;
+                        unsigned int tileScale_;
+                        
             std::string towerTemplate_;
     };

code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc

@@ -65 +65 @@
             return;
 
-                orxout() << "(" << this->waypoints_.size() << ") entity: " << this->getControllableEntity() << endl;
+//              orxout() << "(" << this->waypoints_.size() << ") entity: " << this->getControllableEntity() << endl;
 
         if (this->waypoints_.size() == 0 || !this->getControllableEntity())
             return;
 
-                printf("3");
+//              printf("3");
 
         if (this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_)
             this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
 
-                printf("4");
+//              printf("4");
 
         this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());