Changeset 9522 for code/branches

Timestamp:

Dec 16, 2012, 4:02:34 PM (12 years ago)

Author:

jo

Message:

Repairing the Compiler Errors.

File:

• code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc (modified) (4 diffs)

code/branches/Racingbot/src/modules/gametypes/SpaceRaceController.cc

@@ -358 +358 @@
     {
         if (this->getControllableEntity() == NULL || this->getControllableEntity()->getPlayer() == NULL )
-        {   orxout()<<this->getControllableEntity()<< " in tick"<<endl; return;}
+        {
+            //orxout()<< this->getControllableEntity() << " in tick"<<endl;
+            return;
+        }
         //FOR virtual Checkpoints
         if(nextRaceCheckpoint_->getCheckpointIndex() < 0)
@@ -409 +412 @@
         if(abs(pointToPoint.z) < groesse.z)
             return true;
+        return false;
 
     }
@@ -460 +464 @@
                                 Vector3 norm_r_CP = cP1ToCP2.crossProduct(centerCP1-positionObjectNonBT);
 
-                                if(norm_r_CP.length == 0){
+                                if(norm_r_CP.length() == 0){
                                         Vector3 zufall;
                     do{
@@ -470 +474 @@
                                 float distanzToCP1 = sqrt(powf(radiusObject,4)/(powf((centerCP1-positionObjectNonBT).length(), 2)-powf(radiusObject,2))+powf(radiusObject,2));
                                 float distanzToCP2 = sqrt(powf(radiusObject,4)/(powf((racepoint2->getPosition()-positionObjectNonBT).length(), 2)-powf(radiusObject,2))+powf(radiusObject,2));
-                                //TODO float distanz=max(distanzToCP1,distanzToCP2);
-                                float distanz = 0.0f; //TEMPORARY
+                float distanz = std::max(distanzToCP1,distanzToCP2);
+                                //float distanz = 0.0f; //TEMPORARY
                                 Vector3 newCheckpointPositionPos = positionObjectNonBT+(distanz*VecToVCP)/VecToVCP.length();
                                 Vector3 newCheckpointPositionNeg = positionObjectNonBT-(distanz*VecToVCP)/VecToVCP.length();
-                                if((newCheckpointPositionPos-centerCP1).length+(newCheckpointPositionPos-(centerCP1+cP1ToCP2)).length < (newCheckpointPositionNeg-centerCP1).length+(newCheckpointPositionNeg-(centerCP1+cP1ToCP2)).length){
+                                if((newCheckpointPositionPos - centerCP1).length() + (newCheckpointPositionPos - (centerCP1+cP1ToCP2)).length() < (newCheckpointPositionNeg - centerCP1).length() + (newCheckpointPositionNeg - (centerCP1+cP1ToCP2)).length() )
+                                {
                                         RaceCheckPoint* newVirtualCheckpoint = addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), newCheckpointPositionPos);
-                                }else{
+                                }
+                                else
+                                {
                                         RaceCheckPoint* newVirtualCheckpoint = addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), newCheckpointPositionNeg);
                                 }