Commit Graph

73 Commits

Author SHA1 Message Date
Brad Grantham
420f016098 extract program compilation and rect v array buffer 2018-10-14 12:49:58 -07:00
Brad Grantham
f2b28839e4 separate out opengl_texture 2018-10-14 12:10:31 -07:00
Brad Grantham
bb30c33d2d start separating out GL into modules 2018-10-14 12:07:05 -07:00
Lawrence Kesteloot
9f2667d93f Disable dithering on GIF write. 2018-08-08 16:45:41 -07:00
Brad Grantham
2c437b27da record at 50ms simulation per frame
Change bare "5" to more descriptive "recording_frame_duration_hundredths".

Create APPLE2Einterface events that allow interface to limit main loop speed.

Implement rate limiting on start_record and release limiting on stop_record.

During recording, simulation will not run at clock rate.
2018-08-08 16:18:16 -07:00
Brad Grantham
6028d62786 scale GIF output to 2x screen size 2018-08-08 15:46:41 -07:00
Brad Grantham
6caca1ec5d fix stop_recording 2018-08-08 15:45:15 -07:00
Brad Grantham
dddd18c258 Partially implement animated GIF
This uses the update rate of OpenGL swapbuffers, but should clock frames by 50ms.

This is 1x sized.  Needs to be 2x sized.
2018-08-08 15:24:38 -07:00
Lawrence Kesteloot
a2a13e24dc Start GIF-recording mode. 2018-08-07 23:33:14 -07:00
Brad Grantham
043429311a fix crash if text is dragged from Chrome
If the drag-and-dropped filename has no leading "/", assume it is
drag-and-dropped text.  This matches the behavior of Chrome on Ubuntu,
for which dragging selected text onto GLFW is passed to the file drop
callback.

If the dragged selected text starts with "/", the drop callback will
still attempt to open it as a filename.
2018-08-06 00:15:58 -07:00
Brad Grantham
347c2d4ddb remove warning on unused result of fread by using the result 2018-08-06 00:15:58 -07:00
Brad Grantham
1cfc30e904 use correct default page 2018-08-03 01:46:57 -07:00
Brad Grantham
eaffc29115 fix regular mode changes, disable prints 2018-08-01 11:26:49 -07:00
Brad Grantham
0cdabd22ad initial split mode implementation 2018-08-01 10:28:43 -07:00
Brad Grantham
e09d49c323 also send current clock to iterate 2018-08-01 09:29:41 -07:00
Brad Grantham
48be02beb0 add initial support for recording softswitch history by byte clock 2018-08-01 00:42:31 -07:00
Brad Grantham
55bbd69e28 move to per-clock mode setting history within frame
delete set_switches()

Pass history of mode settings to iterate()
2018-07-31 15:33:51 -07:00
Brad Grantham
9d5d4b4a35 initial floating bus implementation 2018-07-31 14:31:36 -07:00
Brad Grantham
94e1fc1c6d fix #23 by added fudge to texture sample
Another case sampling the wrong location fixed by adding vec2(.01, .01)...
2018-07-20 20:28:16 -07:00
Brad Grantham
a9aefa583a fix #25, terminate the pasted string with NUL
Allocate one more byte, and append a '\0'.

Whoops.
2018-07-20 20:21:57 -07:00
Brad Grantham
e9ac6136f8 fix #3, add .01 texel to texture sampling
Not sure why that works, need to look at texture coordinates...
2018-07-20 18:58:40 -07:00
Brad Grantham
93b1f14cee temporarily hack textport shader to work 2018-07-20 18:44:10 -07:00
Brad Grantham
3dbc37ba35 Port to Linux and fix gcc warnings
Introduce GLEW for GL extension management

Fix warnings about "&" used in logical-AND with precedence likely not matching programmer's intent

Fix a GL shader type incompatibility uint vs int in lores shader

Add Makefile.linux
2018-07-20 16:09:59 -07:00
Brad Grantham
4e4c9e5a48 Change some tuples to pairs and typedef for readability
Change every get_min_dimensions to return "width_height", which is
hopefully obviously a pair containing a width and height.

Change tuples in the writes map to "address_auxpage", which is
maybe a more descriptive type of a pair containing an address and an
aux page.

Inspired by http://maintainablecode.logdown.com/posts/158531-stdpair-considered-harmful
    I kind of cheated - I used std::pairs but gave them descriptive typedefs.
2017-01-18 16:48:00 -08:00
Brad Grantham
0075ee6b3f Change text and lores shaders from R8UI to RED
Last of the INTEGER textures.

Scale values up from textport so they can be interpreted as byte values.
2017-01-07 15:51:02 -08:00
Brad Grantham
6de05cefb2 Move font texture from R8UI to RED 2017-01-07 15:42:11 -08:00
Brad Grantham
7570a1c842 Move image and hires textures from R8UI to RED
Rename initialize_texture to initialize_texture_integer.

New function initialize_texture that loads a GL_RED texture, and
use it for hires and image shaders.

Don't scale texture values back to 0.0-1.0 in image and hires shaders.
2017-01-07 15:38:54 -08:00
Brad Grantham
7ce091c23e Remove some unnecessary subtrations of 0 2017-01-07 15:27:41 -08:00
Brad Grantham
4460274b75 Fix hires color shader 2017-01-07 15:13:30 -08:00
Brad Grantham
be750dfac4 Use 2D for hires, images textures; not RECTANGLE
Rename "texture" to "opengl_texture" for a touch more readability
and less ambiguity.

