Changeset 8524 in orxonox.OLD for branches/bsp_model/src/lib/graphics
- Timestamp:
- Jun 16, 2006, 11:40:03 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/bsp_model/src/lib/graphics/importer/bsp_manager.cc
r8490 r8524 942 942 this->outputFraction = 1.0f; 943 943 944 Vector position = worldEntity->getAbsCoor(); 944 945 945 946 946 … … 958 958 dest.z += forwardDir.z; 959 959 */ 960 961 dest = worldEntity->getAbsCoor() - upDir*40.0 ;960 Vector position = worldEntity->getAbsCoor() + upDir*5.0f ; 961 dest = worldEntity->getAbsCoor() - upDir*40.0f; // 962 962 Vector out = dest; 963 963 … … 986 986 // position1.debug(); 987 987 988 if(!this->outputStartsOut ) 989 { 990 this->collPlane = new plane; 991 this->collPlane->x = 0.0f; 992 this->collPlane->y = 0.0f; 993 this->collPlane->z = 0.0f; 994 collision = true; 995 } 996 else 997 { 998 999 1000 1001 988 1002 if( this->outputFraction == 1.0f) 989 1003 { 990 if(this->outputAllSolid )1004 if(this->outputAllSolid ) 991 1005 { 992 1006 this->collPlane = new plane; 993 this->collPlane->x = 1.0f;1007 this->collPlane->x = 0.0f; 994 1008 this->collPlane->y = 0.0f; 995 1009 this->collPlane->z = 0.0f; … … 1013 1027 } 1014 1028 1029 1030 } 1015 1031 // Return the normal here: Normal's stored in this->collPlane; 1016 1032 if( collision) { … … 1018 1034 worldEntity->registerCollision(this->parent, worldEntity, Vector(this->collPlane->x, this->collPlane->y, this->collPlane->z), out); 1019 1035 } 1036 else worldEntity->registerCollision(this->parent, worldEntity, Vector(0.0, 1.0, 0.0), dest); 1020 1037 1021 1038 }
Note: See TracChangeset
for help on using the changeset viewer.