[Pingus-CVS] r2933 - in branches/pingus_sdl: . src/math src/particles

[jsalmon3]

Author: jsalmon3
Date: 2007-08-15 18:59:58 +0200 (Wed, 15 Aug 2007)
New Revision: 2933

Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/src/math/origin.cpp
   branches/pingus_sdl/src/math/origin.hpp
   branches/pingus_sdl/src/particles/rain_particle_holder.cpp
Log:
Enabled rain particle drawing, removed unused origin code



Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-15 16:20:34 UTC (rev 2932)
+++ branches/pingus_sdl/TODO    2007-08-15 16:59:58 UTC (rev 2933)
@@ -48,8 +48,6 @@
 Important:
 ==========
 
-- rain particles are missing, see 
data/levels/playable/blockers-timpany-tutorial.pingus
-
 - paralax handling is different between 0.6 and SDL, see
   data/levels/playable/slidenride1-grumbel.pingus
 

Modified: branches/pingus_sdl/src/math/origin.cpp
===================================================================
--- branches/pingus_sdl/src/math/origin.cpp     2007-08-15 16:20:34 UTC (rev 
2932)
+++ branches/pingus_sdl/src/math/origin.cpp     2007-08-15 16:59:58 UTC (rev 
2933)
@@ -88,78 +88,5 @@
     }
 }
 
-#if 0
-CL_Pointf calc_origin(CL_Origin origin, const CL_Sizef &size)
-{
-       switch(origin)
-       {
-       case origin_top_left:
-       default:
-               return CL_Pointf(0, 0);
-               break;
-       case origin_top_center:
-               return CL_Pointf(size.width / 2, 0);
-               break;
-       case origin_top_right:
-               return CL_Pointf(size.width, 0);
-               break;
-       case origin_center_left:
-               return CL_Pointf(0, size.height / 2);
-               break;
-       case origin_center:
-               return CL_Pointf(size.width / 2, size.height / 2);
-               break;
-       case origin_center_right:
-               return CL_Pointf(size.width, size.height / 2);
-               break;
-       case origin_bottom_left:
-               return CL_Pointf(0, size.height);
-               break;
-       case origin_bottom_center:
-               return CL_Pointf(size.width / 2, size.height);
-               break;
-       case origin_bottom_right:
-               return CL_Pointf(size.width, size.height);
-               break;
-       }
-}
-
-CL_Pointd calc_origin(CL_Origin origin, const CL_Sized &size)
-{
-       switch(origin)
-       {
-       case origin_top_left:
-       default:
-               return CL_Pointd(0, 0);
-               break;
-       case origin_top_center:
-               return CL_Pointd(size.width / 2, 0);
-               break;
-       case origin_top_right:
-               return CL_Pointd(size.width, 0);
-               break;
-       case origin_center_left:
-               return CL_Pointd(0, size.height / 2);
-               break;
-       case origin_center:
-               return CL_Pointd(size.width / 2, size.height / 2);
-               break;
-       case origin_center_right:
-               return CL_Pointd(size.width, size.height / 2);
-               break;
-       case origin_bottom_left:
-               return CL_Pointd(0, size.height);
-               break;
-       case origin_bottom_center:
-               return CL_Pointd(size.width / 2, size.height);
-               break;
-       case origin_bottom_right:
-               return CL_Pointd(size.width, size.height);
-               break;
-       }
-}
-
-#endif
-
 /* EOF */
 

Modified: branches/pingus_sdl/src/math/origin.hpp
===================================================================
--- branches/pingus_sdl/src/math/origin.hpp     2007-08-15 16:20:34 UTC (rev 
2932)
+++ branches/pingus_sdl/src/math/origin.hpp     2007-08-15 16:59:58 UTC (rev 
2933)
@@ -61,12 +61,4 @@
 
 Vector2i calc_origin(Origin origin, const Size& size);
 
-#if 0
-//: Returns the anchor point for the origin within the dimensions of the size 
structure.
-//- !group=Display/Display 2D!
-//- !header=display.h!
-CL_API_CORE CL_Pointf calc_origin(CL_Origin origin, const CL_Sizef &size);
-CL_API_CORE CL_Pointd calc_origin(CL_Origin origin, const CL_Sized &size);
-#endif 
-
 #endif

Modified: branches/pingus_sdl/src/particles/rain_particle_holder.cpp
===================================================================
--- branches/pingus_sdl/src/particles/rain_particle_holder.cpp  2007-08-15 
16:20:34 UTC (rev 2932)
+++ branches/pingus_sdl/src/particles/rain_particle_holder.cpp  2007-08-15 
16:59:58 UTC (rev 2933)
@@ -107,7 +107,6 @@
 void
 RainParticleHolder::draw (SceneContext& gc)
 {
-#ifdef CLANLIB_0_6
   for (std::vector<RainParticle>::iterator it=particles.begin(); it != 
particles.end(); ++it)
     {
       // skip dead/invisible particles
@@ -115,14 +114,16 @@
         continue;
 
       if (it->splash)
-        gc.color().draw(rain_splash, it->pos, 
static_cast<int>(it->splash_frame));
+        {
+          rain_splash.set_frame(static_cast<int>(it->splash_frame));
+          gc.color().draw(rain_splash, it->pos);
+        }
       else
         if (it->use_rain2_surf)
-          gc.color().draw(rain2_surf, static_cast<int>(it->pos.x), 
static_cast<int>(it->pos.y - rain1_surf.get_height()));
+          gc.color().draw(rain2_surf, it->pos.x, it->pos.y - 
rain1_surf.get_height());
         else
-          gc.color().draw(rain1_surf, static_cast<int>(it->pos.x), 
static_cast<int>(it->pos.y - rain1_surf.get_height()));
+          gc.color().draw(rain1_surf, it->pos.x, it->pos.y - 
rain1_surf.get_height());
     }
-#endif
 }
 
 } // namespace Particles