Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10033 in orxonox.OLD


Ignore:
Timestamp:
Dec 7, 2006, 3:05:27 PM (17 years ago)
Author:
patrick
Message:

moved some of the importer sources, probably will need to rebuild the project

Location:
trunk/src
Files:
2 added
10 edited
10 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/collision_detection/cd_engine.cc

    r9877 r10033  
    2929//#include "quadtree_node.h"
    3030
    31 #include "bsp_manager.h"
     31#include "bsp/bsp_manager.h"
    3232#include "bsp_entity.h"
    3333

  • trunk/src/lib/collision_detection/obb_tree_node.cc

    r10013 r10033  
    2020
    2121#include "collision_tube.h"
     22#include "world_entity.h"
    2223
    2324#include "matrix.h"
    … …  
    479480    return;
    480481
    481 #warning this should be done
    482 //   if( !CoRe::CollisionTube::getInstance()->isReactive( *nodeA, *nodeB) )
     482  PRINTF(4)("collideWith\n");
     483  PRINTF(5)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
     484
     485  // check if these world entities have registered for a collision reaction between each other
     486//   if( !nodeA->isReactive( *nodeB) && !nodeB->isReactive( *nodeA) )
    483487//     return;
    484488
     489  // now use bounding spheres as a first collision estimation
    485490//   float distanceMax = this->bvElement->radius + ((OBBTreeNode*)treeNode)->bvElement->radius;
    486491//   float distance = fabs((nodeA->getAbsCoor() - nodeB->getAbsCoor()).len());
    487 
    488 
    489 //   if( distance < distanceMax)
    490 //     PRINTF(0)(" %s (%s: group %i) vs %s (%s: group %i): distanceMax: %f, distance: %f\n", nodeA->getClassCName(), nodeA->getName(), nodeA->getOMListNumber(), nodeB->getClassCName(),  nodeB->getName(), nodeB->getOMListNumber(), distanceMax, distance);
    491 
    492 
    493   PRINTF(4)("collideWith\n");
    494   PRINTF(5)("Checking OBB %i vs %i: ", this->getIndex(), treeNode->getIndex());
     492//   if( distance > distanceMax)
     493//     return;
    495494
    496495  // for now only collide with OBBTreeNodes

  • trunk/src/lib/graphics/importer/Makefile.am

    r9869 r10033  
    1212                static_model.cc \
    1313                static_model_data.cc \
    14                 objModel.cc \
    1514                resource_obj.cc \
    1615                primitive_model.cc \
    1716                height_map.cc \
    18                 bsp_manager.cc \
    19                 bsp_file.cc \
    20                 bsp_tree_node.cc \
    21                 bsp_tree_leaf.cc \
    2217                \
    2318                material.cc \
    … …  
    2924                movie_player.cc \
    3025                \
    31                 bsp_manager.cc \
    32                 bsp_file.cc \
    33                 bsp_tree_node.cc \
    34                 bsp_tree_leaf.cc \
     26                obj/objModel.cc \
     27                \
     28                bsp/bsp_manager.cc \
     29                bsp/bsp_file.cc \
     30                bsp/bsp_tree_node.cc \
     31                bsp/bsp_tree_leaf.cc \
    3532                \
    3633                md2/md2Model.cc \
    … …  
    6057                static_model.h \
    6158                static_model_data.h \
    62                 objModel.h \
    6359                resource_obj.h \
    6460                primitive_model.h \
    … …  
    7672                movie_player.h\
    7773                \
    78                 bsp_manager.h \
    79                 bsp_file.h \
    80                 bsp_tree_node.h \
    81                 bsp_tree_leaf.h \
     74                bsp/bsp_manager.h \
     75                bsp/bsp_file.h \
     76                bsp/bsp_tree_node.h \
     77                bsp/bsp_tree_leaf.h \
     78                \
     79                obj/objModel.h \
    8280                \
    8381                md2/md2Model.h \

  • trunk/src/lib/graphics/importer/resource_obj.h

    r9869 r10033  
    99
    1010#include "util/loading/resource.h"
    11 #include "objModel.h"
     11#include "obj/objModel.h"
    1212
    1313class ResourceOBJ : public StaticModel, public Resources::Resource

  • trunk/src/subprojects/collision_detection/collision_test_entity.cc

    r9406 r10033  
    2121
    2222#include "vector.h"
    23 #include "objModel.h"
     23#include "obj/objModel.h"
    2424#include "obb_tree.h"
    2525#include "util/loading/factory.h"

  • trunk/src/subprojects/importer/importer.cc

    r8490 r10033  
    2020#include "light.h"
    2121
    22 #include "objModel.h"
     22#include "obj/objModel.h"
    2323#include "md2/md2Model.h"
    2424#include "primitive_model.h"

  • trunk/src/world_entities/bsp_entity.h

    r9869 r10033  
    88
    99#include "world_entity.h"
    10 #include "bsp_manager.h"
     10#include "bsp/bsp_manager.h"
    1111
    1212#include "util/loading/factory.h"

  • trunk/src/world_entities/creatures/md2_creature.cc

    r9869 r10033  
    2020#include "md2_creature.h"
    2121
    22 #include "objModel.h"
     22#include "obj/objModel.h"
    2323#include "md2/md2Model.h"
    2424#include "state.h"

  • trunk/src/world_entities/environment.cc

    r9869 r10033  
    2020#include "environment.h"
    2121
    22 #include "objModel.h"
     22#include "obj/objModel.h"
    2323#include "obb_tree.h"
    2424#include "util/loading/factory.h"

  • trunk/src/world_entities/satellite.cc

    r9869 r10033  
    2020#include "satellite.h"
    2121
    22 #include "objModel.h"
     22#include "obj/objModel.h"
    2323
    2424
Note: See TracChangeset for help on using the changeset viewer.