Added wind

Author: Cheng Xie

src/final.pro

@@ -51,7 +51,8 @@ SOURCES += main.cpp \
     cloud.cpp \
     rain.cpp \
     rainsplash.cpp \
-    PhysicsObject.cpp
+    PhysicsObject.cpp \
+    wind.cpp
 
 HEADERS += mainwindow.h \
     view.h \
@@ -91,6 +92,7 @@ HEADERS += mainwindow.h \
     cloud.h \
     rain.h \
     rainsplash.h \
-    PhysicsObject.h
+    PhysicsObject.h \
+    wind.h
 
 FORMS += mainwindow.ui

src/rain.cpp

@@ -42,7 +42,7 @@ void Rain::spawnParticle(Particle *particle)
     particle->size = 0.08;
 
     float scale = randf(0.6f, 0.8f);
-    particle->color = {scale, scale * 0.9, scale * 0.85};
+    particle->color = {scale, scale * 0.9, scale * 0.80};
 
     particle->opacity = randf(0.4, 0.7);
 }

src/scene.cpp

@@ -16,6 +16,7 @@
 #include "rain.h"
 #include "rainsplash.h"
 #include "camera.h"
+#include "wind.h"
 
 Scene::Scene()
 {
@@ -104,7 +105,7 @@ void Scene::initialize()
     tornado_->setDestination(dest);
     TornadoParticleSystem* tPart = new TornadoParticleSystem(tornado_);
     tPart->init();
-    Texture* tornadoMap = TextureCache::getInstance()->acquire("tornado", TextureType::Texture2D);
+    Texture* tornadoMap = TextureCache::getInstance()->acquire("tornado2", TextureType::Texture2D);
     tPart->setParticleTexture(tornadoMap);
     sceneObjects_.push_back(tPart);
 
@@ -130,6 +131,8 @@ void Scene::initialize()
         phys_->objects.push_back(p);
     }
 
+    Wind* wind = new Wind(50);
+    sceneObjects_.push_back(wind);
 }
 
 void Scene::render(DrawContext &context)

src/textures/tornado2.png

@@ -0,0 +1,61 @@
+#include "wind.h"
+#include "texture.h"
+#include "texturecache.h"
+#include "particlematerial.h"
+#include "drawcontext.h"
+#include "camera.h"
+
+Wind::Wind(float radius)
+{
+    radius_ = radius;
+    
+    Texture* texture =  TextureCache::getInstance()->acquire("wind", TextureType::Texture2D);
+    setParticleTexture(texture);
+    
+    setEmissionRate(5);
+    
+    setMaxParticleCount(40);
+}
+
+void Wind::spawnParticle(Particle *particle)
+{
+    float speed = 10;
+    vec3 velocity = {randf(0, 1), 0, randf(0, 1)};
+    velocity *= speed;
+    
+    particle->velocity = velocity;
+    
+    float phi = randf(0, M_PI * 2);
+    float r = radius_ * randf(0.3, 1.0);
+    
+    float x = cosf(phi) * r;
+    float y = 0;
+    float z = sinf(phi) * r;
+    
+    particle->position = {x, y, z};
+    
+    particle->maxLife = 10;
+    
+    particle->size = randf(25, 50);
+    
+    float scale = randf(0.6f, 0.8f);
+    particle->color = {scale, scale * 0.9, scale * 0.85};
+    
+    particle->opacity = randf(0.05, 0.1);
+}
+
+void Wind::updateParticle(Particle &particle, float dt)
+{
+    particle.position += particle.velocity * dt;
+    
+    particle.opacity = randf(0.1, 0.11);
+}
+
+void Wind::renderGeometry(DrawContext &context)
+{
+    ParticleSystem::renderGeometry(context);
+    transform().setToIdentity();
+    vec3 camPos = context.camera->position();
+    transform().translate(camPos.x(), camPos.y(), camPos.z());
+}
+	

src/textures/wind.png

@@ -0,0 +1,22 @@
+#ifndef WIND_H
+#define WIND_H
+
+#include "particlesystem.h"
+
+class Wind : public ParticleSystem
+{
+public:
+    Wind(float radius);
+    
+    virtual void spawnParticle(Particle *particle) override;
+    
+    virtual void updateParticle(Particle &particle, float dt) override;
+    
+    virtual void renderGeometry(DrawContext &context) override;
+
+private:
+    float radius_;
+
+};
+
+#endif // WIND_H