Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8930 in orxonox.OLD for branches/single_player_map/src/lib/graphics


Ignore:
Timestamp:
Jun 30, 2006, 12:07:58 AM (18 years ago)
Author:
bottac
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/single_player_map/src/lib/graphics/importer/bsp_manager.cc

    r8926 r8930  
    10611061    if(this->outputFraction < 1.0f) {
    10621062      out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction;
    1063       dest1 = dest1 + (dest1 -position1) * this->outputFraction;
     1063      dest1 = position1 + (dest1 -position1) * this->outputFraction;
    10641064      xCollision = true;
    10651065      testPlane = this->collPlane;
    10661066    }
    1067     if(this->outputAllSolid || !this->outputStartsOut) {
     1067    if(this->outputAllSolid ) {
     1068     
     1069      this->collPlane = new plane;
     1070      this->collPlane->x = 0.0f;
     1071      this->collPlane->y = 0.0f;
     1072      this->collPlane->z = 0.0f;
     1073      testPlane = this->collPlane;
    10681074      SolidFlag = true;
    10691075      xCollision = true;
     
    10851091      if(this->outputFraction < 1.0f ) {
    10861092        out.z = out.z = dest2.z + (dest2.z -position2.z) * this->outputFraction;
    1087         dest2 = dest2 + (dest2 -position2) * this->outputFraction;
     1093        dest2 = position2 + (dest2 -position2) * this->outputFraction;
    10881094        zCollision = true;
    10891095        testPlane = this->collPlane;
    10901096
    10911097      }
    1092       if(this->outputAllSolid || !this->outputStartsOut) {
     1098      if(this->outputAllSolid ) {
     1099        this->collPlane = new plane;
     1100        this->collPlane->x = 0.0f;
     1101        this->collPlane->y = 0.0f;
     1102        this->collPlane->z = 0.0f;
     1103        testPlane = this->collPlane;
     1104
    10931105        SolidFlag = true;
    10941106        zCollision = true;
Note: See TracChangeset for help on using the changeset viewer.