Switch hires and image textures to "opengl_texture".

Use coordinate scale for image textures and hires textures in shaders
and pass in as Uniforms
2017-01-07 14:51:29 -08:00
Brad Grantham
4a3dc4a9b7 Fix broken 80-column text 2017-01-07 14:35:00 -08:00
Brad Grantham
3863010d07 Move textport textures from RECTANGLE to 2D
Change initialize_texture to return an object containing width and
height, since the GUI uses textport textures of various sizes.

Add scale factors to text, text80, and lores shaders and set them as Uniforms.
2017-01-07 14:00:46 -08:00
Brad Grantham
c9113ece86 Change font texture from RECTANGLE to 2D
Make new texture function for making 2D textures instead of RECTANGLE
textures.

Pass in scale factor from texel coordinates to UV coordinates.

Change text and text80 fragment shaders to scale texel coordinates
to UV for sampler for font_texture.

Use sampler2D instead of sampler2DRect for font_texture
2017-01-07 13:32:35 -08:00
Brad Grantham
2e7f809bc9 Fix compile errors caused by moving to range for 2017-01-04 22:09:31 -08:00
Brad Grantham
30ec998252 Use range-for on containers 2017-01-03 09:41:38 -08:00
Brad Grantham
cb60985ef0 Move audio implementation into interface.cpp
Move all libao operation into interface.cpp
This should have the result of removing all AV and GUI code from apple2e.cpp
OS code remaining in apple2e.cpp should basically be only file I/O, console I/O, and chrono.
2016-12-26 22:28:45 -08:00
Brad Grantham
bf7961855f Reduce OpenGL texture download overhead a touch
Store all text and hgr writes in write() in a map.
Later, in apply_writes(), actually download all writes from the map.
This has the effect of downloading only the most recent write.
After implementation, this has the effect in FAST mode on my Mac of only reducing writes by between 0% and 4% in both QUADRADOODLE and LodeRunner.  So probably not worth it.  But maybe worth an interation on this which would mark rows and try to coalesce adjacent writes in X and Y to single texture updates.
2016-12-26 02:00:09 -08:00
Brad Grantham
81a4ab26bd resize to window, fix #3 2016-12-06 20:02:18 -08:00
Brad Grantham
15e0c797bd resize to fit window 2016-12-06 18:58:34 -08:00
Brad Grantham
f7b76a8631 center floppy icons 2016-12-06 00:16:43 -08:00
Brad Grantham
f1bd37a984 HGR colors, label floppy drives
New hirescolor fragment shader
2016-12-05 16:27:59 -08:00
Brad Grantham
66c8945d9f Provide cute floppy icons
New image shader
    Had so much trouble getting hires-like images (MSbit ignored) to work, finally gave up
2016-12-05 10:04:43 -08:00
Brad Grantham
ddf4655a43 Implement 80-column mode - ProDOS boots to 80 cols
Catch ALTCHAR but do nothing about it
Catch VID80 (80VID)
Add aux pages to interface.cpp
Plumb aux pages through apple2e.cpp display_write functions
Implement 80-column text shader using aux page
2016-12-04 22:07:00 -08:00
Brad Grantham
5418de45aa drag files onto screen to paste contents 2016-12-02 14:57:55 -08:00
Brad Grantham
96835e2400 Add drag-and-drop floppies, fix cold-start
On cold-start, force Button0/OpenApple on for a short period
    This is how cold-start (disk boot) is differentiated from plain RESET
Add padding widget that pads another widget on all sides
Add drag-and-drop functionality to widgets and manage through GLFW
Honor current time through all widget methods
Fix character encoding in text_widget (especially for ' ')
Add floppy_icon widget that manages drag-and-drop and drive motor (activity) light
    Later move to vector graphic or bitmap
Add floppy eject and insert notification from APPLE2Einterface
Add activity notification through APPLE2Einterface
Optimize with -O2
2016-12-02 10:42:22 -08:00
Brad Grantham
c5dc2ec782 Honor -fast in UI; lay groundwork for floppy UI 2016-12-01 12:03:40 -08:00
Brad Grantham
824459f575 support an initialization file that provides joystick mapping 2016-11-30 10:27:51 -08:00
Brad Grantham
067b3f4886 Gamepad (Samsung EI-GP20 tested) 2016-11-30 09:58:58 -08:00
Brad Grantham
ed8dfa33ea Rudimentary paddle support, fix audio stuttering
Mouse/Trackpad drag across the screen emulates paddles
Click on the screen emulates button 0
Ignore reads from C020 (tape out)
Add BRA instruction for 65C02 (maybe not necessary)
Disable audio in FAST mode
Throttle a little better when audio is enabled - stopped stutter
2016-11-29 22:17:17 -08:00
Brad Grantham
0687587428 Make all screen elements widgets
Widget for Apple 2 screen (graphics and textport)
Make box be vertical or horizontal
Add spacer widget
Fix calls to draw, click, drag, release to reflect whole screen being a widget
Fix #16
2016-11-29 13:16:20 -08:00