Changeset 8912 in orxonox.OLD for branches/single_player_map/src/lib/graphics
- Timestamp:
- Jun 29, 2006, 4:22:36 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/single_player_map/src/lib/graphics/importer/bsp_manager.cc
r8910 r8912 974 974 Vector dest = worldEntity->getAbsCoor() - upDir*40.0f; // 975 975 Vector dest1 = position + forwardDir*4.0f; 976 Vector dest2 = position2 + forwardDir ;976 Vector dest2 = position2 + forwardDir*4.0; 977 977 dest = position - Vector(0.0, 40.0,0.0); 978 978 Vector out = dest; … … 1045 1045 } 1046 1046 1047 plane* testPlane = new plane; 1048 testPlane->x = this->collPlane->x; 1049 testPlane->y = this->collPlane->y; 1050 testPlane->z = this->collPlane->z; 1051 1047 plane* testPlane = this->collPlane; 1052 1048 1053 1049 bool xCollision = false; … … 1082 1078 this->inputStart = position2; 1083 1079 this->inputEnd = dest2; 1080 1084 1081 this->checkCollisionRayN(this->root,0.0f,1.0f, &position2, &dest2 ); 1085 1082 //out.x = this->outputFraction; … … 1105 1102 1106 1103 // Return the normal here: Normal's stored in this->collPlane; 1107 if( collision) {1104 /* if( collision) { 1108 1105 PRINTF(5)("We got a collision!! Are you sure: outputFraction = %f\n", this->outputFraction); 1109 1106 worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag); 1110 } 1107 } */ 1111 1108 if(xCollision) { 1112 1109 worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);
Note: See TracChangeset
for help on using the changeset viewer.