Changeset 4639 in orxonox.OLD for orxonox/trunk/src/subprojects

Timestamp:

Jun 16, 2005, 1:59:25 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: particleFun draws some Particles again

Location:

orxonox/trunk/src/subprojects

Files:

• importer/Makefile.in (modified) (1 diff)
• particles/particle_fun.cc (modified) (2 diffs)

orxonox/trunk/src/subprojects/importer/Makefile.in

@@ -205 +205 @@
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
                  $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
-                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
+                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
 
 importer_SOURCES = ../framework.cc \
-                  importer.cc \
-                  $(MAINSRCDIR)/lib/graphics/light.cc \
-                  $(MAINSRCDIR)/util/state.cc \
-                  $(MAINSRCDIR)/world_entities/camera.cc \
-                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
-                  $(MAINSRCDIR)/lib/lang/base_object.cc \
-                  $(MAINSRCDIR)/lib/math/vector.cc \
-                  $(MAINSRCDIR)/util/resource_manager.cc \
-                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
-                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
-                  $(MAINSRCDIR)/lib/coord/p_node.cc \
-                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
-                  $(MAINSRCDIR)/util/loading/load_param.cc \
-                  $(MAINSRCDIR)/lib/util/substring.cc
+                  importer.cc \
+                  $(MAINSRCDIR)/lib/graphics/light.cc \
+                  $(MAINSRCDIR)/util/state.cc \
+                  $(MAINSRCDIR)/world_entities/camera.cc \
+                  $(MAINSRCDIR)/lib/graphics/graphics_engine.cc \
+                  $(MAINSRCDIR)/lib/lang/base_object.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc \
+                  $(MAINSRCDIR)/util/resource_manager.cc \
+                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
+                  $(MAINSRCDIR)/lib/graphics/text_engine.cc \
+                  $(MAINSRCDIR)/lib/coord/p_node.cc \
+                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                  $(MAINSRCDIR)/util/loading/load_param.cc \
+                  $(MAINSRCDIR)/lib/util/substring.cc
 
 all: all-am

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -49 +49 @@
 
   // Creating a Test Particle System
+
   ParticleSystem* system = new ParticleSystem(100000, PINIT_PARTICLE_TYPE);
   system->setRadius(0, PINIT_START_RADIUS, 0 );
@@ -55 +56 @@
 
   system->setConserve(PINIT_CONSERVE_FACTOR);
-  system->setMass(5,3,6);
+  //system->setMass(5,3,6);
 
   // Creating a Test Particle Emitter