Changeset 4649 in orxonox.OLD for orxonox

Timestamp:

Jun 17, 2005, 10:52:16 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: subproject Particles looks good again

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• lib/particles/particle_system.cc (modified) (3 diffs)
• lib/particles/quick_animation.cc (modified) (2 diffs)
• subprojects/importer/importer.cc (modified) (2 diffs)
• subprojects/particles/Makefile.am (modified) (1 diff)
• subprojects/particles/Makefile.in (modified) (8 diffs)
• subprojects/particles/particle_fun.cc (modified) (2 diffs)

orxonox/trunk/src/Makefile.am

@@ -151 +151 @@
 endif
 
-SUBDIRS = lib \
-          . \
-          $(SUB_PROGS)
+SUBDIRS = lib . $(SUB_PROGS) subprojects
 
 

orxonox/trunk/src/Makefile.in

@@ -370 +370 @@
 @SUB_PROJECTS_FALSE@SUB_PROGS = 
 @SUB_PROJECTS_TRUE@SUB_PROGS = subprojects
-SUBDIRS = lib \
-          . \
-          $(SUB_PROGS)
-
+SUBDIRS = lib . $(SUB_PROGS) subprojects
 all: all-recursive
 

orxonox/trunk/src/lib/particles/particle_system.cc

@@ -194 +194 @@
 void ParticleSystem::setRadius(float lifeCycleTime, float radius, float randRadius)
 {
-  this->radiusAnim.addEntry(lifeCycleTime, radius);
-  this->randRadiusAnim.addEntry(lifeCycleTime, randRadius);
+  this->radiusAnim.changeEntry(lifeCycleTime, radius);
+  this->randRadiusAnim.changeEntry(lifeCycleTime, randRadius);
 }
 
@@ -206 +206 @@
 void ParticleSystem::setMass(float lifeCycleTime, float mass, float randMass)
 {
-  this->massAnim.addEntry(lifeCycleTime, mass);
-  this->randMassAnim.addEntry(lifeCycleTime, randMass);
+  this->massAnim.changeEntry(lifeCycleTime, mass);
+  this->randMassAnim.changeEntry(lifeCycleTime, randMass);
 }
 
@@ -220 +220 @@
 void ParticleSystem::setColor(float lifeCycleTime, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-  this->colorAnim[0].addEntry(lifeCycleTime, red);
-  this->colorAnim[1].addEntry(lifeCycleTime, green);
-  this->colorAnim[2].addEntry(lifeCycleTime, blue);
-  this->colorAnim[3].addEntry(lifeCycleTime, alpha);
+  this->colorAnim[0].changeEntry(lifeCycleTime, red);
+  this->colorAnim[1].changeEntry(lifeCycleTime, green);
+  this->colorAnim[2].changeEntry(lifeCycleTime, blue);
+  this->colorAnim[3].changeEntry(lifeCycleTime, alpha);
 }
 

orxonox/trunk/src/lib/particles/quick_animation.cc

@@ -36 +36 @@
    this->first = this->current = NULL;
 }
