Previous 15994 Revisions Next

r7498 Friday 5th March, 2010 at 09:10:14 UTC by Fabio Priuli
[SNES] drawing routine rewrite, part 6:
* added offset-per-tile support
[src/mame/video]snes.c

src/mame/video/snes.c
r7497r7498
581581   /* scrolling */
582582   UINT32 charaddr;
583583   UINT16 vscroll, hscroll;
584//  UINT16 offset_per_tile_valid;
585//  UINT8 offset_per_tile_mode;
584   UINT16 opt_bit = (layer == SNES_BG1) ? 13 : (layer == SNES_BG2) ? 14 : 0;
586585   UINT8 vshift, hshift, tile_size;
587586   /* variables depending on color_depth */
588587   UINT8 color_shift = 0;
r7497r7498
619618   vshift = ((snes_ppu.layer[layer].voffs & 0x3ff) + curline) & ((8 << tile_size) - 1);
620619
621620   xoff = snes_ppu.layer[layer].hoffs;
622   yoff = snes_ppu.layer[layer].voffs + curline;
621   yoff = snes_ppu.layer[layer].voffs;
623622
624623   /* figure out which line to draw */
625624   if (vshift > ((8 << tile_size) - 1))   /* scrolled into the next tile */
r7497r7498
666665        cccccccccc = Tile number.
667666      */
668667
669      UINT32 addr = snes_get_tmap(layer, tile_size, tmap, (ii << (tile_size * hires)) + xoff, yoff);
668      // determine the horizontal position (Bishojo Janshi Suchi Pai & Desert Figther have tile_size & hires == 1)
669      UINT32 xpos = xoff + (ii << (tile_size * hires));
670      UINT32 ypos = yoff + curline;
671
672      if (offset_per_tile != SNES_OPT_NONE)
673      {
674         int opt_x = ii + (xoff & 7);
675         UINT32 haddr = 0, vaddr = 0;
676         UINT16 hval = 0, vval = 0;
677
678            if (opt_x >= 8)
679         {
680            switch (offset_per_tile)
681            {
682            case SNES_OPT_MODE2:
683            case SNES_OPT_MODE6:
684               haddr = snes_get_tmap(SNES_BG3, snes_ppu.layer[SNES_BG3].tile_size, snes_ppu.layer[SNES_BG3].tilemap << 9, (opt_x - 8) + ((snes_ppu.layer[SNES_BG3].hoffs & 0x3ff) & ~7), (snes_ppu.layer[SNES_BG3].voffs & 0x3ff));
685               vaddr = snes_get_tmap(SNES_BG3, snes_ppu.layer[SNES_BG3].tile_size, snes_ppu.layer[SNES_BG3].tilemap << 9, (opt_x - 8) + ((snes_ppu.layer[SNES_BG3].hoffs & 0x3ff) & ~7), (snes_ppu.layer[SNES_BG3].voffs & 0x3ff) + 8);
686               hval = snes_vram[haddr] | (snes_vram[haddr + 1] << 8);
687               vval = snes_vram[vaddr] | (snes_vram[vaddr + 1] << 8);
688               if (BIT(hval, opt_bit))
689                  xpos = opt_x + (hval & ~7);
690               if (BIT(vval, opt_bit))
691                  ypos = curline + vval;
692               break;
693            case SNES_OPT_MODE4:
694               haddr = snes_get_tmap(SNES_BG3, snes_ppu.layer[SNES_BG3].tile_size, snes_ppu.layer[SNES_BG3].tilemap << 9, (opt_x - 8) + ((snes_ppu.layer[SNES_BG3].hoffs & 0x3ff) & ~7), (snes_ppu.layer[SNES_BG3].voffs & 0x3ff));
695               hval = snes_vram[haddr] | (snes_vram[haddr + 1] << 8);
696               if (BIT(hval, opt_bit))
697               {
698                  if (!BIT(hval, 15))
699                     xpos = opt_x + (hval & ~7);
700                  else
701                     ypos = curline + hval;
702               }
703               break;
704            }
705
706         }
707      }
708
709      UINT32 addr = snes_get_tmap(layer, tile_size, tmap, xpos, ypos);
670710      UINT16 tilemap = snes_vram[addr] | (snes_vram[addr + 1] << 8);
671711      vflip = BIT(tilemap, 15);
672712      hflip = BIT(tilemap, 14);
r7497r7498
10531093      return;
10541094#endif /* SNES_LAYER_DEBUG */
10551095
1056   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 0, 3, SNES_BG4, curline, 0, 0);
1057   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 1, 4, SNES_BG3, curline, 0, 0);
1058   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 6, 9, SNES_BG2, curline, 0, 0);
1059   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 7, 10, SNES_BG1, curline, 0, 0);
1096   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 0, 3, SNES_BG4, curline, SNES_OPT_NONE, 0);
1097   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 1, 4, SNES_BG3, curline, SNES_OPT_NONE, 0);
1098   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 6, 9, SNES_BG2, curline, SNES_OPT_NONE, 0);
1099   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 7, 10, SNES_BG1, curline, SNES_OPT_NONE, 0);
10601100   snes_update_objects(0, curline);
10611101}
10621102
r7497r7498
10691109
10701110   if (!snes_ppu.bg3_priority_bit)
10711111   {
1072      snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 0, 2, SNES_BG3, curline, 0, 0);
1073      snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 4, 7, SNES_BG2, curline, 0, 0);
1074      snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 5, 8, SNES_BG1, curline, 0, 0);
1112      snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 0, 2, SNES_BG3, curline, SNES_OPT_NONE, 0);
1113      snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 4, 7, SNES_BG2, curline, SNES_OPT_NONE, 0);
1114      snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 5, 8, SNES_BG1, curline, SNES_OPT_NONE, 0);
10751115      snes_update_objects(1, curline);
10761116   }
10771117   else
10781118   {
1079      snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 0, 9, SNES_BG3, curline, 0, 0);
1080      snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 3, 6, SNES_BG2, curline, 0, 0);
1081      snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 4, 7, SNES_BG1, curline, 0, 0);
1119      snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 0, 9, SNES_BG3, curline, SNES_OPT_NONE, 0);
1120      snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 3, 6, SNES_BG2, curline, SNES_OPT_NONE, 0);
1121      snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 4, 7, SNES_BG1, curline, SNES_OPT_NONE, 0);
10821122      snes_update_objects(9, curline);
10831123   }
10841124}
r7497r7498
10901130      return;
10911131#endif /* SNES_LAYER_DEBUG */
10921132
1093   snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 0, 4, SNES_BG2, curline, 1, 0);
1094   snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 2, 6, SNES_BG1, curline, 1, 0);
1133   snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 0, 4, SNES_BG2, curline, SNES_OPT_MODE2, 0);
1134   snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 2, 6, SNES_BG1, curline, SNES_OPT_MODE2, 0);
10951135   snes_update_objects(2, curline);
10961136}
10971137
r7497r7498
11021142      return;
11031143#endif /* SNES_LAYER_DEBUG */
11041144
1105   snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 0, 4, SNES_BG2, curline, 0, 0);
1106   snes_update_line(SNES_COLOR_DEPTH_8BPP, 0, 2, 6, SNES_BG1, curline, 0, snes_ppu.direct_color);
1145   snes_update_line(SNES_COLOR_DEPTH_4BPP, 0, 0, 4, SNES_BG2, curline, SNES_OPT_NONE, 0);
1146   snes_update_line(SNES_COLOR_DEPTH_8BPP, 0, 2, 6, SNES_BG1, curline, SNES_OPT_NONE, snes_ppu.direct_color);
11071147   snes_update_objects(3, curline);
11081148}
11091149
r7497r7498
11141154      return;
11151155#endif /* SNES_LAYER_DEBUG */
11161156
1117   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 0, 4, SNES_BG2, curline, 0, 0);
1118   snes_update_line(SNES_COLOR_DEPTH_8BPP, 0, 2, 6, SNES_BG1, curline, 0, snes_ppu.direct_color);
1157   snes_update_line(SNES_COLOR_DEPTH_2BPP, 0, 0, 4, SNES_BG2, curline, SNES_OPT_MODE4, 0);
1158   snes_update_line(SNES_COLOR_DEPTH_8BPP, 0, 2, 6, SNES_BG1, curline, SNES_OPT_MODE4, snes_ppu.direct_color);
11191159   snes_update_objects(4, curline);
11201160}
11211161
r7497r7498
11261166      return;
11271167#endif /* SNES_LAYER_DEBUG */
11281168
1129   snes_update_line(SNES_COLOR_DEPTH_4BPP, 1, 2, 6, SNES_BG1, curline, 0, 0);
1130   snes_update_line(SNES_COLOR_DEPTH_2BPP, 1, 0, 4, SNES_BG2, curline, 0, 0);
1169   snes_update_line(SNES_COLOR_DEPTH_4BPP, 1, 2, 6, SNES_BG1, curline, SNES_OPT_NONE, 0);
1170   snes_update_line(SNES_COLOR_DEPTH_2BPP, 1, 0, 4, SNES_BG2, curline, SNES_OPT_NONE, 0);
11311171   snes_update_objects(5, curline);
11321172}
11331173
r7497r7498
11381178      return;
11391179#endif /* SNES_LAYER_DEBUG */
11401180
1141   snes_update_line(SNES_COLOR_DEPTH_4BPP, 1, 1, 4, SNES_BG1, curline, 1, 0);
1181   snes_update_line(SNES_COLOR_DEPTH_4BPP, 1, 1, 4, SNES_BG1, curline, SNES_OPT_MODE6, 0);
11421182   snes_update_objects(6, curline);
11431183}
11441184

Previous 15994 Revisions Next


© 1998-2018 The MESS Team