Changeset 6140 in orxonox.OLD for branches

Timestamp:

Dec 16, 2005, 6:47:33 PM (19 years ago)

Author:

patrick

Message:

network: removing branche network

Location:

branches

Files:

• collision_detection/src/lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• collision_detection/src/world_entities/world_entity.cc (modified) (1 diff)
• network (deleted)

branches/collision_detection/src/lib/collision_detection/obb_tree_node.cc

@@ -469 +469 @@
     if( tmpDist > 0.0f)
       partition1.push_back(box.triangleIndexes[i]); /* positive numbers plus zero */
-    else
+    else if( tmpDist < 0.0f)
       partition2.push_back(box.triangleIndexes[i]); /* negatice numbers */
+    else {
+      partition1.push_back(box.triangleIndexes[i]); /* 0.0f? unprobable... */
+      partition2.push_back(box.triangleIndexes[i]);
+    }
   }
   PRINTF(3)("\nPartition1: got \t%i Vertices \nPartition2: got \t%i Vertices\n", partition1.size(), partition2.size());

branches/collision_detection/src/world_entities/world_entity.cc

@@ -101 +101 @@
       this->model = (Model*)ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, &scaling);
 
-    this->buildObbTree(4);
+    this->buildObbTree(10);
   }
   else