X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fparticlesystem.cpp;h=8df8108697174dba87538e574ad0deae3679505d;hb=db14b806439363d7f4809d0d5e4187e356295841;hp=de228208443a67a8e0d7514900f1757d7383da36;hpb=70fdbd45026801f0f0f312278c69b383eaca9d3a;p=supertux.git diff --git a/src/object/particlesystem.cpp b/src/object/particlesystem.cpp index de2282084..8df810869 100644 --- a/src/object/particlesystem.cpp +++ b/src/object/particlesystem.cpp @@ -1,47 +1,45 @@ -// $Id$ -// // SuperTux -// Copyright (C) 2004 Matthias Braun +// Copyright (C) 2006 Matthias Braun // -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. // // This program is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -// +// // You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include +// along with this program. If not, see . + +#include "object/particlesystem.hpp" -#include -#include +#include -#include "particlesystem.hpp" +#include "math/random_generator.hpp" +#include "supertux/globals.hpp" #include "video/drawing_context.hpp" -#include "lisp/parser.hpp" -#include "lisp/lisp.hpp" -#include "lisp/writer.hpp" -#include "resources.hpp" -#include "main.hpp" -ParticleSystem::ParticleSystem() +ParticleSystem::ParticleSystem(float max_particle_size_) : + max_particle_size(max_particle_size_), + z_pos(), + particles(), + virtual_width(), + virtual_height() { - virtual_width = SCREEN_WIDTH; - virtual_height = SCREEN_HEIGHT; - layer = LAYER_BACKGROUND1; + virtual_width = SCREEN_WIDTH + max_particle_size * 2; + virtual_height = SCREEN_HEIGHT + max_particle_size *2; + z_pos = LAYER_BACKGROUND1; } ParticleSystem::~ParticleSystem() { - std::vector::iterator i; - for(i = particles.begin(); i != particles.end(); ++i) { - delete *i; - } + std::vector::iterator i; + for(i = particles.begin(); i != particles.end(); ++i) { + delete *i; + } } void ParticleSystem::draw(DrawingContext& context) @@ -50,186 +48,28 @@ void ParticleSystem::draw(DrawingContext& context) float scrolly = context.get_translation().y; context.push_transform(); - context.set_translation(Vector(0,0)); - - std::vector::iterator i; - for(i = particles.begin(); i != particles.end(); ++i) { - Particle* particle = *i; - - // remap x,y coordinates onto screencoordinates - Vector pos; - pos.x = fmodf(particle->pos.x - scrollx, virtual_width); - if(pos.x < 0) pos.x += virtual_width; - pos.y = fmodf(particle->pos.y - scrolly, virtual_height); - if(pos.y < 0) pos.y += virtual_height; - - if(pos.x > SCREEN_WIDTH) pos.x -= virtual_width; - if(pos.y > SCREEN_HEIGHT) pos.y -= virtual_height; - context.draw_surface(particle->texture, pos, layer); - } - - context.pop_transform(); -} - -SnowParticleSystem::SnowParticleSystem() -{ - snowimages[0] = new Surface("images/objects/particles/snow0.png"); - snowimages[1] = new Surface("images/objects/particles/snow1.png"); - snowimages[2] = new Surface("images/objects/particles/snow2.png"); - - virtual_width = SCREEN_WIDTH * 2; - - // create some random snowflakes - size_t snowflakecount = size_t(virtual_width/10.0); - for(size_t i=0; ipos.x = fmodf(rand(), virtual_width); - particle->pos.y = fmodf(rand(), SCREEN_HEIGHT); - int snowsize = rand() % 3; - particle->texture = snowimages[snowsize]; - do { - particle->speed = snowsize*.2 + (float(rand()%10)*.4); - } while(particle->speed < 1); - particle->speed *= 10; // gravity - - particles.push_back(particle); - } -} - -void -SnowParticleSystem::parse(const lisp::Lisp& reader) -{ - reader.get("layer", layer); -} - -void -SnowParticleSystem::write(lisp::Writer& writer) -{ - writer.start_list("particles-snow"); - writer.write_int("layer", layer); - writer.end_list("particles-snow"); -} - -SnowParticleSystem::~SnowParticleSystem() -{ - for(int i=0;i<3;++i) - delete snowimages[i]; -} - -void SnowParticleSystem::update(float elapsed_time) -{ - std::vector::iterator i; - for(i = particles.begin(); i != particles.end(); ++i) { - SnowParticle* particle = (SnowParticle*) *i; - particle->pos.y += particle->speed * elapsed_time; - if(particle->pos.y > SCREEN_HEIGHT) { - particle->pos.y = fmodf(particle->pos.y , virtual_height); - particle->pos.x = rand() % int(virtual_width); - } - } -} - -//FIXME: Sometimes both ghosts have the same image -// Ghosts don't change their movement pattern - not random -GhostParticleSystem::GhostParticleSystem() -{ - ghosts[0] = new Surface("images/objects/particles/ghost0.png"); - ghosts[1] = new Surface("images/objects/particles/ghost1.png"); + context.set_translation(Vector(max_particle_size,max_particle_size)); - virtual_width = SCREEN_WIDTH * 2; + std::vector::iterator i; + for(i = particles.begin(); i != particles.end(); ++i) { + Particle* particle = *i; - // create two ghosts - size_t ghostcount = 2; - for(size_t i=0; ipos.x = fmodf(rand(), virtual_width); - particle->pos.y = fmodf(rand(), SCREEN_HEIGHT); - int size = rand() % 2; - particle->texture = ghosts[size]; - do { - particle->speed = size*.2 + (float(rand()%10)*.4); - } while(particle->speed < 1); - particle->speed *= 50; - particles.push_back(particle); - } -} + // remap x,y coordinates onto screencoordinates + Vector pos; -void -GhostParticleSystem::parse(const lisp::Lisp& reader) -{ - reader.get("layer", layer); -} + pos.x = fmodf(particle->pos.x - scrollx, virtual_width); + if(pos.x < 0) pos.x += virtual_width; -void -GhostParticleSystem::write(lisp::Writer& writer) -{ - writer.start_list("particles-ghosts"); - writer.write_int("layer", layer); - writer.end_list("particles-ghosts"); -} + pos.y = fmodf(particle->pos.y - scrolly, virtual_height); + if(pos.y < 0) pos.y += virtual_height; -GhostParticleSystem::~GhostParticleSystem() -{ - for(int i=0;i<2;++i) - delete ghosts[i]; -} - -void GhostParticleSystem::update(float elapsed_time) -{ - std::vector::iterator i; - for(i = particles.begin(); i != particles.end(); ++i) { - GhostParticle* particle = (GhostParticle*) *i; - particle->pos.y -= particle->speed * elapsed_time; - particle->pos.x -= particle->speed * elapsed_time; - if(particle->pos.y > SCREEN_HEIGHT) { - particle->pos.y = fmodf(particle->pos.y , virtual_height); - particle->pos.x = rand() % int(virtual_width); - } - } -} - -CloudParticleSystem::CloudParticleSystem() -{ - cloudimage = new Surface("images/objects/particles/cloud.png"); + //if(pos.x > virtual_width) pos.x -= virtual_width; + //if(pos.y > virtual_height) pos.y -= virtual_height; - virtual_width = 2000.0; + context.draw_surface(particle->texture, pos, particle->angle, Color(1.0f, 1.0f, 1.0f), Blend(), z_pos); + } - // create some random clouds - for(size_t i=0; i<15; ++i) { - CloudParticle* particle = new CloudParticle; - particle->pos.x = rand() % int(virtual_width); - particle->pos.y = rand() % int(virtual_height); - particle->texture = cloudimage; - particle->speed = -float(25 + rand() % 30); - - particles.push_back(particle); - } -} - -void -CloudParticleSystem::parse(const lisp::Lisp& reader) -{ - reader.get("layer", layer); -} - -void -CloudParticleSystem::write(lisp::Writer& writer) -{ - writer.start_list("particles-clouds"); - writer.write_int("layer", layer); - writer.end_list("particles-clouds"); -} - -CloudParticleSystem::~CloudParticleSystem() -{ - delete cloudimage; + context.pop_transform(); } -void CloudParticleSystem::update(float elapsed_time) -{ - std::vector::iterator i; - for(i = particles.begin(); i != particles.end(); ++i) { - CloudParticle* particle = (CloudParticle*) *i; - particle->pos.x += particle->speed * elapsed_time; - } -} +/* EOF */