Changeset 8926 in orxonox.OLD for branches/single_player_map/src/lib/graphics
- Timestamp:
- Jun 29, 2006, 11:11:20 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/single_player_map/src/lib/graphics/importer/bsp_manager.cc
r8924 r8926 1061 1061 if(this->outputFraction < 1.0f) { 1062 1062 out.x = dest1.x + (dest1.x -position1.x) * this->outputFraction; 1063 dest1 = dest1 + (dest1 -position1) * this->outputFraction; 1063 1064 xCollision = true; 1064 1065 testPlane = this->collPlane; … … 1084 1085 if(this->outputFraction < 1.0f ) { 1085 1086 out.z = out.z = dest2.z + (dest2.z -position2.z) * this->outputFraction; 1087 dest2 = dest2 + (dest2 -position2) * this->outputFraction; 1086 1088 zCollision = true; 1087 1089 testPlane = this->collPlane; … … 1106 1108 } 1107 1109 if(xCollision) { 1108 worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);1110 worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z),dest1 , SolidFlag); 1109 1111 } 1110 1112 if(zCollision) { 1111 worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);1113 worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), dest2 , SolidFlag); 1112 1114 } 1113 1115
Note: See TracChangeset
for help on using the changeset viewer.