Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4649 in orxonox.OLD for orxonox/trunk


Ignore:
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:
8 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/Makefile.am

    r4643 r4649  
    151151endif
    152152
    153 SUBDIRS = lib \
    154           . \
    155           $(SUB_PROGS)
     153SUBDIRS = lib . $(SUB_PROGS) subprojects
    156154
    157155
  • orxonox/trunk/src/Makefile.in

    r4643 r4649  
    370370@SUB_PROJECTS_FALSE@SUB_PROGS =
    371371@SUB_PROJECTS_TRUE@SUB_PROGS = subprojects
    372 SUBDIRS = lib \
    373           . \
    374           $(SUB_PROGS)
    375 
     372SUBDIRS = lib . $(SUB_PROGS) subprojects
    376373all: all-recursive
    377374
  • orxonox/trunk/src/lib/particles/particle_system.cc

    r4602 r4649  
    194194void ParticleSystem::setRadius(float lifeCycleTime, float radius, float randRadius)
    195195{
    196   this->radiusAnim.addEntry(lifeCycleTime, radius);
    197   this->randRadiusAnim.addEntry(lifeCycleTime, randRadius);
     196  this->radiusAnim.changeEntry(lifeCycleTime, radius);
     197  this->randRadiusAnim.changeEntry(lifeCycleTime, randRadius);
    198198}
    199199
     
    206206void ParticleSystem::setMass(float lifeCycleTime, float mass, float randMass)
    207207{
    208   this->massAnim.addEntry(lifeCycleTime, mass);
    209   this->randMassAnim.addEntry(lifeCycleTime, randMass);
     208  this->massAnim.changeEntry(lifeCycleTime, mass);
     209  this->randMassAnim.changeEntry(lifeCycleTime, randMass);
    210210}
    211211
     
    220220void ParticleSystem::setColor(float lifeCycleTime, GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
    221221{
    222   this->colorAnim[0].addEntry(lifeCycleTime, red);
    223   this->colorAnim[1].addEntry(lifeCycleTime, green);
    224   this->colorAnim[2].addEntry(lifeCycleTime, blue);
    225   this->colorAnim[3].addEntry(lifeCycleTime, alpha);
     222  this->colorAnim[0].changeEntry(lifeCycleTime, red);
     223  this->colorAnim[1].changeEntry(lifeCycleTime, green);
     224  this->colorAnim[2].changeEntry(lifeCycleTime, blue);
     225  this->colorAnim[3].changeEntry(lifeCycleTime, alpha);
    226226}
    227227
  • orxonox/trunk/src/lib/particles/quick_animation.cc

    r4597 r4649  
    3636   this->first = this->current = NULL;
    3737}
    38 
    3938
    4039/**
     
    115114    }
    116115  this->current = this->first;
    117   return false;
     116
     117  this->addEntry(position, value);
    118118}
    119119
  • orxonox/trunk/src/subprojects/importer/importer.cc

    r4554 r4649  
    2424#include <stdlib.h>
    2525
     26#include "resource_manager.h"
    2627
    2728Model* obj;
     
    2930void Framework::moduleInit(int argc, char** argv)
    3031{
     32  ResourceManager::getInstance()->addImageDir("./");
     33
    3134  if (argc>=3)
    3235    obj = new OBJModel (argv[1], atof(argv[2]));
  • orxonox/trunk/src/subprojects/particles/Makefile.am

    r4637 r4649  
    3333                   $(MAINSRCDIR)/util/loading/load_param.cc \
    3434                   $(MAINSRCDIR)/lib/util/ini_parser.cc
     35applnkApplication_DATA = particles.desktop
     36applnkApplicationdir = $(kde_appsdir)/Application
  • orxonox/trunk/src/subprojects/particles/Makefile.in

    r4637 r4649  
    1414
    1515@SET_MAKE@
     16
    1617
    1718SOURCES = $(particles_SOURCES)
     
    4849CONFIG_HEADER = $(top_builddir)/config.h
    4950CONFIG_CLEAN_FILES =
    50 am__installdirs = "$(DESTDIR)$(bindir)"
     51am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(applnkApplicationdir)"
    5152binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    5253PROGRAMS = $(bin_PROGRAMS)
     
    9899SOURCES = $(particles_SOURCES)
    99100DIST_SOURCES = $(particles_SOURCES)
     101applnkApplicationDATA_INSTALL = $(INSTALL_DATA)
     102DATA = $(applnkApplication_DATA)
    100103ETAGS = etags
    101104CTAGS = ctags
     
    239242                   $(MAINSRCDIR)/lib/util/ini_parser.cc
    240243
     244applnkApplication_DATA = particles.desktop
     245applnkApplicationdir = $(kde_appsdir)/Application
    241246all: all-am
    242247
     
    611616@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`
    612617uninstall-info-am:
     618install-applnkApplicationDATA: $(applnkApplication_DATA)
     619        @$(NORMAL_INSTALL)
     620        test -z "$(applnkApplicationdir)" || $(mkdir_p) "$(DESTDIR)$(applnkApplicationdir)"
     621        @list='$(applnkApplication_DATA)'; for p in $$list; do \
     622          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
     623          f="`echo $$p | sed -e 's|^.*/||'`"; \
     624          echo " $(applnkApplicationDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(applnkApplicationdir)/$$f'"; \
     625          $(applnkApplicationDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(applnkApplicationdir)/$$f"; \
     626        done
     627
     628uninstall-applnkApplicationDATA:
     629        @$(NORMAL_UNINSTALL)
     630        @list='$(applnkApplication_DATA)'; for p in $$list; do \
     631          f="`echo $$p | sed -e 's|^.*/||'`"; \
     632          echo " rm -f '$(DESTDIR)$(applnkApplicationdir)/$$f'"; \
     633          rm -f "$(DESTDIR)$(applnkApplicationdir)/$$f"; \
     634        done
    613635
    614636ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
     
    689711check-am: all-am
    690712check: check-am
    691 all-am: Makefile $(PROGRAMS)
     713all-am: Makefile $(PROGRAMS) $(DATA)
    692714installdirs:
    693         for dir in "$(DESTDIR)$(bindir)"; do \
     715        for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(applnkApplicationdir)"; do \
    694716          test -z "$$dir" || $(mkdir_p) "$$dir"; \
    695717        done
     
    738760info-am:
    739761
    740 install-data-am:
     762install-data-am: install-applnkApplicationDATA
    741763
    742764install-exec-am: install-binPROGRAMS
     
    765787ps-am:
    766788
    767 uninstall-am: uninstall-binPROGRAMS uninstall-info-am
     789uninstall-am: uninstall-applnkApplicationDATA uninstall-binPROGRAMS \
     790        uninstall-info-am
    768791
    769792.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
    770793        clean-generic ctags distclean distclean-compile \
    771794        distclean-generic distclean-tags distdir dvi dvi-am html \
    772         html-am info info-am install install-am install-binPROGRAMS \
    773         install-data install-data-am install-exec install-exec-am \
    774         install-info install-info-am install-man install-strip \
    775         installcheck installcheck-am installdirs maintainer-clean \
     795        html-am info info-am install install-am \
     796        install-applnkApplicationDATA install-binPROGRAMS install-data \
     797        install-data-am install-exec install-exec-am install-info \
     798        install-info-am install-man install-strip installcheck \
     799        installcheck-am installdirs maintainer-clean \
    776800        maintainer-clean-generic mostlyclean mostlyclean-compile \
    777801        mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
    778         uninstall-am uninstall-binPROGRAMS uninstall-info-am
     802        uninstall-am uninstall-applnkApplicationDATA \
     803        uninstall-binPROGRAMS uninstall-info-am
    779804
    780805include $(MAINSRCDIR)/defs/include_paths.am
  • orxonox/trunk/src/subprojects/particles/particle_fun.cc

    r4639 r4649  
    2222#include "fields.h"
    2323#include "stdlibincl.h"
     24#include "graphics_engine.h"
    2425
    2526#define PINIT_EMISSION_RATE          50
     
    4344void Framework::moduleInit(int argc, char** argv)
    4445{
     46  GraphicsEngine::getInstance()->setWindowName("ParticlesFun", "particles");
     47
    4548  verbose = 5;
    4649  ParticleEngine::getInstance();
Note: See TracChangeset for help on using the changeset viewer.