Changeset 512 for abuse/trunk/src/light.cppTweet

Timestamp:

Apr 20, 2011, 12:39:27 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: use vec2i for image::size and unroll all necessary changes
everywhere else in the code.

File:

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

abuse/trunk/src/light.cpp

@@ -12 +12 @@
 
 #include <stdlib.h>
+
+#include "common.h"
 
 #include "light.h"
@@ -793 +795 @@
   screen->lock();
 
-  int scr_w=screen->width();
+  int scr_w=screen->Size().x;
   uint8_t *screen_line=screen->scan_line(cy1)+cx1;
 
@@ -899 +901 @@
              image *out, int32_t out_x, int32_t out_y)
 {
-  if (sc->width()*2+out_x>out->width() ||
-      sc->height()*2+out_y>out->height())
+  if (sc->Size().x*2+out_x>out->Size().x ||
+      sc->Size().y*2+out_y>out->Size().y)
     return ;   // screen was resized and small_render has not changed size yet
 
@@ -930 +932 @@
     uint8_t *src=sc->scan_line(0);
     uint8_t *dst=out->scan_line(out_y+cy1*2)+cx1*2+out_x;
-    int d_skip=out->width()-sc->width()*2;
+    int d_skip=out->Size().x-sc->Size().x*2;
     int x,y;
     uint16_t v;
-    for (y=sc->height(); y; y--)
-    {
-      for (x=sc->width(); x; x--)
+    for (y=sc->Size().y; y; y--)
+    {
+      for (x=sc->Size().x; x; x--)
       {
     v=*(src++);
@@ -942 +944 @@
       }
       dst=dst+d_skip;
-      memcpy(dst,dst-out->width(),sc->width()*2);
-      dst+=out->width();
+      memcpy(dst,dst-out->Size().x,sc->Size().x*2);
+      dst+=out->Size().x;
     }
 
@@ -951 +953 @@
   light_patch *first=make_patch_list(cx2-cx1+1,cy2-cy1+1,screenx,screeny);
 
-  int scr_w=sc->width();
-  int dscr_w=out->width();
+  int scr_w=sc->Size().x;
+  int dscr_w=out->Size().x;
 
   int prefix_x=(screenx&7);