Merge branch 'master' of https://github.com/xiecheng59/cs123_final

Conflicts:
	src/scene.cpp

fixed merge conflict

Author: Kenneth Lin

src/rain.cpp

@@ -12,9 +12,9 @@ Rain::Rain(float radius)
     Texture* texture =  TextureCache::getInstance()->acquire("rain", TextureType::Texture2D);
     setParticleTexture(texture);
 
-    setEmissionRate(1000);
+    setEmissionRate(4000);
 
-    setMaxParticleCount(10000);
+    setMaxParticleCount(20000);
 
     ParticleMaterial* material = static_cast<ParticleMaterial *>(material_);
     material->setLengthScale(12);
@@ -42,7 +42,7 @@ void Rain::spawnParticle(Particle *particle)
     particle->size = 0.08;
 
     float scale = randf(0.6f, 0.8f);
-    particle->color = {scale, scale, scale};
+    particle->color = {scale, scale * 0.9, scale * 0.85};
 
     particle->opacity = randf(0.4, 0.7);
 }
@@ -58,7 +58,7 @@ void Rain::renderGeometry(DrawContext &context)
     ParticleSystem::renderGeometry(context);
     transform().setToIdentity();
     vec3 camPos = context.camera->position();
-    transform().translate(camPos.x(), camPos.y() + 30, camPos.z());
+    transform().translate(camPos.x(), camPos.y() + 50, camPos.z());
 }
 
 

src/rainsplash.cpp

@@ -3,6 +3,8 @@
 #include "texturecache.h"
 #include "particlematerial.h"
 #include "terrain.h"
+#include "drawcontext.h"
+#include "camera.h"
 
 RainSplash::RainSplash(float radius, bool mist, Terrain* terrain)
 {
@@ -23,18 +25,18 @@ RainSplash::RainSplash(float radius, bool mist, Terrain* terrain)
 
     setParticleTexture(texture);
 
-    setEmissionRate(1000);
+    setEmissionRate(8000);
 
-    setMaxParticleCount(10000);
+    setMaxParticleCount(40000);
 }
 
 void RainSplash::spawnParticle(Particle *particle)
 {
     float phi = randf(0, M_PI * 2);
-    float r = radius_ * randf(0.3, 1.0);
+    float r = radius_ * randf(0, 1.0);
 
-    float x = cosf(phi) * r;
-    float z = sinf(phi) * r;
+    float x = cosf(phi) * r + cameraPosition_.x();
+    float z = sinf(phi) * r + cameraPosition_.z();
     float y = terrain_->height(x, z) + 0.1;
 
     particle->position = {x, y, z};
@@ -58,3 +60,10 @@ void RainSplash::updateParticle(Particle &particle, float dt)
     particle.opacity = startOpacity_ * (1 - x);
 
 }
+
+void RainSplash::renderGeometry(DrawContext &context)
+{
+    ParticleSystem::renderGeometry(context);
+    transform().setToIdentity();
+    cameraPosition_ = context.camera->position();
+}

src/rainsplash.h

@@ -14,6 +14,8 @@ class RainSplash : public ParticleSystem
 
     virtual void updateParticle(Particle &particle, float dt) override;
 
+    virtual void renderGeometry(DrawContext &context) override;
+    
 private:
     float radius_ = 0;
 
@@ -22,6 +24,8 @@ class RainSplash : public ParticleSystem
 
     float startSize_ = 0;
     float startOpacity_ = 0;
+    
+    vec3 cameraPosition_;
 };
 
 #endif // RAINSPLASH_H

src/scene.cpp

@@ -84,10 +84,10 @@ void Scene::initialize()
     sceneObjects_.push_back(rain);
 
     // RainSplash
-    RainSplash* splash = new RainSplash(50, true, terrain);
+    RainSplash* splash = new RainSplash(100, true, terrain);
     sceneObjects_.push_back(splash);
 
-    splash = new RainSplash(50, false, terrain);
+    splash = new RainSplash(100, false, terrain);
     sceneObjects_.push_back(splash);
 
     // Follower cloud
@@ -188,7 +188,6 @@ void Scene::pick(const vec3 &point)
     vec3 p = point;
     float height = terrain_->height(p.x(), p.z());
     p.setY(height);
-    vec3 pos = tornado_->getOrigin();
     tornado_->setDestination(p);
 }