Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3455 in orxonox.OLD


Ignore:
Timestamp:
Mar 3, 2005, 7:57:26 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: cone3D-fonts added, but they will still need some work till they totally adapted to orxonox.

Location:
orxonox/trunk/src
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r3436 r3455  
    3838                 glmenu_imagescreen.cc \
    3939                 skysphere.cc \
    40                  light.cc
     40                 light.cc \
     41                 sfont/cone3dfont.cc
    4142
    4243noinst_HEADERS = ability.h \

  • orxonox/trunk/src/Makefile.in

    r3436 r3455  
    6464        helper_parent.$(OBJEXT) track_manager.$(OBJEXT) \
    6565        matrix.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) \
    66         skysphere.$(OBJEXT) light.$(OBJEXT)
     66        skysphere.$(OBJEXT) light.$(OBJEXT) cone3dfont.$(OBJEXT)
    6767orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    6868orxonox_LDADD = $(LDADD)
    … …  
    7474@AMDEP_TRUE@    ./$(DEPDIR)/base_object.Po ./$(DEPDIR)/camera.Po \
    7575@AMDEP_TRUE@    ./$(DEPDIR)/campaign.Po ./$(DEPDIR)/collision.Po \
    76 @AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po ./$(DEPDIR)/curve.Po \
     76@AMDEP_TRUE@    ./$(DEPDIR)/command_node.Po \
     77@AMDEP_TRUE@    ./$(DEPDIR)/cone3dfont.Po ./$(DEPDIR)/curve.Po \
    7778@AMDEP_TRUE@    ./$(DEPDIR)/data_tank.Po \
    7879@AMDEP_TRUE@    ./$(DEPDIR)/environment.Po \
    … …  
    248249                 glmenu_imagescreen.cc \
    249250                 skysphere.cc \
    250                  light.cc
     251                 light.cc \
     252                 sfont/cone3dfont.cc
    251253
    252254noinst_HEADERS = ability.h \
    … …  
    379381@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collision.Po@am__quote@
    380382@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command_node.Po@am__quote@
     383@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cone3dfont.Po@am__quote@
    381384@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/curve.Po@am__quote@
    382385@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_tank.Po@am__quote@
    … …  
    500503@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    501504@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o texture.obj `if test -f 'importer/texture.cc'; then $(CYGPATH_W) 'importer/texture.cc'; else $(CYGPATH_W) '$(srcdir)/importer/texture.cc'; fi`
     505
     506cone3dfont.o: sfont/cone3dfont.cc
     507@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cone3dfont.o -MD -MP -MF "$(DEPDIR)/cone3dfont.Tpo" -c -o cone3dfont.o `test -f 'sfont/cone3dfont.cc' || echo '$(srcdir)/'`sfont/cone3dfont.cc; \
     508@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/cone3dfont.Tpo" "$(DEPDIR)/cone3dfont.Po"; else rm -f "$(DEPDIR)/cone3dfont.Tpo"; exit 1; fi
     509@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='sfont/cone3dfont.cc' object='cone3dfont.o' libtool=no @AMDEPBACKSLASH@
     510@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/cone3dfont.Po' tmpdepfile='$(DEPDIR)/cone3dfont.TPo' @AMDEPBACKSLASH@
     511@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     512@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cone3dfont.o `test -f 'sfont/cone3dfont.cc' || echo '$(srcdir)/'`sfont/cone3dfont.cc
     513
     514cone3dfont.obj: sfont/cone3dfont.cc
     515@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT cone3dfont.obj -MD -MP -MF "$(DEPDIR)/cone3dfont.Tpo" -c -o cone3dfont.obj `if test -f 'sfont/cone3dfont.cc'; then $(CYGPATH_W) 'sfont/cone3dfont.cc'; else $(CYGPATH_W) '$(srcdir)/sfont/cone3dfont.cc'; fi`; \
     516@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/cone3dfont.Tpo" "$(DEPDIR)/cone3dfont.Po"; else rm -f "$(DEPDIR)/cone3dfont.Tpo"; exit 1; fi
     517@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='sfont/cone3dfont.cc' object='cone3dfont.obj' libtool=no @AMDEPBACKSLASH@
     518@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/cone3dfont.Po' tmpdepfile='$(DEPDIR)/cone3dfont.TPo' @AMDEPBACKSLASH@
     519@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     520@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o cone3dfont.obj `if test -f 'sfont/cone3dfont.cc'; then $(CYGPATH_W) 'sfont/cone3dfont.cc'; else $(CYGPATH_W) '$(srcdir)/sfont/cone3dfont.cc'; fi`
    502521uninstall-info-am:
    503522

  • orxonox/trunk/src/world.cc

    r3449 r3455  
    2929#include "skysphere.h"
    3030#include "light.h"
     31#include "sfont/cone3dfont.h"
    3132
    3233using namespace std;
    … …  
    200201void World::load()
    201202{
    202   // LIGHT initialisation
    203   light = Light::getInstance();
    204   light->addLight(0);
    205   light->setAttenuation(QUADRATIC, 1.0);
    206   light->setPosition(20.0, 10.0, 20.0);
    207   light->setDiffuseColor(1,1,1);
    208   //  light->addLight(1);
    209   //  light->setPosition(20, 10, -20);
    210   //  light->setDiffuseColor(0,0,0);
    211   light->debug();
    212 
    213203  //  BezierCurve* tmpCurve = new BezierCurve();
    214204  if(this->debugWorldNr != -1)
    215205    {
     206      // initializing Font
     207      testFont = new Cone3DFont();
     208      testFont->BuildFont("../data/pictures/font.tga");
     209
     210      // initializing the TrackManager
    216211      trackManager = TrackManager::getInstance();
    217212      trackManager->addPoint(Vector(0,-5,0));
    … …  
    583578  */
    584579  glEndList();
     580  // LIGHT initialisation
     581  light = Light::getInstance();
     582  light->addLight(0);
     583  light->setAttenuation(QUADRATIC, 1.0);
     584  light->setAttenuation(CONSTANT, 2.0);
     585  light->setAttenuation(QUADRATIC, 1.0);
     586  light->setPosition(10.0, 1.0, 0.0);
     587  light->setDiffuseColor(1,1,1);
     588  //  light->addLight(1);
     589  //  light->setPosition(20, 10, -20);
     590  //  light->setDiffuseColor(0,0,0);
     591  light->debug();
     592
     593
    585594}
    586595
    … …  
    648657  // draw debug coord system
    649658  glCallList (objectList);
    650 
    651659  //! \todo skysphere is a WorldEntity and should be inside of the world-entity-list.
    652660  skySphere->draw();
     661
     662  testFont->PrintText(10, 10, 1, "orxonox_" PACKAGE_VERSION);
    653663
    654664}

  • orxonox/trunk/src/world.h

    r3449 r3455  
    1818class Skysphere;
    1919class Light;
     20class Cone3DFont;
    2021
    2122//! The game world
    … …  
    7273  bool bPause;                  //!< pause mode
    7374
     75  Cone3DFont* testFont;         //!< A test Font. \todo fix this, so it is for real.
    7476  GLMenuImageScreen* glmis;     //!< The Level-Loader Display
    7577
Note: See TracChangeset for help on using the changeset viewer.