Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5446 in orxonox.OLD for trunk/src/lib/particles


Ignore:
Timestamp:
Oct 29, 2005, 11:55:41 AM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: removed debug-stuff

Location:
trunk/src/lib/particles
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/particles/particle_system.cc

    r5445 r5446  
    2727#include "material.h"
    2828#include "state.h"
     29#include "shell_command.h"
    2930
    3031#include "tinyxml.h"
    3132
    3233CREATE_FACTORY(ParticleSystem);
    33 
     34SHELL_COMMAND(texture, ParticleSystem, setMaterialTexture)
     35    ->defaultValues(1, "maps/evil-flower.png");
    3436
    3537using namespace std;
     
    176178 * @param particleType the type of particles in this System
    177179 * @param count how many particles (in PARTICLE_MULTI-mode)
    178    @todo this will be different
     180   @todo this MUST be different
    179181*/
    180182void ParticleSystem::setType(PARTICLE_TYPE particleType, int count)
     
    214216{
    215217  this->material = material;
     218}
     219
     220void ParticleSystem::setMaterialTexture(const char* textureFile)
     221{
     222  if (this->material != NULL)
     223    this->material->setDiffuseMap(textureFile);
    216224}
    217225
  • trunk/src/lib/particles/particle_system.h

    r5405 r5446  
    7979  void setType(PARTICLE_TYPE particleType, int count = 0);
    8080  void setMaterial(Material* material);
     81  void setMaterialTexture(const char* textureFile);
    8182  void setModel(const char* modelName = NULL);
    8283  void setLifeSpan(float lifeSpan, float randomLifeSpan = 0.0);
Note: See TracChangeset for help on using the changeset viewer.