Changeset 665 for abuse/trunk/src/particle.cppTweet

Timestamp:

May 15, 2011, 5:32:56 PM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: refactor GetClip?, SetClip? etc. to use vec2i.

File:

• abuse/trunk/src/particle.cpp (modified) (6 diffs)

abuse/trunk/src/particle.cpp

@@ -171 +171 @@
 void part_frame::draw(image *screen, int x, int y, int dir)
 {
-  int cx1, cy1, cx2, cy2;
-  screen->GetClip(cx1, cy1, cx2, cy2);
-  if (x + x1 >= cx2 || x + x2 < cx1 || y + y1 >= cy2 || y + y2 < cy1) return;
+    vec2i caa, cbb;
+    screen->GetClip(caa, cbb);
+
+    if (x + x1 >= cbb.x || x + x2 < caa.x || y + y1 >= cbb.y || y + y2 < caa.y)
+       return;
 
   part *pon=data;
-  cy1 -= y;
-  cy2 -= y;
+  caa.y -= y;
+  cbb.y -= y;
 
   int i=t;
-  while (i && pon->y<cy1) { pon++; i--; }
+  while (i && pon->y<caa.y) { pon++; i--; }
   if (!i) return ;
   screen->Lock();
   if (dir>0)
   {
-    while (i && pon->y < cy2)
+    while (i && pon->y < cbb.y)
     {
       long dx=x-pon->x;
-      if (dx >= cx1 && dx < cx2)
+      if (dx >= caa.x && dx < cbb.x)
       *(screen->scan_line(pon->y+y)+dx)=pon->color;
       i--;
@@ -195 +197 @@
   } else
   {
-    while (i && pon->y < cy2)
+    while (i && pon->y < cbb.y)
     {
       long dx=pon->x+x;
-      if (dx >= cx1 && dx < cx2)
+      if (dx >= caa.x && dx < cbb.x)
         *(screen->scan_line(pon->y+y)+dx)=pon->color;
       i--;
@@ -209 +211 @@
 void scatter_line(int x1, int y1, int x2, int y2, int c, int s)
 {
-    int cx1, cy1, cx2, cy2;
-    main_screen->GetClip(cx1, cy1, cx2, cy2);
+    vec2i caa, cbb;
+    main_screen->GetClip(caa, cbb);
 
     int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1;
@@ -224 +226 @@
         x = ( xo >> 16 ) + ( jrand() >> s ) - xm;
         y = ( yo >> 16 ) + ( jrand() >> s ) - ym;
-        if( !( x < cx1 || y < cy1 || x >= cx2 || y >= cy2 ) )
+        if( !( x < caa.x || y < caa.y || x >= cbb.x || y >= cbb.y ) )
         {
             *(main_screen->scan_line( y ) + x ) = c;
@@ -238 +240 @@
 void ascatter_line(int x1, int y1, int x2, int y2, int c1, int c2, int s)
 {
-    int cx1, cy1, cx2, cy2;
-    main_screen->GetClip(cx1, cy1, cx2, cy2);
+    vec2i caa, cbb;
+    main_screen->GetClip(caa, cbb);
 
     int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1;
@@ -259 +261 @@
         // FIXME: these clip values seemed wrong to me before the GetClip
         // refactoring.
-        if( !( x <= cx1 || y <= cy1 || x >= cx2 - 1 || y >= cy2 - 1) )
+        if( !( x <= caa.x || y <= caa.y || x >= cbb.x - 1 || y >= cbb.y - 1) )
         {
             addr = main_screen->scan_line( y ) + x;