Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5465 in orxonox.OLD


Ignore:
Timestamp:
Nov 2, 2005, 9:01:12 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: vegetation rendering in the terrain (trees are now rendered correctly)

Location:
trunk/src
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/Makefile.in

    r5463 r5465  
    366366          esac; \
    367367        done; \
    368         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
     368        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
    369369        cd $(top_srcdir) && \
    370           $(AUTOMAKE) --gnu  src/Makefile
     370          $(AUTOMAKE) --foreign  src/Makefile
    371371.PRECIOUS: Makefile
    372372Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/Makefile.in

    r5463 r5465  
    275275          esac; \
    276276        done; \
    277         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
     277        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
    278278        cd $(top_srcdir) && \
    279           $(AUTOMAKE) --gnu  src/lib/Makefile
     279          $(AUTOMAKE) --foreign  src/lib/Makefile
    280280.PRECIOUS: Makefile
    281281Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/collision_detection/Makefile.in

    r5463 r5465  
    224224          esac; \
    225225        done; \
    226         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile'; \
     226        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile'; \
    227227        cd $(top_srcdir) && \
    228           $(AUTOMAKE) --gnu  src/lib/collision_detection/Makefile
     228          $(AUTOMAKE) --foreign  src/lib/collision_detection/Makefile
    229229.PRECIOUS: Makefile
    230230Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/event/Makefile.in

    r5463 r5465  
    212212          esac; \
    213213        done; \
    214         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/event/Makefile'; \
     214        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/event/Makefile'; \
    215215        cd $(top_srcdir) && \
    216           $(AUTOMAKE) --gnu  src/lib/event/Makefile
     216          $(AUTOMAKE) --foreign  src/lib/event/Makefile
    217217.PRECIOUS: Makefile
    218218Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/graphics/Makefile.in

    r5463 r5465  
    230230          esac; \
    231231        done; \
    232         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
     232        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
    233233        cd $(top_srcdir) && \
    234           $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
     234          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
    235235.PRECIOUS: Makefile
    236236Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/graphics/importer/Makefile.in

    r5463 r5465  
    217217          esac; \
    218218        done; \
    219         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
     219        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
    220220        cd $(top_srcdir) && \
    221           $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
     221          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
    222222.PRECIOUS: Makefile
    223223Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/graphics/spatial_separation/Makefile.in

    r5463 r5465  
    205205          esac; \
    206206        done; \
    207         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile'; \
     207        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile'; \
    208208        cd $(top_srcdir) && \
    209           $(AUTOMAKE) --gnu  src/lib/graphics/spatial_separation/Makefile
     209          $(AUTOMAKE) --foreign  src/lib/graphics/spatial_separation/Makefile
    210210.PRECIOUS: Makefile
    211211Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/gui/Makefile.in

    r5463 r5465  
    179179          esac; \
    180180        done; \
    181         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
     181        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
    182182        cd $(top_srcdir) && \
    183           $(AUTOMAKE) --gnu  src/lib/gui/Makefile
     183          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
    184184.PRECIOUS: Makefile
    185185Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/gui/gl_gui/Makefile.in

    r5463 r5465  
    238238          esac; \
    239239        done; \
    240         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gl_gui/Makefile'; \
     240        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gl_gui/Makefile'; \
    241241        cd $(top_srcdir) && \
    242           $(AUTOMAKE) --gnu  src/lib/gui/gl_gui/Makefile
     242          $(AUTOMAKE) --foreign  src/lib/gui/gl_gui/Makefile
    243243.PRECIOUS: Makefile
    244244Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/gui/gtk_gui/Makefile.in

    r5463 r5465  
    240240          esac; \
    241241        done; \
    242         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gtk_gui/Makefile'; \
     242        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gtk_gui/Makefile'; \
    243243        cd $(top_srcdir) && \
    244           $(AUTOMAKE) --gnu  src/lib/gui/gtk_gui/Makefile
     244          $(AUTOMAKE) --foreign  src/lib/gui/gtk_gui/Makefile
    245245.PRECIOUS: Makefile
    246246Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/particles/Makefile.in

    r5463 r5465  
    209209          esac; \
    210210        done; \
    211         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/particles/Makefile'; \
     211        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/particles/Makefile'; \
    212212        cd $(top_srcdir) && \
    213           $(AUTOMAKE) --gnu  src/lib/particles/Makefile
     213          $(AUTOMAKE) --foreign  src/lib/particles/Makefile
    214214.PRECIOUS: Makefile
    215215Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/physics/Makefile.in

    r5463 r5465  
    218218          esac; \
    219219        done; \
    220         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/physics/Makefile'; \
     220        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/physics/Makefile'; \
    221221        cd $(top_srcdir) && \
    222           $(AUTOMAKE) --gnu  src/lib/physics/Makefile
     222          $(AUTOMAKE) --foreign  src/lib/physics/Makefile
    223223.PRECIOUS: Makefile
    224224Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/shell/Makefile.in

    r5463 r5465  
    212212          esac; \
    213213        done; \
    214         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/shell/Makefile'; \
     214        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/shell/Makefile'; \
    215215        cd $(top_srcdir) && \
    216           $(AUTOMAKE) --gnu  src/lib/shell/Makefile
     216          $(AUTOMAKE) --foreign  src/lib/shell/Makefile
    217217.PRECIOUS: Makefile
    218218Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/sound/Makefile.in

    r5463 r5465  
    209209          esac; \
    210210        done; \
    211         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/sound/Makefile'; \
     211        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/sound/Makefile'; \
    212212        cd $(top_srcdir) && \
    213           $(AUTOMAKE) --gnu  src/lib/sound/Makefile
     213          $(AUTOMAKE) --foreign  src/lib/sound/Makefile
    214214.PRECIOUS: Makefile
    215215Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/lib/tinyxml/Makefile.in

    r5463 r5465  
    204204          esac; \
    205205        done; \
    206         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile'; \
     206        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile'; \
    207207        cd $(top_srcdir) && \
    208           $(AUTOMAKE) --gnu  src/lib/tinyxml/Makefile
     208          $(AUTOMAKE) --foreign  src/lib/tinyxml/Makefile
    209209.PRECIOUS: Makefile
    210210Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/subprojects/Makefile.in

    r5463 r5465  
    186186          esac; \
    187187        done; \
    188         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/Makefile'; \
     188        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/Makefile'; \
    189189        cd $(top_srcdir) && \
    190           $(AUTOMAKE) --gnu  src/subprojects/Makefile
     190          $(AUTOMAKE) --foreign  src/subprojects/Makefile
    191191.PRECIOUS: Makefile
    192192Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/subprojects/collision_detection/Makefile.in

    r5463 r5465  
    276276          esac; \
    277277        done; \
    278         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/collision_detection/Makefile'; \
     278        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/collision_detection/Makefile'; \
    279279        cd $(top_srcdir) && \
    280           $(AUTOMAKE) --gnu  src/subprojects/collision_detection/Makefile
     280          $(AUTOMAKE) --foreign  src/subprojects/collision_detection/Makefile
    281281.PRECIOUS: Makefile
    282282Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r5463 r5465  
    245245          esac; \
    246246        done; \
    247         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile'; \
     247        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile'; \
    248248        cd $(top_srcdir) && \
    249           $(AUTOMAKE) --gnu  src/subprojects/importer/Makefile
     249          $(AUTOMAKE) --foreign  src/subprojects/importer/Makefile
    250250.PRECIOUS: Makefile
    251251Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

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

    r5463 r5465  
    267267          esac; \
    268268        done; \
    269         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile'; \
     269        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile'; \
    270270        cd $(top_srcdir) && \
    271           $(AUTOMAKE) --gnu  src/subprojects/particles/Makefile
     271          $(AUTOMAKE) --foreign  src/subprojects/particles/Makefile
    272272.PRECIOUS: Makefile
    273273Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/subprojects/testmain/Makefile.in

    r5463 r5465  
    196196          esac; \
    197197        done; \
    198         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile'; \
     198        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile'; \
    199199        cd $(top_srcdir) && \
    200           $(AUTOMAKE) --gnu  src/subprojects/testmain/Makefile
     200          $(AUTOMAKE) --foreign  src/subprojects/testmain/Makefile
    201201.PRECIOUS: Makefile
    202202Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/util/Makefile.in

    r5463 r5465  
    242242          esac; \
    243243        done; \
    244         echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/util/Makefile'; \
     244        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/util/Makefile'; \
    245245        cd $(top_srcdir) && \
    246           $(AUTOMAKE) --gnu  src/util/Makefile
     246          $(AUTOMAKE) --foreign  src/util/Makefile
    247247.PRECIOUS: Makefile
    248248Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • trunk/src/world_entities/terrain.cc

    r5415 r5465  
    2121#include "factory.h"
    2222#include "spatial_separation.h"
     23
     24#include "resource_manager.h"
    2325
    2426using namespace std;
    … …  
    7880  if( this->ssp)
    7981    delete ssp;
     82  if (this->vegetation)
     83  {
     84    ResourceManager::getInstance()->unload(this->vegetation);
     85  }
    8086}
    8187
    … …  
    8793  this->objectList = 0;
    8894  this->ssp = NULL;
     95  this->vegetation = NULL;
    8996}
    9097
    … …  
    94101  static_cast<WorldEntity*>(this)->loadParams(root);
    95102
     103  LoadParam<Terrain>(root, "vegetation", this, &Terrain::loadVegetation)
     104      .describe("the fileName of the vegetation, that should be loaded onto this terrain. (must be relative to the data-dir)") ;
     105
    96106  //LoadParam<Terrain>(root, "DebugTerrain",  );
    97107}
     108
     109void Terrain::loadVegetation(const char* vegetationFile)
     110{
     111  if (this->vegetation)
     112    ResourceManager::getInstance()->unload(this->vegetation, RP_LEVEL);
     113  if (vegetationFile != NULL)
     114  {
     115    PRINTF(4)("fetching %s\n", vegetationFile);
     116      this->vegetation = (Model*)ResourceManager::getInstance()->load(vegetationFile, OBJ, RP_CAMPAIGN);
     117  }
     118  else
     119    this->vegetation = NULL;
     120}
     121
     122
    98123
    99124void Terrain::draw ()
    … …  
    114139  else if (this->model)
    115140    this->model->draw();
     141  if (this->vegetation)
     142    this->vegetation->draw();
    116143  glPopMatrix();
    117144

  • trunk/src/world_entities/terrain.h

    r5405 r5465  
    3333  void loadParams(const TiXmlElement* root);
    3434
     35  void loadVegetation(const char* vegetationFile);
     36
    3537  void buildDebugTerrain(DebugTerrain debugTerrain);
    3638  virtual void draw();
    … …  
    4042
    4143 private:
    42   int objectList;
     44   Model*              vegetation;
     45   int                 objectList;
    4346};
    4447

  • trunk/src/world_entities/weapons/laser.cc

    r5458 r5465  
    5151  this->emitter->setParent(this);
    5252  this->emitter->setSpread(M_PI, M_PI);
    53   this->emitter->setEmissionRate(50.0);
     53  this->emitter->setEmissionRate(300.0);
    5454  this->emitter->setEmissionVelocity(50.0);
    5555}
    … …  
    8383    Laser::explosionParticles->setName("LaserExplosionParticles");
    8484    Laser::explosionParticles->setLifeSpan(.5, .3);
    85     Laser::explosionParticles->setRadius(0.0, 5);
    86     Laser::explosionParticles->setRadius(.5, 10.0);
     85    Laser::explosionParticles->setRadius(0.0, 3.0);
     86    Laser::explosionParticles->setRadius(.5, 6.0);
    8787    Laser::explosionParticles->setRadius(1.0, 3.0);
    8888    Laser::explosionParticles->setColor(0.0, 1,1,0,.9);

  • trunk/src/world_entities/weapons/rocket.cc

    r5456 r5465  
    9797  if (unlikely(Rocket::explosionParticles == NULL))
    9898  {
    99     Rocket::explosionParticles = new ParticleSystem(1000, PARTICLE_SPRITE);
     99    Rocket::explosionParticles = new ParticleSystem(200, PARTICLE_SPRITE);
    100100    Rocket::explosionParticles->setName("RocketExplosionParticles");
    101     Rocket::explosionParticles->setLifeSpan(.5, .3);
     101    Rocket::explosionParticles->setLifeSpan(.6, .3);
    102102    Rocket::explosionParticles->setRadius(0.0, 10);
    103103    Rocket::explosionParticles->setRadius(.5, 20.0);
    104     Rocket::explosionParticles->setRadius(1.0, 3.0);
    105     Rocket::explosionParticles->setColor(0.0, 0,1,0,.9);
    106     Rocket::explosionParticles->setColor(0.5, .8,.8,0,.5);
     104    Rocket::explosionParticles->setRadius(1.0, 20.0);
     105    Rocket::explosionParticles->setColor(0.0, 0,1,0,1);
     106    Rocket::explosionParticles->setColor(0.5, .8,.8,0,.8);
     107    Rocket::explosionParticles->setColor(0.8, .8,.8,.3,.8);
    107108    Rocket::explosionParticles->setColor(1.0, 1,1,1,.0);
    108109  }
    … …  
    164165  ParticleEngine::getInstance()->addConnection(this->emitter, Rocket::explosionParticles);
    165166
    166   this->emitter->setEmissionRate(30.0);
     167  this->emitter->setEmissionRate(1000.0);
    167168  this->emitter->setEmissionVelocity(50.0);
    168169//  this->deactivate();

  • trunk/src/world_entities/world_entity.cc

    r5435 r5465  
    6666  // Model Loading
    6767  LoadParam<WorldEntity>(root, "model", this, &WorldEntity::loadModel)
    68     .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
     68      .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
     69
     70  // HACK
     71  LoadParam<WorldEntity>(root, "scaled-model", this, &WorldEntity::loadModelWithScale)
     72      .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)") ;
    6973}
    7074
Note: See TracChangeset for help on using the changeset viewer.