Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3919 in orxonox.OLD


Ignore:
Timestamp:
Apr 21, 2005, 11:34:36 AM (19 years ago)
Author:
bensch
Message:

orxonox/branches/heightMap: branche heightmap compiles again

Location:
orxonox/branches/heightMap/src/lib/graphics/importer
Files:
2 edited
5 copied

Legend:

Unmodified
Added
Removed

  • orxonox/branches/heightMap/src/lib/graphics/importer/Makefile.am

    r3907 r3919  
    2727
    2828
    29 bin_PROGRAMS=importer
     29bin_PROGRAMS=importer heightmap
    3030importer_SOURCES= framework.cc \
    3131                  windowHandler.cc \
    … …  
    4343                  $(MAINSRCDIR)/lib/coord/p_node.cc \
    4444                  $(MAINSRCDIR)/lib/coord/null_parent.cc
     45
     46
     47heightmap_SOURCES= main.cc \
     48                   heightMapTerrain.cc \
     49                   heightMapViewer.cc \
     50                   $(MAINSRCDIR)/lib/math/vector.cc \
     51                   windowHandler.cc
    4552
    4653noinst_HEADERS= framework.h \

  • orxonox/branches/heightMap/src/lib/graphics/importer/Makefile.in

    r3907 r3919  
    1616
    1717
    18 SOURCES = $(importer_SOURCES)
     18SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
    1919
    2020srcdir = @srcdir@
    … …  
    3939POST_UNINSTALL = :
    4040host_triplet = @host@
    41 bin_PROGRAMS = importer$(EXEEXT)
     41bin_PROGRAMS = importer$(EXEEXT) heightmap$(EXEEXT)
    4242subdir = src/lib/graphics/importer
    4343DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
    … …  
    5353binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5454PROGRAMS = $(bin_PROGRAMS)
     55am_heightmap_OBJECTS = main.$(OBJEXT) heightMapTerrain.$(OBJEXT) \
     56        heightMapViewer.$(OBJEXT) vector.$(OBJEXT) \
     57        windowHandler.$(OBJEXT)
     58heightmap_OBJECTS = $(am_heightmap_OBJECTS)
     59heightmap_LDADD = $(LDADD)
    5560am_importer_OBJECTS = framework.$(OBJEXT) windowHandler.$(OBJEXT) \
    5661        model.$(OBJEXT) objModel.$(OBJEXT) primitive_model.$(OBJEXT) \
    … …  
    6873@AMDEP_TRUE@    ./$(DEPDIR)/framework.Po \
    6974@AMDEP_TRUE@    ./$(DEPDIR)/graphics_engine.Po \
     75@AMDEP_TRUE@    ./$(DEPDIR)/heightMapTerrain.Po \
     76@AMDEP_TRUE@    ./$(DEPDIR)/heightMapViewer.Po ./$(DEPDIR)/main.Po \
    7077@AMDEP_TRUE@    ./$(DEPDIR)/material.Po ./$(DEPDIR)/model.Po \
    7178@AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
    … …  
    8087CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
    8188        -o $@
    82 SOURCES = $(importer_SOURCES)
    83 DIST_SOURCES = $(importer_SOURCES)
     89SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
     90DIST_SOURCES = $(heightmap_SOURCES) $(importer_SOURCES)
    8491HEADERS = $(noinst_HEADERS)
    8592ETAGS = etags
    … …  
    214221                  $(MAINSRCDIR)/lib/coord/null_parent.cc
    215222
     223heightmap_SOURCES = main.cc \
     224                   heightMapTerrain.cc \
     225                   heightMapViewer.cc \
     226                   $(MAINSRCDIR)/lib/math/vector.cc \
     227                   windowHandler.cc
     228
    216229noinst_HEADERS = framework.h \
    217230                windowHandler.h \
    … …  
    279292clean-binPROGRAMS:
    280293        -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
     294heightmap$(EXEEXT): $(heightmap_OBJECTS) $(heightmap_DEPENDENCIES)
     295        @rm -f heightmap$(EXEEXT)
     296        $(CXXLINK) $(heightmap_LDFLAGS) $(heightmap_OBJECTS) $(heightmap_LDADD) $(LIBS)
    281297importer$(EXEEXT): $(importer_OBJECTS) $(importer_DEPENDENCIES)
    282298        @rm -f importer$(EXEEXT)
    … …  
    293309@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/framework.Po@am__quote@
    294310@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/graphics_engine.Po@am__quote@
     311@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heightMapTerrain.Po@am__quote@
     312@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/heightMapViewer.Po@am__quote@
     313@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
    295314@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/material.Po@am__quote@
    296315@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@
    … …  
    321340@am__fastdepCXX_FALSE@  $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
    322341
     342vector.o: $(MAINSRCDIR)/lib/math/vector.cc
     343@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc; \
     344@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
     345@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
     346@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     347@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     348@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc
     349
     350vector.obj: $(MAINSRCDIR)/lib/math/vector.cc
     351@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.obj -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o 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`; \
     352@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
     353@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
     354@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
     355@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     356@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o 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`
     357
    323358graphics_engine.o: $(MAINSRCDIR)/lib/graphics/graphics_engine.cc
    324359@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT graphics_engine.o -MD -MP -MF "$(DEPDIR)/graphics_engine.Tpo" -c -o graphics_engine.o `test -f '$(MAINSRCDIR)/lib/graphics/graphics_engine.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/graphics/graphics_engine.cc; \
    … …  
    352387@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    353388@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o base_object.obj `if test -f '$(MAINSRCDIR)/lib/lang/base_object.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/lang/base_object.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/lang/base_object.cc'; fi`
    354 
    355 vector.o: $(MAINSRCDIR)/lib/math/vector.cc
    356 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.o -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc; \
    357 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
    358 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.o' libtool=no @AMDEPBACKSLASH@
    359 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
    360 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    361 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o vector.o `test -f '$(MAINSRCDIR)/lib/math/vector.cc' || echo '$(srcdir)/'`$(MAINSRCDIR)/lib/math/vector.cc
    362 
    363 vector.obj: $(MAINSRCDIR)/lib/math/vector.cc
    364 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vector.obj -MD -MP -MF "$(DEPDIR)/vector.Tpo" -c -o 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`; \
    365 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/vector.Tpo" "$(DEPDIR)/vector.Po"; else rm -f "$(DEPDIR)/vector.Tpo"; exit 1; fi
    366 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='$(MAINSRCDIR)/lib/math/vector.cc' object='vector.obj' libtool=no @AMDEPBACKSLASH@
    367 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/vector.Po' tmpdepfile='$(DEPDIR)/vector.TPo' @AMDEPBACKSLASH@
    368 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    369 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o 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`
    370389
    371390resource_manager.o: $(MAINSRCDIR)/util/resource_manager.cc

  • orxonox/branches/heightMap/src/lib/graphics/importer/heightMapTerrain.h

    r3917 r3919  
    1111using namespace std;
    1212
    13 #include "../stdincl.h"
     13#include "stdincl.h"
     14class Vector;
    1415
    1516class HeightMapTerrain

  • orxonox/branches/heightMap/src/lib/graphics/importer/heightMapViewer.h

    r3917 r3919  
    1616#include "vector.h"
    1717
    18 #include "../stdincl.h"
     18#include "stdincl.h"
    1919
    2020
    … …  
    2929class HeightMapViewer
    3030{
    31 public:
     31 public:
    3232        HeightMapViewer();
    3333        ~HeightMapViewer();
    … …  
    3737        bool run();
    3838
    39 private:               
     39 private:               
    4040        void drawScene();
    4141        void updateView();

  • orxonox/branches/heightMap/src/lib/graphics/importer/main.cc

    r3917 r3919  
    44#include "heightMapViewer.h"
    55
     6int verbose = 3;
    67
    78int main(int argc, char *argv[])
Note: See TracChangeset for help on using the changeset viewer.