Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5030 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Aug 15, 2005, 9:21:49 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: subproject collision_detection should work again

Location:
orxonox/trunk/src/subprojects
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r4908 r5030  
    3434                   $(MAINSRCDIR)/lib/lang/class_list.cc \
    3535                   $(MAINSRCDIR)/lib/math/vector.cc \
     36                   $(MAINSRCDIR)/lib/util/color.cc \
    3637                   $(MAINSRCDIR)/util/resource_manager.cc \
    3738                   $(MAINSRCDIR)/lib/coord/p_node.cc \

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

    r4908 r5030  
    6060        collision-state.$(OBJEXT) collision-base_object.$(OBJEXT) \
    6161        collision-class_list.$(OBJEXT) collision-vector.$(OBJEXT) \
    62         collision-resource_manager.$(OBJEXT) \
     62        collision-color.$(OBJEXT) collision-resource_manager.$(OBJEXT) \
    6363        collision-p_node.$(OBJEXT) collision-null_parent.$(OBJEXT) \
    6464        collision-gui_gtk.$(OBJEXT) collision-test_entity.$(OBJEXT) \
    … …  
    8787@AMDEP_TRUE@    ./$(DEPDIR)/collision-class_list.Po \
    8888@AMDEP_TRUE@    ./$(DEPDIR)/collision-collision_detection.Po \
     89@AMDEP_TRUE@    ./$(DEPDIR)/collision-color.Po \
    8990@AMDEP_TRUE@    ./$(DEPDIR)/collision-element_2d.Po \
    9091@AMDEP_TRUE@    ./$(DEPDIR)/collision-environment.Po \
    … …  
    253254                   $(MAINSRCDIR)/lib/lang/class_list.cc \
    254255                   $(MAINSRCDIR)/lib/math/vector.cc \
     256                   $(MAINSRCDIR)/lib/util/color.cc \
    255257                   $(MAINSRCDIR)/util/resource_manager.cc \
    256258                   $(MAINSRCDIR)/lib/coord/p_node.cc \
    … …  
    339341@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-class_list.Po@am__quote@
    340342@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-collision_detection.Po@am__quote@
     343@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-color.Po@am__quote@
    341344@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-element_2d.Po@am__quote@
    342345@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision-environment.Po@am__quote@
    … …  
    615618@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    616619@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-vector.obj `if test -f '$(MAINSRCDIR)/lib/math/vector.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/math/vector.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/math/vector.cc'; fi`
     620
     621collision-color.o: $(MAINSRCDIR)/lib/util/color.cc
     622@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-color.o -MD -MP -MF "$(DEPDIR)/collision-color.Tpo" -c -o collision-color.o `test -f '$(MAINSRCDIR)/lib/util/color.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/color.cc; \
     623@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-color.Tpo" "$(DEPDIR)/collision-color.Po"; else rm -f "$(DEPDIR)/collision-color.Tpo"; exit 1; fi
     624@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/color.cc' object='collision-color.o' libtool=no @AMDEPBACKSLASH@
     625@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-color.Po' tmpdepfile='$(DEPDIR)/collision-color.TPo' @AMDEPBACKSLASH@
     626@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     627@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-color.o `test -f '$(MAINSRCDIR)/lib/util/color.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/util/color.cc
     628
     629collision-color.obj: $(MAINSRCDIR)/lib/util/color.cc
     630@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT collision-color.obj -MD -MP -MF "$(DEPDIR)/collision-color.Tpo" -c -o collision-color.obj `if test -f '$(MAINSRCDIR)/lib/util/color.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/color.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/color.cc'; fi`; \
     631@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/collision-color.Tpo" "$(DEPDIR)/collision-color.Po"; else rm -f "$(DEPDIR)/collision-color.Tpo"; exit 1; fi
     632@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/util/color.cc' object='collision-color.obj' libtool=no @AMDEPBACKSLASH@
     633@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/collision-color.Po' tmpdepfile='$(DEPDIR)/collision-color.TPo' @AMDEPBACKSLASH@
     634@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     635@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(collision_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision-color.obj `if test -f '$(MAINSRCDIR)/lib/util/color.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/color.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/color.cc'; fi`
    617636
    618637collision-resource_manager.o: $(MAINSRCDIR)/util/resource_manager.cc

  • orxonox/trunk/src/subprojects/framework.cc

    r4903 r5030  
    3232{
    3333  // create parser
    34   IniParser parser (DEFAULT_CONFIG_FILE);
    35 
    36   GraphicsEngine::getInstance()->initFromIniFile(&parser);
     34
     35  char* configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
     36
     37  IniParser iniParser (configFileName);
     38  delete configFileName;
     39
     40  GraphicsEngine::getInstance()->initFromIniFile(&iniParser);
    3741
    3842  LightManager::getInstance();
    3943
    40   if( parser.getSection (CONFIG_SECTION_DATA) == -1)
     44  const char* dataPath;
     45  if ((dataPath = iniParser.getVar(CONFIG_NAME_DATADIR, CONFIG_SECTION_DATA))!= NULL)
    4146  {
    42     PRINTF(1)("Could not find Section %s in %s\n", CONFIG_SECTION_DATA, DEFAULT_CONFIG_FILE);
    43   }
    44   char namebuf[256];
    45   char valuebuf[256];
    46   memset (namebuf, 0, 256);
    47   memset (valuebuf, 0, 256);
    48 
    49   while( parser.nextVar (namebuf, valuebuf) != -1)
    50   {
    51     if (!strcmp(namebuf, CONFIG_NAME_DATADIR))
     47    if (!ResourceManager::getInstance()->setDataDir(dataPath))
    5248    {
    53           //  printf("Not yet implemented\n");
    54       if (!ResourceManager::getInstance()->setDataDir(valuebuf))
    55       {
    56         PRINTF(1)("Data Could not be located\n");
    57       }
     49      PRINTF(1)("Data Could not be located\n");
     50      exit(-1);
    5851    }
    59 
    60     memset (namebuf, 0, 256);
    61     memset (valuebuf, 0, 256);
    6252  }
    6353
    6454  if (!ResourceManager::getInstance()->checkDataDir(DEFAULT_DATA_DIR_CHECKFILE))
    6555  {
    66     PRINTF(1)("The DataDirectory %s could not be verified\nPlease Change in File %s Section %s Entry %s to a suitable value\n",
     56    PRINTF(1)("The DataDirectory %s could not be verified\n" \
     57        "  Please Change in File %s Section %s Entry %s to a suitable value\n",
    6758    ResourceManager::getInstance()->getDataDir(),
    6859    DEFAULT_CONFIG_FILE,
Note: See TracChangeset for help on using the changeset viewer.