Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4529 in orxonox.OLD for orxonox/trunk


Ignore:
Timestamp:
Jun 7, 2005, 9:10:24 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: preparing to create the collision-detection-algorithms for patrick

Location:
orxonox/trunk
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/configure.ac

    r4527 r4529  
    600600                 src/subprojects/importer/Makefile
    601601                 src/subprojects/particles/Makefile
     602                 src/subprojects/collision_detection/Makefile
    602603                 src/subprojects/gui/Makefile
    603604                 ])

  • orxonox/trunk/src/defs/include_paths.am

    r4504 r4529  
    1616AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics
    1717AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/physics/fields
     18AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/collision_detection
    1819AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
    1920AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs

  • orxonox/trunk/src/lib/graphics/importer/model.h

    r4468 r4529  
    132132
    133133 protected:
    134   float scaleFactor;    //!< The Factor with which the Model should be scaled. \todo maybe one wants to scale the Model after Initialisation
    135134  void cubeModel(void);
    136135
    137136  Material* findMaterialByName(const char* materialName);
     137
     138
     139 protected:
     140  float            scaleFactor;     //!< The Factor with which the Model should be scaled. \todo maybe one wants to scale the Model after Initialisation
    138141
    139142 private:
    … …  
    162165  ModelGroup*      firstGroup;      //!< The first of all groups.
    163166  ModelGroup*      currentGroup;    //!< The currentGroup. this is the one we will work with.
    164   int              groupCount;             //!< The Count of Groups.
     167  int              groupCount;      //!< The Count of Groups.
    165168
    166169  tList<Material>* materialList;    //!< A list for all the Materials in this Model

  • orxonox/trunk/src/subprojects/Makefile.am

    r4338 r4529  
    11SUBDIRS = importer \
    22          particles \
     3          collision_detection \
    34          gui \
    45          testmain

  • orxonox/trunk/src/subprojects/collision_detection/Makefile.am

    r4493 r4529  
    1515
    1616particles_SOURCES= ../framework.cc \
    17                    particle_fun.cc \
     17                   collision_detection.cc \
    1818                   $(MAINSRCDIR)/lib/particles/particle_engine.cc \
    1919                   $(MAINSRCDIR)/lib/particles/particle_system.cc \
Note: See TracChangeset for help on using the changeset viewer.