projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added (temporary) dispenser sprites
[supertux.git]
/
src
/
particlesystem.h
diff --git
a/src/particlesystem.h
b/src/particlesystem.h
index
f0b86b7
..
d11c5c1
100644
(file)
--- a/
src/particlesystem.h
+++ b/
src/particlesystem.h
@@
-21,9
+21,16
@@
#define SUPERTUX_PARTICLESYSTEM_H
#include <vector>
#define SUPERTUX_PARTICLESYSTEM_H
#include <vector>
-#include "texture.h"
-#include "drawable.h"
-#include "game_object.h"
+
+#include "video/surface.h"
+#include "special/game_object.h"
+#include "serializable.h"
+
+using namespace SuperTux;
+
+namespace SuperTux {
+class LispReader;
+}
class DisplayManager;
class DisplayManager;
@@
-42,23
+49,24
@@
class DisplayManager;
* initialize particles in the constructor and move them in the simulate
* function.
*/
* initialize particles in the constructor and move them in the simulate
* function.
*/
-class ParticleSystem : public
_GameObject, public Drawable
+class ParticleSystem : public
GameObject
{
public:
{
public:
- ParticleSystem(
DisplayManager& displaymanager
);
+ ParticleSystem();
virtual ~ParticleSystem();
virtual ~ParticleSystem();
- virtual void draw(
ViewPort& view, int layer
);
+ virtual void draw(
DrawingContext& context
);
protected:
protected:
+ int layer;
+
class Particle
{
public:
virtual ~Particle()
{ }
class Particle
{
public:
virtual ~Particle()
{ }
- float x, y;
- int layer;
+ Vector pos;
Surface* texture;
};
Surface* texture;
};
@@
-66,12
+74,15
@@
protected:
float virtual_width, virtual_height;
};
float virtual_width, virtual_height;
};
-class SnowParticleSystem : public ParticleSystem
+class SnowParticleSystem : public ParticleSystem
, public Serializable
{
public:
{
public:
- SnowParticleSystem(
DisplayManager& displaymanager
);
+ SnowParticleSystem();
virtual ~SnowParticleSystem();
virtual ~SnowParticleSystem();
+ void parse(LispReader& reader);
+ void write(LispWriter& writer);
+
virtual void action(float elapsed_time);
std::string type() const
virtual void action(float elapsed_time);
std::string type() const
@@
-87,12
+98,15
@@
private:
Surface* snowimages[3];
};
Surface* snowimages[3];
};
-class CloudParticleSystem : public ParticleSystem
+class CloudParticleSystem : public ParticleSystem
, public Serializable
{
public:
{
public:
- CloudParticleSystem(
DisplayManager& displaymanager
);
+ CloudParticleSystem();
virtual ~CloudParticleSystem();
virtual ~CloudParticleSystem();
+ void parse(LispReader& reader);
+ void write(LispWriter& writer);
+
virtual void action(float elapsed_time);
std::string type() const
virtual void action(float elapsed_time);
std::string type() const