Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-01-20 21:37:11 +0000
committerStijn Buys <ingar@osirion.org>2013-01-20 21:37:11 +0000
commitd4f9da2f3c19511b028da2569d7b6a8d1371e135 (patch)
treee1bba0d8dd3b15169612f865612d3fca6475639a /src/render/render.cc
parent4feff2411d1b703a3b93d8a342112bd998b1ffed (diff)
Major overhaul of the particle system back-end, support multiple ejectors per particle system.
Diffstat (limited to 'src/render/render.cc')
-rw-r--r--src/render/render.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/render.cc b/src/render/render.cc
index bf14e7d..d6c8817 100644
--- a/src/render/render.cc
+++ b/src/render/render.cc
@@ -21,7 +21,7 @@
#include "render/gl.h"
#include "render/state.h"
#include "render/dust.h"
-#include "render/particles.h"
+#include "render/particlesystemscript.h"
#include "render/render.h"
#include "render/screenshot.h"
#include "render/textures.h"
@@ -51,7 +51,7 @@ void func_list_textures(std::string const &args)
void func_list_particles(std::string const &args)
{
- ParticleScript::list();
+ ParticleSystemScript::list();
}
void func_load_info_models(std::string const &args)
@@ -201,7 +201,7 @@ void clear()
}
// clear particle system scripts
- ParticleScript::clear();
+ ParticleSystemScript::clear();
}
// load assets
@@ -235,7 +235,7 @@ void load_info_models()
for (model::Model::ParticleSystems::iterator pit = (*it).second->particles().begin(); pit != (*it).second->particles().end(); pit++) {
model::Particles *particles = (*pit);
if (particles->script().size()) {
- ParticleScript::load(particles->script());
+ ParticleSystemScript::load(particles->script());
}
}
}