Changeset 9086 in orxonox.OLD for branches/presentation/src/lib/graphics
- Timestamp:
- Jul 4, 2006, 1:52:10 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/presentation/src/lib/graphics/importer/bsp_manager.cc
r9084 r9086 1146 1146 1147 1147 1148 Vector forwardDir = Vector(0.0,0.0,1.0);1149 Vector upDir = Vector(0.0,1.0,0.0); 1148 /* Vector forwardDir = Vector(0.0,0.0,1.0); 1149 Vector upDir = Vector(0.0,1.0,0.0);*/ 1150 1150 Vector position = entity->getAbsCoor(); 1151 1151 … … 1154 1154 plane* testPlane = NULL; 1155 1155 1156 bool xCollision = false; 1156 bool xCollisionRight = false; 1157 bool xCollisionLeft = false; 1157 1158 1158 1159 … … 1166 1167 Vector dirX = entity->getAbsDirX(); dirX.y = 0.0f; dirX.normalize(); 1167 1168 1169 // calculate the rays 1168 1170 if( box != NULL) 1169 1171 { … … 1173 1175 else 1174 1176 { 1175 Vector position2 = position + Vector(0.0, 1.0,0.0); 1176 Vector position3 = position; 1177 Vector position4 = position + Vector(0.0, 1.0, 0.0); 1178 1179 left = position + forwardDir * 4.0f; 1180 right = position2 + forwardDir * 4.0; 1181 } 1182 1183 // dest1 1184 // dest2 1177 left = position + dirX * 4.0f; 1178 right = position + Vector(0.0, 1.0, 0.0) + dirX * 4.0; 1179 } 1185 1180 1186 1181 … … 1198 1193 { 1199 1194 collPos = position + (right - position) * this->outputFraction; 1200 xCollision = true;1195 xCollisionRight = true; 1201 1196 testPlane = this->collPlane; 1202 1197 } … … 1209 1204 testPlane = this->collPlane; 1210 1205 SolidFlag = true; 1211 xCollision = true;1206 xCollisionRight = true; 1212 1207 } 1213 1208 1214 1209 // collision registration 1215 if( xCollision ) {1210 if( xCollisionRight) { 1216 1211 entity->registerCollision(COLLISION_TYPE_AXIS_X , 1217 1212 this->parent, entity,
Note: See TracChangeset
for help on using the changeset viewer.