[PlaneShift-svn] SF.net SVN: planeshift:[3776] trunk/src/client/weather.cpp

[<mg...@us...>]

Revision: 3776
          http://planeshift.svn.sourceforge.net/planeshift/?rev=3776&view=rev
Author:   mgist
Date:     2009-05-25 14:03:28 +0000 (Mon, 25 May 2009)

Log Message:
-----------
- Fixed rain/snow.

Modified Paths:
--------------
    trunk/src/client/weather.cpp

Modified: trunk/src/client/weather.cpp
===================================================================
--- trunk/src/client/weather.cpp	2009-05-25 03:52:02 UTC (rev 3775)
+++ trunk/src/client/weather.cpp	2009-05-25 14:03:28 UTC (rev 3776)
@@ -210,26 +210,9 @@
 bool RainWeatherObject::CreateMesh()
 {
     // Create new rain
-    const char *matname = "raindrop";
-    float speed = 5;
+    iTextureWrapper* t = psengine->GetEngine()->CreateTexture("raindrop", "/this/art/effects/raindrop.dds", 0, 0);
+    csRef<iMaterialWrapper> mat = psengine->GetEngine()->CreateMaterial("raindrop", t);
 
-    // Attempt to fetch material.
-    csRef<iMaterialWrapper> mat = psengine->GetLoader()->LoadMaterial(matname);
-    while (!mat)
-    {
-        mat = psengine->GetLoader()->LoadMaterial(matname);
-    }
-
-    if(!mfw)
-    {
-        mfw = psengine->GetEngine ()->CreateMeshFactory ("crystalspace.mesh.object.particles", "rain");
-        if (!mfw)
-        {
-            Bug1("Could not create rain factory.");
-            return false;
-        }
-    }
-
     // Get the sector
     iSector* sector = psengine->GetEngine()->FindSector(parent->sector);
         
@@ -255,7 +238,7 @@
     boxemit->SetInitialMass (5.0f, 7.5f);
     boxemit->SetUniformVelocity (true);
     boxemit->SetInitialTTL (2.5f, 2.5f);
-    boxemit->SetInitialVelocity (csVector3 (0, -speed, 0), csVector3 (0));
+    boxemit->SetInitialVelocity (csVector3 (0, -5, 0), csVector3 (0));
 
     csRef<iParticleBuiltinEffectorLinColor> lincol = eff_factory->
         CreateLinColor ();
@@ -369,26 +352,9 @@
 bool SnowWeatherObject::CreateMesh()
 {
     // Create new snow
-    const char *matname = "snowflake";
-    float speed = 1.5f;
+    iTextureWrapper* t = psengine->GetEngine()->CreateTexture("snowflake", "/this/art/effects/snow.dds", 0, 0);
+    csRef<iMaterialWrapper> mat = psengine->GetEngine()->CreateMaterial("snowflake", t);
 
-    // Attempt to fetch material.
-    csRef<iMaterialWrapper> mat = psengine->GetLoader()->LoadMaterial(matname);
-    while (!mat)
-    {
-        mat = psengine->GetLoader()->LoadMaterial(matname);
-    }
-
-    if(!mfw)
-    {
-        mfw = psengine->GetEngine ()->CreateMeshFactory ("crystalspace.mesh.object.particles", "snow");
-        if (!mfw)
-        {
-            Bug1("Could not create snow factory.");
-            return false;
-        }
-    }
-
     // Get the sector
     iSector* sector = psengine->GetEngine()->FindSector(parent->sector);
         
@@ -414,7 +380,7 @@
     boxemit->SetInitialMass (5.0f, 7.5f);
     boxemit->SetUniformVelocity (true);
     boxemit->SetInitialTTL (5.0f, 5.0f);
-    boxemit->SetInitialVelocity (csVector3 (0, -speed, 0), csVector3 (0));
+    boxemit->SetInitialVelocity (csVector3 (0, -1.5f, 0), csVector3 (0));
 
     csRef<iParticleBuiltinEffectorLinColor> lincol = eff_factory->
         CreateLinColor ();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.