Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4839 in orxonox.OLD for orxonox


Ignore:
Timestamp:
Jul 12, 2005, 1:54:38 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: render2D-class definition

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

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/Makefile.am

    r4838 r4839  
    6868                  lib/graphics/light.cc \
    6969                  lib/graphics/text_engine.cc \
    70                   lib/graphics/render2D/element_2D.cc \
     70                  lib/graphics/render2D/element_2d.cc \
     71                  lib/graphics/render2D/render_2d.cc \
    7172                  lib/lang/base_object.cc \
    7273                  lib/lang/class_list.cc \
    … …  
    135136                 lib/graphics/text_engine.h \
    136137                 lib/lang/base_object.h \
     138                 lib/graphics/render2D/element_2d.h \
     139                 lib/graphics/render2D/render_2d.h \
    137140                 lib/lang/class_list.h \
    138141                 lib/util/ini_parser.h \

  • orxonox/trunk/src/Makefile.in

    r4838 r4839  
    7575        orxonox-null_parent.$(OBJEXT) \
    7676        orxonox-graphics_engine.$(OBJEXT) orxonox-light.$(OBJEXT) \
    77         orxonox-text_engine.$(OBJEXT) orxonox-element_2D.$(OBJEXT) \
    78         orxonox-base_object.$(OBJEXT) orxonox-class_list.$(OBJEXT) \
    79         orxonox-ini_parser.$(OBJEXT) orxonox-substring.$(OBJEXT) \
    80         orxonox-vector.$(OBJEXT) orxonox-curve.$(OBJEXT) \
    81         orxonox-glmenu_imagescreen.$(OBJEXT) \
     77        orxonox-text_engine.$(OBJEXT) orxonox-element_2d.$(OBJEXT) \
     78        orxonox-render_2d.$(OBJEXT) orxonox-base_object.$(OBJEXT) \
     79        orxonox-class_list.$(OBJEXT) orxonox-ini_parser.$(OBJEXT) \
     80        orxonox-substring.$(OBJEXT) orxonox-vector.$(OBJEXT) \
     81        orxonox-curve.$(OBJEXT) orxonox-glmenu_imagescreen.$(OBJEXT) \
    8282        orxonox-benchmark.$(OBJEXT)
    8383orxonox_OBJECTS = $(am_orxonox_OBJECTS)
    … …  
    9797@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-crosshair.Po \
    9898@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-curve.Po \
    99 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox-element_2D.Po \
     99@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-element_2d.Po \
    100100@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-environment.Po \
    101101@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-factory.Po \
    … …  
    114114@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-player.Po \
    115115@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-projectile.Po \
     116@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-render_2d.Po \
    116117@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-resource_manager.Po \
    117118@AMDEP_TRUE@    ./$(DEPDIR)/orxonox-satellite.Po \
    … …  
    318319                  lib/graphics/light.cc \
    319320                  lib/graphics/text_engine.cc \
    320                   lib/graphics/render2D/element_2D.cc \
     321                  lib/graphics/render2D/element_2d.cc \
     322                  lib/graphics/render2D/render_2d.cc \
    321323                  lib/lang/base_object.cc \
    322324                  lib/lang/class_list.cc \
    … …  
    385387                 lib/graphics/text_engine.h \
    386388                 lib/lang/base_object.h \
     389                 lib/graphics/render2D/element_2d.h \
     390                 lib/graphics/render2D/render_2d.h \
    387391                 lib/lang/class_list.h \
    388392                 lib/util/ini_parser.h \
    … …  
    482486@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-crosshair.Po@am__quote@
    483487@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-curve.Po@am__quote@
    484 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-element_2D.Po@am__quote@
     488@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-element_2d.Po@am__quote@
    485489@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-environment.Po@am__quote@
    486490@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-factory.Po@am__quote@
    … …  
    499503@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-player.Po@am__quote@
    500504@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-projectile.Po@am__quote@
     505@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-render_2d.Po@am__quote@
    501506@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-resource_manager.Po@am__quote@
    502507@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-satellite.Po@am__quote@
    … …  
    11431148@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-text_engine.obj `if test -f 'lib/graphics/text_engine.cc'; then $(CYGPATH_W) 'lib/graphics/text_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/text_engine.cc'; fi`
    11441149
    1145 orxonox-element_2D.o: lib/graphics/render2D/element_2D.cc
    1146 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-element_2D.o -MD -MP -MF "$(DEPDIR)/orxonox-element_2D.Tpo" -c -o orxonox-element_2D.o `test -f 'lib/graphics/render2D/element_2D.cc' || echo '$(srcdir)/'`lib/graphics/render2D/element_2D.cc; \
    1147 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-element_2D.Tpo" "$(DEPDIR)/orxonox-element_2D.Po"; else rm -f "$(DEPDIR)/orxonox-element_2D.Tpo"; exit 1; fi
    1148 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/render2D/element_2D.cc' object='orxonox-element_2D.o' libtool=no @AMDEPBACKSLASH@
    1149 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-element_2D.Po' tmpdepfile='$(DEPDIR)/orxonox-element_2D.TPo' @AMDEPBACKSLASH@
    1150 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1151 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-element_2D.o `test -f 'lib/graphics/render2D/element_2D.cc' || echo '$(srcdir)/'`lib/graphics/render2D/element_2D.cc
    1152 
    1153 orxonox-element_2D.obj: lib/graphics/render2D/element_2D.cc
    1154 @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-element_2D.obj -MD -MP -MF "$(DEPDIR)/orxonox-element_2D.Tpo" -c -o orxonox-element_2D.obj `if test -f 'lib/graphics/render2D/element_2D.cc'; then $(CYGPATH_W) 'lib/graphics/render2D/element_2D.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/render2D/element_2D.cc'; fi`; \
    1155 @am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-element_2D.Tpo" "$(DEPDIR)/orxonox-element_2D.Po"; else rm -f "$(DEPDIR)/orxonox-element_2D.Tpo"; exit 1; fi
    1156 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/render2D/element_2D.cc' object='orxonox-element_2D.obj' libtool=no @AMDEPBACKSLASH@
    1157 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-element_2D.Po' tmpdepfile='$(DEPDIR)/orxonox-element_2D.TPo' @AMDEPBACKSLASH@
    1158 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    1159 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-element_2D.obj `if test -f 'lib/graphics/render2D/element_2D.cc'; then $(CYGPATH_W) 'lib/graphics/render2D/element_2D.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/render2D/element_2D.cc'; fi`
     1150orxonox-element_2d.o: lib/graphics/render2D/element_2d.cc
     1151@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-element_2d.o -MD -MP -MF "$(DEPDIR)/orxonox-element_2d.Tpo" -c -o orxonox-element_2d.o `test -f 'lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`lib/graphics/render2D/element_2d.cc; \
     1152@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-element_2d.Tpo" "$(DEPDIR)/orxonox-element_2d.Po"; else rm -f "$(DEPDIR)/orxonox-element_2d.Tpo"; exit 1; fi
     1153@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/render2D/element_2d.cc' object='orxonox-element_2d.o' libtool=no @AMDEPBACKSLASH@
     1154@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-element_2d.Po' tmpdepfile='$(DEPDIR)/orxonox-element_2d.TPo' @AMDEPBACKSLASH@
     1155@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1156@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-element_2d.o `test -f 'lib/graphics/render2D/element_2d.cc' || echo '$(srcdir)/'`lib/graphics/render2D/element_2d.cc
     1157
     1158orxonox-element_2d.obj: lib/graphics/render2D/element_2d.cc
     1159@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-element_2d.obj -MD -MP -MF "$(DEPDIR)/orxonox-element_2d.Tpo" -c -o orxonox-element_2d.obj `if test -f 'lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) 'lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/render2D/element_2d.cc'; fi`; \
     1160@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-element_2d.Tpo" "$(DEPDIR)/orxonox-element_2d.Po"; else rm -f "$(DEPDIR)/orxonox-element_2d.Tpo"; exit 1; fi
     1161@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/render2D/element_2d.cc' object='orxonox-element_2d.obj' libtool=no @AMDEPBACKSLASH@
     1162@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-element_2d.Po' tmpdepfile='$(DEPDIR)/orxonox-element_2d.TPo' @AMDEPBACKSLASH@
     1163@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1164@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-element_2d.obj `if test -f 'lib/graphics/render2D/element_2d.cc'; then $(CYGPATH_W) 'lib/graphics/render2D/element_2d.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/render2D/element_2d.cc'; fi`
     1165
     1166orxonox-render_2d.o: lib/graphics/render2D/render_2d.cc
     1167@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-render_2d.o -MD -MP -MF "$(DEPDIR)/orxonox-render_2d.Tpo" -c -o orxonox-render_2d.o `test -f 'lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`lib/graphics/render2D/render_2d.cc; \
     1168@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-render_2d.Tpo" "$(DEPDIR)/orxonox-render_2d.Po"; else rm -f "$(DEPDIR)/orxonox-render_2d.Tpo"; exit 1; fi
     1169@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/render2D/render_2d.cc' object='orxonox-render_2d.o' libtool=no @AMDEPBACKSLASH@
     1170@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-render_2d.Po' tmpdepfile='$(DEPDIR)/orxonox-render_2d.TPo' @AMDEPBACKSLASH@
     1171@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1172@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-render_2d.o `test -f 'lib/graphics/render2D/render_2d.cc' || echo '$(srcdir)/'`lib/graphics/render2D/render_2d.cc
     1173
     1174orxonox-render_2d.obj: lib/graphics/render2D/render_2d.cc
     1175@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-render_2d.obj -MD -MP -MF "$(DEPDIR)/orxonox-render_2d.Tpo" -c -o orxonox-render_2d.obj `if test -f 'lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) 'lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/render2D/render_2d.cc'; fi`; \
     1176@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/orxonox-render_2d.Tpo" "$(DEPDIR)/orxonox-render_2d.Po"; else rm -f "$(DEPDIR)/orxonox-render_2d.Tpo"; exit 1; fi
     1177@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/render2D/render_2d.cc' object='orxonox-render_2d.obj' libtool=no @AMDEPBACKSLASH@
     1178@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/orxonox-render_2d.Po' tmpdepfile='$(DEPDIR)/orxonox-render_2d.TPo' @AMDEPBACKSLASH@
     1179@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     1180@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-render_2d.obj `if test -f 'lib/graphics/render2D/render_2d.cc'; then $(CYGPATH_W) 'lib/graphics/render2D/render_2d.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/render2D/render_2d.cc'; fi`
    11601181
    11611182orxonox-base_object.o: lib/lang/base_object.cc
    … …  
    14091430
    14101431distdir: $(DISTFILES)
    1411         $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities $(distdir)/world_entities/weapons
     1432        $(mkdir_p) $(distdir)/defs $(distdir)/glmenu $(distdir)/lib/coord $(distdir)/lib/graphics $(distdir)/lib/graphics/render2D $(distdir)/lib/lang $(distdir)/lib/math $(distdir)/lib/util $(distdir)/proto $(distdir)/story_entities $(distdir)/subprojects $(distdir)/util $(distdir)/util/animation $(distdir)/util/loading $(distdir)/util/track $(distdir)/world_entities $(distdir)/world_entities/weapons
    14121433        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    14131434        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

  • orxonox/trunk/src/defs/class_id.h

    r4838 r4839  
    108108  CL_STATE                      =    0x00000f13,
    109109  CL_FRAMEWORK                  =    0x00000f14,
    110 
     110  CL_RENDER_2D                  =    0x00000f15,
    111111
    112112

  • orxonox/trunk/src/lib/graphics/render2D/element_2d.cc

    r4838 r4839  
    1616//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
    1717
    18 #include "element_2D.h"
     18#include "element_2d.h"
    1919
    2020using namespace std;
    … …  
    2929   this->setClassID(CL_ELEMENT_2D, "Element2D");
    3030
    31    /* If you make a new class, what is most probably the case when you write this file
    32       don't forget to:
    33        1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
    35 
    36       Advanced Topics:
    37       - if you want to let your object be managed via the ObjectManager make sure to read
    38         the object_manager.h header comments. You will use this most certanly only if you
    39         make many objects of your class, like a weapon bullet.
    40    */
    4131}
    42 
    4332
    4433/**

  • orxonox/trunk/src/lib/graphics/render2D/element_2d.h

    r4838 r4839  
    11/*!
    2  * @file element_2D.h
     2 * @file element_2d.h
    33 * @brief Definition of the 2D elements rendered on top through the GraphicsEngine
    44*/
    … …  
    1111// FORWARD DECLARATION
    1212
     13//!< An enumerator defining the Depth of a 2D-element.
     14typedef enum
     15{
     16  E2D_TOP,                             //!< Will be rendered on top of everything else
     17  E2D_MEDIUM,                          //!< Will be rendered on the medium Layer.
     18  E2D_BOTTOM,                          //!< Will be rendered on the bottom Layer
     19  E2D_BELOW_ALL                        //!< Will be rendered below the 3D-scene. @todo make this work.
     20}E2DDepth;
     21
    1322//! A class for ...
    1423class Element2D : public BaseObject {
    … …  
    2029
    2130 private:
     31   bool               bDraw;
     32   int                position2D[2];    //!< X-coord, Y-Coord
     33   E2DDepth           depth;
    2234
    2335};
    2436
     37
    2538#endif /* _ELEMENT_2D_H */

  • orxonox/trunk/src/lib/graphics/render2D/render_2d.cc

    r4838 r4839  
    1616//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
    1717
    18 #include "proto_singleton.h"
     18#include "render_2d.h"
    1919
    2020using namespace std;
     21
    2122
    2223
    … …  
    2425 * standard constructor
    2526 */
    26 ProtoSingleton::ProtoSingleton ()
     27Render2D::Render2D ()
    2728{
    28    this->setClassName("ProtoSingleton");
    29    this->setClassID(CL_PROTO_ID, "ProtoSingleton");
     29   this->setClassID(CL_RENDER_2D, "Render2D");
     30   this->setName("Render2D");
    3031
    31    /* If you make a new class, what is most probably the case when you write this file
    32       don't forget to:
    33        1. Add the new file new_class.cc to the ./src/Makefile.am
    34        2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
    35 
    36       Advanced Topics:
    37       - if you want to let your object be managed via the ObjectManager make sure to read
    38         the object_manager.h header comments. You will use this most certanly only if you
    39         make many objects of your class, like a weapon bullet.
    40    */
    4132}
    4233
    … …  
    4435 *  the singleton reference to this class
    4536 */
    46 ProtoSingleton* ProtoSingleton::singletonRef = NULL;
     37Render2D* Render2D::singletonRef = NULL;
    4738
    4839/**
    4940   @brief standard deconstructor
    5041 */
    51 ProtoSingleton::~ProtoSingleton ()
     42Render2D::~Render2D ()
    5243{
    53   ProtoSingleton::singletonRef = NULL;
     44  Render2D::singletonRef = NULL;
    5445}

  • orxonox/trunk/src/lib/graphics/render2D/render_2d.h

    r4838 r4839  
    11/*!
    2  * @file proto_singleton.h
    3  * @brief Definition of the ... singleton Class
     2 * @file render_2d.h
     3 * @brief Definition of the 2D-rendering engine singleton Class
    44*/
    55
    6 #ifndef _PROTO_SINGLETON_H
    7 #define _PROTO_SINGLETON_H
     6#ifndef _RENDER_2D_H
     7#define _RENDER_2D_H
    88
    99#include "base_object.h"
    … …  
    1212
    1313//! A default singleton class.
    14 class ProtoSingleton : public BaseObject {
     14class Render2D : public BaseObject {
    1515
    1616 public:
    17   virtual ~ProtoSingleton(void);
     17  virtual ~Render2D(void);
    1818  /** @returns a Pointer to the only object of this Class */
    19   inline static ProtoSingleton* getInstance(void) { if (!singletonRef) singletonRef = new ProtoSingleton();  return singletonRef; };
     19  inline static Render2D* getInstance(void) { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
    2020
    2121 private:
    22   ProtoSingleton(void);
    23   static ProtoSingleton* singletonRef;
     22  Render2D(void);
     23  static Render2D* singletonRef;
    2424};
    2525
    26 #endif /* _PROTO_SINGLETON_H */
     26#endif /* _RENDER_2D_H */

  • orxonox/trunk/src/proto/proto_singleton.cc

    r4838 r4839  
    2626ProtoSingleton::ProtoSingleton ()
    2727{
    28    this->setClassName("ProtoSingleton");
    2928   this->setClassID(CL_PROTO_ID, "ProtoSingleton");
     29   this->setName("ProtoSingleton");
    3030
    3131   /* If you make a new class, what is most probably the case when you write this file
Note: See TracChangeset for help on using the changeset viewer.