Thomas Harte
354143a78c
Reintroduced an attempt to plot sprites.
2016-05-18 07:51:25 -04:00
Thomas Harte
0b99649b0f
Had a first shot at triggering player and missile resets.
2016-05-18 07:31:05 -04:00
Thomas Harte
b8708b805c
The vertical blank flag now works again.
2016-05-17 22:02:57 -04:00
Thomas Harte
a1e63e8320
Attempted to generalise on pixel counter storage, at least. Further adjusted background timing but I'm still not sure.
2016-05-17 21:41:32 -04:00
Thomas Harte
ad6f405483
Fixed: was off by one on pixels, allowing four extra pixel output cycles per line.
2016-05-17 19:02:32 -04:00
Thomas Harte
c96674b341
Made genuine first approximate attempt at hmove.
2016-05-17 18:35:40 -04:00
Thomas Harte
d170bb14e6
Extended scheduling plans, inserted initial events for hmove, albeit not yet implemented.
2016-05-17 18:21:49 -04:00
Thomas Harte
6a961c4d28
Added something of the ball counter, but without yet a working HMOVE it's prone to error.
2016-05-17 07:18:14 -04:00
Thomas Harte
7d3cf76576
Generalised slightly, to allow events to be queued up to eight cycles in advance; most importantly each event gets to pick its own delay.
2016-05-17 07:09:18 -04:00
Thomas Harte
3d003070b3
Made an attempt better to generalise the idea of things with 4 CLK delays.
2016-05-16 21:54:27 -04:00
Thomas Harte
4ad074fc78
Introduced a four-cycle delay between playfield fetch and display, curing Yar's Revenge. Also disabled barrel roll scanling colouring again. I really need to make my mind up on that.
2016-05-16 19:55:56 -04:00
Thomas Harte
f19ed2e8f8
Started merely attempting to reintroduce the background layer.
2016-05-16 19:04:13 -04:00
Thomas Harte
9d92ad659f
Established the basic timing loop, albeit without clocking delays yet.
2016-05-16 08:01:29 -04:00
Thomas Harte
cca53598d3
Made another run at 2600 colours.
2016-05-14 16:52:24 -04:00
Thomas Harte
8d52765f40
Realised why new shaders weren't taking. Very negligibly decreased Atari drawing cost.
2016-05-12 22:22:24 -04:00
Thomas Harte
6d65bc9b3a
Permitted a wider error window on vertical sync, tidied things up a little and started trying to move towards full implementation of the OpenGL contract.
2016-05-11 22:11:01 -04:00
Thomas Harte
4b3c4082d2
These functions appear correctly to model the NTSC and PAL palettes; the CRT's attempt to switch function doesn't work properly yet though.
2016-05-11 21:07:18 -04:00
Thomas Harte
5a4262d74e
Confirmed: it is inaccurate for a 6502 to self reset at power up. So that responsibility now rests in the machines.
2016-05-10 21:05:52 -04:00
Thomas Harte
1142c86811
Slightly simplified conditional.
2016-05-07 18:38:51 -04:00
Thomas Harte
bf9917707e
Merge branch 'master' into Glitches
2016-05-05 08:31:40 -04:00
Thomas Harte
fea32869b0
Implemented what I now believe to be the real paging logic.
2016-05-05 08:28:06 -04:00
Thomas Harte
87df57195d
Started on an attempt not to treat the various buffers as free to loop within, starting with the input texture.
2016-05-04 07:39:45 -04:00
Thomas Harte
3af97d4069
Eliminated redundant variable.
2016-04-26 19:57:05 -04:00
Thomas Harte
6c567d166a
Fixed colour burst acceptance, switched to an integral single byte streaming of Atari colours.
2016-04-25 20:56:15 -04:00
Thomas Harte
9b64f64db7
Attempted to normalise some style decisions.`
2016-04-24 22:32:24 -04:00
Thomas Harte
7a8d100861
Found a new working formula for NTSC Atari 2600 colours.
2016-04-24 22:02:00 -04:00
Thomas Harte
d221c712b0
Ensured GL context is active when destructing CRTOpenGL.
2016-04-24 20:34:25 -04:00
Thomas Harte
db908a7547
Adjusted Atari to using its non-standard line lengths.
2016-04-24 19:23:30 -04:00
Thomas Harte
9260d97b03
Oh, of course, it's that the output vertex array doesn't get initialised unless there's an RGB shader program. Silly oversight. Fixed. And switched back to TV output for correct colours.
2016-04-24 17:56:36 -04:00
Thomas Harte
d0f9a6c2f5
Added a dump-the-input default RGB output shader. Which at least proves that the Atari 2600 is generally still working.
2016-04-24 17:35:25 -04:00
Thomas Harte
80a3169674
Started reviving the Atari 2600 emulation. Put new startup sequence into place.
2016-04-24 06:56:08 -04:00
Thomas Harte
ae2760e034
Colour phase is now updated and varies per line.
2016-04-21 21:07:29 -04:00
Thomas Harte
7aa87723a9
Added: key states are all cleared if the window loses focus. Which resolves sticky key issues. Allowing me just to use command+option+O for options and map both command and option as FUNC.
2016-04-19 21:29:10 -04:00
Thomas Harte
66f2c10c04
Resolved potential crash if tape requests are made without one inserted. Softened glFinish to glFlush, though I'm still not sure I should strictly need even that.
2016-04-19 21:00:48 -04:00
Thomas Harte
3d53f157de
Output selection now takes effect. So I can stop accidentally committing changes back and forth.
2016-04-18 08:27:58 -04:00
Thomas Harte
94f148e212
Wired in options, at least getting as far as the Objective-C bridge. Then fast loading makes it to the emulated machine, display output type doesn't.
2016-04-18 08:21:00 -04:00
Thomas Harte
499f7ace07
Re-enabled working video output for the Electron for the day and consolidated the rough metric I'm using to pick a number of taps for the audio filter.
2016-04-17 20:43:20 -04:00
Thomas Harte
6ff9ffba6c
Switching temporarily to an attempt to draw input runs as if RGB: shader compiles, fixed a race condition on out-of-bounds accesses for the source buffer.
2016-04-17 15:51:28 -04:00
Thomas Harte
104f44f27f
Attempted to improve deinterlacing, gave the CRT full control over blend mode, switched back to 2000000Mhz audio.
2016-04-14 22:20:47 -04:00
Thomas Harte
6a17c2992d
Introduced a compile-time configurable audio divider, set it arbitrarily to '8' for now. Discovered why my graphics aren't centred and added a TODO.
2016-04-13 22:31:59 -04:00
Thomas Harte
026ce0255f
Source runs are now captured, and that buffer appropriately reset.
2016-04-13 22:20:13 -04:00
Thomas Harte
2ea02ed127
A source array buffer is also now created, mapped, unmapped, etc.
2016-04-13 22:14:18 -04:00
Thomas Harte
955e185790
Minor simplification.
2016-04-13 19:19:04 -04:00
Thomas Harte
4d889d9c7f
Made an attempt slightly to simplify the fragment processor, at both ends.
2016-04-12 22:35:11 -04:00
Thomas Harte
2cc72169ff
Ensured machines can nominate their own aspect ratio windows. Switched to 11/10 for the Electron.
2016-04-11 23:12:56 -04:00
Thomas Harte
7276a06cc0
Added a helper to calculate a visible rect based on output timings, used it to scale the Electron output up to the full window size.
2016-04-11 21:47:23 -04:00
Thomas Harte
a3c2cd880e
I discovered a further post on this on the STH forums; apparently the Electron simply asserts sync continuously. No breaks.
2016-04-11 21:01:09 -04:00
Thomas Harte
bdb99ba92f
Corrections back towards composite output: fixed misnamed constant, ensured the CRT doesn't write nonsense to the output buffer, ensured it grows three vertices at a time rather than six when desired. Net effect should be that the output stage is working again, with the input processing remaining to fill in.
2016-04-10 22:56:52 -04:00
Thomas Harte
8701366277
Switched horizontal sync detection back to differential, switched the Electron to an XOR-style sync output (believed to be accurate, but I need to check), fixed some latent issues around vertical sync detection.
2016-04-10 21:34:40 -04:00
Thomas Harte
e617bd2bb3
Turned audio quality up to the maximum, at least for now.
2016-04-06 21:12:22 -04:00
Thomas Harte
5aa6da221f
Shifted responsibility for byte shifts, probably to a more logical place.
2016-04-05 22:19:14 -04:00
Thomas Harte
2248769df9
Pulled a bunch of selection parts outside of the loops. Probably exhausting this angle of attack.
2016-04-05 22:17:44 -04:00
Thomas Harte
8f87973a96
Switched to table-based byte to output conversion.
2016-04-05 22:07:10 -04:00
Thomas Harte
e35456612a
Simplified 40-column to pixel conversion.
2016-04-05 20:44:05 -04:00
Thomas Harte
6dbd20ffde
Expanded interface to rgb_sample to eliminate its need to make assumptions about globals, used expanded interface to compact Electron data to two pixels per byte.
2016-04-05 20:32:55 -04:00
Thomas Harte
7838507a7a
Simplified sound generation.
2016-04-04 22:22:19 -04:00
Thomas Harte
729fddea1c
Switched to integer textures, likely to simplify for most use cases.
2016-04-04 19:39:01 -04:00
Thomas Harte
3ca58b2a57
Attemted further to diminish jumpiness.
2016-03-22 22:07:30 -04:00
Thomas Harte
8cd5d40e00
Made an attempt to reduce the amount of data heading to the GPU.
2016-03-22 21:16:32 -04:00
Thomas Harte
902017a962
Fixes: drop any processing backlog, try not to allow an Electron document to close mid-draw, perform a frame grab even if the emulated machine is over-processing, really really don't create a CRT until it's safe.
2016-03-20 18:42:37 -04:00
Thomas Harte
fb6fb5d948
Switched to two-phase setup to deal with OpenGL scheduling.
2016-03-20 13:50:13 -04:00
Thomas Harte
aa8a192c7e
Simplified API down to their being a single texture with a specified depth.
2016-03-19 17:37:55 -04:00
Thomas Harte
b074860031
Updated to latest information on interrupt timing.
2016-03-18 21:11:25 -04:00
Thomas Harte
4cd0aa3416
Completed FIR filter based audio output.
2016-03-15 23:37:35 -04:00
Thomas Harte
0edf165401
Fixed sound pitch, though I'm not yet exactly sure why.
2016-03-14 22:52:16 -04:00
Thomas Harte
9a492ac15f
Made a further guess at the state interrupts would probably be left; slightly simplified interface.
2016-03-14 22:42:52 -04:00
Thomas Harte
15120d8fb6
Switched to probably more accurate contended memory, resolved issue of not leaving the tape data received interrupt set when returning a byte from the fast tape, fixing Joe Blade, and tested slightly further to determine that interrupts probably signal upon entry into horizontal sync.
2016-03-14 19:29:28 -04:00
Thomas Harte
fb26b38ff9
This is as simplified as things seem to be able to get without breaking at least Northern Star. Joe Blade et al remain stubbornly broken but I'm not immediately able to determine why.
2016-03-13 19:55:20 -04:00
Thomas Harte
f797e6b5b6
Started taking baby steps towards a genuine unification of the tape interrupt generating code.
2016-03-13 19:45:50 -04:00
Thomas Harte
bc554dedf7
Fixed: attempting to read the screen start address no longer alters it.
2016-03-13 18:50:23 -04:00
Thomas Harte
1c4acfb599
I think this is a prima facie acceptable implementation of the fast tape hack.
2016-03-13 17:39:53 -04:00
Thomas Harte
4462bb92f8
Moved interrupt back down to where it's probably meant to be.
2016-03-12 23:18:46 -05:00
Thomas Harte
cdff90f20d
Fixed: setting an interrupt control value with the lowest bit set could result in interrupts that can't be disabled.
2016-03-12 22:55:33 -05:00
Thomas Harte
6327311130
Made an attempt to separate and clarify on tape interrupts.
2016-03-12 20:32:26 -05:00
Thomas Harte
cfa616d593
Fixed: timing issue versus supplied test ROM was failure to include the Plus 1 ROM in the mix.
2016-03-12 11:51:20 -05:00
Thomas Harte
763d5e8819
Access timing now appears to be exactly on the nail. Disabled automatic interrupt expiration again as I'm not persuaded it's correct for at least the RTC.
2016-03-10 23:12:28 -05:00
Thomas Harte
e305fd9326
Adjusted numbers, empirically.
2016-03-10 22:40:18 -05:00
Thomas Harte
a89225987f
Blank lines are back.
2016-03-10 22:19:54 -05:00
Thomas Harte
b836d74e18
Believing the previous implementation to be overly complicated through premature optimisation, simplified video. It's slightly slower now. Will need work. Immediately to do: figure out how to deal with blank scan lines.
2016-03-10 22:08:50 -05:00
Thomas Harte
20ac630e4d
Some minor optimisations and timing tweaks. Nothing of substance.
2016-03-10 19:58:50 -05:00
Thomas Harte
df3fff51c7
These interrupts apparently last only 64µs at most.
2016-03-10 19:10:53 -05:00
Thomas Harte
f232a12fad
Fixed RAM timings: it's at least two and possibly three cycles to access RAM, and an access that overlaps with video fetch in Modes 0–3 will cost the length of the video fetch rather than somehow finishing in time.
2016-03-10 19:04:43 -05:00
Thomas Harte
c7976dd657
Started trying to clean up my Outputs namespace by moving stuff related to the CRT underneath a separate subnamespace.
2016-03-08 20:49:07 -05:00
Thomas Harte
6dfe877c43
Basic attempts to organise myself into shape for composite output continue.
2016-03-07 21:22:47 -05:00
Thomas Harte
1e5fe2b2c1
Made an attempt to reestablish the Atari 2600 output connection despite various changes (TODO: generalise that stuff), and to start creating the composite shader.
2016-03-07 21:04:04 -05:00
Thomas Harte
cd9c62acca
Still stepping slowly towards a working composite mode, switched the RGB sampling function to returning a vec4, which may be of benefit to any machine with a brightness part of an RGB signal, and started edging towards at least having the correct GLSL programs ready for converting composite output.
2016-03-07 19:08:26 -05:00
Thomas Harte
3b6c9c15a1
Switching momentarily back to monitor mode, resolved why I was suddenly getting no output upon creating some texture targets.
2016-03-07 18:55:15 -05:00
Thomas Harte
eefd17ed4c
Fixed sync response in composite scan output generation and stored texture coordinates.
2016-03-05 21:52:22 -05:00
Thomas Harte
5c8db71c64
Corrected some constants, ensured both machines (so far) are setting the output device.
2016-03-05 16:19:10 -05:00
Thomas Harte
7839d93344
With the provision of an extra hint to the CRT and, finally, the realisation about why my scans weren't exactly joining up, improved output precision.
2016-02-27 22:39:01 -05:00
Thomas Harte
1c6de7692d
Made an attempt to fix tape output interrupts; offloaded raster width and placing conversion to the GPU.
2016-02-27 20:37:41 -05:00
Thomas Harte
db18c85423
Simplified the run builder rather; put a double check of Electron timing in place.
2016-02-25 22:01:42 -05:00
Thomas Harte
1eea28b692
Disabled some debugging parts, added some others, marked some things as inline. Ticking over.
2016-02-22 23:35:42 -05:00
Thomas Harte
ec3cccbb0d
Working towards HQ UEF support: fixed bug whereby writing to tape output would reset input pulse stepper; added support for chunk 0116 and approximate support for 0113.
2016-02-20 22:03:14 -05:00
Thomas Harte
3754cf4bce
Played about with interrupt timing.
2016-02-20 21:24:02 -05:00
Thomas Harte
574985f9a2
Fixed interlaced timing; switched to a more robust detector for horizontal sync; eliminated some test logging.
2016-02-20 20:29:40 -05:00
Thomas Harte
00f414d757
Made an attempt to reintroduce interlacing and screen modes with gaps. Something's wrong with synchronisation though, so most likely I'm outputting a bad signal.
2016-02-20 17:32:51 -05:00
Thomas Harte
da361be3ee
This might be more accurate? Probably not. Who knows?
2016-02-20 00:13:43 -05:00
Thomas Harte
518c134348
Blank lines are missing (if the double negative can be forgiven) but the framebuffer is otherwise seemingly working well again.
2016-02-20 00:11:23 -05:00
Thomas Harte
a3432120f3
Fixed synchronisation — my two fields weren't of equal length, I wasn't breaking calls to the CRT upon 40/80 transitions, I had the wrong maximum run length. Now I just need to put real pixels back in.
2016-02-19 23:57:57 -05:00
Thomas Harte
1954f7bcbd
Got back to a stable image, at least when staying in a mode. Which is what I was trying to fix. Hmmm.
2016-02-19 23:41:09 -05:00
Thomas Harte
dce1649fc5
Commuted some camelCase variables into more standard C++ underscore names; decided the best fix for the graphics output is to break it down into much simpler chunks. output_pixels is currently a placeholder that simply outputs blank so the current effect is that all data is missing but it should be easy enough now to put pixels back in.
2016-02-18 23:23:49 -05:00
Thomas Harte
0b5417ab44
Made an attempt to put interrupts in the correct places regardless of even/odd field.
2016-02-16 20:36:19 -05:00
Thomas Harte
a01f90ff3e
Attempted a switch to the real PAL visible area and to something a bit like a real phosphor decay.
2016-02-14 21:57:23 -05:00
Thomas Harte
7580d192d5
Fixes: now setting correct frame time estimate, properly enabling the timestamp attribute, and ensuring that the Electron flushes screen work at least once per host frame update.
2016-02-14 19:28:02 -05:00
Thomas Harte
7bd237193d
Edged closer towards realistic timing.
2016-02-13 20:52:35 -05:00
Thomas Harte
341fafd3c5
Adjusted visible area.
2016-02-12 19:52:04 -05:00
Thomas Harte
1d20a29d97
Made an attempt to switch to the flywheels for both vertical and horizontal sync, and to act more appropriately for out-of-bounds sync requests. Lots of tweaking to do, I fear.
2016-02-11 23:43:08 -05:00
Thomas Harte
86017de1fb
Fixed field timing. It's 312.5 lines now, closer to the PAL standard.
2016-02-11 22:12:37 -05:00
Thomas Harte
c66409421e
Switched to generating an interlaced output, that apparently being correct. Enabled a poor man's version of phosphor persistence to smooth things out a little. It's not completely unconvincing.
2016-02-10 23:11:25 -05:00
Thomas Harte
b5bcadb8d3
Reinstated clipped CRT output, with more appropriate ownership of the decision.
2016-02-07 22:18:55 -05:00
Thomas Harte
2e3ba6bbb2
Removed some logging.
2016-02-07 14:42:40 -05:00
Thomas Harte
6ab425deda
There is now a semi-reasonable amount of screen output again.
2016-02-05 21:35:39 -05:00
Thomas Harte
e0d51408e4
Onward with carrying this through to the bitter end, this at least results in all the appropriate knowledge and call-ins occuring at the CRT.
2016-02-04 22:28:50 -05:00
Thomas Harte
4554abb755
Made an attempt to be more rigorous in display generation on the Electron, to make sure I deal with mid-line changes to/from blank line mode. Even if it turns out that they generate pixels.
2016-01-29 21:14:13 -05:00
Thomas Harte
adc6838ba0
Continued slow migration of shader ownership to CRT. Attempted to start debugging the tape interface.
2016-01-27 21:35:57 -05:00
Thomas Harte
96c946b8af
Made a very basic attempt to emulate tape output.
2016-01-24 18:20:55 -05:00
Thomas Harte
ace331d4b4
Got a bit higher level in CRT timing specification. Which internally allows it now to infer the colour clock frequency. Which will be helpful momentarily.
2016-01-23 18:53:20 -05:00
Thomas Harte
cd97617a8a
Bumped the speaker up to the full namespace, since Tape lives there to avoid delegation complexity. Turned the CRT into something the Electron statically owns, fixing a memory leak by simplifying.
2016-01-23 17:45:06 -05:00
Thomas Harte
f4cd0aa38e
Ensured that all relevant information is given to the tape class. Made an attempt not to write to a screen output buffer if we don't have one. Added some debug printing.
2016-01-23 13:09:56 -05:00
Thomas Harte
949c33774a
Fixed failure to set a delegate, slowed tape speed if operating in RAM.
2016-01-23 11:42:14 -05:00
Thomas Harte
43a7d1b7ae
It'll be helpful to be able to isolate the tape interface when I'm faking a fast load. So factored out.
2016-01-23 00:14:44 -05:00
Thomas Harte
0efe4b312c
Disabled my various bits of rate interchange debugging; improved test for when to call update_display due to a RAM write.
2016-01-21 22:16:52 -05:00
Thomas Harte
82cb1c365c
Further simplified inner loops.
2016-01-21 21:35:04 -05:00
Thomas Harte
34640cec93
Started trying to move some logic out of the inner loop.
2016-01-21 21:28:09 -05:00
Thomas Harte
48ddd3c497
Set about documenting the CRT; while doing so decided to add an optional clock divider for input; having done so decided to try to exploit it with the Electron.
2016-01-21 21:17:47 -05:00
Thomas Harte
de7218cdf0
Added a lot of commenting to the CPU6502 definition, simplifying its construction. Added missing nullability modifier to CSElectron. Fixed bad-habit Objective-C style naming on the Electron's Interrupt enum.
2016-01-20 21:55:38 -05:00
Thomas Harte
4c16d34063
Moved set_tape so that the inline definition of get_next_tape_pulse is visible to it. Also eliminated some dead typedefs.
2016-01-20 08:27:25 -05:00
Thomas Harte
280a2292ff
Shushed.
2016-01-19 23:33:15 -05:00
Thomas Harte
9036cf3b7c
Thus did the first UEF load.
2016-01-19 23:03:27 -05:00
Thomas Harte
e65cd4cf06
Some data is marginally reaching the CPU from the tape.
2016-01-19 22:05:34 -05:00
Thomas Harte
956b90e203
Attempted further to improve latency; added view adjustment for non-4:3 output aspect ratios. The 4:3 is currently hardcoded, so further work will be required.
2016-01-18 23:55:52 -05:00
Thomas Harte
e63b6d22ae
As shown by the commented-out code, the aliasing-adaptation seems to be working. So something is wrong somewhere else.
2016-01-14 21:59:37 -05:00
Thomas Harte
383b2be4c6
Fixed one off-by-one error.
2016-01-14 21:33:27 -05:00
Thomas Harte
8bd04a6be4
Switched model for filter subclasses. Implemented test square[-ish] wave to check for obvious stream errors. None is clear.
2016-01-14 21:27:02 -05:00
Thomas Harte
38ffcaa262
Here, at last, is _some_ audio output, at least.
2016-01-14 20:33:22 -05:00
Thomas Harte
439d452e23
Resolved some errors.
2016-01-13 22:11:33 -05:00
Thomas Harte
49e89a4bcb
I'm not yet completely convinced by my approach to time basing, but it'll probably do? If so then this more or less gets me ready for a point-sampled filtering.
2016-01-13 22:02:39 -05:00
Thomas Harte
d9a7ef9e46
Edging towards audio output; the speaker is given appropriate input and output rates, and then updated with current divider and enabled/disabled status.
2016-01-13 21:03:43 -05:00
Thomas Harte
d28abdc037
Made an attempt at correct timing, adding support for additional paged ROMs, added file association for .rom.
2016-01-12 22:34:26 -05:00
Thomas Harte
84ba4e2900
Tidied a little, started working towards supporting speaker output.
2016-01-12 22:19:56 -05:00
Thomas Harte
75d6ec354b
Added some very basic filtering in RGB mode.
2016-01-12 16:27:09 -05:00
Thomas Harte
cba09b5490
Switched display update and RAM write order.
2016-01-11 22:29:16 -05:00
Thomas Harte
650077feac
Pulled a few things out as constants, zoomed in a little. Still in a 4:3 window though.
2016-01-11 22:18:34 -05:00
Thomas Harte
72019d0ea3
Made an attempt to get video output correct.
2016-01-11 22:08:30 -05:00
Thomas Harte
e93dbdb463
Implemented keyboard input.
2016-01-11 19:48:31 -05:00
Thomas Harte
ce916ebd6a
Fixed runaway frame generator.
2016-01-10 23:32:57 -05:00
Thomas Harte
ccf20299a3
Made an attempt at getting some interrupts all up inside this thing.
2016-01-10 19:06:46 -05:00
Thomas Harte
cc5ba8243e
Fixed: turned out the power-on bit was being cleared.
2016-01-10 17:17:39 -05:00
Thomas Harte
d95414b2eb
I'm not really sure what's going wrong with paging yet but this fixes the 0xc000 byte error.
2016-01-10 12:30:24 -05:00
Thomas Harte
e07981c147
Fixed screen start address.
2016-01-09 22:52:08 -05:00
Thomas Harte
1308332a71
Hard-coded to 40 columns of black and white, here's some text, at least.
2016-01-09 22:39:46 -05:00
Thomas Harte
037602765a
This now correctly (I think) decodes information posted to the CRT. But doesn't yet post it correctly. I'm very close now, I hope.
2016-01-09 22:19:00 -05:00
Thomas Harte
07a041d788
Fixed vertical retrace sync.
2016-01-09 21:54:31 -05:00
Thomas Harte
3d6f20b7b9
Output, at last! Though sync is clearly way off.
2016-01-09 21:53:33 -05:00
Thomas Harte
b4f31edea3
Made an attempt to get RGB output mode up and running, and showing at least a box where pixels would be.
2016-01-09 21:32:56 -05:00
Thomas Harte
a900bfed65
Fixed to ensure that frame rendering wraps around, and to properly connect the Electron to its view. Now I need a working pixel shader.
2016-01-09 20:34:22 -05:00
Thomas Harte
7341f5c341
This is intended to be enough to start producing something of an output. But something's obviously still broken.
2016-01-09 20:26:40 -05:00
Thomas Harte
716bb3281b
This at least now connects up a CRT, though it never talks to it.
2016-01-07 22:26:49 -05:00
Thomas Harte
47a7654c00
Added just enough that this is probably a successful boot. I guess I'm going to need to get invested in graphics next? Hmmm.
2016-01-07 21:01:13 -05:00
Thomas Harte
8c1bfa5a05
This is the bare minimum to prove that the ROM is trying properly to boot.
2016-01-07 20:36:27 -05:00
Thomas Harte
0db8938d27
Added the option for the CSCathodeRayView to show only a subsection of the full scan area. Zoomed in a little on the 2600. Put in enough piping to give the Electron sight of its ROMs at least.
2016-01-06 23:14:36 -05:00
Thomas Harte
bfd9957c81
You now get an Electron only if you ask for a new file. That'll do for now while it's the only thing that one might want to start without supplying a file. The 6502 now starts from a defined point — being reset. The Electron is starting to grow the absolute most simple buds of its memory map.
2016-01-06 21:09:49 -05:00
Thomas Harte
ab45c1d530
Started working on a shell for the Electron emulation, including factoring out the common CRT delegate -> Objective-C bridging, serial dispatch queue and frameskipping logic from the Atari 2600 shell.
2016-01-04 23:12:47 -05:00
Thomas Harte
675070c5dd
Very, _very_ minor: switched to normal C++ constructor syntax for simple variable initialisation.
2015-12-06 16:53:37 -05:00
Thomas Harte
5d6bee4927
Of course, being in-phase means being the cosine wave.
2015-09-10 21:30:39 -04:00
Thomas Harte
82aa6d074a
'type' is out, at least for the time being.
2015-09-05 20:25:30 -04:00
Thomas Harte
7fb6c86d9d
Okay, it looks like colour 3 is approximately phase offset 0, and the palette wraps around after 14 entries, not 16. Also got a bit less dependent on floating point accuracy for the step.
2015-09-05 17:10:41 -04:00
Thomas Harte
80cf3d9301
Formally gave the 2600 responsibility for providing the code that decodes one of the things it has put into a buffer into a composite sample.
2015-09-03 12:28:16 -04:00
Thomas Harte
ac8fc9a1a0
Experimenting with pre-encoding luminance and chrominance separation over on the
...
CPU as otherwise the GPU does them repetitively and more awkwardly (as it's working purely in floats). It means uploading twice as much data though, so I don't
know. Still only half as much as the RGBA path of a few days ago. Will experiment.
Also slightly adjusted division of responsibility in the fragment shader per the
desire to have the `sample` function owned externally.
2015-09-03 11:15:23 -04:00
Thomas Harte
cb6e6e8acb
It's the worst fragment shader you'll ever see. The worst. But this attempts NTSC composite video emulation, artefacts included.
2015-09-01 22:36:45 -04:00
Thomas Harte
043d2f9896
It sounds like the two sync signals are exclusive ORd.
2015-08-19 21:36:33 -04:00
Thomas Harte
c5e480cfae
Threw in missile repeats.
2015-08-19 09:46:57 -04:00
Thomas Harte
ca6b54536e
Added fire and reset inputs.
2015-08-18 20:58:05 -04:00
Thomas Harte
bc805a90fe
Wired up joystick directions, at least, and fire button presses get as far as the C++. But there's some latching to figure out before they'll work.
2015-08-18 20:33:24 -04:00
Thomas Harte
d21ccddeef
Fixed: _vBlankExtend is now cleared at the correct moment.
2015-08-17 17:54:36 -04:00
Thomas Harte
a33d31d02a
Fixed to allow loading of ROMs less than 1kb in size.
2015-08-17 00:34:01 -04:00
Thomas Harte
df68aeff5a
Fixed: made sure that _vBlankExtend resets itself even on non-pixel lines.
2015-08-17 00:09:28 -04:00
Thomas Harte
414849f166
Confirmed: pixel counters are not paused by programmatic vertical blank.
2015-08-16 17:34:20 -04:00
Thomas Harte
a693c081f8
Switched on the appropriate compiler warnings re: signed comparisons and implicit conversions. Fixed all less-than-explicit calls.
2015-08-16 16:08:29 -04:00
Thomas Harte
410c09cb35
Made attempt not to touch the _collisions registers (which are instance variables) unless the local variables imply it's potentially necessary. So that's a broad phase on collisions, I guess.
2015-08-16 15:39:40 -04:00
Thomas Harte
40cb1cf60d
... and the ball graphic.
2015-08-16 11:24:33 -04:00
Thomas Harte
afaa86a649
Minor thing: skip the internal counter stuff if we're definitely going to end up with a transparent pixel anyway for the player and missile graphics.
2015-08-16 11:23:46 -04:00
Thomas Harte
4b5aabdd54
Attempted to take even more out of the inner pixel loop.
2015-08-13 23:23:04 +01:00
Thomas Harte
92c7d56cc3
Tiny little speed improvement. Every little helps.
2015-08-13 21:50:24 +01:00
Thomas Harte
17bbe27c9a
As an experiment, performed some very basic moving of playfield composition outside of the pixel loop.
2015-08-13 21:32:22 +01:00
Thomas Harte
033655835a
My understanding now is that object position counting will begin the cycle after the call is made, not that cycle, and that the timer loops just once, with the logic for counter pumping being whether the relevant flag is still set, irregardless of whether the counter is still going.
2015-08-13 18:59:23 +01:00
Thomas Harte
323aa27e13
Fixed: paging is based directly on the access, independent of the read/write line (since it isn't actually exposed to catridges).
2015-08-13 15:04:30 +01:00
Thomas Harte
9838e01cc1
Made a first attempt at paging.
2015-08-13 13:24:02 +01:00
Thomas Harte
9ca57b80a7
Minor steps to help with diagnostics; all commented out or merely to benefit with breakpoint placement.
2015-08-13 08:43:10 +01:00
Thomas Harte
6616265d93
Fixed collision tests, added a few more timing tests.
2015-08-13 03:33:45 +01:00
Thomas Harte
d19f8ed507
Removed the implicit reset upon 6502 startup, adding a reset line. Hence all tests now pass again. Added an empty shell for timing tests, the all-RAM 6502 now counting bus cycles.
2015-08-13 00:51:06 +01:00
Thomas Harte
687816d470
Made some attempted simplifications, implemented collisions.
2015-08-13 00:31:57 +01:00
Thomas Harte
aebf636528
Ensured the PIA timer resumes its normal tick rate after being read; fixed those spaces that had crept in where tabs should be.
2015-08-10 16:55:16 +01:00
Thomas Harte
42677f5f83
Fixed association of motion registers and actual registers.
2015-08-10 16:43:45 +01:00
Thomas Harte
2dde2efff0
Attempted to standardise object counters.
2015-08-10 15:09:40 +01:00
Thomas Harte
a228969655
This should happen every fourth cycle.
2015-08-10 08:16:17 +01:00
Thomas Harte
3c27306a8e
My counter was going the wrong way.
2015-08-10 00:33:37 +01:00
Thomas Harte
a4e52cc4db
Made an attempt to switch to a hardware-accurate object timer model. Without yet perfect success.
2015-08-10 00:20:18 +01:00
Thomas Harte
cd67e31e64
Made a first attempt at switching a little closer to TIA's real internal counter setup.
2015-08-09 22:47:11 +01:00
Thomas Harte
987be65a59
Made a quick attempt at reimplementing skip-to-the-end logic for ready waits.
2015-08-09 02:42:01 -04:00
Thomas Harte
eb23a493e5
Switched back to one texel per colour clock, at least for now. Attempted to break _RGBA assumption within the cathode ray view.
2015-08-05 23:36:04 -04:00
Thomas Harte
fd36f13baf
The cathode ray view no longer hard codes the frame size. So that's one less coupling. Doubled pixel output size to give sufficient sampling detail to capture the NTSC colour clock (ummm, hopefully).
2015-08-05 21:45:47 -04:00
Thomas Harte
5644b3a1cc
Fixed scanline sizing and fill issues, as well as shortening vsync to the correct Atari length.
2015-08-05 20:55:27 -04:00
Thomas Harte
5313b48ebd
I'm ashamed to admit, I: played with numbers until enough things looked stable such that I can investigate other things. Discovery: my PAL autodetection was way off. Fixed, hopefully.
2015-08-02 20:32:18 -04:00
Thomas Harte
5f1d76e855
Can't seem to find any documentation: assumed horizontal sync is generated during vertical.
2015-07-31 18:49:02 -04:00
Thomas Harte
9c91f1a2eb
Added an attempt at NTSC/PAL autodetection, based on number of missed vertical syncs.
2015-07-31 18:04:33 -04:00
Thomas Harte
a5d66e9dd6
Factored out a few more constants, started trying to ensure there's enough slack and the mechanisms in place for the CathodeRayView to hold onto two frames if it desires, for potential phosphor simulation, switched once again to additive blending — much more like a real CRT — and added a sine function across the width of spans per my understanding of how an electron gun actually fires.
...
Why do all this when overall timing is still so far off? It helps me more easily see how overall timing is so far off.
2015-07-31 17:47:10 -04:00
Thomas Harte
c1d1fb65cb
Made an attempt properly to emulate the RDY line and the Atari's use of it.
2015-07-31 16:54:20 -04:00
Thomas Harte
53dd5c8f16
Trying to fix my RDY line emulation. Switched to PAL timings, at least temporarily, since it's starting to make a difference.
2015-07-31 16:44:53 -04:00
Thomas Harte
39bfbf1000
Attempted ball graphics enable delay.
2015-07-30 23:01:28 -04:00
Thomas Harte
78e66d2577
Added an attempt at ball rendering.
2015-07-30 21:30:00 -04:00
Thomas Harte
a95b36a53d
Made first attempt at missile display. In Enduro, at least, one seems to work but the other seems to be absent.
2015-07-30 21:09:18 -04:00
Thomas Harte
1b7846f09b
Made a first attempt at the sprite latches. Hopefully this should make a few more Activision logos, etc, show up correctly.
2015-07-30 20:52:26 -04:00
Thomas Harte
1fa7a77793
Continuing in my attempts to figure out the complete absence of graphics from some games: there are 262 lines on an NTSC screen, not 256. Also ensured that the CRT has a little spare range at the edges so that its generated triangles don't wrap around just because of integer overflow.
2015-07-30 20:07:20 -04:00
Thomas Harte
98efae2536
Reintroduced emergency vertical sync — so that output occurs even when the emulation isn't catching syncs properly — and switched some spaces to tabs.
2015-07-30 17:16:49 -04:00
Thomas Harte
14adcd2096
Had a quick bash at timer overflow.
2015-07-30 16:09:32 -04:00
Thomas Harte
58908b60ac
So, provisionally: this looks like (i) the one cycle to write; plus (ii) the number of cycles to get to the end of the pixels (which is _horizontalTimer+1 for me because _horizontalTimer = 0 is a pixel); plus (iii) one cycle of latency to wake up. Am I making that up? Time will tell.
2015-07-30 15:49:38 -04:00
Thomas Harte
f5475369d6
Fixed foreshadowing of sprites yet to come. Put flipMask back the other way around.
2015-07-30 12:07:28 -04:00
Thomas Harte
f653b5dff3
Made a first tentative attempt at supporting all eight sprite modes.
2015-07-30 11:52:28 -04:00
Thomas Harte
151c6b4421
Quick fix: add one cycle to get to the genuine end of the line (i.e. after cycle 0, not on it). Not 3, with the video then becoming desynchronised from the CPU clock.
2015-07-30 00:00:35 -04:00
Thomas Harte
d1ae2caf91
Did the absolute minimum necessary to get some sprites showing in some capacity.
2015-07-29 23:48:52 -04:00
Thomas Harte
23df94d011
Got at least as far as putting a single dot at the player 0 and player 1 positions. Which may or may not be accurate.
2015-07-29 22:37:37 -04:00
Thomas Harte
164866d613
Collapsed two methods into one, to avoid redundant pixel copying.
2015-07-27 22:12:13 -04:00
Thomas Harte
3c25ead1f3
Started working out some of my retain cycles and general failures to release. Switched .mm filename so that Xcode will stop getting confused when I try to switch between implementation and interface files.
2015-07-27 21:15:10 -04:00
Thomas Harte
1f229ee6f7
More tweaks to provide a stable image, at least for the time being.
2015-07-27 20:18:25 -04:00
Thomas Harte
01109d441b
Made an attempt at NTSC colours. Hard coded in RGB, not composite. Short cuts, tsk.
2015-07-27 19:04:03 -04:00
Thomas Harte
caffe56a2d
Slightly expanded width of cathode ray gun, decided to figure out exactly how to deal with off-by-one lengths and precision at a later date, ensured that failure to catch vertical sync doesn't cause out-of-bounds buffer access on the hard-coded, assumed large enough, 512x512 data textures.
2015-07-27 00:28:47 -04:00
Thomas Harte
65bb31d55b
With around about a thousand issues, not the least of which being sometimes unsafe memory accesses, I've at last got pixels on screen.
2015-07-26 23:50:43 -04:00
Thomas Harte
cd0a62d21e
With a slight tweak to the informal protocol used for 6502 memory access cycles, ensured the wait strobe actually halts the CPU, to give a more accurate linking of machine time to real time.
2015-07-26 15:55:19 -04:00
Thomas Harte
8efd449834
Switched to a down counter and a reset test that remains unconditional but doesn't depend on % (which seems to turn into a big imul-powered deal). Probably pointless mulling around the edges at this point.
2015-07-26 15:45:19 -04:00
Thomas Harte
6252f6030f
Switched to idiomatic source name, ensured latest project name is in all appropriate header places, threw texture coordinates slightly into the shader mix.
2015-07-26 15:25:11 -04:00
Thomas Harte
ecb2898bd5
The overall architecture of who has responsibility for what is now very askew but: the CRT now outputs a tightly packed short buffer, with the probable OpenGL destination in mind. So it's now all fixed arithmetic internally. CRTFrame is reduced to a plain C struct with the intention that the OpenGL view will take responsibility for it and stop doing the back-and-forth sprint on getting buffer data. The Atari 2600 now outputs explicit blanks rather than level blacks for its border, so that it's easier visually to debug the CRT in its form as far as it has currently progressed: to drawing lines where the cathode ray gun would run while outputting pixel. I note that I'm still not quite getting vertical sync right yet — I'm just accepting it anywhere in teh frame — but that should be an easy fix.
2015-07-24 23:29:45 -04:00
Thomas Harte
d72287a776
Looked up normal retrace time (it's a lot less than 16µs and 26 scanlines — more like 7 and 10) and that the visible portion of a line is defined to start about 12 µs after the start of hsync, put the first two numbers into my CRT to make that more accurate, then derived a newer guess about what the Atari 2600 does for each of its 228 cycles. The text version of a frame is now looking pretty good. So it's probably time to hit OpenGL and the OS X side of things. Though I'll have a quick look to find out whether I can learn the exact real Atari 2600 timings before moving on.
2015-07-23 19:24:25 -04:00
Thomas Harte
529f61caa1
Removed a stray newline.
2015-07-22 20:45:21 -04:00
Thomas Harte
065050115f
Made an attempt to switch to a triple-buffering scheme for CRT outputs, with an eye towards asynchronicity.
2015-07-22 20:33:20 -04:00
Thomas Harte
963cb2f6fb
Attempted to switch to slightly more meaningful names within the CRT and implemented a delegate to investigate output. Working on it.
2015-07-22 18:15:18 -04:00
Thomas Harte
a1a1b15d18
Made a quick attempt to accumulate a list of detected output runs. Which means finally having to specify normal frame height. I'm already at too many magic formulae though, so this will need proper revision when I'm next awake. Definitely my horizontal position advancement is way off.
2015-07-20 23:18:56 -04:00
Thomas Harte
4e4c082a05
Made some minor attempt at proper sync response. I think I've gone way off piste and overcomplicated it.
2015-07-19 23:43:22 -04:00
Thomas Harte
4a1e9fe2a8
Rephrased the CRT as owning an arbitrary number of buffers and vending storage space for pixel output. That much better maps to potential implementations of this thing in GLSL, with ES 2.0's limitations kept in mind.
2015-07-19 21:21:34 -04:00
Thomas Harte
4d1e410150
Fix 1: _horizontalTimer should be treated as read only out here.
2015-07-19 16:51:11 -04:00
Thomas Harte
6f78ecdc9c
Made first genuine attempt at outputting a meaningful CRT stream. Which shows some significant errors. So work to do.
2015-07-19 16:48:14 -04:00
Thomas Harte
2d0f861474
Incoming: a 'CRT' class, to receive information intended for a cathode ray tube. To decode sync, etc.
2015-07-19 13:36:27 -04:00
Thomas Harte
03a25c8ff2
Fixed playfield pixel logic.
2015-07-19 10:56:04 -04:00
Thomas Harte
3e0679235a
This now goes just far enough to create an instance of Atari2600::Machine and push a ROM to it. Next jobs are to get a basic CRT emulation wired up, outputting to the window.
2015-07-16 20:40:46 -04:00
Thomas Harte
6558ae1425
Imported what little I have so far in the way of a memory-access cycle complete 6502 and just enough of a pretend Atari 2600 on top to be able to see some playfields in ASCII art.
2015-07-16 19:56:02 -04:00
