Changeset 666Tweet

Timestamp:

May 16, 2011, 2:37:11 AM (11 years ago)

Author:

Sam Hocevar

Message:

game: refactor the GetFg? methods to use vec2i.

Location:

abuse/trunk

Files:

• TODO (modified) (2 diffs)
• src/clisp.cpp (modified) (4 diffs)
• src/dev.cpp (modified) (7 diffs)
• src/game.cpp (modified) (2 diffs)
• src/game.h (modified) (3 diffs)
• src/level.cpp (modified) (4 diffs)
• src/level.h (modified) (1 diff)

abuse/trunk/TODO

@@ -61 +61 @@
   - scale_put, scale_put_trans
   - tint_area, darken_area
+  - fg_width, etc.
 
 Jwindow::_x1 _x2
@@ -70 +71 @@
 
 x, y in game_object?
-get_fg ?
 snap_x() snap_y()
 scatter_line, ascatter_line

abuse/trunk/src/clisp.cpp

@@ -1668 +1668 @@
         lbreak("%d %d is out of range of fg map",x,y);
       else
-        current_level->put_fg(x,y,type);
+        current_level->PutFg(vec2i(x, y), type);
     } break;
     case 193 :
@@ -1676 +1676 @@
       if (x<0 || y<0 || x>=current_level->foreground_width() || y>=current_level->foreground_width())
         lbreak("%d %d is out of range of fg map",x,y);
-      else return current_level->get_fg(x,y);
+      else return current_level->GetFg(vec2i(x, y));
     } break;
     case 194 :
@@ -1686 +1686 @@
         lbreak("%d %d is out of range of fg map",x,y);
       else
-        current_level->put_bg(x,y,type);
+        current_level->PutBg(vec2i(x, y), type);
     } break;
     case 195 :
@@ -1694 +1694 @@
       if (x<0 || y<0 || x>=current_level->background_width() || y>=current_level->background_width())
         lbreak("%d %d is out of range of fg map",x,y);
-      else return current_level->get_bg(x,y);
+      else return current_level->GetBg(vec2i(x, y));
     } break;
     case 196 : load_tiles(args); break;

abuse/trunk/src/dev.cpp

@@ -1057 +1057 @@
     for (y=0,i=cur_bg; y<h; y++)
           for (x=0; x<l; x++)
-            the_game->put_bg(tile.x+x,tile.y+y,i++);
+            the_game->PutBg(tile + vec2i(x, y), i++);
     dprintf("%dx%d\n",l,h);
       } else dprintf(symbol_str("unchop1"));
@@ -1217 +1217 @@
         tile.y < current_level->foreground_height())
     {
-      cur_fg=current_level->get_fg(tile.x, tile.y);
+      cur_fg=current_level->GetFg(tile);
       if (forew)
     ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->m_surf);
@@ -1862 +1862 @@
           if (tile.x>=0 && tile.y>=0 && tile.x<current_level->foreground_width() &&
           tile.y<current_level->foreground_height())
-          current_level->put_fg(tile.x,tile.y,raise_all ? make_above_tile(cur_fg) : cur_fg);
+          current_level->PutFg(tile, raise_all ? make_above_tile(cur_fg) : cur_fg);
           the_game->need_refresh();
         } else if (ev.mouse_button==1 && !selected_object && !selected_light)
@@ -1869 +1869 @@
           if (tile.x>=0 && tile.y>=0 && tile.x<current_level->background_width() &&
           tile.y<current_level->background_height())
-          current_level->put_bg(tile.x,tile.y,cur_fg);
+          current_level->PutBg(tile, cur_fg);
           the_game->need_refresh();
         }
@@ -1954 +1954 @@
         if (tile.x>=0 && tile.y>=0 && tile.x<current_level->foreground_width() &&
             tile.y<current_level->foreground_height())
-        the_game->put_fg(tile.x,tile.y,raise_all ? make_above_tile(cur_fg) : cur_fg);
+        the_game->PutFg(tile, raise_all ? make_above_tile(cur_fg) : cur_fg);
           }
           if ((dev & DRAW_BG_LAYER) && ev.mouse_button==2)
@@ -1961 +1961 @@
         if (tile.x>=0 && tile.y>=0 && tile.x<current_level->background_width() &&
             tile.y<current_level->background_height())
