Changeset 9061 in orxonox.OLD for trunk/src/lib/graphics/importer
- Timestamp:
- Jul 3, 2006, 6:39:10 PM (18 years ago)
- Location:
- trunk/src/lib/graphics/importer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/graphics/importer/bsp_manager.cc
r9003 r9061 972 972 Vector position1 = position; 973 973 Vector position2 = position + Vector(0.0,1.0,0.0); 974 Vector position3 = position; 975 Vector position4 = position + Vector(0.0,1.0,0.0); 974 976 Vector dest = worldEntity->getAbsCoor() - upDir*40.0f; // 975 977 Vector dest1 = position + forwardDir*4.0f; 976 978 Vector dest2 = position2 + forwardDir*4.0; 979 Vector dest3 = position + forwardDir*4.0f; 980 Vector dest4 = position2 + forwardDir*4.0; 977 981 dest = position - Vector(0.0, 40.0,0.0); 978 982 Vector out = dest; … … 986 990 987 991 if( box != NULL) { 988 position = worldEntity->getAbsCoor() + box->center + Vector(0.0, 1.0, 0.0) * box->halfLength[1]; 989 dest = worldEntity->getAbsCoor() + box->center - Vector(0.0, 1.0, 0.0) * (box->halfLength[1] + BSP_Y_OFFSET); 990 991 position1 = worldEntity->getAbsCoor() + box->center - worldEntity->getAbsDirX() * (box->halfLength[0] + BSP_X_OFFSET); 992 dest1 = worldEntity->getAbsCoor() + box->center + worldEntity->getAbsDirX() * (box->halfLength[0] + BSP_X_OFFSET); 993 994 position2 = worldEntity->getAbsCoor() + box->center - worldEntity->getAbsDirZ() * (box->halfLength[2] + BSP_Z_OFFSET); 995 dest2 = worldEntity->getAbsCoor() + box->center + worldEntity->getAbsDirZ() * (box->halfLength[2] + BSP_Z_OFFSET); 996 992 position = worldEntity->getAbsCoor() + box->center; // + Vector(0.0, 1.0, 0.0) * box->halfLength[1] * 1.0f; 993 dest = worldEntity->getAbsCoor() + box->center - Vector(0.0, 1.0, 0.0) * (box->halfLength[1] + BSP_Y_OFFSET) * 100; 994 995 Vector dirX = worldEntity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize(); 996 997 //position1 = worldEntity->getAbsCoor() + box->center - dirX * (box->halfLength[0] + BSP_X_OFFSET); 998 dest1 = worldEntity->getAbsCoor() + box->center + dirX * (box->halfLength[0] + BSP_X_OFFSET); 999 dest2 = worldEntity->getAbsCoor() - box->center + dirX * (box->halfLength[0] + BSP_X_OFFSET); 1000 1001 Vector dirZ = worldEntity->getAbsDirZ(); dirX.y = 0.0f; dirZ.normalize(); 1002 //position2 = worldEntity->getAbsCoor() + box->center - dirZ * (box->halfLength[2] + BSP_Z_OFFSET); 1003 dest3 = worldEntity->getAbsCoor() + box->center + dirZ * (box->halfLength[2] + BSP_Z_OFFSET); 1004 dest4 = worldEntity->getAbsCoor() - box->center + dirZ * (box->halfLength[2] + BSP_Z_OFFSET); 997 1005 } else { 998 1006 // Init positions and destinations to anything useful! … … 1052 1060 bool xCollision = false; 1053 1061 bool zCollision = false; 1062 bool xCollisionNeg = false; 1063 bool zCollisionNeg = false; 1064 1054 1065 1055 1066 … … 1120 1131 // Return the normal here: Normal's stored in this->collPlane; 1121 1132 if( collision) { 1122 worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag);1133 worldEntity->registerCollision(COLLISION_TYPE_AXIS_Y_NEG , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), out, SolidFlag); 1123 1134 } 1124 1135 if(xCollision) { 1125 1136 worldEntity->registerCollision(COLLISION_TYPE_AXIS_X , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z),dest1 , SolidFlag); 1126 1137 } 1138 1127 1139 if(zCollision) { 1128 1140 worldEntity->registerCollision(COLLISION_TYPE_AXIS_Z , this->parent, worldEntity, Vector(testPlane->x, testPlane->y, testPlane->z), dest2 , SolidFlag); -
trunk/src/lib/graphics/importer/bsp_manager.h
r9003 r9061 28 28 29 29 30 #define BSP_X_OFFSET 20.0f30 #define BSP_X_OFFSET 40.0f 31 31 #define BSP_Y_OFFSET 40.0f 32 #define BSP_Z_OFFSET 20.0f32 #define BSP_Z_OFFSET 40.0f 33 33 34 34
Note: See TracChangeset
for help on using the changeset viewer.