Changeset 11913 for code/branches/RacingBots_FS18/src/modules

Timestamp:

Apr 26, 2018, 4:05:17 PM (7 years ago)

Author:

arismu

Message:

pickups, position of checkpoints are fixed

Location:

code/branches/RacingBots_FS18/src/modules/gametypes

Files:

• SpaceRace.cc (modified) (1 diff)
• SpaceRaceController.cc (modified) (2 diffs)

code/branches/RacingBots_FS18/src/modules/gametypes/SpaceRace.cc

@@ -125 +125 @@
         {
             engine->setActive(false);
+            engine->addSpeedMultiply(3.5f);
         }
 

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

@@ -235 +235 @@
     }
 
-    /*RaceCheckPoint* SpaceRaceController::addVirtualCheckPoint( RaceCheckPoint* previousCheckpoint, int indexFollowingCheckPoint , const Vector3& virtualCheckPointPosition )
-    {
-        orxout()<<"add VCP at"<<virtualCheckPointPosition.x<<", "<<virtualCheckPointPosition.y<<", "<<virtualCheckPointPosition.z<<endl;
-        RaceCheckPoint* newTempRaceCheckPoint;
-        ObjectList<SpaceRaceManager> list;
-        for (ObjectList<SpaceRaceManager>::iterator it = list.begin(); it!= list.end(); ++it)
-        {
-            newTempRaceCheckPoint = new RaceCheckPoint((*it));
-        }
-        newTempRaceCheckPoint->setVisible(false);
-        newTempRaceCheckPoint->setPosition(virtualCheckPointPosition);
-        newTempRaceCheckPoint->setCheckpointIndex(virtualCheckPointIndex);
-        newTempRaceCheckPoint->setLast(false);
-        newTempRaceCheckPoint->setNextVirtualCheckpointsAsVector3(Vector3(indexFollowingCheckPoint,-1,-1));
-
-        Vector3 temp = previousCheckpoint->getVirtualNextCheckpointsAsVector3();
-        //orxout()<<"temp bei 0: ="<< temp.x<< temp.y<< temp.z<<endl;
-        checkpoints_.insert(checkpoints_.end(), newTempRaceCheckPoint);
-        int positionInNextCheckPoint;
-        for (int i = 0; i <3; i++)
-        {
-            if(previousCheckpoint->getVirtualNextCheckpointsAsVector3()[i] == indexFollowingCheckPoint)
-            positionInNextCheckPoint=i;
-        }
-        switch(positionInNextCheckPoint)
-        {
-            case 0: temp.x=virtualCheckPointIndex; break;
-            case 1: temp.y=virtualCheckPointIndex; break;
-            case 2: temp.z=virtualCheckPointIndex; break;
-        }
-        previousCheckpoint->setNextVirtualCheckpointsAsVector3(temp); //Existiert internes Problem bei negativen index fueer next Checkpoint
-        virtualCheckPointIndex--;
-        //orxout()<<"temp bei 1: ="<< temp.x<< temp.y<< temp.z<<endl;
-        //orxout()<<"temp nach ausgabe: "<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().x<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().y<<previousCheckpoint->getVirtualNextCheckpointsAsVector3().z<<endl;
-        //OrxAssert(virtualCheckPointIndex < -1, "TO much virtual cp");
-        orxout()<<"id: "<< previousCheckpoint->getCheckpointIndex() <<", following:"<<indexFollowingCheckPoint<<" :       "<<temp.x<<", "<<temp.y<<", "<<temp.z<<";       ";
-         temp=previousCheckpoint->getNextCheckpointsAsVector3();
-         orxout()<<"id: "<< previousCheckpoint->getCheckpointIndex() <<":       "<<temp.x<<", "<<temp.y<<", "<<temp.z<<";       ";
-         orxout()<<endl;
-        return newTempRaceCheckPoint;
-    }*/
-
     SpaceRaceController::~SpaceRaceController()
     {
@@ -380 +338 @@
 
     }
