Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3603 in orxonox.OLD


Ignore:
Timestamp:
Mar 18, 2005, 10:28:57 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: attenuation works, and the Light is now in lib/graphics

Location:
orxonox/trunk/src
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r3595 r3603  
    66AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/coord
    77AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/data
    8 AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/gaphics
     8AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics
    99AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/font
    1010AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/graphics/importer
    … …  
    3434                 track_manager.cc \
    3535                 track_node.cc \
    36                  light.cc \
    3736                 simple_animation.cc \
    3837                 story_entities/story_entity.cc \
    … …  
    5352                 lib/coord/helper_parent.cc \
    5453                 lib/data/data_tank.cc \
     54                 lib/graphics/light.cc \
    5555                 lib/graphics/font/fontset.cc \
    5656                 lib/graphics/importer/array.cc \
    … …  
    7676                 command_node.h \
    7777                 message_structures.h \
    78                  light.h \
    7978                 track_manager.h \
    8079                 track_node.h \
    … …  
    104103                 lib/coord/null_parent.h \
    105104                 lib/coord/helper_parent.h \
     105                 lib/graphics/light.h \
    106106                 lib/graphics/font/fontset.h \
    107107                 lib/data/data_tank.h \

  • orxonox/trunk/src/Makefile.in

    r3595 r3603  
    5555am_orxonox_OBJECTS = orxonox.$(OBJEXT) game_loader.$(OBJEXT) \
    5656        command_node.$(OBJEXT) keynames.$(OBJEXT) camera.$(OBJEXT) \
    57         track_manager.$(OBJEXT) track_node.$(OBJEXT) light.$(OBJEXT) \
     57        track_manager.$(OBJEXT) track_node.$(OBJEXT) \
    5858        simple_animation.$(OBJEXT) story_entity.$(OBJEXT) \
    5959        campaign.$(OBJEXT) world.$(OBJEXT) world_entity.$(OBJEXT) \
    … …  
    6262        projectile.$(OBJEXT) character_attributes.$(OBJEXT) \
    6363        ai.$(OBJEXT) p_node.$(OBJEXT) null_parent.$(OBJEXT) \
    64         helper_parent.$(OBJEXT) data_tank.$(OBJEXT) fontset.$(OBJEXT) \
    65         array.$(OBJEXT) objModel.$(OBJEXT) model.$(OBJEXT) \
    66         material.$(OBJEXT) texture.$(OBJEXT) base_entity.$(OBJEXT) \
    67         base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
    68         vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
     64        helper_parent.$(OBJEXT) data_tank.$(OBJEXT) light.$(OBJEXT) \
     65        fontset.$(OBJEXT) array.$(OBJEXT) objModel.$(OBJEXT) \
     66        model.$(OBJEXT) material.$(OBJEXT) texture.$(OBJEXT) \
     67        base_entity.$(OBJEXT) base_object.$(OBJEXT) \
     68        ini_parser.$(OBJEXT) list.$(OBJEXT) vector.$(OBJEXT) \
     69        curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
    6970orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    7071orxonox_LDADD = $(LDADD)
    … …  
    225226target_vendor = @target_vendor@
    226227MAINSRCDIR = .
    227 AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/gaphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
     228AM_CXXFLAGS = -I$(MAINSRCDIR) -I$(MAINSRCDIR)/world_entities -I$(MAINSRCDIR)/story_entities -I$(MAINSRCDIR)/lib -I$(MAINSRCDIR)/lib/coord -I$(MAINSRCDIR)/lib/data -I$(MAINSRCDIR)/lib/graphics -I$(MAINSRCDIR)/lib/graphics/font -I$(MAINSRCDIR)/lib/graphics/importer -I$(MAINSRCDIR)/lib/gui -I$(MAINSRCDIR)/lib/lang -I$(MAINSRCDIR)/lib/util -I$(MAINSRCDIR)/lib/math -I$(MAINSRCDIR)/defs -I$(MAINSRCDIR)/font -I$(MAINSRCDIR)/network -I$(MAINSRCDIR)/glmenu -I$(MAINSRCDIR)/ai
    228229AM_LDFLAGS = $(MWINDOWS)
    229230orxonox_SOURCES = orxonox.cc \
    … …  
    234235                 track_manager.cc \
    235236                 track_node.cc \
    236                  light.cc \
    237237                 simple_animation.cc \
    238238                 story_entities/story_entity.cc \
    … …  
    253253                 lib/coord/helper_parent.cc \
    254254                 lib/data/data_tank.cc \
     255                 lib/graphics/light.cc \
    255256                 lib/graphics/font/fontset.cc \
    256257                 lib/graphics/importer/array.cc \
    … …  
    276277                 command_node.h \
    277278                 message_structures.h \
    278                  light.h \
    279279                 track_manager.h \
    280280                 track_node.h \
    … …  
    304304                 lib/coord/null_parent.h \
    305305                 lib/coord/helper_parent.h \
     306                 lib/graphics/light.h \
    306307                 lib/graphics/font/fontset.h \
    307308                 lib/data/data_tank.h \
    … …  
    714715@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    715716@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o data_tank.obj `if test -f 'lib/data/data_tank.cc'; then $(CYGPATH_W) 'lib/data/data_tank.cc'; else $(CYGPATH_W) '$(srcdir)/lib/data/data_tank.cc'; fi`
     717
     718light.o: lib/graphics/light.cc
     719@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT light.o -MD -MP -MF "$(DEPDIR)/light.Tpo" -c -o light.o `test -f 'lib/graphics/light.cc' || echo '$(srcdir)/'`lib/graphics/light.cc; \
     720@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/light.Tpo" "$(DEPDIR)/light.Po"; else rm -f "$(DEPDIR)/light.Tpo"; exit 1; fi
     721@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/light.cc' object='light.o' libtool=no @AMDEPBACKSLASH@
     722@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/light.Po' tmpdepfile='$(DEPDIR)/light.TPo' @AMDEPBACKSLASH@
     723@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     724@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o light.o `test -f 'lib/graphics/light.cc' || echo '$(srcdir)/'`lib/graphics/light.cc
     725
     726light.obj: lib/graphics/light.cc
     727@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT light.obj -MD -MP -MF "$(DEPDIR)/light.Tpo" -c -o light.obj `if test -f 'lib/graphics/light.cc'; then $(CYGPATH_W) 'lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/light.cc'; fi`; \
     728@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/light.Tpo" "$(DEPDIR)/light.Po"; else rm -f "$(DEPDIR)/light.Tpo"; exit 1; fi
     729@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/light.cc' object='light.obj' libtool=no @AMDEPBACKSLASH@
     730@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/light.Po' tmpdepfile='$(DEPDIR)/light.TPo' @AMDEPBACKSLASH@
     731@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     732@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o light.obj `if test -f 'lib/graphics/light.cc'; then $(CYGPATH_W) 'lib/graphics/light.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/light.cc'; fi`
    716733
    717734fontset.o: lib/graphics/font/fontset.cc
    … …  
    10451062
    10461063distdir: $(DISTFILES)
    1047         $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics/font $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/story_entities $(distdir)/world_entities
     1064        $(mkdir_p) $(distdir)/ai $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/data $(distdir)/lib/graphics $(distdir)/lib/graphics/font $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/network $(distdir)/story_entities $(distdir)/world_entities
    10481065        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    10491066        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/story_entities/world.cc

    r3602 r3603  
    171171      lightMan->setAmbientColor(.1,.1,.1);
    172172      lightMan->addLight();
    173       //      lightMan->setAttenuation(1.0, 2, 5);
     173      //      lightMan->setAttenuation(1.0, .01, 0.0);
    174174      //      lightMan->setDiffuseColor(1,1,1);
    175175      //  lightMan->addLight(1);
    … …  
    258258          {
    259259            lightMan->setPosition(.0, .0, .0);
     260            lightMan->setAttenuation(1.0, .01, 0.0);
     261            lightMan->setSpecularColor(1,0,0);
    260262            this->nullParent = NullParent::getInstance ();
    261263            this->nullParent->setName ("NullParent");
Note: See TracChangeset for help on using the changeset viewer.