Commit Graph

1101 Commits

Author SHA1 Message Date
Simon Forman 87aef6f06d It seems to be working.
It took all expletive-deleted day but I finally nailed it down.  In the
end the last bug was I was decrementing a stack pointer /after/ trying
to load the item at the (empty) top of the stack.  Classic.

I still need to make it not re-allocate strings that it has already
interned, but beyond that I think it's fine.
2023-03-04 17:48:26 -08:00
Simon Forman 9cde4ed73d tokenate() and reverse_list_in_place() 2023-03-04 17:23:54 -08:00
Simon Forman dfd8f86e7b Use symbols for tokens for brackets.
Try a different tack on the parser.
2023-03-04 15:48:55 -08:00
Simon Forman 8b1db4bea7 Almost working parser. 2023-03-04 11:59:19 -08:00
Simon Forman 5ee30a70f9 Minor cleanup.
Some printing to see the machinery in action.
2023-03-04 08:31:40 -08:00
Simon Forman fc5992c23b Joy parser in NCC. 2023-03-04 08:25:32 -08:00
Simon Forman cf37e52550 A start on error handling. 2023-03-03 19:23:15 -08:00
Simon Forman 7284a7fcf3 Double hashing w/ extra bits of hash. 2023-03-03 14:52:26 -08:00
Simon Forman d8571d2063 A start on a hash table for symbols. 2023-03-03 12:05:40 -08:00
Simon Forman fd2ba3b67d Joy in UVM NCC code. 2023-03-03 07:31:52 -08:00
Simon Forman 5b6185209a A bunch of stuff. 2023-03-03 07:30:55 -08:00
Simon Forman f87ddbfa9e Minor cleanup. 2023-02-28 07:45:38 -08:00
Simon Forman 5423e0b239 Use defines to abstract font choice.
Clunky but now you only have to change the font name four time in one
place rather than N times in N places, eh?

Writing C again for the first time in ages (this and the Joy
interpreter) the using the preprocessor is like stone-age
meta-programming, from the lens of lisp it's like, "you do what to your
source code?".
2023-02-28 07:14:33 -08:00
Simon Forman 144e73ebc3 A different font.
It's easy enough to substitute a different font in the call to
Imagemagick's `convert` tool, but in the case of pixel fonts, it will
scale them, so you're not getting a proper bitmap of the pixels, you're
getting a kind of screenshot of the pixels.

I want to make a different machinery for bitmapped pixel fonts, and I
want to make a simple DEFINE-based way to pick them without having to
edit your source code,  e.g. #define font_data font_PublicPixel_22_data
yeah?

After that, simple affine transforms for fake 3D..
2023-02-28 06:53:31 -08:00
Simon Forman 58f779c430 Wu-ish lines. 2023-02-27 19:27:32 -08:00
Simon Forman 300cf2f24d Mostly working Wu-ish algorithm. 2023-02-27 16:29:45 -08:00
Simon Forman ee8ba58441 Minor cleanup. 2023-02-26 21:46:05 -08:00
Simon Forman 61527f3e64 Cicada bg, needs work.
Not as pretty as I'd hoped.

Putting a pin in Wu lines for tonight.  I'll lick it in the morning when
I'm fresh.
2023-02-26 21:02:57 -08:00
Simon Forman 2c6dc4fee5 I clearly don't know what I'm doing.
Go to sleep!  Think, then type!
2023-02-26 20:39:32 -08:00
Simon Forman 42068ebcb6 Is this fun? Kinda.
I should break out the graph papaer and Abrash's Black Book and figure
out WTF I'm doing rather than just noodling around, eh?
2023-02-26 20:02:14 -08:00
Simon Forman 66d687bba6 Horizontal proto-Wu. 2023-02-26 19:06:15 -08:00
Simon Forman d8e20c0ce9 Horz/vert lines and boxes. 2023-02-26 18:07:47 -08:00
Simon Forman c385ad096b Aw, exit() doesn't work?
In any event, I can live with esc-to-quit (is there a callback to hook
into?)
2023-02-26 16:55:53 -08:00
Simon Forman e18eb36c52 But KEY_BACKSPACE doesn't seem to fire?
Maybe worth a bug report?
2023-02-26 16:53:41 -08:00
Simon Forman 50e34c70cb Ha ha! The escape-to-quit behavior...
...seems to be baked into the UVM.
2023-02-26 16:52:02 -08:00
Simon Forman f8f27ed83e Add if..else ladder for keys.
I just noticed that I have KEY_BACKSPACE for the exit key rather than
KEY_ESCAPE as I had thought, yet escape key surely does exit the
program!
2023-02-26 16:49:11 -08:00
Simon Forman e1c81d2c1c Escape key exits program. 2023-02-26 16:27:23 -08:00
Simon Forman 14e15b08a1 minor edits
I don't think this is any better?
2023-02-26 16:04:54 -08:00
Simon Forman 2b07553aa1 Draw chars when you click.
Pick a letter at random.