-
 
 /**
@@ -115 +114 @@
     }
   this->current = this->first;
-  return false;
+
+  this->addEntry(position, value);
 }
 

orxonox/trunk/src/subprojects/importer/importer.cc

@@ -24 +24 @@
 #include <stdlib.h>
 
+#include "resource_manager.h"
 
 Model* obj;
@@ -29 +30 @@
 void Framework::moduleInit(int argc, char** argv)
 {
+  ResourceManager::getInstance()->addImageDir("./");
+
   if (argc>=3)
     obj = new OBJModel (argv[1], atof(argv[2]));

orxonox/trunk/src/subprojects/particles/Makefile.am

@@ -33 +33 @@
                    $(MAINSRCDIR)/util/loading/load_param.cc \
                    $(MAINSRCDIR)/lib/util/ini_parser.cc
+applnkApplication_DATA = particles.desktop
+applnkApplicationdir = $(kde_appsdir)/Application

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

@@ -14 +14 @@
 
 @SET_MAKE@
+
 
 SOURCES = $(particles_SOURCES)
@@ -48 +49 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(applnkApplicationdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -98 +99 @@
 SOURCES = $(particles_SOURCES)
 DIST_SOURCES = $(particles_SOURCES)
+applnkApplicationDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(applnkApplication_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -239 +242 @@
                    $(MAINSRCDIR)/lib/util/ini_parser.cc
 
+applnkApplication_DATA = particles.desktop
+applnkApplicationdir = $(kde_appsdir)/Application
 all: all-am
 
@@ -611 +616 @@
 @am__fastdepCXX_FALSE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(particles_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o particles-ini_parser.obj `if test -f '$(MAINSRCDIR)/lib/util/ini_parser.cc'; then $(CYGPATH_W) '$(MAINSRCDIR)/lib/util/ini_parser.cc'; else $(CYGPATH_W) '$(srcdir)/$(MAINSRCDIR)/lib/util/ini_parser.cc'; fi`
 uninstall-info-am:
+install-applnkApplicationDATA: $(applnkApplication_DATA)
+        @$(NORMAL_INSTALL)
+        test -z "$(applnkApplicationdir)" || $(mkdir_p) "$(DESTDIR)$(applnkApplicationdir)"
+        @list='$(applnkApplication_DATA)'; for p in $$list; do \
+          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+          f="`echo $$p | sed -e 's|^.*/||'`"; \
+          echo " $(applnkApplicationDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(applnkApplicationdir)/$$f'"; \
+          $(applnkApplicationDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(applnkApplicationdir)/$$f"; \
+        done
+
+uninstall-applnkApplicationDATA:
+        @$(NORMAL_UNINSTALL)
+        @list='$(applnkApplication_DATA)'; for p in $$list; do \
+          f="`echo $$p | sed -e 's|^.*/||'`"; \
+          echo " rm -f '$(DESTDIR)$(applnkApplicationdir)/$$f'"; \
+          rm -f "$(DESTDIR)$(applnkApplicationdir)/$$f"; \
+        done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -689 +711 @@
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs:
-        for dir in "$(DESTDIR)$(bindir)"; do \
+        for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(applnkApplicationdir)"; do \
           test -z "$$dir" || $(mkdir_p) "$$dir"; \
         done
@@ -738 +760 @@
 info-am:
 
-install-data-am:
+install-data-am: install-applnkApplicationDATA
 
 install-exec-am: install-binPROGRAMS
@@ -765 +787 @@
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-applnkApplicationDATA uninstall-binPROGRAMS \
+        uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
         clean-generic ctags distclean distclean-compile \
         distclean-generic distclean-tags distdir dvi dvi-am html \
-        html-am info info-am install install-am install-binPROGRAMS \
-        install-data install-data-am install-exec install-exec-am \
-        install-info install-info-am install-man install-strip \
-        installcheck installcheck-am installdirs maintainer-clean \
+        html-am info info-am install install-am \
+        install-applnkApplicationDATA install-binPROGRAMS install-data \
+        install-data-am install-exec install-exec-am install-info \
+        install-info-am install-man install-strip installcheck \
+        installcheck-am installdirs maintainer-clean \
         maintainer-clean-generic mostlyclean mostlyclean-compile \
         mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-        uninstall-am uninstall-binPROGRAMS uninstall-info-am
+        uninstall-am uninstall-applnkApplicationDATA \
+        uninstall-binPROGRAMS uninstall-info-am
 
 include $(MAINSRCDIR)/defs/include_paths.am

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

@@ -22 +22 @@
 #include "fields.h"
 #include "stdlibincl.h"
+#include "graphics_engine.h"
 
 #define PINIT_EMISSION_RATE          50
@@ -43 +44 @@
 void Framework::moduleInit(int argc, char** argv)
 {
+  GraphicsEngine::getInstance()->setWindowName("ParticlesFun", "particles");
+
   verbose = 5;
   ParticleEngine::getInstance();