Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5687 in orxonox.OLD for trunk


Ignore:
Timestamp:
Nov 21, 2005, 11:14:39 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: subproject collision_detection works again, and again, and again

Location:
trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/collision_detection/Makefile.am

    r5674 r5687  
    2424                     bv_tree_node.h \
    2525                     bounding_volume.h \
    26                      bounding_sphere.h \
    27                      lin_alg.h
     26                     bounding_sphere.h
    2827
  • trunk/src/lib/collision_detection/Makefile.in

    r5674 r5687  
    204204                     bv_tree_node.h \
    205205                     bounding_volume.h \
    206                      bounding_sphere.h \
    207                      lin_alg.h
     206                     bounding_sphere.h
    208207
    209208all: all-am
  • trunk/src/subprojects/collision_detection/Makefile.am

    r5546 r5687  
    66
    77collision_LDADD = $(MAINSRCDIR)/util/libORXutils.a \
     8                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
     9                  $(MAINSRCDIR)/lib/libORXlibs.a \
    810                  $(MAINSRCDIR)/lib/physics/libORXphysics.a \
    9                   $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
    1011                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
    1112                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
  • trunk/src/subprojects/collision_detection/Makefile.in

    r5674 r5687  
    6666am__DEPENDENCIES_1 =
    6767collision_DEPENDENCIES = $(MAINSRCDIR)/util/libORXutils.a \
     68        $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
     69        $(MAINSRCDIR)/lib/libORXlibs.a \
    6870        $(MAINSRCDIR)/lib/physics/libORXphysics.a \
    69         $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
    7071        $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
    7172        $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
     
    202203MAINSRCDIR = ../..
    203204collision_LDADD = $(MAINSRCDIR)/util/libORXutils.a \
     205                  $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
     206                  $(MAINSRCDIR)/lib/libORXlibs.a \
    204207                  $(MAINSRCDIR)/lib/physics/libORXphysics.a \
    205                   $(MAINSRCDIR)/lib/collision_detection/libORXcd.a \
    206208                  $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a \
    207209                  $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
  • trunk/src/subprojects/collision_detection/collision_test_entity.cc

    r5487 r5687  
    3434{
    3535  this->init();
    36   this->loadModel("models/ships/fighter.obj");
     36  this->loadModel("models/ships/reaplow.obj");
     37  //  this->loadModel("models/ships/figther.obj");
    3738
    3839  this->buildObbTree(10);
  • trunk/src/world_entities/weapons/laser.cc

    r5675 r5687  
    4141  this->setClassID(CL_LASER, "Laser");
    4242
    43   this->loadModel("models/projectiles/blue_laser.obj");
     43  this->loadModel("models/projectiles/laser.obj");
    4444
    4545  this->energyMin = 1;
Note: See TracChangeset for help on using the changeset viewer.