I wasn't checking that the destination values were not less than zero,
which let you click at the top/left edges of the screen and therefore
the carefree_alpha_blend_blit() would try to write to areas outside the
framebuffer.  I started to see "zalgol" pixels in the letters, so I'm
guessing the pixel data is getting stored just above the framebuffer,
which makes sense (because that's the order they appear in the source
code and this is a simple system!)  When you click at the top of the
screen it was writing pixels in the font data, eh?  Then when you click
elsewhere on the screen you get extra pixels with your letterforms and
it looks like Unicode Lovecraft puns.
2023-02-26 15:24:40 -08:00
Simon Forman 9ca4f81325 A sort of blit. 2023-02-26 15:06:30 -08:00
Simon Forman d7db105bc8 Depend on graphics.h. 2023-02-26 13:24:34 -08:00
Simon Forman dbc2fe5854 Move draw_background to own file graphics.h. 2023-02-26 13:20:38 -08:00
Simon Forman 27385e5319 Switch font size to 22.
My old eyes ain't what they used to be.
2023-02-26 13:09:02 -08:00
Simon Forman f7b644d210 Minor cleanup. 2023-02-26 13:04:04 -08:00
Simon Forman 057743c473 Try changing the font size. 2023-02-26 12:42:39 -08:00
Simon Forman f403b6caa2 Display font in anti-aliased glory! 2023-02-26 11:23:32 -08:00
Simon Forman 84f163b71c Alpha blend font FTW! 2023-02-26 11:21:18 -08:00
Simon Forman 2680d8ce1b Okay, alright, skipping blank pixels. 2023-02-26 11:12:07 -08:00
Simon Forman 051b9a46b8 We have a character on the screen!
It looks like potato because no alpha blending yet, but it's certainly
there!  I don't like the spelling of the C code, but who cares?  It
works.
2023-02-26 11:07:29 -08:00
Simon Forman 5d01480f3d A start on draw_char(). 2023-02-26 10:52:09 -08:00
Simon Forman c886a27ddd Rename anim_callback to draw_background
because that's what it is
2023-02-26 10:18:46 -08:00
Simon Forman fc8920a09c i can haz font data
ooo that's a finicky parser tho

Early days.  It's all good.

