Skip to content

Commit

Permalink
Update rdemo
Browse files Browse the repository at this point in the history
  • Loading branch information
@bryce-carson
bryce-carson committed Nov 7, 2024
1 parent b7bb13a commit 29c259a
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 19 deletions.
2 changes: 1 addition & 1 deletion build/assets/rdemo.tic.dat
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0x78, 0xda, 0xbd, 0x54, 0x5d, 0x4f, 0xdb, 0x30, 0x14, 0xdd, 0xcb, 0x34, 0x29, 0xbf, 0xe2, 0x0e, 0x84, 0x94, 0x8c, 0x52, 0x9c, 0x38, 0x5f, 0xcd, 0xd8, 0x24, 0xc4, 0x8a, 0x86, 0xd6, 0x8d, 0x09, 0xba, 0xb1, 0x87, 0x3d, 0xd4, 0x71, 0x6c, 0x1a, 0x11, 0x92, 0x28, 0x71, 0xa1, 0xd5, 0xc4, 0x7f, 0x9f, 0xed, 0x24, 0x2d, 0x2d, 0x6c, 0xda, 0x24, 0xc4, 0xad, 0xd2, 0xeb, 0x73, 0xbf, 0xce, 0x89, 0x7b, 0xd5, 0x97, 0x77, 0xaf, 0x5e, 0x6c, 0x6f, 0x83, 0x48, 0x45, 0xc6, 0x22, 0x00, 0xb8, 0x24, 0xd7, 0xac, 0x41, 0x86, 0x0c, 0x93, 0x99, 0x98, 0x16, 0x55, 0xd4, 0x86, 0x13, 0x76, 0xc3, 0xb2, 0xa2, 0x64, 0x55, 0x0f, 0xd8, 0x35, 0x49, 0x33, 0xe9, 0x04, 0xed, 0xab, 0xba, 0x84, 0xd5, 0x54, 0x75, 0x43, 0x2d, 0xcb, 0x85, 0x86, 0x55, 0x5a, 0x8a, 0xb4, 0xc8, 0x55, 0xb6, 0x4e, 0x85, 0x9e, 0x0d, 0xb7, 0x2c, 0x56, 0x67, 0xc8, 0xd2, 0xfc, 0x4a, 0x25, 0xb2, 0x94, 0xb2, 0xbc, 0x96, 0xb9, 0xcf, 0x27, 0x63, 0x18, 0x35, 0x00, 0x4c, 0x3a, 0x25, 0xf9, 0xa5, 0x14, 0x31, 0x4d, 0x6b, 0x10, 0x05, 0x2c, 0x8a, 0x59, 0xd5, 0x55, 0x42, 0xc1, 0x81, 0x4e, 0x0b, 0x09, 0x2c, 0xd5, 0x7f, 0xc3, 0xaa, 0x5a, 0x72, 0x44, 0x80, 0xfa, 0xb6, 0x26, 0xd2, 0xac, 0x92, 0xaa, 0x32, 0x0c, 0x01, 0x07, 0x7b, 0x80, 0x8c, 0xb9, 0x72, 0x03, 0xdf, 0x58, 0x28, 0xef, 0xb8, 0x86, 0x71, 0x4d, 0xae, 0x58, 0x51, 0xf2, 0x5c, 0xe1, 0x9f, 0x26, 0xb7, 0xe4, 0xd7, 0xdc, 0x02, 0x76, 0x43, 0xb2, 0x7e, 0x49, 0x2a, 0x96, 0x0b, 0xb3, 0x9e, 0xc5, 0xb5, 0xbc, 0x81, 0x99, 0x60, 0xa6, 0xee, 0xe6, 0xe6, 0xbc, 0x07, 0xb6, 0x65, 0x59, 0x46, 0x9a, 0x53, 0x15, 0xe8, 0x46, 0x98, 0x93, 0xdd, 0x89, 0x65, 0x24, 0x6c, 0x23, 0xb8, 0x27, 0x83, 0xc6, 0x64, 0x7c, 0x72, 0xb4, 0x17, 0xa2, 0x89, 0x1e, 0x30, 0xcb, 0xa9, 0xba, 0x0b, 0xd3, 0x82, 0x5f, 0x06, 0xc8, 0xca, 0xb2, 0xcc, 0x16, 0xe6, 0xf1, 0xb7, 0x2f, 0xf0, 0x4e, 0xb2, 0xc7, 0x3d, 0x28, 0x2c, 0x48, 0x39, 0x98, 0xfd, 0xe1, 0x5c, 0xb0, 0x2a, 0x27, 0x99, 0xb9, 0x25, 0x42, 0xd4, 0x8f, 0x45, 0xbe, 0xd5, 0x83, 0xd8, 0xb2, 0xa0, 0xe8, 0x19, 0xd0, 0x19, 0x8a, 0xf0, 0x3d, 0x94, 0xa5, 0xb5, 0x30, 0xa5, 0x02, 0x73, 0x61, 0xf5, 0x40, 0xca, 0x53, 0x7e, 0x95, 0xd5, 0xa6, 0xb2, 0xf3, 0x36, 0x3b, 0x97, 0x6f, 0xf1, 0x56, 0xe6, 0x37, 0x98, 0x68, 0x56, 0x4b, 0x26, 0x1b, 0x3f, 0x96, 0xab, 0xcb, 0x6a, 0x6b, 0x7d, 0x64, 0x9a, 0x48, 0xdd, 0x36, 0xec, 0x82, 0x29, 0x60, 0x67, 0x07, 0x7c, 0x64, 0xc1, 0x3e, 0x60, 0x04, 0x6f, 0xc0, 0x59, 0x2f, 0xac, 0x29, 0xc9, 0x98, 0xac, 0xc5, 0xeb, 0x61, 0x79, 0x9b, 0x8b, 0xf5, 0x08, 0x2d, 0xb2, 0xa2, 0xba, 0x62, 0x0b, 0x35, 0xd7, 0x5d, 0x4f, 0xdd, 0xca, 0x98, 0xd3, 0x83, 0xa9, 0x72, 0x8f, 0xc9, 0x2b, 0xab, 0x34, 0x17, 0x52, 0xfc, 0xd6, 0xc7, 0xe1, 0x68, 0x74, 0x0a, 0x17, 0xa7, 0x67, 0xa3, 0x0f, 0xaf, 0x25, 0x0e, 0x5d, 0xf5, 0xe8, 0x0e, 0xf5, 0xe2, 0x42, 0x9e, 0xee, 0x0c, 0xb5, 0x23, 0x07, 0xe3, 0x93, 0xd1, 0xf0, 0xfc, 0xbd, 0x3a, 0x22, 0x64, 0x47, 0x8c, 0x76, 0x16, 0x6a, 0xa3, 0xa4, 0x31, 0x4a, 0x3a, 0xdc, 0xa6, 0xa5, 0x47, 0x8f, 0xf8, 0x66, 0x8e, 0x13, 0xe9, 0x1a, 0xc6, 0x98, 0xee, 0x91, 0x07, 0x35, 0x03, 0x51, 0x8d, 0xb5, 0x57, 0x1d, 0xaa, 0x1e, 0x69, 0x8f, 0x1e, 0xf8, 0x66, 0x0e, 0xfe, 0x2f, 0x3d, 0xf4, 0x8f, 0x7a, 0xdc, 0x7f, 0xd6, 0x43, 0xff, 0xa6, 0xc7, 0x0e, 0xa2, 0x15, 0x4f, 0xa7, 0x63, 0xf5, 0x90, 0xfb, 0xf1, 0xb0, 0xd5, 0x47, 0x11, 0x52, 0x73, 0x9b, 0xf7, 0x60, 0xed, 0x9c, 0x30, 0xd2, 0x3c, 0xa8, 0x29, 0x47, 0x2a, 0xd1, 0xea, 0x21, 0x1b, 0xbe, 0xd3, 0xab, 0xa7, 0x30, 0xad, 0x53, 0x39, 0xd6, 0xcc, 0x19, 0x3c, 0x8d, 0x1e, 0x07, 0x3d, 0x89, 0x9e, 0x83, 0xfd, 0x76, 0x97, 0x34, 0xb8, 0x38, 0xfc, 0xbe, 0xdc, 0x2b, 0x14, 0xa1, 0xd6, 0x78, 0x6b, 0x9b, 0xb8, 0xdb, 0x3f, 0x64, 0x3b, 0xd8, 0xf5, 0xfc, 0x20, 0x1c, 0x90, 0x98, 0x26, 0x8c, 0x73, 0x96, 0xd0, 0x98, 0x0c, 0xc2, 0xc0, 0xf7, 0x5c, 0xec, 0xd8, 0xa8, 0xdb, 0xaf, 0xcd, 0xba, 0x4d, 0xdc, 0xe8, 0x69, 0x35, 0x68, 0x70, 0x7e, 0xfc, 0xe3, 0x81, 0x9a, 0xe7, 0x36, 0x8c, 0xdc, 0xe5, 0xb9, 0x51, 0xa8, 0x55, 0xe9, 0xe3, 0xd7, 0xc3, 0xd1, 0x70, 0x3c, 0x1e, 0x2e, 0x35, 0xda, 0xc4, 0xa6, 0x0e, 0xf5, 0x12, 0x27, 0xf0, 0x92, 0xd8, 0xc6, 0xcc, 0xc3, 0x8c, 0x07, 0x89, 0x17, 0x70, 0x4e, 0x93, 0xc0, 0x23, 0x01, 0x47, 0x01, 0xc2, 0x61, 0x1c, 0xf8, 0xae, 0xe3, 0x05, 0x76, 0x30, 0x70, 0x06, 0xd8, 0xf7, 0x39, 0x8e, 0xbd, 0x84, 0x0e, 0x5c, 0x9b, 0xf8, 0xdc, 0x0f, 0x64, 0x07, 0x0f, 0xb8, 0xab, 0x3e, 0x03, 0x37, 0x46, 0xd4, 0xf1, 0x7c, 0x9f, 0x86, 0x3e, 0xc6, 0x98, 0x7a, 0x41, 0xc3, 0xbf, 0x64, 0x6d, 0xfe, 0x0b, 0xce, 0x0e, 0x8f, 0x3e, 0xad, 0x7e, 0x34, 0xfb, 0x59, 0x2e, 0xa5, 0x5d, 0x9d, 0x96, 0xfa, 0x37, 0x4e, 0x02, 0x02, 0x8f,
0x78, 0xda, 0xbd, 0x54, 0x6d, 0x6f, 0xd3, 0x30, 0x10, 0xe6, 0x0b, 0x42, 0xca, 0xaf, 0x38, 0x3a, 0x4d, 0x4a, 0x20, 0xeb, 0x9c, 0x38, 0xef, 0x0c, 0xa4, 0x69, 0x14, 0x98, 0x28, 0x1a, 0xda, 0x2a, 0xc6, 0x87, 0x7d, 0x98, 0xe3, 0x38, 0x6b, 0x44, 0x96, 0x84, 0xc4, 0xed, 0x5a, 0x21, 0x7e, 0x03, 0x7f, 0x19, 0xdb, 0x49, 0xda, 0xb5, 0x03, 0x34, 0xa4, 0x69, 0x57, 0x45, 0x77, 0xcf, 0xdd, 0xe3, 0xbb, 0xc7, 0xc9, 0xa9, 0x4f, 0x7f, 0x3d, 0x7b, 0xb2, 0xb3, 0x03, 0x3c, 0xe3, 0x39, 0x8b, 0x00, 0xe0, 0x8a, 0x5c, 0xb3, 0x16, 0x69, 0x22, 0x4d, 0x66, 0x7c, 0x5a, 0xd6, 0x51, 0x97, 0x4e, 0xd8, 0x9c, 0xe5, 0x65, 0xc5, 0x6a, 0x13, 0xd8, 0x35, 0xc9, 0x72, 0xe1, 0x38, 0x1d, 0x4a, 0x5e, 0xc2, 0x1a, 0x2a, 0x4f, 0x43, 0x23, 0xe8, 0x5c, 0xc1, 0x3a, 0xab, 0x78, 0x56, 0x16, 0xb2, 0xda, 0x64, 0x5c, 0xf5, 0x86, 0x1b, 0x16, 0xcb, 0x18, 0xf2, 0xac, 0xf8, 0x26, 0x0b, 0x79, 0x46, 0x59, 0xd1, 0x88, 0xda, 0xa7, 0xe3, 0x09, 0x8c, 0x5b, 0x00, 0x3a, 0x9d, 0x92, 0xe2, 0x4a, 0x88, 0x98, 0x66, 0x0d, 0xf0, 0x12, 0x96, 0xe5, 0xac, 0xee, 0x99, 0x50, 0xa6, 0x40, 0xa7, 0xa5, 0x00, 0x86, 0x3c, 0x3f, 0x67, 0x75, 0x23, 0x66, 0x44, 0x80, 0x86, 0x96, 0x1a, 0xa4, 0xa6, 0x8a, 0x51, 0xb5, 0xa6, 0x71, 0x38, 0xd8, 0x03, 0xa4, 0x2d, 0xa4, 0x0b, 0x3d, 0x6d, 0x29, 0xbd, 0xed, 0x68, 0x5a, 0x56, 0x50, 0x19, 0x5e, 0xe8, 0x0b, 0x03, 0xd8, 0x9c, 0xe4, 0xc3, 0x8a, 0xd4, 0xac, 0xe0, 0x7a, 0x33, 0x8b, 0x1b, 0x71, 0xef, 0x19, 0x67, 0xba, 0x3a, 0xb3, 0x80, 0x97, 0x60, 0x19, 0x86, 0x96, 0xb0, 0xfb, 0xf2, 0xf7, 0x14, 0x5f, 0xbb, 0x9c, 0x1c, 0x1f, 0xed, 0x05, 0xe8, 0x52, 0x26, 0xd3, 0x59, 0x41, 0xe5, 0x5b, 0xd0, 0x0d, 0xf8, 0xa1, 0x01, 0x5c, 0x93, 0xaa, 0xca, 0x97, 0xfa, 0x85, 0x1e, 0x9b, 0x50, 0x1a, 0x90, 0xa5, 0xa0, 0x0f, 0x47, 0x0b, 0xce, 0xea, 0x82, 0xe4, 0xfa, 0x20, 0xe6, 0xc5, 0xc0, 0x84, 0xd8, 0x68, 0xe7, 0xe8, 0xa5, 0x09, 0xc3, 0xf7, 0x79, 0x19, 0x93, 0x7c, 0x54, 0xcc, 0x0d, 0x53, 0x83, 0xde, 0x50, 0x84, 0x6f, 0xa1, 0x3c, 0x6b, 0xb8, 0xfe, 0x7d, 0x56, 0x0a, 0x1d, 0x42, 0xaa, 0xbe, 0x34, 0x0c, 0x13, 0x5a, 0x28, 0x6e, 0xaa, 0xe0, 0x9a, 0xab, 0x6c, 0xcd, 0x5d, 0x6c, 0x72, 0x05, 0x34, 0x8c, 0x57, 0x82, 0x7d, 0x4b, 0x13, 0xcd, 0x1b, 0xa1, 0xc9, 0xc2, 0xdb, 0xf9, 0xa6, 0xaa, 0x07, 0x9b, 0x8d, 0xb3, 0x04, 0x5e, 0x83, 0x25, 0x5e, 0x9a, 0xce, 0x61, 0x77, 0x17, 0x3c, 0x64, 0xc0, 0x3e, 0x60, 0x04, 0x2f, 0xc0, 0xde, 0x24, 0x36, 0x94, 0xe4, 0x4c, 0x70, 0xf1, 0x66, 0x7a, 0x61, 0xc2, 0x72, 0x33, 0x43, 0xcb, 0xbc, 0xac, 0xbf, 0xb1, 0xa5, 0xec, 0xeb, 0x6c, 0x96, 0x6e, 0x44, 0xce, 0x36, 0x61, 0x2a, 0xdd, 0xb6, 0xb4, 0xaa, 0xce, 0x0a, 0x2e, 0x44, 0x0f, 0x3e, 0x8c, 0xc6, 0xe3, 0x13, 0x38, 0x3f, 0x39, 0x1d, 0xbf, 0x7d, 0x2e, 0x70, 0xe0, 0xc8, 0x47, 0xb1, 0xe5, 0x6d, 0xb9, 0x88, 0x7e, 0x6a, 0x72, 0x6b, 0x0e, 0x26, 0xc7, 0xe3, 0xd1, 0xd9, 0x1b, 0x19, 0x22, 0x64, 0x45, 0x8c, 0xf6, 0x16, 0x28, 0xa3, 0xa4, 0x35, 0x4a, 0x7a, 0xdc, 0x95, 0x85, 0x47, 0x7f, 0xf0, 0x6d, 0x1f, 0x3b, 0x52, 0x1c, 0xc6, 0x98, 0x3a, 0x23, 0x02, 0xd9, 0x03, 0x51, 0x85, 0x95, 0x97, 0x27, 0x24, 0x1f, 0x29, 0x8f, 0xee, 0xf8, 0xb6, 0x0f, 0xfe, 0x2f, 0x3d, 0xf4, 0xaf, 0x7a, 0x9c, 0x7b, 0xeb, 0xa1, 0xff, 0xd2, 0x63, 0xf9, 0xd1, 0x7a, 0x4e, 0xaf, 0x63, 0xfd, 0x90, 0xdb, 0xf9, 0xa0, 0xd3, 0x47, 0x11, 0x92, 0x7d, 0xdb, 0x7b, 0xb0, 0xae, 0x4f, 0x10, 0xa9, 0x39, 0xa8, 0xa5, 0x23, 0x59, 0xe8, 0xf4, 0x90, 0x2d, 0xdf, 0xeb, 0x55, 0x5d, 0x98, 0xd2, 0x29, 0x1d, 0x6b, 0xfb, 0x84, 0x0f, 0xa3, 0xc7, 0x46, 0x0f, 0xa2, 0xe7, 0x60, 0xbf, 0xdb, 0x25, 0x05, 0xce, 0x0f, 0xbf, 0xac, 0xf6, 0x0a, 0x45, 0xa8, 0xb3, 0xb4, 0xb3, 0x6d, 0xdc, 0xef, 0x1f, 0xb2, 0x6c, 0xec, 0xb8, 0x9e, 0x1f, 0x84, 0x24, 0xa6, 0x09, 0x4b, 0x53, 0x96, 0xd0, 0x98, 0x84, 0x81, 0xef, 0xb9, 0x0e, 0xb6, 0x2d, 0xd4, 0xef, 0xd7, 0x36, 0x6f, 0x1b, 0xb7, 0x7a, 0x3a, 0x0d, 0x0a, 0x9c, 0xbd, 0xfb, 0x7a, 0x47, 0xcd, 0x63, 0x1b, 0x46, 0xce, 0x2a, 0x6e, 0x15, 0x2a, 0x55, 0x2a, 0xfc, 0x7c, 0x38, 0x1e, 0x4d, 0x26, 0xa3, 0x95, 0x46, 0x8b, 0x58, 0xd4, 0xa6, 0x6e, 0x62, 0xfb, 0x6e, 0x12, 0x5b, 0x98, 0xb9, 0x98, 0xa5, 0x7e, 0xe2, 0xfa, 0x69, 0x4a, 0x13, 0xdf, 0x25, 0x7e, 0x8a, 0x7c, 0x84, 0x83, 0xd8, 0xf7, 0x1c, 0xdb, 0xf5, 0x2d, 0x3f, 0xb4, 0x43, 0xec, 0x79, 0x29, 0x8e, 0xdd, 0x84, 0x86, 0x8e, 0x45, 0xbc, 0xd4, 0xf3, 0xc5, 0x89, 0xd4, 0x4f, 0x1d, 0xf9, 0x0b, 0x9d, 0x18, 0x51, 0xdb, 0xf5, 0x3c, 0x1a, 0x78, 0x18, 0x63, 0xea, 0xfa, 0xed, 0xfc, 0xd5, 0xd4, 0xf6, 0xbf, 0xe0, 0xf4, 0xf0, 0xe8, 0xe3, 0xfa, 0xa3, 0x59, 0x8f, 0xf2, 0x52, 0xba, 0xd5, 0xe9, 0x46, 0xff, 0x06, 0xe8, 0xf2, 0x0a, 0xeb,
17 changes: 8 additions & 9 deletions demos/rdemo.r
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,22 @@ t <- 0
x <- 96
y <- 24

