- Timestamp:
- Jul 2, 2005, 10:03:59 PM (19 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 3 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/Makefile.am
r4758 r4779 61 61 world_entities/weapons/test_gun.cc \ 62 62 world_entities/weapons/test_bullet.cc \ 63 world_entities/weapons/crosshair.cc \ 63 64 lib/coord/p_node.cc \ 64 65 lib/coord/null_parent.cc \ … … 112 113 world_entities/weapons/test_gun.h \ 113 114 world_entities/weapons/test_bullet.h \ 115 world_entities/weapons/crosshair.h \ 114 116 defs/stdincl.h \ 115 117 defs/stdlibincl.h \ -
orxonox/trunk/src/Makefile.in
r4758 r4779 71 71 orxonox-test_entity.$(OBJEXT) orxonox-weapon.$(OBJEXT) \ 72 72 orxonox-projectile.$(OBJEXT) orxonox-test_gun.$(OBJEXT) \ 73 orxonox-test_bullet.$(OBJEXT) orxonox- p_node.$(OBJEXT) \74 orxonox- null_parent.$(OBJEXT) \73 orxonox-test_bullet.$(OBJEXT) orxonox-crosshair.$(OBJEXT) \ 74 orxonox-p_node.$(OBJEXT) orxonox-null_parent.$(OBJEXT) \ 75 75 orxonox-graphics_engine.$(OBJEXT) orxonox-light.$(OBJEXT) \ 76 76 orxonox-text_engine.$(OBJEXT) orxonox-base_object.$(OBJEXT) \ … … 93 93 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-character_attributes.Po \ 94 94 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-class_list.Po \ 95 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-crosshair.Po \ 95 96 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-curve.Po \ 96 97 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox-environment.Po \ … … 306 307 world_entities/weapons/test_gun.cc \ 307 308 world_entities/weapons/test_bullet.cc \ 309 world_entities/weapons/crosshair.cc \ 308 310 lib/coord/p_node.cc \ 309 311 lib/coord/null_parent.cc \ … … 357 359 world_entities/weapons/test_gun.h \ 358 360 world_entities/weapons/test_bullet.h \ 361 world_entities/weapons/crosshair.h \ 359 362 defs/stdincl.h \ 360 363 defs/stdlibincl.h \ … … 470 473 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-character_attributes.Po@am__quote@ 471 474 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-class_list.Po@am__quote@ 475 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-crosshair.Po@am__quote@ 472 476 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-curve.Po@am__quote@ 473 477 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox-environment.Po@am__quote@ … … 1017 1021 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1018 1022 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-test_bullet.obj `if test -f 'world_entities/weapons/test_bullet.cc'; then $(CYGPATH_W) 'world_entities/weapons/test_bullet.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/test_bullet.cc'; fi` 1023 1024 orxonox-crosshair.o: world_entities/weapons/crosshair.cc 1025 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-crosshair.o -MD -MP -MF "$(DEPDIR)/orxonox-crosshair.Tpo" -c -o orxonox-crosshair.o `test -f 'world_entities/weapons/crosshair.cc' || echo '$(srcdir)/'`world_entities/weapons/crosshair.cc; \ 1026 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-crosshair.Tpo" "$(DEPDIR)/orxonox-crosshair.Po"; else rm -f "$(DEPDIR)/orxonox-crosshair.Tpo"; exit 1; fi 1027 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/weapons/crosshair.cc' object='orxonox-crosshair.o' libtool=no @AMDEPBACKSLASH@ 1028 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/orxonox-crosshair.Po' tmpdepfile='$(DEPDIR)/orxonox-crosshair.TPo' @AMDEPBACKSLASH@ 1029 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1030 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-crosshair.o `test -f 'world_entities/weapons/crosshair.cc' || echo '$(srcdir)/'`world_entities/weapons/crosshair.cc 1031 1032 orxonox-crosshair.obj: world_entities/weapons/crosshair.cc 1033 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT orxonox-crosshair.obj -MD -MP -MF "$(DEPDIR)/orxonox-crosshair.Tpo" -c -o orxonox-crosshair.obj `if test -f 'world_entities/weapons/crosshair.cc'; then $(CYGPATH_W) 'world_entities/weapons/crosshair.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/crosshair.cc'; fi`; \ 1034 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/orxonox-crosshair.Tpo" "$(DEPDIR)/orxonox-crosshair.Po"; else rm -f "$(DEPDIR)/orxonox-crosshair.Tpo"; exit 1; fi 1035 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='world_entities/weapons/crosshair.cc' object='orxonox-crosshair.obj' libtool=no @AMDEPBACKSLASH@ 1036 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/orxonox-crosshair.Po' tmpdepfile='$(DEPDIR)/orxonox-crosshair.TPo' @AMDEPBACKSLASH@ 1037 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1038 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(orxonox_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o orxonox-crosshair.obj `if test -f 'world_entities/weapons/crosshair.cc'; then $(CYGPATH_W) 'world_entities/weapons/crosshair.cc'; else $(CYGPATH_W) '$(srcdir)/world_entities/weapons/crosshair.cc'; fi` 1019 1039 1020 1040 orxonox-p_node.o: lib/coord/p_node.cc -
orxonox/trunk/src/defs/class_id.h
r4754 r4779 77 77 CL_MASK_LOWLEVEL_CLASS = 0x00000fff, 78 78 79 // singleton classes (range from 0x00000f0 1to 0x00000fff)79 // singleton classes (range from 0x00000f00 to 0x00000fff) 80 80 CL_MASK_SINGLETON = 0x00000f00, 81 81 CL_ORXONOX = 0x00000f01, … … 102 102 103 103 104 // StoryEntities (range from 0x0000010 1to 0x000001ff)104 // StoryEntities (range from 0x00000100 to 0x000001ff) 105 105 CL_CAMPAIGN = 0x00000101, 106 106 CL_WORLD = 0x00000102, 107 107 108 108 109 // WorldEntities (range from 0x0000020 1to 0x000004ff)109 // WorldEntities (range from 0x00000200 to 0x000004ff) 110 110 CL_CAMERA = 0x00000201, 111 111 CL_CAMERA_TARGET = 0x00000202, … … 124 124 CL_EVENT = 0x00000501, 125 125 CL_KEY_MAPPER = 0x00000502, 126 CL_CROSSHAIR = 0x0000050f, 126 127 127 128 CL_WEAPON_MANAGER = 0x00000503, -
orxonox/trunk/src/world_entities/weapons/crosshair.cc
r4774 r4779 10 10 11 11 ### File Specific: 12 main-programmer: ...12 main-programmer: Benjamin Grauer 13 13 co-programmer: ... 14 14 */ … … 16 16 //#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_ 17 17 18 #include " proto_class.h"18 #include "crosshair.h" 19 19 20 20 using namespace std; … … 25 25 \todo this constructor is not jet implemented - do it 26 26 */ 27 ProtoClass::ProtoClass()27 Crosshair::Crosshair () 28 28 { 29 this->setClassID(CL_PROTO_ID, "ProtoClass"); 29 this->setClassID(CL_CROSSHAIR, "Crosshair"); 30 this->setName("Crosshair"); 30 31 31 /* If you make a new class, what is most probably the case when you write this file32 don't forget to:33 1. Add the new file new_class.cc to the ./src/Makefile.am34 2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS35 36 Advanced Topics:37 - if you want to let your object be managed via the ObjectManager make sure to read38 the object_manager.h header comments. You will use this most certanly only if you39 make many objects of your class, like a weapon bullet.40 */41 32 } 42 33 … … 46 37 47 38 */ 48 ProtoClass::~ProtoClass()39 Crosshair::~Crosshair () 49 40 { 50 41 // delete what has to be deleted here 51 42 } 43 44 void Crosshair::process(const Event &event) 45 { 46 47 48 } -
orxonox/trunk/src/world_entities/weapons/crosshair.h
r4774 r4779 1 /*! 2 \file proto_class.h1 /*! 2 \file crosshair.h 3 3 \brief Definition of ... 4 4 5 5 */ 6 6 7 #ifndef _ PROTO_CLASS_H8 #define _ PROTO_CLASS_H7 #ifndef _CROSSHAIR_H 8 #define _CROSSHAIR_H 9 9 10 #include "base_object.h" 10 #include "event_listener.h" 11 12 #include "vector.h" 11 13 12 14 // FORWARD DEFINITION 13 15 14 16 15 16 //! A class for ... 17 class ProtoClass : public BaseObject { 17 //! A class that enables the 18 class Crosshair : public EventListener { 18 19 19 20 public: 20 ProtoClass();21 virtual ~ ProtoClass();21 Crosshair(); 22 virtual ~Crosshair(); 22 23 23 24 25 virtual void process(const Event &event); 26 27 /** @returns the current 3D-position of the Crosshair */ 28 const Vector& getPosition() { return this->position; }; 29 30 void tick(float dt); 31 void draw(); 32 24 33 private: 34 Vector position; //!< The current position of the Crosshair 25 35 26 36 }; 27 37 28 #endif /* _ PROTO_CLASS_H */38 #endif /* _CROSSHAIR_H */
Note: See TracChangeset
for help on using the changeset viewer.