(But damn those Rust tracebacks, what a useless pile of text.  i know
the problem is in the parser!?  why is it showing me all the rust
internal crap and none of the actual stack trace of the ncc code?  I
mean, look at this thing:

    sforman@bock:~/src/Joypy/implementations/uvm-ncc % setenv RUST_BACKTRACE full
    sforman@bock:~/src/Joypy/implementations/uvm-ncc % gmake
    cd /home/sforman/src/uvm/ncc ; cargo run /home/sforman/src/Joypy/implementations/uvm-ncc/xerblin.c
        Finished dev [unoptimized + debuginfo] target(s) in 0.01s
         Running `target/debug/ncc /home/sforman/src/Joypy/implementations/uvm-ncc/xerblin.c`
    thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: ParseError { msg: "expected identifier", line_no: 139, col_no: 20 }', src/main.rs:98:43
    stack backtrace:
       0:          0x10d741f - <std::sys_common::backtrace::_print::DisplayBacktrace as core::fmt::Display>::fmt::h919bef3d5abebde9
       1:          0x10ee08e - core::fmt::write::h6413343c5226105f
       2:          0x10bce85 - std::io::Write::write_fmt::had0ddcb25461208f
       3:          0x10d71d5 - std::sys_common::backtrace::print::h5ed9962f90e9b258
       4:          0x10c6eff - std::panicking::default_hook::{{closure}}::h3978a8a8f5c1f893
       5:          0x10c6b91 - std::panicking::default_hook::h0cdbdd5201407347
       6:          0x10c75bb - std::panicking::rust_panic_with_hook::h15bc8b6da20c2af3
       7:          0x10d7777 - std::panicking::begin_panic_handler::{{closure}}::h082a693f9436206b
       8:          0x10d756c - std::sys_common::backtrace::__rust_end_short_backtrace::h56343aa2331ff455
       9:          0x10c7142 - rust_begin_unwind
      10:          0x10ed3d3 - core::panicking::panic_fmt::hf18d1d226927e137
      11:          0x10efa93 - core::result::unwrap_failed::ha5725a0b4539229c
      12:          0x105b505 - core::result::Result<T,E>::unwrap::h0f336a18a308049e
                                   at /wrkdirs/usr/ports/lang/rust/work/rustc-1.66.0-src/library/core/src/result.rs:1113:23
      13:          0x1068314 - ncc::main::h189929cbc5450262
                                   at /usr/home/sforman/src/uvm/ncc/src/main.rs:98:20
      14:          0x10611cb - core::ops::function::FnOnce::call_once::h8146a3c8fa28ca14
                                   at /wrkdirs/usr/ports/lang/rust/work/rustc-1.66.0-src/library/core/src/ops/function.rs:251:5
      15:          0x106e13e - std::sys_common::backtrace::__rust_begin_short_backtrace::h4e9f285841c55b79
                                   at /wrkdirs/usr/ports/lang/rust/work/rustc-1.66.0-src/library/std/src/sys_common/backtrace.rs:121:18
      16:          0x1069fa1 - std::rt::lang_start::{{closure}}::h8ca60a785648e691
                                   at /wrkdirs/usr/ports/lang/rust/work/rustc-1.66.0-src/library/std/src/rt.rs:166:18
      17:          0x10c1514 - std::rt::lang_start_internal::hadf3843363799440
      18:          0x1069f7a - std::rt::lang_start::h3ee6ffb894d9f1d3
                                   at /wrkdirs/usr/ports/lang/rust/work/rustc-1.66.0-src/library/std/src/rt.rs:165:17
      19:          0x10684ee - main
      20:          0x104f472 - _start
                                   at /usr/src/lib/csu/amd64/crt1.c:76:7
    gmake: *** [GNUmakefile:11: /home/sforman/src/uvm/ncc/out.asm] Error 101

There's ONE LINE from the ncc source: uvm/ncc/src/main.rs:98:20 which is a call
to parse_unit, but it's the following unwrap that seems to be causing the error
message?
2023-02-26 10:11:58 -08:00
Simon Forman 3d419a3330 This compiles. 2023-02-26 10:06:39 -08:00
Simon Forman 843654861b I think I got it. 2023-02-26 10:01:40 -08:00
Simon Forman 7a289db111 Adding a function and it still compiles. 2023-02-26 09:39:21 -08:00
Simon Forman f5f6233302 This compiles and runs, include font.h but don't call init_font_data() yet. 2023-02-26 09:37:59 -08:00
Simon Forman 8c5e9aa105 So far... 2023-02-26 09:37:20 -08:00
Simon Forman b013168679 Drawing pixel per mouse move is slow at 1280x800.
So let's just use a smaller screen for now, eh?
2023-02-26 08:52:53 -08:00
Simon Forman e047af09b3 Repair damage during mouse move.
This is a compromise between updating the screen every frame (which
takes ~60% CPU on my old no-GPU hardware) and repairing damage from e.g.
dragging offscreen and back on, or covering and uncovering the window
with another window.
2023-02-26 08:42:37 -08:00
Simon Forman c48f1797b4 Ignore tryrax binary. 2023-02-26 07:58:18 -08:00