Changeset 3925 in orxonox.OLD for orxonox/branches/particleEngine
- Timestamp:
- Apr 21, 2005, 4:11:01 PM (20 years ago)
- Location:
- orxonox/branches/particleEngine/src
- Files:
-
- 3 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
orxonox/branches/particleEngine/src/Makefile.am
r3924 r3925 71 71 lib/graphics/importer/texture.cc \ 72 72 lib/graphics/particles/particle_engine.cc \ 73 lib/graphics/particles/particle_system.cc \ 73 74 lib/lang/base_entity.cc \ 74 75 lib/lang/base_object.cc \ … … 128 129 lib/graphics/text_engine.h \ 129 130 lib/graphics/particles/particle_engine.h \ 131 lib/graphics/particles/particle_system.h \ 130 132 lib/data/data_tank.h \ 131 133 lib/lang/base_entity.h \ -
orxonox/branches/particleEngine/src/Makefile.in
r3924 r3925 69 69 primitive_model.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \ 70 70 texture.$(OBJEXT) particle_engine.$(OBJEXT) \ 71 base_entity.$(OBJEXT) base_object.$(OBJEXT) \ 72 ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \ 73 vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT) 71 particle_system.$(OBJEXT) base_entity.$(OBJEXT) \ 72 base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \ 73 resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \ 74 glmenu_imagescreen.$(OBJEXT) 74 75 orxonox_OBJECTS = $(am_orxonox_OBJECTS) 75 76 orxonox_LDADD = $(LDADD) … … 98 99 @AMDEP_TRUE@ ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \ 99 100 @AMDEP_TRUE@ ./$(DEPDIR)/particle_engine.Po \ 101 @AMDEP_TRUE@ ./$(DEPDIR)/particle_system.Po \ 100 102 @AMDEP_TRUE@ ./$(DEPDIR)/player.Po \ 101 103 @AMDEP_TRUE@ ./$(DEPDIR)/primitive_model.Po \ … … 282 284 lib/graphics/importer/texture.cc \ 283 285 lib/graphics/particles/particle_engine.cc \ 286 lib/graphics/particles/particle_system.cc \ 284 287 lib/lang/base_entity.cc \ 285 288 lib/lang/base_object.cc \ … … 339 342 lib/graphics/text_engine.h \ 340 343 lib/graphics/particles/particle_engine.h \ 344 lib/graphics/particles/particle_system.h \ 341 345 lib/data/data_tank.h \ 342 346 lib/lang/base_entity.h \ … … 459 463 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@ 460 464 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_engine.Po@am__quote@ 465 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_system.Po@am__quote@ 461 466 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/player.Po@am__quote@ 462 467 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/primitive_model.Po@am__quote@ … … 1038 1043 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1039 1044 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_engine.obj `if test -f 'lib/graphics/particles/particle_engine.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_engine.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_engine.cc'; fi` 1045 1046 particle_system.o: lib/graphics/particles/particle_system.cc 1047 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_system.o -MD -MP -MF "$(DEPDIR)/particle_system.Tpo" -c -o particle_system.o `test -f 'lib/graphics/particles/particle_system.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_system.cc; \ 1048 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/particle_system.Tpo" "$(DEPDIR)/particle_system.Po"; else rm -f "$(DEPDIR)/particle_system.Tpo"; exit 1; fi 1049 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/graphics/particles/particle_system.cc' object='particle_system.o' libtool=no @AMDEPBACKSLASH@ 1050 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/particle_system.Po' tmpdepfile='$(DEPDIR)/particle_system.TPo' @AMDEPBACKSLASH@ 1051 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1052 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_system.o `test -f 'lib/graphics/particles/particle_system.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_system.cc 1053 1054 particle_system.obj: lib/graphics/particles/particle_system.cc 1055 @am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_system.obj -MD -MP -MF "$(DEPDIR)/particle_system.Tpo" -c -o particle_system.obj `if test -f 'lib/graphics/particles/particle_system.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_system.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_system.cc'; fi`; \ 1056 @am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/particle_system.Tpo" "$(DEPDIR)/particle_system.Po"; else rm -f "$(DEPDIR)/particle_system.Tpo"; exit 1; fi 1057 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='lib/graphics/particles/particle_system.cc' object='particle_system.obj' libtool=no @AMDEPBACKSLASH@ 1058 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ depfile='$(DEPDIR)/particle_system.Po' tmpdepfile='$(DEPDIR)/particle_system.TPo' @AMDEPBACKSLASH@ 1059 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 1060 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_system.obj `if test -f 'lib/graphics/particles/particle_system.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_system.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_system.cc'; fi` 1040 1061 1041 1062 base_entity.o: lib/lang/base_entity.cc -
orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.h
r3923 r3925 10 10 11 11 // FORWARD DEFINITION 12 template<class T> class tList; 13 class ParticleSystem; 14 12 15 13 16 //! A default singleton class. … … 18 21 virtual ~ParticleEngine(void); 19 22 23 void tick(float dt); 24 20 25 private: 21 26 ParticleEngine(void); 22 27 static ParticleEngine* singletonRef; 28 29 tList<ParticleSystem>* partSysList; 23 30 }; 24 31 -
orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.cc
r3924 r3925 1 2 3 1 /* 4 2 orxonox - the future of 3D-vertical-scrollers … … 12 10 13 11 ### File Specific: 14 main-programmer: ...12 main-programmer: Benjamin Grauer 15 13 co-programmer: ... 16 14 */ … … 18 16 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY 19 17 20 #include "proto_class.h" 21 22 #include "stdincl.h" // maybe 18 #include "particle_system.h" 23 19 24 20 using namespace std; … … 29 25 \todo this constructor is not jet implemented - do it 30 26 */ 31 P rotoClass::ProtoClass()27 ParticleSystem::ParticleSystem () 32 28 { 33 this->setClassName ("P rotoClass");29 this->setClassName ("ParticleSystem"); 34 30 } 35 31 … … 39 35 40 36 */ 41 P rotoClass::~ProtoClass()37 ParticleSystem::~ParticleSystem () 42 38 { 43 39 // delete what has to be deleted here 44 40 } 45 41 46 /**47 \brief nonsense - delete this method48 \param realy nothing to give49 \returns true or false - probably nothing?50 51 this is just to show the doxygen abilities (this for example is an extension for a long comment)52 */53 bool ProtoClass::doNonSense (int nothing) {} -
orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.h
r3924 r3925 1 1 /*! 2 \file proto_class.h 3 \brief Definition of the proto class template, used quickly start work 4 \todo Example: this shows how to use simply add a Marker that here has to be done something. 2 \file particle_system.h 5 3 6 The Protoclass exists, to help you quikly getting the run for how to develop in orxonox.7 It is an example for the CODING-CONVENTION, and a starting-point for every class.8 4 */ 9 5 10 #ifndef _P ROTO_CLASS_H11 #define _P ROTO_CLASS_H6 #ifndef _PARTICLE_SYSTEM_H 7 #define _PARTICLE_SYSTEM_H 12 8 13 #include "what realy has to be included"14 9 #include "base_object.h" 15 16 // FORWARD DEFINITION \\ 17 class someClassWeNeed; 10 #include "vector.h" 11 // FORWARD DEFINITION 18 12 19 13 20 /*class Test;*/ /* forward definition of class Test (without including it here!)*/ 14 //! A struct for one Particle 15 typedef struct Particle 16 { 17 float timeToLive; 18 Vector position; 19 Quaternion rotation; 20 21 22 }; 21 23 22 //! A default class that aids you to start creating a new class 23 /** 24 here can be some longer description of this class 25 */ 26 class ProtoClass : public BaseObject { 24 //! A class to handle particle Systems 25 class ParticleSystem : public BaseObject { 27 26 28 27 public: 29 P rotoClass();30 virtual ~P rotoClass();28 ParticleSystem(); 29 virtual ~ParticleSystem(); 31 30 32 bool doNonSense (int nothing);33 31 34 32 private: 35 int nonSense; //!< doxygen tag here like this for all the variables - delete this variable if you use this 33 34 int particleCount; 35 36 Particle* particles; 36 37 37 38 }; 38 39 39 #endif /* _P ROTO_CLASS_H */40 #endif /* _PARTICLE_SYSTEM_H */
Note: See TracChangeset
for help on using the changeset viewer.