-        the_game->put_bg(tile.x,tile.y,cur_bg);
+        the_game->PutBg(tile, cur_bg);
           }
         }
@@ -3109 +3109 @@
         if (xx>=0 && yy>=0 && xx<current_level->foreground_width() &&
             yy<current_level->foreground_height())
-          the_game->put_fg(xx,yy,raise_all ? make_above_tile(pat[xx-tile.x+(yy-tile.y)*w]) : pat[xx-tile.x+(yy-tile.y)*w] );
+          the_game->PutFg(vec2i(xx, yy), raise_all ? make_above_tile(pat[xx-tile.x+(yy-tile.y)*w]) : pat[xx-tile.x+(yy-tile.y)*w] );
           }
         }

abuse/trunk/src/game.cpp

@@ -544 +544 @@
 }
 
-void Game::put_block_fg(int x, int y, TransImage *im)
-{
-  for(view *f = first_view; f; f = f->next)
-  {
-    if(f->drawable())
-    {
-      int xoff = f->xoff(), yoff = f->yoff(), viewx1 = f->cx1, viewy1 = f->cy1, viewx2 = f->cx2, viewy2 = f->cy2;
-      if(xoff / ftile_width()>x || xoff / ftile_width()+(viewx2 - viewx1)/ftile_width()+1 < x ||
-      yoff / ftile_height()>y || yoff / ftile_height()+(viewy2 - viewy1)/ftile_height()+1 < y) return;
-      vec2i caa, cbb;
-      main_screen->GetClip(caa, cbb);
-      main_screen->SetClip(vec2i(viewx1, viewy1), vec2i(viewx2 + 1, viewy2 + 1));
-      im->PutImage(main_screen, vec2i((x - xoff / ftile_width())*ftile_width()+viewx1 - xoff % ftile_width(),
-            (y - yoff / ftile_height())*ftile_height()+viewy1 - yoff % ftile_height()));
-      main_screen->SetClip(caa, cbb);
-    }
-  }
-}
-
-void Game::put_block_bg(int x, int y, image *im)
-{
-  for(view *f = first_view; f; f = f->next)
-  {
-    if(f->drawable())
-    {
-      int xoff = f->xoff(), yoff = f->yoff(), viewx1 = f->cx1, viewy1 = f->cy1, viewx2 = f->cx2, viewy2 = f->cy2;
-      int xo = xoff * bg_xmul / bg_xdiv;
-      int yo = yoff * bg_ymul / bg_ydiv;
-
-      if(xo / btile_width()>x || xo / btile_width()+(viewx2 - viewx1)/btile_width()+1 < x ||
-      yo / btile_height()>y || yo / btile_height()+(viewy2 - viewy1)/btile_height()+1 < y) return;
-      vec2i caa, cbb;
-      main_screen->GetClip(caa, cbb);
-      main_screen->SetClip(vec2i(viewx1, viewy1), vec2i(viewx2 + 1, viewy2 + 1));
-      main_screen->PutImage(im, vec2i((x - xo / btile_width())*btile_width()+viewx1 - xo % btile_width(),
-            (y - yo / btile_height())*btile_height()+viewy1 - yo % btile_height()), 0);
-      main_screen->SetClip(caa, cbb);
-    }
-  }
-}
-
 int need_delay = 1;
 
@@ -1099 +1058 @@
 }
 
