X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fobject%2Fparticlesystem.cpp;h=bb79f54de91603d3f1fd6e4f15930f0987f2b80b;hb=c1277f5b7db9f55d1d28f658b4e804f32b76f0ce;hp=56e4414e37c36b42e249ef7db9226981ee212306;hpb=d963f8dc3d2c4e432d3eeecd15351169e10243da;p=supertux.git diff --git a/src/object/particlesystem.cpp b/src/object/particlesystem.cpp index 56e4414e3..bb79f54de 100644 --- a/src/object/particlesystem.cpp +++ b/src/object/particlesystem.cpp @@ -1,12 +1,10 @@ -// $Id$ -// // SuperTux // 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 @@ -14,28 +12,21 @@ // 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. +// along with this program. If not, see . -#include +#include "object/particlesystem.hpp" -#include #include -#include "particlesystem.hpp" +#include "math/random_generator.hpp" +#include "supertux/main.hpp" #include "video/drawing_context.hpp" -#include "lisp/parser.hpp" -#include "lisp/lisp.hpp" -#include "lisp/writer.hpp" -#include "resources.hpp" -#include "main.hpp" -#include "object/camera.hpp" -#include "random_generator.hpp" - -ParticleSystem::ParticleSystem() + +ParticleSystem::ParticleSystem(float max_particle_size) : + max_particle_size(max_particle_size) { - virtual_width = SCREEN_WIDTH; - virtual_height = SCREEN_HEIGHT; + virtual_width = SCREEN_WIDTH + max_particle_size * 2; + virtual_height = SCREEN_HEIGHT + max_particle_size *2; z_pos = LAYER_BACKGROUND1; } @@ -53,7 +44,7 @@ void ParticleSystem::draw(DrawingContext& context) float scrolly = context.get_translation().y; context.push_transform(); - context.set_translation(Vector(0,0)); + context.set_translation(Vector(max_particle_size,max_particle_size)); std::vector::iterator i; for(i = particles.begin(); i != particles.end(); ++i) { @@ -61,13 +52,16 @@ void ParticleSystem::draw(DrawingContext& context) // 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; + //if(pos.x > virtual_width) pos.x -= virtual_width; + //if(pos.y > virtual_height) pos.y -= virtual_height; + context.draw_surface(particle->texture, pos, z_pos); } @@ -76,9 +70,9 @@ void ParticleSystem::draw(DrawingContext& context) SnowParticleSystem::SnowParticleSystem() { - snowimages[0] = new Surface("images/objects/particles/snow0.png"); + snowimages[0] = new Surface("images/objects/particles/snow2.png"); snowimages[1] = new Surface("images/objects/particles/snow1.png"); - snowimages[2] = new Surface("images/objects/particles/snow2.png"); + snowimages[2] = new Surface("images/objects/particles/snow0.png"); virtual_width = SCREEN_WIDTH * 2; @@ -86,33 +80,29 @@ SnowParticleSystem::SnowParticleSystem() size_t snowflakecount = size_t(virtual_width/10.0); for(size_t i=0; ipos.x = systemRandom.randf(virtual_width); particle->pos.y = systemRandom.randf(SCREEN_HEIGHT); - int snowsize = systemRandom.rand(3); + particle->anchorx = particle->pos.x + (systemRandom.randf(-0.5, 0.5) * 16); + particle->drift_speed = systemRandom.randf(-0.5, 0.5) * 0.3; + particle->wobble = 0.0; + particle->texture = snowimages[snowsize]; - do { - particle->speed = snowsize*.2 + systemRandom.randf(3.6); - } while(particle->speed < 1); - particle->speed *= 10; // gravity + + particle->speed = 1 + (2 - snowsize)/2 + systemRandom.randf(1.8); + particle->speed *= 20; // gravity particles.push_back(particle); } } void -SnowParticleSystem::parse(const lisp::Lisp& reader) +SnowParticleSystem::parse(const Reader& reader) { reader.get("z-pos", z_pos); } -void -SnowParticleSystem::write(lisp::Writer& writer) -{ - writer.start_list("particles-snow"); - writer.write_int("z-pos", z_pos); - writer.end_list("particles-snow"); -} - SnowParticleSystem::~SnowParticleSystem() { for(int i=0;i<3;++i) @@ -122,13 +112,18 @@ SnowParticleSystem::~SnowParticleSystem() void SnowParticleSystem::update(float elapsed_time) { std::vector::iterator i; + for(i = particles.begin(); i != particles.end(); ++i) { SnowParticle* particle = (SnowParticle*) *i; + float anchor_delta; + particle->pos.y += particle->speed * elapsed_time; - if(particle->pos.y > SCREEN_HEIGHT + Sector::current()->camera->get_translation().y) { - particle->pos.y = fmodf(particle->pos.y , virtual_height); - particle->pos.x = systemRandom.rand((int)virtual_width); - } + particle->pos.x += particle->wobble * elapsed_time /* * particle->speed * 0.125*/; + + anchor_delta = (particle->anchorx - particle->pos.x); + particle->wobble += (4 * anchor_delta * 0.05) + systemRandom.randf(-0.5, 0.5); + particle->wobble *= 0.99f; + particle->anchorx += particle->drift_speed * elapsed_time; } } @@ -149,28 +144,17 @@ GhostParticleSystem::GhostParticleSystem() particle->pos.y = systemRandom.randf(SCREEN_HEIGHT); int size = systemRandom.rand(2); particle->texture = ghosts[size]; - do { - particle->speed = size*.2 + systemRandom.randf(3.6); - } while(particle->speed < 1); - particle->speed *= 50; + particle->speed = systemRandom.randf(std::max(50, (size * 10)), 180 + (size * 10)); particles.push_back(particle); } } void -GhostParticleSystem::parse(const lisp::Lisp& reader) +GhostParticleSystem::parse(const Reader& reader) { reader.get("z-pos", z_pos); } -void -GhostParticleSystem::write(lisp::Writer& writer) -{ - writer.start_list("particles-ghosts"); - writer.write_int("z-pos", z_pos); - writer.end_list("particles-ghosts"); -} - GhostParticleSystem::~GhostParticleSystem() { for(int i=0;i<2;++i) @@ -186,12 +170,13 @@ void GhostParticleSystem::update(float 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 = systemRandom.rand((int)virtual_width); + particle->pos.x = systemRandom.rand(static_cast(virtual_width)); } } } -CloudParticleSystem::CloudParticleSystem() +CloudParticleSystem::CloudParticleSystem() : + ParticleSystem(128) { cloudimage = new Surface("images/objects/particles/cloud.png"); @@ -200,29 +185,21 @@ CloudParticleSystem::CloudParticleSystem() // create some random clouds for(size_t i=0; i<15; ++i) { CloudParticle* particle = new CloudParticle; - particle->pos.x = systemRandom.rand((int)virtual_width); - particle->pos.y = systemRandom.rand((int)virtual_height); + particle->pos.x = systemRandom.rand(static_cast(virtual_width)); + particle->pos.y = systemRandom.rand(static_cast(virtual_height)); particle->texture = cloudimage; - particle->speed = -systemRandom.randf(25, 54); + particle->speed = -systemRandom.randf(25.0, 54.0); particles.push_back(particle); } } void -CloudParticleSystem::parse(const lisp::Lisp& reader) +CloudParticleSystem::parse(const Reader& reader) { reader.get("z-pos", z_pos); } -void -CloudParticleSystem::write(lisp::Writer& writer) -{ - writer.start_list("particles-clouds"); - writer.write_int("z-pos", z_pos); - writer.end_list("particles-clouds"); -} - CloudParticleSystem::~CloudParticleSystem() { delete cloudimage; @@ -236,3 +213,5 @@ void CloudParticleSystem::update(float elapsed_time) particle->pos.x += particle->speed * elapsed_time; } } + +/* EOF */