Changeset 12073 for code/branches/OrxoKart_HS18/src

Timestamp:

Nov 7, 2018, 10:13:31 AM (6 years ago)

Author:

emustafa

Message:

reverted hover files

Location:

code/branches/OrxoKart_HS18/src/modules/hover

Files:

• Hover.cc (modified) (2 diffs)
• HoverShip.cc (modified) (1 diff)

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

@@ -70 +70 @@
             generator.generateMaze();
             generator.renderMaze();
-            int levelcodeArray[] = {1,1,1,1,1,1,1,1,0,0,0
-                                    ,1,0,0,0,0,0,0,1,1,1,0
-                                    ,1,0,1,1,1,1,0,0,0,1,1
-                                    ,1,1,1,0,0,1,1,0,0,0,1
-                                    ,0,0,0,0,0,0,1,0,1,1,1
-                                    ,1,1,1,1,1,1,1,0,1,0,0
-                                    ,1,0,0,0,0,0,0,0,1,0,0
-                                    ,1,0,0,0,0,0,0,0,1,0,0
-                                    ,1,1,1,1,1,0,0,0,1,1,1
-                                    ,0,0,0,0,1,0,0,0,0,0,1
-                                    ,0,0,0,0,1,1,1,1,1,1,1};
-            //int* levelcode = generator.getLevelcode();
-            int* levelcode = levelcodeArray;
 
+            int* levelcode = generator.getLevelcode();
 
             //Outer Walls
@@ -99 +87 @@
                         case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1);
                                 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);
+                        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;
                     }

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

@@ -49 +49 @@
 
     void HoverShip::moveFrontBack(const Vector2& value)
-        { 
-            this->steering_.z -= value.x; 
-            orxout() << "mFB" << endl;
-        }
+        { this->steering_.z -= value.x; }
 
     void HoverShip::moveRightLeft(const Vector2& value)
-        { 
-            this->rotateYaw(value);
-            orxout() << "mRL" << endl;
-        }
+        { this->steering_.x += value.x; }
 
     void HoverShip::moveUpDown(const Vector2& value)
-        { 
-            this->steering_.y += value.x; 
-            orxout() << "mUD" << endl;
-        }
+        { this->steering_.y += value.x; }
 
     void HoverShip::rotateYaw(const Vector2& value)
-        {
-            this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() - value.x);
-            //orxout() << value;
-            Pawn::rotateYaw(value);
-        }
+    {
+        this->localAngularAcceleration_.setY(this->localAngularAcceleration_.y() + value.x);
+
+        Pawn::rotateYaw(value);
+    }
 
     void HoverShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)