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

Timestamp:

Mar 16, 2008, 10:51:54 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Add lock() and unlock() methods to jimage objects. They're no-ops, but the Win32/DirectX version uses them all over the place because it uses DirectDraw? surfaces. One day we may wish to merge Abuse Win32's video output, or to use the SDL blending functions. You never know.

File:

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

abuse/trunk/src/particle.cpp

@@ -45 +45 @@
     last_anim->next=pan;
     last_anim=pan;
-  }  
+  }
 }
 
@@ -76 +76 @@
   args=lcdr(args);
   pseqs[total_pseqs]=new part_sequence(args);
-  total_pseqs++;  
+  total_pseqs++;
   return total_pseqs;
 }
@@ -84 +84 @@
 part_sequence::part_sequence(void *args)
 {
-  char *fn=lstring_value(lcar(args)); 
+  char *fn=lstring_value(lcar(args));
   bFILE *fp=open_file(fn,"rb");
   if (fp->open_failure())
@@ -106 +106 @@
     if (sd.entries[i]->type==SPEC_PARTICLE) tframes++;
   frames=(int *)jmalloc(sizeof(int)*tframes,"part_frame id list\n");
- 
+
   int on=0;
   for (i=0;i<sd.total;i++)
-    if (sd.entries[i]->type==SPEC_PARTICLE)     
+    if (sd.entries[i]->type==SPEC_PARTICLE)
       frames[on++]=cash.reg(fn,sd.entries[i]->name,SPEC_PARTICLE,1);
 
@@ -128 +128 @@
     if (y>y2) y2=x;
     data[i].x=x;
-    data[i].y=y;   
-    data[i].color=fp->read_uint8(); 
+    data[i].y=y;
+    data[i].color=fp->read_uint8();
   }
 }
@@ -148 +148 @@
       p=p->next;
       delete d;
-    } else 
+    } else
     {
       last=p;
@@ -159 +159 @@
 void draw_panims(view *v)
 {
-  for (part_animation *p=first_anim;p;p=p->next)      
+  for (part_animation *p=first_anim;p;p=p->next)
   {
     cash.part(p->seq->frames[p->frame])->draw(screen,p->x-v->xoff()+v->cx1,p->y-v->yoff()+v->cy1,p->dir);
@@ -178 +178 @@
   while (i && pon->y<cy1) { pon++; i--; }
   if (!i) return ;
+  screen->lock();
   if (dir>0)
   {
@@ -187 +188 @@
       i--;
       pon++;
-    }   
+    }
   } else
   {
@@ -197 +198 @@
       i--;
       pon++;
-    }   
-  }
-
-}
-
-
-
+    }
+  }
+  screen->unlock();
+}
 
 void scatter_line(int x1, int y1, int x2, int y2, int c, int s)
 {
-        int16_t cx1, cy1, cx2, cy2;
-        screen->get_clip( cx1, cy1, cx2, cy2 );
-
-        int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1;
-        long xo = x1 << 16, yo = y1 << 16, dx = ( ( x2 - x1 ) << 16 ) / t, dy = ( ( y2 - y1 ) << 16 ) / t, x, y;
-
-        int xm = ( 1 << s );
-        int ym = ( 1 << s );
-        s = ( 15 - s );
-
-        while( t-- )
-        {
-                x = ( xo >> 16 ) + ( jrand() >> s ) - xm;
-                y = ( yo >> 16 ) + ( jrand() >> s ) - ym;
-                if( !( x < cx1 || y < cy1 || x > cx2 || y > cy2 ) )
-                {
-                        *(screen->scan_line( y ) + x ) = c;
-                }
-                xo += dx;
-                yo += dy;
-        }
+    int16_t cx1, cy1, cx2, cy2;
+    screen->get_clip( cx1, cy1, cx2, cy2 );
+
+    int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1;
+    long xo = x1 << 16, yo = y1 << 16, dx = ( ( x2 - x1 ) << 16 ) / t, dy = ( ( y2 - y1 ) << 16 ) / t, x, y;
+
+    int xm = ( 1 << s );
+    int ym = ( 1 << s );
+    s = ( 15 - s );
+
+    screen->lock();
+    while( t-- )
+    {
+        x = ( xo >> 16 ) + ( jrand() >> s ) - xm;
+        y = ( yo >> 16 ) + ( jrand() >> s ) - ym;
+        if( !( x < cx1 || y < cy1 || x > cx2 || y > cy2 ) )
+        {
+            *(screen->scan_line( y ) + x ) = c;
+        }
+        xo += dx;
+        yo += dy;
+    }
+    screen->unlock();
 }
 
@@ -234 +234 @@
 void ascatter_line(int x1, int y1, int x2, int y2, int c1, int c2, int s)
 {
-        int16_t cx1, cy1, cx2, cy2;
-        screen->get_clip( cx1, cy1, cx2, cy2 );
-
-        int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1;
-        long xo = x1 << 16, yo = y1 << 16, dx = ( ( x2 - x1 ) << 16 ) / t, dy = ( ( y2 - y1 ) <<16 ) / t, x, y;
-
-        int xm = ( 1 << s );
-        int ym = ( 1 << s );
-        s = ( 15 - s );
-
-        int w = screen->width();
-        uint8_t *addr;
-
-        while( t-- )
-        {
-                x = ( xo >> 16 ) + ( jrand() >> s ) - xm;
-                y = ( yo >> 16 ) + ( jrand() >> s ) - ym;
-                if( !( x <= cx1 || y <= cy1 || x >= cx2 || y >= cy2 ) )
-                {
-                        addr = screen->scan_line( y ) + x;
-                        *addr = c1;
-                        *(addr + w) = c2;
-                        *(addr - w) = c2;
-                        *(addr - 1) = c2;
-                        *(addr + 1) = c2;
-                }
-                xo += dx;
-                yo += dy;
-        }
-}
+    int16_t cx1, cy1, cx2, cy2;
+    screen->get_clip( cx1, cy1, cx2, cy2 );
+
+    int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1;
+    long xo = x1 << 16, yo = y1 << 16, dx = ( ( x2 - x1 ) << 16 ) / t, dy = ( ( y2 - y1 ) <<16 ) / t, x, y;
+
+    int xm = ( 1 << s );
+    int ym = ( 1 << s );
+    s = ( 15 - s );
+
+    screen->lock();
+
+    int w = screen->width();
+    uint8_t *addr;
+
+    while( t-- )
+    {
+        x = ( xo >> 16 ) + ( jrand() >> s ) - xm;
+        y = ( yo >> 16 ) + ( jrand() >> s ) - ym;
+        if( !( x <= cx1 || y <= cy1 || x >= cx2 || y >= cy2 ) )
+        {
+            addr = screen->scan_line( y ) + x;
+            *addr = c1;
+            *(addr + w) = c2;
+            *(addr - w) = c2;
+            *(addr - 1) = c2;
+            *(addr + 1) = c2;
+        }
+        xo += dx;
+        yo += dy;
+    }
+
+    screen->unlock();
+}
+