Changeset 3926 in orxonox.OLD for orxonox

Timestamp:

Apr 21, 2005, 4:39:48 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk/lib/particles: added an abstract emitter class with some attributes, not yet finished

Location:

orxonox/branches/particleEngine/src

Files:

• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (6 diffs)
• lib/graphics/particles/particle_emitter.cc (added)
• lib/graphics/particles/particle_emitter.h (added)
• lib/graphics/particles/particle_engine.h (modified) (1 diff)
• lib/graphics/particles/particle_system.h (modified) (3 diffs)

orxonox/branches/particleEngine/src/Makefile.am

@@ -72 +72 @@
                  lib/graphics/particles/particle_engine.cc \
                  lib/graphics/particles/particle_system.cc \
+                 lib/graphics/particles/particle_emitter.cc \
                  lib/lang/base_entity.cc \
                  lib/lang/base_object.cc \
@@ -130 +131 @@
                  lib/graphics/particles/particle_engine.h \
                  lib/graphics/particles/particle_system.h \
+                 lib/graphics/particles/particle_emitter.h \
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \

orxonox/branches/particleEngine/src/Makefile.in

@@ -69 +69 @@
         primitive_model.$(OBJEXT) model.$(OBJEXT) material.$(OBJEXT) \
         texture.$(OBJEXT) particle_engine.$(OBJEXT) \
-        particle_system.$(OBJEXT) base_entity.$(OBJEXT) \
-        base_object.$(OBJEXT) ini_parser.$(OBJEXT) list.$(OBJEXT) \
-        resource_manager.$(OBJEXT) vector.$(OBJEXT) curve.$(OBJEXT) \
-        glmenu_imagescreen.$(OBJEXT)
+        particle_system.$(OBJEXT) particle_emitter.$(OBJEXT) \
+        base_entity.$(OBJEXT) base_object.$(OBJEXT) \
+        ini_parser.$(OBJEXT) list.$(OBJEXT) resource_manager.$(OBJEXT) \
+        vector.$(OBJEXT) curve.$(OBJEXT) glmenu_imagescreen.$(OBJEXT)
 orxonox_OBJECTS = $(am_orxonox_OBJECTS)
 orxonox_LDADD = $(LDADD)
@@ -98 +98 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/null_parent.Po ./$(DEPDIR)/objModel.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/orxonox.Po ./$(DEPDIR)/p_node.Po \
+@AMDEP_TRUE@    ./$(DEPDIR)/particle_emitter.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/particle_engine.Po \
 @AMDEP_TRUE@    ./$(DEPDIR)/particle_system.Po \
@@ -285 +286 @@
                  lib/graphics/particles/particle_engine.cc \
                  lib/graphics/particles/particle_system.cc \
+                 lib/graphics/particles/particle_emitter.cc \
                  lib/lang/base_entity.cc \
                  lib/lang/base_object.cc \
@@ -343 +345 @@
                  lib/graphics/particles/particle_engine.h \
                  lib/graphics/particles/particle_system.h \
+                 lib/graphics/particles/particle_emitter.h \
                  lib/data/data_tank.h \
                  lib/lang/base_entity.h \
@@ -462 +465 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/orxonox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/p_node.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_emitter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_engine.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/particle_system.Po@am__quote@
@@ -1059 +1063 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @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`
+
+particle_emitter.o: lib/graphics/particles/particle_emitter.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_emitter.o -MD -MP -MF "$(DEPDIR)/particle_emitter.Tpo" -c -o particle_emitter.o `test -f 'lib/graphics/particles/particle_emitter.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_emitter.cc; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particle_emitter.Tpo" "$(DEPDIR)/particle_emitter.Po"; else rm -f "$(DEPDIR)/particle_emitter.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/particle_emitter.cc' object='particle_emitter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particle_emitter.Po' tmpdepfile='$(DEPDIR)/particle_emitter.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_emitter.o `test -f 'lib/graphics/particles/particle_emitter.cc' || echo '$(srcdir)/'`lib/graphics/particles/particle_emitter.cc
+
+particle_emitter.obj: lib/graphics/particles/particle_emitter.cc
+@am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT particle_emitter.obj -MD -MP -MF "$(DEPDIR)/particle_emitter.Tpo" -c -o particle_emitter.obj `if test -f 'lib/graphics/particles/particle_emitter.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_emitter.cc'; fi`; \
+@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/particle_emitter.Tpo" "$(DEPDIR)/particle_emitter.Po"; else rm -f "$(DEPDIR)/particle_emitter.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='lib/graphics/particles/particle_emitter.cc' object='particle_emitter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      depfile='$(DEPDIR)/particle_emitter.Po' tmpdepfile='$(DEPDIR)/particle_emitter.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particle_emitter.obj `if test -f 'lib/graphics/particles/particle_emitter.cc'; then $(CYGPATH_W) 'lib/graphics/particles/particle_emitter.cc'; else $(CYGPATH_W) '$(srcdir)/lib/graphics/particles/particle_emitter.cc'; fi`
 
 base_entity.o: lib/lang/base_entity.cc

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_engine.h

@@ -28 +28 @@
 
   tList<ParticleSystem>* partSysList;
+
 };
 

orxonox/branches/particleEngine/src/lib/graphics/particles/particle_system.h

@@ -11 +11 @@
 // FORWARD DEFINITION
 
+class Material;
+class Vector;
+
 
 //! A struct for one Particle
@@ -18 +21 @@
   Vector position;
   Quaternion rotation;
-  
-  
+  Material* material;  
 };
 
@@ -35 +37 @@
 
   Particle* particles;
-
 };