Previous 15994 Revisions Next

r3200 Sunday 7th September, 2008 at 17:21:33 UTC by Roberto Zandonà
[C64] better implementation of sprites (new raster effects can be visible)
[C64] modified timings (different timings for PAL and NTSC)
[C65] fixed crash and implemented partially a screen drawn line by line
[src/mess/drivers]c128.c c64.c c65.c cbmb.c
[src/mess/video]vic4567.c vic6567.c vic6567.h

src/mess/video/vic4567.c
r3199r3200
211211   if (!SCREENON)
212212   {
213213      for (line = first; (line < last) && (line < vic2.bitmap->height); line++)
214      {
214215         memset16 (BITMAP_ADDR16(vic2.bitmap, line + FIRSTLINE, 0), 0, vic2.bitmap->width);
216      }
215217      return;
216218   }
217219   if (COLUMNS40)
r3199r3200
827829                           VIC2_STARTVISIBLELINES + 34 + raws + 16 - 1);
828830         else
829831            video_screen_set_visarea(   machine->primary_screen,
830                           VIC2_STARTVISIBLECOLUMNS + 32,
831                           VIC2_STARTVISIBLECOLUMNS + 32 + columns + 16 - 1,
832                           VIC2_STARTVISIBLELINES + 34,
833                           VIC2_STARTVISIBLELINES + 34 + raws + 16 - 1);
832                           VIC2_STARTVISIBLECOLUMNS + 34,
833                           VIC2_STARTVISIBLECOLUMNS + 34 + columns + 16 - 1,
834                           VIC2_STARTVISIBLELINES + 10,
835                           VIC2_STARTVISIBLELINES + 10 + raws + 16 - 1);
834836      }
835837      if (VIC3_BITPLANES) {
836838         if (!video_skip_this_frame ()) vic3_draw_bitplanes(machine);
r3199r3200
849851   }
850852   if (vic2.rasterline == C64_2_RASTERLINE (RASTERLINE))
851853   {
852      if (vic2.on)
853         vic2_drawlines (vic2.lastline, vic2.rasterline);
854854      vic2_set_interrupt (1);
855855   }
856   if (vic2.on)
857      if ((vic2.rasterline >= VIC2_FIRSTRASTERLINE) && (vic2.rasterline < (VIC2_FIRSTRASTERLINE + VIC2_VISIBLELINES)))
858         vic2_drawlines (vic2.rasterline-1, vic2.rasterline);
856859}
857860
861
src/mess/video/vic6567.c
r3199r3200
6565/* lightpen values */
6666#include "includes/c64.h"
6767
68
6968#define VERBOSE_LEVEL 0
7069#define DBG_LOG(N,M,A) \
7170   { \
r3199r3200
12531252      /* sprite priority, sprite overwrites lowerprior pixels */
12541253      for (i = 7; i >= 0; i--)
12551254      {
1256         if (vic2.sprites[i].line || vic2.sprites[i].repeat)
1257         {
1258            syend = yend;
1259            if (SPRITE_Y_EXPAND (i))
1260            {
1261               if ((21 - vic2.sprites[i].line) * 2 - vic2.sprites[i].repeat < yend - ybegin + 1)
1262                  syend = ybegin + (21 - vic2.sprites[i].line) * 2 - vic2.sprites[i].repeat - 1;
1263            }
1264            else
1265            {
1266               if (vic2.sprites[i].line + yend - ybegin + 1 > 20)
1267                  syend = ybegin + 20 - vic2.sprites[i].line;
1268            }
1269            if (yoff + syend > YPOS + 200)
1270               syend = YPOS + 200 - yoff - 1;
1271            if (yoff + ybegin < 0)
1272               {
1273                  ybegin = -yoff;
1274                  yend = - yoff;
1275               }
1276
1277            if (SPRITE_MULTICOLOR (i))
1278               vic2_draw_sprite_multi (i, yoff, ybegin, syend);
1279            else
1280               vic2_draw_sprite (i, yoff, ybegin, syend);
1281            if ((syend != yend) || (vic2.sprites[i].line > 20))
1282            {
1283               vic2.sprites[i].line = vic2.sprites[i].repeat = 0;
1284               for (j = syend; j <= yend; j++)
1285                  vic2.sprites[i].paintedline[j] = 0;
1286            }
1287         }
1288         // wrap at the top of the screen
1289         else if    (SPRITEON (i) &&
1255         if    (SPRITEON (i) &&
12901256               (yoff + ybegin >= SPRITE_Y_POS (i)) &&
12911257               (yoff + ybegin - SPRITE_Y_POS (i) < (SPRITE_Y_EXPAND (i)? 21 * 2 : 21 )) &&
12921258               (SPRITE_Y_POS (i) < 0))
r3199r3200
13221288               vic2.sprites[i].line = vic2.sprites[i].repeat = 0;
13231289            }
13241290         }
1325         else if (SPRITEON (i) && (yoff + ybegin <= SPRITE_Y_POS (i))
1326                && (yoff + yend >= SPRITE_Y_POS (i)) && (SPRITE_Y_POS (i) >= 0) )
1291         else if    (SPRITEON (i) &&
1292               (yoff + ybegin >= SPRITE_Y_POS (i)) &&
1293               (yoff + ybegin - SPRITE_Y_POS (i) < (SPRITE_Y_EXPAND (i)? 21 * 2 : 21 )) &&
1294               (SPRITE_Y_POS (i) >= 0))
13271295         {
1296            int wrapped = yoff + ybegin - SPRITE_Y_POS (i);
1297
13281298            syend = yend;
1299
13291300            if (SPRITE_Y_EXPAND (i))
13301301            {
1331               if (21 * 2 < yend - ybegin + 1)
1332                  syend = ybegin + 21 * 2 - 1;
1302               if (wrapped & 1) vic2.sprites[i].repeat = 1;
1303               wrapped >>= 1;
1304               syend = 21 * 2 - 1 - wrapped * 2;
1305               if (syend > (yend - ybegin)) syend = yend - ybegin;
13331306            }
13341307            else
13351308            {
1336               if (yend - ybegin + 1 > 21)
1337                  syend = ybegin + 21 - 1;
1309               syend = 21 - 1 - wrapped;
1310               if (syend > (yend - ybegin)) syend = yend - ybegin;
13381311            }
1339            if (yoff + syend >= YPOS + 200)
1340               syend = YPOS + 200 - yoff - 1;
1341             for (j = 0; j < SPRITE_Y_POS (i) - yoff; j++)
1312
1313            vic2.sprites[i].line = wrapped;
1314
1315            for (j = 0; j < SPRITE_Y_POS (i) - yoff; j++)
13421316               vic2.sprites[i].paintedline[j] = 0;
1317
13431318            if (SPRITE_MULTICOLOR (i))
1344               vic2_draw_sprite_multi (i, yoff, SPRITE_Y_POS (i) - yoff, syend);
1319               vic2_draw_sprite_multi (i, yoff + ybegin, 0, 0);
13451320            else
1346               vic2_draw_sprite (i, yoff, SPRITE_Y_POS (i) - yoff, syend);
1321               vic2_draw_sprite (i, yoff + ybegin, 0, 0);
13471322
13481323            if ((syend != yend) || (vic2.sprites[i].line > 20))
13491324            {
r3199r3200
13801355
13811356   vic2.rasterline++;
13821357
1383   if (vic2.rasterline >= vic2.lines)
1358   if (vic2.rasterline == vic2.lines)
13841359   {
13851360      if (!c64_pal)   // FIX ME
13861361         for (i = vic2.lines; i < (VIC2_FIRSTRASTERLINE + VIC2_VISIBLELINES); i++)
r3199r3200
14031378      vic2_set_interrupt (1);
14041379   }
14051380
1406// printf("%08x  ",(int)activecpu_gettotalcycles());
14071381   if (vic2.on)
14081382      if ((vic2.rasterline >= VIC2_FIRSTRASTERLINE) && (vic2.rasterline < (VIC2_FIRSTRASTERLINE + VIC2_VISIBLELINES)))
14091383         vic2_drawlines (vic2.rasterline-1, vic2.rasterline);
1384
1385// printf("%08x  ",(int)activecpu_gettotalcycles());
14101386}
14111387
14121388VIDEO_UPDATE( vic2 )
src/mess/video/vic6567.h
r3199r3200
1717#define VIC6567_VRETRACERATE 60
1818#define VIC6569_VRETRACERATE 50
1919#define VIC2_VRETRACERATE (vic2.pal?VIC6569_VRETRACERATE:VIC6567_VRETRACERATE)
20#define VIC2_HRETRACERATE 15625
2120
2221/* to be inserted in MachineDriver-Structure */
2322/* the following values depend on the VIC clock,
r3199r3200
2928/* video timing */
3029#define VIC6567_CLOCK   1022730
3130         /* (8180000/8) old value */
32#define VIC6569_CLOCK   985250
33         /* (7880000/8) old value */
31#define VIC6569_CLOCK   985248
32         /* (7880000/8) old value */
33
3434/* pixel clock 8 mhz */
3535/* accesses to memory with 2 megahertz */
3636/* needs 2 memory accesses for 8 pixel */
r3199r3200
3939/* cpu driven with one (visible screen area) */
4040#define VIC2_CLOCK ((vic2.pal?VIC6569_CLOCK:VIC6567_CLOCK))
4141
42#define VIC6567_HRETRACERATE 15734
43#define VIC6569_HRETRACERATE 15639
44#define VIC2_HRETRACERATE (vic2.pal?VIC6569_VRETRACERATE:VIC6567_VRETRACERATE)
45
4246/* pal 50 Hz vertical screen refresh, screen consists of 312 lines
4347 * ntsc 60 Hz vertical screen refresh, screen consists of 262 lines */
4448#define VIC6567_LINES 262
4549#define VIC6569_LINES 312
4650#define VIC2_LINES (vic2.pal?VIC6569_LINES:VIC6567_LINES)
51
4752#define VIC6567_VISIBLELINES 234
4853#define VIC6569_VISIBLELINES 284
4954#define VIC2_VISIBLELINES (vic2.pal?VIC6569_VISIBLELINES:VIC6567_VISIBLELINES)
55
5056#define VIC6567_STARTVISIBLELINES ((VIC6567_LINES - VIC6567_VISIBLELINES)/2)
5157#define VIC6569_STARTVISIBLELINES ((VIC6569_LINES - VIC6569_VISIBLELINES)/2)
5258#define VIC2_STARTVISIBLELINES ((VIC2_LINES - VIC2_VISIBLELINES)/2)
59
5360#define VIC6567_FIRSTRASTERLINE 34
5461#define VIC6569_FIRSTRASTERLINE 9
5562#define VIC2_FIRSTRASTERLINE (vic2.pal?VIC6569_FIRSTRASTERLINE:VIC6567_FIRSTRASTERLINE)
r3199r3200
5764#define VIC6567_COLUMNS 512
5865#define VIC6569_COLUMNS 504
5966#define VIC2_COLUMNS (vic2.pal?VIC6569_COLUMNS:VIC6567_COLUMNS)
67
6068#define VIC6567_VISIBLECOLUMNS 411
6169#define VIC6569_VISIBLECOLUMNS 403
6270#define VIC2_VISIBLECOLUMNS (vic2.pal?VIC6569_VISIBLECOLUMNS:VIC6567_VISIBLECOLUMNS)
71
6372#define VIC6567_STARTVISIBLECOLUMNS ((VIC6567_COLUMNS - VIC6567_VISIBLECOLUMNS)/2)
6473#define VIC6569_STARTVISIBLECOLUMNS ((VIC6569_COLUMNS - VIC6569_VISIBLECOLUMNS)/2)
6574#define VIC2_STARTVISIBLECOLUMNS ((VIC2_COLUMNS - VIC2_VISIBLECOLUMNS)/2)
src/mess/drivers/c65.c
r3199r3200
210210   MDRV_CPU_ADD("main", M4510, 3500000)  /* or VIC6567_CLOCK, */
211211   MDRV_CPU_PROGRAM_MAP(c65_mem, 0)
212212   MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt)
213   MDRV_CPU_PERIODIC_INT(vic3_raster_irq, VIC2_HRETRACERATE)
213   MDRV_CPU_PERIODIC_INT(vic3_raster_irq, VIC6567_HRETRACERATE)
214214   MDRV_INTERLEAVE(0)
215215
216216   MDRV_MACHINE_START( c65 )
r3199r3200
220220   MDRV_SCREEN_MODIFY("main")
221221   MDRV_SCREEN_REFRESH_RATE(VIC6567_VRETRACERATE)
222222   MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */
223   MDRV_SCREEN_SIZE(VIC6567_COLUMNS * 3, VIC6567_LINES * 3)
224//   MDRV_SCREEN_VISIBLE_AREA(VIC6567_STARTVISIBLECOLUMNS ,(VIC6567_STARTVISIBLECOLUMNS + VIC6567_VISIBLECOLUMNS - 1) * 2, VIC6567_STARTVISIBLELINES, VIC6567_STARTVISIBLELINES + VIC6567_VISIBLELINES - 1)
225   MDRV_SCREEN_VISIBLE_AREA(0, VIC6567_COLUMNS * 3 - 1, 0, VIC6567_LINES * 3 - 1)
223   MDRV_SCREEN_SIZE(VIC6567_COLUMNS * 2, VIC6567_LINES * 2)
224   MDRV_SCREEN_VISIBLE_AREA(VIC6567_STARTVISIBLECOLUMNS ,(VIC6567_STARTVISIBLECOLUMNS + VIC6567_VISIBLECOLUMNS - 1) * 2, VIC6567_STARTVISIBLELINES, VIC6567_STARTVISIBLELINES + VIC6567_VISIBLELINES - 1)
226225   MDRV_PALETTE_LENGTH(sizeof(vic3_palette) / sizeof(vic3_palette[0]) / 3)
227226   MDRV_PALETTE_INIT( c65 )
228227
r3199r3200
242241   MDRV_IMPORT_FROM( c65 )
243242   MDRV_SCREEN_MODIFY("main")
244243   MDRV_SCREEN_REFRESH_RATE(VIC6569_VRETRACERATE)
245   MDRV_SCREEN_SIZE(VIC6569_COLUMNS * 3, VIC6569_LINES * 3)
246//   MDRV_SCREEN_VISIBLE_AREA(VIC6569_STARTVISIBLECOLUMNS, (VIC6569_STARTVISIBLECOLUMNS + VIC6569_VISIBLECOLUMNS - 1) * 2, VIC6569_STARTVISIBLELINES, VIC6569_STARTVISIBLELINES + VIC6569_VISIBLELINES - 1)
247   MDRV_SCREEN_VISIBLE_AREA(0, VIC6569_COLUMNS * 3 - 1, 0, VIC6569_LINES * 3 - 1)
244   MDRV_SCREEN_SIZE(VIC6569_COLUMNS * 2, VIC6569_LINES * 2)
245   MDRV_SCREEN_VISIBLE_AREA(VIC6569_STARTVISIBLECOLUMNS, (VIC6569_STARTVISIBLECOLUMNS + VIC6569_VISIBLECOLUMNS - 1) * 2, VIC6569_STARTVISIBLELINES, VIC6569_STARTVISIBLELINES + VIC6569_VISIBLELINES - 1)
248246
249247   MDRV_SOUND_REPLACE("sid_r", SID8580, 1022727)
250248   MDRV_SOUND_CONFIG(c65_sound_interface)
src/mess/drivers/cbmb.c
r3199r3200
587587   /* basic machine hardware */
588588   MDRV_CPU_ADD("main", M6509, VIC6567_CLOCK)        /* 7.8336 Mhz */
589589   MDRV_CPU_PROGRAM_MAP(cbm500_readmem, cbm500_writemem)
590   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE)
590   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6567_HRETRACERATE)
591591   MDRV_INTERLEAVE(0)
592592
593593   MDRV_MACHINE_RESET( cbmb )
src/mess/drivers/c128.c
r3199r3200
561561   MDRV_CPU_PROGRAM_MAP( c128_z80_mem, 0 )
562562   MDRV_CPU_IO_MAP( c128_z80_io, 0 )
563563   MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt)
564   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE)
564   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6567_HRETRACERATE)
565565
566566   MDRV_CPU_ADD("m8502", M8502, VIC6567_CLOCK)
567567   MDRV_CPU_PROGRAM_MAP( c128_mem, 0 )
568568   MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt)
569   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE)
569   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6567_HRETRACERATE)
570570
571571   MDRV_INTERLEAVE(0)
572572
src/mess/drivers/c64.c
r3199r3200
500500   MDRV_CPU_ADD("main", M6510, VIC6567_CLOCK)
501501   MDRV_CPU_PROGRAM_MAP(c64_mem, 0)
502502   MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt)
503   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE)
503   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6567_HRETRACERATE)
504504   MDRV_INTERLEAVE(1)
505505
506506   MDRV_MACHINE_START( c64 )
r3199r3200
528528   MDRV_CPU_PROGRAM_MAP(c64_mem, 0)
529529   MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt)
530530   MDRV_CPU_VBLANK_INT("main", c64_frame_interrupt)
531   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC2_HRETRACERATE)
531   MDRV_CPU_PERIODIC_INT(vic2_raster_irq, VIC6569_HRETRACERATE)
532532   MDRV_INTERLEAVE(1)
533533
534534   MDRV_MACHINE_START( c64 )

Previous 15994 Revisions Next


© 1998-2018 The MESS Team