makeopfn <- \(f) \(x) eval.parent(substitute(x <- f(x, 1)))
inc <- makeopfn(`+`)
dec <- makeopfn(`-`)
inc <- \(x) eval.parent(substitute(x <- x + 1))
dec <- \(x) eval.parent(substitute(x <- x - 1))

`TIC-80` <- function() {
mapply(FUN = \(b, o) if (.External("t80.btn", b)) o,
mapply(\(b, o) if (.External("btn", b)) eval(o, .GlobalEnv),
0:3,
list(dec(y), inc(y),
dec(x), inc(x)));
.External("t80.cls", 13);
.External("t80.spr",
list(quote(dec(y)), quote(inc(y)),
quote(dec(x)), quote(inc(x))));
.External("cls", 13);
.External("spr",
id = 1 + (t %% 60) / 30 * 2,
scale = 3,
x, y,
colorkey = 14,
w = 2, h = 2);
.External("t80.print", "HELLO WORLD!", 84, 84);
.External("print", "HELLO WORLD!", 84, 84);
inc(t);
}

Expand Down
17 changes: 8 additions & 9 deletions src/api/r.org
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1935,23 +1935,22 @@ convention).
x <- 96
y <- 24

makeopfn <- \(f) \(x) eval.parent(substitute(x <- f(x, 1)))
inc <- makeopfn(`+`)
dec <- makeopfn(`-`)
inc <- \(x) eval.parent(substitute(x <- x + 1))
dec <- \(x) eval.parent(substitute(x <- x - 1))

`TIC-80` <- function() {
mapply(FUN = \(b, o) if (.External("t80.btn", b)) o,
mapply(\(b, o) if (.External("btn", b)) eval(o, .GlobalEnv),
0:3,
list(dec(y), inc(y),
dec(x), inc(x)));
.External("t80.cls", 13);
.External("t80.spr",
list(quote(dec(y)), quote(inc(y)),
quote(dec(x)), quote(inc(x))));
.External("cls", 13);
.External("spr",
id = 1 + (t %% 60) / 30 * 2,
scale = 3,
x, y,
colorkey = 14,
w = 2, h = 2);
.External("t80.print", "HELLO WORLD!", 84, 84);
.External("print", "HELLO WORLD!", 84, 84);
inc(t);
}

Expand Down

0 comments on commit 29c259a

Please sign in to comment.