-void Game::put_fg(int x, int y, int type)
-{
-  if(current_level->get_fg(x, y)!=type)
-  {
-    current_level->put_fg(x, y, type);
+void Game::PutFg(vec2i pos, int type)
+{
+    if (current_level->GetFg(pos) == type)
+        return;
+
+    current_level->PutFg(pos, type);
     for(view *f = first_view; f; f = f->next)
-      if(f->drawable())
-        draw_map(f);
-  }
-}
-
-void Game::put_bg(int x, int y, int type)
-{
-  if(current_level->get_bg(x, y)!=type)
-  {
-    current_level->put_bg(x, y, type);
+        if(f->drawable())
+            draw_map(f);
+}
+
+void Game::PutBg(vec2i pos, int type)
+{
+    if (current_level->GetBg(pos) == type)
+        return;
+
+    current_level->PutBg(pos, type);
     for(view *f = first_view; f; f = f->next)
-      if(f->drawable())
-        draw_map(f);
-  }
+        if(f->drawable())
+            draw_map(f);
 }
 

abuse/trunk/src/game.h

@@ -125 +125 @@
 
 
-  void put_fg(int x, int y, int type);
-  void put_bg(int x, int y, int type);
+    void PutFg(vec2i pos, int type);
+    void PutBg(vec2i pos, int type);
   void draw_map(view *v, int interpolate=0);
   void dev_scroll();
-  void put_block_fg(int x, int y, TransImage *im);
-  void put_block_bg(int x, int y, image *im);
-
 
   int in_area(Event &ev, int x1, int y1, int x2, int y2);
@@ -137 +134 @@
   void set_level(level *nl);
   void show_time();
-  tile_type get_map_bg(int x, int y) { return current_level->get_bg(x,y); }
-  tile_type get_map_fg(int x, int y) { return current_level->get_fg(x,y); }
+    tile_type GetMapBg(vec2i pos) { return current_level->GetBg(pos); }
+    tile_type GetMapFg(vec2i pos) { return current_level->GetFg(pos); }
   void end_session();
   void need_refresh() { refresh=1; }       // for development mode only
@@ -156 +153 @@
   void request_level_load(char *name);
   void request_end();
-} ;
+};
 
 extern int playing_state(int state);

abuse/trunk/src/level.cpp

@@ -844 +844 @@
   for (y=0; y<miny; y++)
     for (x=0; x<minx; x++)
-      new_fg[x+y*w]=get_fg(x,y);
+      new_fg[x+y*w]=GetFg(vec2i(x, y));
 
   miny=(nbh<bg_height) ? nbh : bg_height;
@@ -851 +851 @@
   for (y=0; y<miny; y++)
     for (x=0; x<minx; x++)
-      new_bg[x+y*nbw]=get_bg(x,y);
+      new_bg[x+y*nbw]=GetBg(vec2i(x, y));
 
   free(map_fg);
@@ -2638 +2638 @@
     for (by=blocky1; by<=blocky2; by++)
     {
-      block=the_game->get_map_fg(bx,by);
+      block=the_game->GetMapFg(vec2i(bx, by));
       if (block>BLACK)        // don't check BLACK, should be no points in it
       {
@@ -2712 +2712 @@
   for (by=blocky1; by<=blocky2; by++,y1-=f_hi,y2-=f_hi,y_addback+=f_hi)
   {
-    block=the_game->get_map_fg(bx,by);
+    block=the_game->GetMapFg(vec2i(bx, by));
 
     // now check the all the line segments in the block

abuse/trunk/src/level.h

@@ -117 +117 @@
   uint16_t *get_fgline(int y) { CHECK(y>=0 && y<fg_height); return map_fg+y*fg_width; }
   uint16_t *get_bgline(int y) { CHECK(y>=0 && y<bg_height); return map_bg+y*bg_width; }
-  uint16_t get_fg(int x, int y) { if (x>=0 && y>=0 && x<fg_width && y<fg_height)
-                              return fgvalue(*(map_fg+x+y*fg_width));
+  uint16_t GetFg(vec2i pos) { if (pos >= vec2i(0) && pos < vec2i(fg_width, fg_height))
+                              return fgvalue(*(map_fg+pos.x+pos.y*fg_width));
                                     else return 0;
                       }
-  uint16_t get_bg(int x, int y) { if (x>=0 && y>=0 && x<bg_width && y<bg_height)
-                      return *(map_bg+x+y*bg_width);
+  uint16_t GetBg(vec2i pos) { if (pos >= vec2i(0) && pos < vec2i(bg_width, bg_height))
+                      return *(map_bg+pos.x+pos.y*bg_width);
                                      else return 0;
                     }
-  void put_fg(int x, int y, uint16_t tile) { *(map_fg+x+y*fg_width)=tile; }
-  void put_bg(int x, int y, uint16_t tile) { *(map_bg+x+y*bg_width)=tile; }
+  void PutFg(vec2i pos, uint16_t tile) { *(map_fg+pos.x+pos.y*fg_width)=tile; }
+  void PutBg(vec2i pos, uint16_t tile) { *(map_bg+pos.x+pos.y*bg_width)=tile; }
   void draw_objects(view *v);
   void interpolate_draw_objects(view *v);