-
-    /*void SpaceRaceController::computeVirtualCheckpoint(RaceCheckPoint* racepoint1, RaceCheckPoint* racepoint2, const std::vector<StaticEntity*>& allObjects)
-    {
-        Vector3 cP1ToCP2=(racepoint2->getPosition()-racepoint1->getPosition()) / (racepoint2->getPosition()-racepoint1->getPosition()).length(); //unit Vector
-        Vector3 centerCP1=racepoint1->getPosition();
-        btVector3 positionObject;
-        btScalar radiusObject;
-
-        for (std::vector<StaticEntity*>::iterator it = allObjects.begin(); it != allObjects.end(); ++it)
-        {
-            for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != nullptr; everyShape++)
-            {
-                btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
-                if(currentShape == nullptr)
-                continue;
-
-                currentShape->getBoundingSphere(positionObject,radiusObject);
-                Vector3 positionObjectNonBT(positionObject.x(), positionObject.y(), positionObject.z());
-                Vector3 norm_r_CP = cP1ToCP2.crossProduct(centerCP1-positionObjectNonBT);
-
-                if(norm_r_CP.length() == 0){
-                    Vector3 zufall;
-                    do{
-                        zufall=Vector3(rnd(),rnd(),rnd());//random
-                    }while((zufall.crossProduct(cP1ToCP2)).length() == 0);
-                    norm_r_CP=zufall.crossProduct(cP1ToCP2);
-                }
-                Vector3 VecToVCP = norm_r_CP.crossProduct(cP1ToCP2);
-                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));
-                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() )
-                {
-                    RaceCheckPoint* newVirtualCheckpoint = addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), newCheckpointPositionPos);
-                }
-                else
-                {
-                    RaceCheckPoint* newVirtualCheckpoint = addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), newCheckpointPositionNeg);
-                }
-                return;
-            }
-        }
-
-    }*/
-
-    /*void SpaceRaceController::placeVirtualCheckpoints(RaceCheckPoint* racepoint1, RaceCheckPoint* racepoint2)
-    {
-        Vector3 point1 = racepoint1->getPosition();
-        Vector3 point2 = racepoint2->getPosition();
-        std::vector<StaticEntity*> problematicObjects;
-
-        ObjectList<StaticEntity> list;
-        for (ObjectList<StaticEntity>::iterator it = list.begin(); it!= list.end(); ++it)
-        {
-
-            if (dynamic_cast<RaceCheckPoint*>(*it) != nullptr)
-            {
-                continue;
-            } // does not work jet
-
-            problematicObjects.insert(problematicObjects.end(), *it);
-            //it->getScale3D();// vector fuer halbe wuerfellaenge
-        }
-
-        if(!directLinePossible(racepoint1, racepoint2, problematicObjects))
-        {
-            //orxout()<<"From "<<racepoint1->getCheckpointIndex()<<" to "<<racepoint2->getCheckpointIndex()<<"produces: "<< virtualCheckPointIndex<<endl;
-            computeVirtualCheckpoint(racepoint1, racepoint2, problematicObjects);
-        }
-
-        //
-        //        do{
-        //            zufall=Vector3(rnd(),rnd(),rnd());//random
-        //        }while((zufall.crossProduct(objectmiddle-racepoint1->getPosition())).length()==0);
-        //
-        //        Vector3 normalvec=zufall.crossProduct(objectmiddle-racepoint1->getPosition());
-        //        // a'/b'=a/b => a' =b'*a/b
-        //        float laengeNormalvec=(objectmiddle-racepoint1->getPosition()).length()/sqrt((objectmiddle-racepoint1->getPosition()).squaredLength()-radius*radius)*radius;
-        //        addVirtualCheckPoint(racepoint1,racepoint2->getCheckpointIndex(), objectmiddle+normalvec/normalvec.length()*laengeNormalvec);
-
-        //        Vector3 richtungen [6];
-        //        richtungen[0]= Vector3(1,0,0);
-        //        richtungen[1]= Vector3(-1,0,0);
-        //        richtungen[2]= Vector3(0,1,0);
-        //        richtungen[3]= Vector3(0,-1,0);
-        //        richtungen[4]= Vector3(0,0,1);
-        //        richtungen[5]= Vector3(0,0,-1);
-        //
-        //        for (int i = 0; i< 6; i++)
-        //        {
-        //            const int STEPS=100;
-        //            const float PHI=1.1;
-        //            bool collision=false;
-        //
-        //            for (int j =0; j<STEPS; j++)
-        //            {
-        //                Vector3 tempPosition=(point1 - (point2-point1+richtungen[i]*PHI)*(float)j/STEPS);
-        //                for (std::vector<StaticEntity*>::iterator it = problematicObjects.begin(); it!=problematicObjects.end(); ++it)
-        //                {
-        //                    btVector3 positionObject;
-        //                    btScalar radiusObject;
-        //                    if((*it)==nullptr)
-        //                    {   orxout()<<"Problempoint 1.1"<<endl; continue;}
-        //                    //TODO: Probably it points on a wrong object
-        //                    for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=nullptr; everyShape++)
-        //                    {
-        //                        if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)
-        //                        {    continue;}
-        //
-        //                        orxout()<<"Problempoint 2.1"<<endl;
-        //                        (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()->getBoundingSphere(positionObject,radiusObject);
-        //                        Vector3 positionObjectNonBT(positionObject.x(), positionObject.y(), positionObject.z());
-        //                        if (((tempPosition - positionObjectNonBT).length()<radiusObject) && (vergleicheQuader((tempPosition-positionObjectNonBT),(*it)->getScale3D())))
-        //                        {
-        //                            collision=true; break;
-        //                        }
-        //                    }
-        //                    if(collision) break;
-        //                }
-        //                if(collision)break;
-        //            }
-        //            if(collision) continue;
-        //            // no collision => possible Way
-        //            for (float j =0; j<STEPS; j++)
-        //            {
-        //                Vector3 possiblePosition=(point1 - (point2-point1+richtungen[i]*PHI)*j/STEPS);
-        //                collision=false;
-        //                for(int ij=0; ij<STEPS; j++)
-        //                {
-        //                    Vector3 tempPosition=(possiblePosition - (point2-possiblePosition)*(float)ij/STEPS);
-        //                    for (std::vector<StaticEntity*>::iterator it = problematicObjects.begin(); it!=problematicObjects.end(); ++it)
-        //                    {
-        //                        btVector3 positionObject;
-        //                        btScalar radiusObject;
-        //                        if((*it)==nullptr)
-        //                        {   orxout()<<"Problempoint 1"<<endl; continue;}
-        //                        for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=nullptr; everyShape++)
-        //                        {
-        //                            if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)
-        //                            {   orxout()<<"Problempoint 2.2"<<endl; continue;}
-        //                            (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()->getBoundingSphere(positionObject,radiusObject);
-        //                            Vector3 positionObjectNonBT(positionObject.x(), positionObject.y(), positionObject.z());
-        //                            if (((tempPosition-positionObjectNonBT).length()<radiusObject) && (vergleicheQuader((tempPosition-positionObjectNonBT),(*it)->getScale3D())))
-        //                            {
-        //                                collision=true; break;
-        //                            }
-        //                        }
-        //                        if(collision) break;
-        //                    }
-        //                    if(collision)break;
-        //                    //addVirtualCheckPoint(racepoint1, racepoint2->getCheckpointIndex(), possiblePosition);
-        //                    return;
-        //                }
-        //
-        //            }
-        //        }
-
-    }*/
 }