diff --git a/.gitignore b/.gitignore index 28ec657..2701f1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1,32 @@ -build -.vscode -*.bmp !images/* +*.bmp *.cache -.deps -Makefile +*.gch *.log *.o +*.out +*.pkg.tar.zst +*.tar.gz +*.txt +!default/sentences.txt +.deps .dirstamp +.vscode +Makefile +Makefile.in aclocal.m4 +build compile +confdeps.* +config.status +configure +configure~ +conftest.* +depcomp +draft/ +error.glsl +forge +forge-* install-sh missing -depcomp -Makefile.in -configure~ -config.status -forge -*.tar.gz -configure -*.pkg.tar.zst pkg -forge-* -confdeps.* -conftest.* -*.txt -error.glsl -draft/ -*.gch -*.out diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 1fb3e5c..f594769 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -9,7 +9,7 @@ Commands/Targets: help show this message init init project clean clean build artifacts -full-clean remove any unversioned file +full-clean remove any residual files build build project build-no-video build project no video in run run project with $RUN_ARGS @@ -35,6 +35,7 @@ prepare-configure-% sed -i {version} configure.ac prepare-pkgbuild-% sed -i {version} PKGBUILD git-commit-release git commit -am "forge (steel) v{version}" makepkg makepkg +glsl-glyphs glsl-glyphs ``` ## Release guide diff --git a/Makefile.dev b/Makefile.dev index 47e3fa2..e4e7e99 100644 --- a/Makefile.dev +++ b/Makefile.dev @@ -26,6 +26,17 @@ MAKEPKG ?= makepkg INSTALL_DIR ?= $(HOME)/.local/bin +ifeq (,$(shell which uv)) + ifeq (,$(shell python3 -m uv --help||python3 -m pip install --user uv)) # detect uv install + UV ?= false + endif + UV ?= python3 -m uv +endif + +UV ?= uv +GLSL_GLYPHS_DIR ?= glsl-glyphs +GLSL_GLYPHS ?= $(UV) run --directory $(GLSL_GLYPHS_DIR) glsl-glyphs + # DOCS .PHONY: help @@ -48,6 +59,12 @@ $(BUILD_DIR)/$(TARGET): mkdir -p $(BUILD_DIR) $(CC) $(SOURCES) $(CFLAGS) $(EXTRA_CFLAGS) $(LDLIBS) -o $(BUILD_DIR)/$(TARGET) +default/inc_cp437.glsl: + $(MAKE) glsl-glyphs + +default/inc_sentences.glsl: default/sentences.txt + $(MAKE) glsl-glyphs + # ACTIONS .PHONY: init @@ -175,3 +192,17 @@ makepkg: ## makepkg mkdir -p $(BUILD_DIR) cp PKGBUILD $(BUILD_DIR) cd $(BUILD_DIR) && $(MAKEPKG) + +.PHONY: glsl-glyphs +glsl-glyphs: ## glsl-glyphs + $(GLSL_GLYPHS) \ + --name cp437 \ + --functions \ + --includes \ + --add-all \ + --input sample/cp437_8x8.png \ + --glyph-names sample/cp437_names.txt \ + --sets sample/cp437_sets.csv \ + --output ../default/inc_cp437.glsl \ + --sentences-input ../default/sentences.txt \ + --sentences-output ../default/inc_sentences.glsl diff --git a/default/frag9.glsl b/default/frag9.glsl index 3389126..912f5b7 100644 --- a/default/frag9.glsl +++ b/default/frag9.glsl @@ -7,7 +7,7 @@ in vec2 vUV; out vec4 fragColor; #include inc_map.glsl -#include inc_cp437.glsl +#include inc_write.glsl uniform sampler2D iTex0; uniform vec3 iGroup2_4[7]; diff --git a/default/inc_cp437.glsl b/default/inc_cp437.glsl index b3a8653..84c4a73 100644 --- a/default/inc_cp437.glsl +++ b/default/inc_cp437.glsl @@ -1,410 +1,305 @@ -#include inc_sentences.glsl - #ifndef INC_CP437 #define INC_CP437 -const int cp437[] = int[1024]( - 0x0000, 0x0000, 0x0000, 0x0000, // 0x00, NUL - 0x151E, 0x8A87, 0xE19D, 0x789B, // 0x01, SOH, SMILEY BLACK - 0xFBFE, 0xFDF7, 0xEF73, 0x7FEC, // 0x02, STX, SMILEY LIGHT - 0xFFF6, 0x7773, 0x08CE, 0x0013, // 0x03, ETX, HEART - 0xFEC8, 0x7310, 0x08CE, 0x0013, // 0x04, EOT, DIAMOND - 0xFCEC, 0x7131, 0xECEF, 0x3137, // 0x05, ENQ, CLUB - 0xEC88, 0x3100, 0xECEF, 0x3137, // 0x06, ACK, SPADE - 0xC800, 0x3100, 0x008C, 0x0013, // 0x07, BEL, DOT - 0x37FF, 0xCEFF, 0xFF73, 0xFFEC, // 0x08, BS, INVERT DOT - 0x26C0, 0x4630, 0x0C62, 0x0364, // 0x09, HT, CIRCLE - 0xD93F, 0xB9CF, 0xF39D, 0xFC9B, // 0x0A, LF, INVERT CIRCLE - 0xE000, 0xBFEF, 0xE333, 0x1333, // 0x0B, VT, MALE - 0x666C, 0x6663, 0x8E8C, 0x1713, // 0x0C, FF, FEMALE - 0xCCCC, 0x0FCF, 0x7FEC, 0x0000, // 0x0D, CR, NOTE - 0x6E6E, 0xCFCF, 0x3766, 0x06EC, // 0x0E, SO, DOUBLE NOTE - 0x7CA9, 0xE359, 0x9AC7, 0x953E, // 0x0F, SI, SUN - 0xFF71, 0x7100, 0x017F, 0x0001, // 0x10, DLE, RIGHT TRIANGLE - 0xFC00, 0x7774, 0x000C, 0x0477, // 0x11, DC1, LEFT TRIANGLE - 0x8EC8, 0x1731, 0x8CE8, 0x1371, // 0x12, DC2, ARROW UP DOWN - 0x6666, 0x6666, 0x0606, 0x0606, // 0x13, DC3, DOUBLE EXCLAMATION - 0xEBBE, 0xDDDF, 0x0888, 0x0DDD, // 0x14, DC4, PARAGRAPH - 0x6C6C, 0x31C7, 0xE3C6, 0x1313, // 0x15, NAK, ? - 0x0000, 0x0000, 0x0EEE, 0x0777, // 0x16, SYN, HALF SQUARE BOTTOM - 0x8EC8, 0x1731, 0xF8CE, 0xF137, // 0x17, ETB, ARROW UP DOWN UNDERLINED - 0x8EC8, 0x1731, 0x0888, 0x0111, // 0x18, CAN, ARROW UP - 0x8888, 0x1111, 0x08CE, 0x0137, // 0x19, EM, ARROW DOWN - 0xF080, 0x7310, 0x0080, 0x0013, // 0x1A, SUB, ARROW RIGHT - 0xF6C0, 0x7000, 0x00C6, 0x0000, // 0x1B, ESC, ARROW LEFT - 0x3300, 0x0000, 0x00F3, 0x0070, // 0x1C, FS, ? - 0xF640, 0xF620, 0x0046, 0x0026, // 0x1D, GS, ARROW LEFT RIGHT - 0xEC80, 0x7310, 0x00FF, 0x00FF, // 0x1E, RS, TRIANGLE UP - 0xEFF0, 0x7FF0, 0x008C, 0x0013, // 0x1F, US, TRIANGLE DOWN +#define CP437_COUNT 256 + +const int cp437_glyphs[] = int[1024]( + 0x0000, 0x0000, 0x0000, 0x0000, // 0x00, EMPTY + 0x151E, 0x8A87, 0xE19D, 0x789B, // 0x01, SMILEY BLACK + 0xFBFE, 0xFDF7, 0xEF73, 0x7FEC, // 0x02, SMILEY LIGHT + 0xFFF6, 0x7773, 0x08CE, 0x0013, // 0x03, HEART + 0xFEC8, 0x7310, 0x08CE, 0x0013, // 0x04, DIAMOND + 0xFCEC, 0x7131, 0xC8BF, 0x1067, // 0x05, CLUB + 0xFEC8, 0x7310, 0xC8AF, 0x1027, // 0x06, SPADE + 0xC800, 0x3100, 0x008C, 0x0013, // 0x07, DOT + 0x37FF, 0xCEFF, 0xFF73, 0xFFEC, // 0x08, INVERT DOT + 0x26C0, 0x4630, 0x0C62, 0x0364, // 0x09, CIRCLE + 0xD93F, 0xB9CF, 0xF39D, 0xFC9B, // 0x0A, INVERT CIRCLE + 0xE000, 0xBFEF, 0xE333, 0x1333, // 0x0B, MALE + 0x666C, 0x6663, 0x8E8C, 0x1713, // 0x0C, FEMALE + 0xCCCC, 0x0767, 0x7FEC, 0x0000, // 0x0D, NOTE + 0x6E6E, 0x6767, 0x3766, 0x0376, // 0x0E, DOUBLE NOTE + 0xCFB8, 0x3FD1, 0x08BF, 0x01DF, // 0x0F, SUN + 0xEE60, 0x7100, 0x06EE, 0x0017, // 0x10, RIGHT TRIANGLE + 0xE800, 0x7760, 0x008E, 0x0677, // 0x11, LEFT TRIANGLE + 0x8EC8, 0x1731, 0x8CE8, 0x1371, // 0x12, ARROW UP DOWN + 0x6666, 0x3333, 0x0606, 0x0303, // 0x13, DOUBLE EXCLAMATION + 0xEBBE, 0xDDDF, 0x0888, 0x0DDD, // 0x14, PARAGRAPH + 0x6C6C, 0x6387, 0xE1C6, 0x3636, // 0x15, ? + 0x0000, 0x0000, 0x0EE0, 0x0770, // 0x16, HALF SQUARE BOTTOM + 0x8EC8, 0x1731, 0xF8CE, 0xF137, // 0x17, ARROW UP DOWN UNDERLINED + 0xEC80, 0x7310, 0x0888, 0x0111, // 0x18, ARROW UP + 0x8880, 0x1110, 0x08CE, 0x0137, // 0x19, ARROW DOWN + 0xE000, 0x7310, 0x000E, 0x0137, // 0x1A, ARROW RIGHT + 0xEC80, 0x7000, 0x08CE, 0x0007, // 0x1B, ARROW LEFT + 0x6000, 0x0000, 0x00E6, 0x0070, // 0x1C, ? + 0xF640, 0xF620, 0x046F, 0x026F, // 0x1D, ARROW LEFT RIGHT + 0xC880, 0x3110, 0x0EEC, 0x0773, // 0x1E, TRIANGLE UP + 0xCEE0, 0x3770, 0x088C, 0x0113, // 0x1F, TRIANGLE DOWN 0x0000, 0x0000, 0x0000, 0x0000, // 0x20, SPACE - 0xCEEC, 0x0110, 0x0C0C, 0x0000, // 0x21, ! - 0x0666, 0x0333, 0x0000, 0x0000, // 0x22, " + 0x8CC8, 0x1331, 0x0808, 0x0101, // 0x21, ! + 0x0466, 0x0133, 0x0000, 0x0000, // 0x22, " 0x6F66, 0x3733, 0x066F, 0x0337, // 0x23, # - 0xE3EC, 0x1030, 0x0CF0, 0x0013, // 0x24, $ + 0xC6C8, 0x3071, 0x08E0, 0x0136, // 0x24, $ 0x8330, 0x1360, 0x036C, 0x0660, // 0x25, % 0xEC6C, 0x6131, 0x0E3B, 0x0633, // 0x26, & - 0x0366, 0x0000, 0x0000, 0x0000, // 0x27, ' + 0x0C88, 0x0011, 0x0000, 0x0000, // 0x27, ' 0x66C8, 0x0001, 0x08C6, 0x0100, // 0x28, ( 0x88C6, 0x1100, 0x06C8, 0x0001, // 0x29, ) - 0xFC60, 0xF360, 0x006C, 0x0063, // 0x2A, * - 0xFCC0, 0x3000, 0x00CC, 0x0000, // 0x2B, + - 0x0000, 0x0000, 0x6CC0, 0x0000, // 0x2C, , - 0xF000, 0x3000, 0x0000, 0x0000, // 0x2D, - - 0x0000, 0x0000, 0x0CC0, 0x0000, // 0x2E, . - 0xC800, 0x0136, 0x0136, 0x0000, // 0x2F, / - 0xB33E, 0x7763, 0x0E7F, 0x0366, // 0x30, 0 - 0xCCEC, 0x0000, 0x0FCC, 0x0300, // 0x31, 1 - 0xC03E, 0x1331, 0x0F36, 0x0330, // 0x32, 2 - 0xC03E, 0x1331, 0x0E30, 0x0133, // 0x33, 3 - 0x36C8, 0x3333, 0x080F, 0x0737, // 0x34, 4 - 0x0F3F, 0x3103, 0x0E30, 0x0133, // 0x35, 5 - 0xF36C, 0x1001, 0x0E33, 0x0133, // 0x36, 6 - 0x803F, 0x1333, 0x0CCC, 0x0000, // 0x37, 7 - 0xE33E, 0x1331, 0x0E33, 0x0133, // 0x38, 8 - 0xE33E, 0x3331, 0x0E80, 0x0013, // 0x39, 9 - 0x0CC0, 0x0000, 0x0CC0, 0x0000, // 0x3A, : - 0x0CC0, 0x0000, 0x6CC0, 0x0000, // 0x3B, ; - 0x36C8, 0x0001, 0x08C6, 0x0100, // 0x3C, < - 0x0F00, 0x0300, 0x00F0, 0x0030, // 0x3D, = + 0xFC60, 0x7130, 0x006C, 0x0031, // 0x2A, * + 0xE880, 0x7110, 0x0088, 0x0011, // 0x2B, + + 0x0000, 0x0000, 0xC880, 0x0110, // 0x2C, , + 0xE000, 0x7000, 0x0000, 0x0000, // 0x2D, - + 0x0000, 0x0000, 0x0880, 0x0110, // 0x2E, . + 0xC800, 0x1376, 0x037E, 0x0000, // 0x2F, / + 0xE66C, 0x7763, 0x0C6E, 0x0366, // 0x30, 0 + 0x88E8, 0x1111, 0x0E88, 0x0711, // 0x31, 1 + 0x806C, 0x3663, 0x0E6C, 0x0760, // 0x32, 2 + 0x806C, 0x3663, 0x0C60, 0x0366, // 0x33, 3 + 0x36C8, 0x3333, 0x000F, 0x0337, // 0x34, 4 + 0x0E6E, 0x6307, 0x0C60, 0x0366, // 0x35, 5 + 0xE6C8, 0x3003, 0x0C66, 0x0366, // 0x36, 6 + 0x006E, 0x3667, 0x0CC8, 0x0001, // 0x37, 7 + 0xC66C, 0x3663, 0x0C66, 0x0366, // 0x38, 8 + 0xC66C, 0x7663, 0x0C00, 0x0136, // 0x39, 9 + 0x8800, 0x1100, 0x0880, 0x0110, // 0x3A, : + 0x8800, 0x1100, 0xC880, 0x0110, // 0x3B, ; + 0x6C80, 0x0013, 0x008C, 0x0310, // 0x3C, < + 0x0E00, 0x0700, 0x000E, 0x0007, // 0x3D, = 0x08C6, 0x3100, 0x06C8, 0x0001, // 0x3E, > - 0x803E, 0x1331, 0x0C0C, 0x0000, // 0x3F, ? - 0xBB3E, 0x7763, 0x0E3B, 0x0107, // 0x40, @ - 0x33EC, 0x3310, 0x033F, 0x0333, // 0x41, A + 0x006C, 0x3663, 0x0808, 0x0101, // 0x3F, ? + 0x666C, 0x7763, 0x0C66, 0x0307, // 0x40, @ + 0x66C8, 0x6631, 0x066E, 0x0667, // 0x41, A 0xE66F, 0x3663, 0x0F66, 0x0366, // 0x42, B 0x336C, 0x0063, 0x0C63, 0x0360, // 0x43, C - 0x666F, 0x6631, 0x0F66, 0x0136, // 0x44, D + 0x666F, 0x6633, 0x0F66, 0x0336, // 0x44, D 0xE66F, 0x1147, 0x0F66, 0x0741, // 0x45, E 0xE66F, 0x1147, 0x0F66, 0x0001, // 0x46, F 0x336C, 0x0063, 0x0C63, 0x0767, // 0x47, G - 0xF333, 0x3333, 0x0333, 0x0333, // 0x48, H - 0xCCCE, 0x0001, 0x0ECC, 0x0100, // 0x49, I + 0xE666, 0x7666, 0x0666, 0x0666, // 0x48, H + 0x888C, 0x1113, 0x0C88, 0x0311, // 0x49, I 0x0008, 0x3337, 0x0E33, 0x0133, // 0x4A, J 0xE667, 0x1366, 0x0766, 0x0663, // 0x4B, K 0x666F, 0x0000, 0x0F66, 0x0764, // 0x4C, L - 0xFF73, 0x7776, 0x033B, 0x0666, // 0x4D, M + 0xBF73, 0x6776, 0x0333, 0x0666, // 0x4D, M 0xBF73, 0x7666, 0x0333, 0x0667, // 0x4E, N 0x336C, 0x6631, 0x0C63, 0x0136, // 0x4F, O 0xE66F, 0x3663, 0x0F66, 0x0000, // 0x50, P - 0x333E, 0x3331, 0x08EB, 0x0313, // 0x51, Q - 0xE66F, 0x3663, 0x0766, 0x0663, // 0x52, R - 0xE73E, 0x0031, 0x0E38, 0x0133, // 0x53, S - 0xCCDF, 0x0023, 0x0ECC, 0x0100, // 0x54, T - 0x3333, 0x3333, 0x0F33, 0x0333, // 0x55, U - 0x3333, 0x3333, 0x0CE3, 0x0013, // 0x56, V + 0x666C, 0x6663, 0x00C6, 0x0737, // 0x51, Q + 0xE66F, 0x3663, 0x076E, 0x0631, // 0x52, R + 0x8E6C, 0x3063, 0x0C60, 0x0367, // 0x53, S + 0x88AE, 0x1157, 0x0C88, 0x0311, // 0x54, T + 0x6666, 0x6666, 0x0E66, 0x0766, // 0x55, U + 0x6666, 0x6666, 0x08C6, 0x0136, // 0x56, V 0xB333, 0x6666, 0x037F, 0x0677, // 0x57, W - 0xC633, 0x1366, 0x036C, 0x0631, // 0x58, X - 0xE333, 0x1333, 0x0ECC, 0x0100, // 0x59, Y - 0x813F, 0x1367, 0x0F6C, 0x0764, // 0x5A, Z - 0x666E, 0x0001, 0x0E66, 0x0100, // 0x5B, [ - 0x8C63, 0x1000, 0x0000, 0x0463, // 0x5C, - 0x888E, 0x1111, 0x0E88, 0x0111, // 0x5D, ] + 0xC633, 0x1366, 0x0336, 0x0663, // 0x58, X + 0xC666, 0x3666, 0x0C88, 0x0311, // 0x59, Y + 0xC93F, 0x0137, 0x0F36, 0x0764, // 0x5A, Z + 0xCCCC, 0x0003, 0x0CCC, 0x0300, // 0x5B, [ + 0xCE73, 0x1000, 0x0008, 0x0673, // 0x5C, ANTISHASH + 0x000C, 0x3333, 0x0C00, 0x0333, // 0x5D, ] 0x36C8, 0x6310, 0x0000, 0x0000, // 0x5E, ^ 0x0000, 0x0000, 0xF000, 0xF000, // 0x5F, _ - 0x08CC, 0x0100, 0x0000, 0x0000, // 0x60, ` + 0x0088, 0x0311, 0x0000, 0x0000, // 0x60, ` 0x0E00, 0x3100, 0x0E3E, 0x0633, // 0x61, a - 0xE667, 0x3000, 0x0B66, 0x0366, // 0x62, b - 0x3E00, 0x3100, 0x0E33, 0x0130, // 0x63, c + 0x6E67, 0x6300, 0x0D66, 0x0366, // 0x62, b + 0x6C00, 0x6300, 0x0C66, 0x0360, // 0x63, c 0xE008, 0x3333, 0x0E33, 0x0633, // 0x64, d - 0x3E00, 0x3100, 0x0E3F, 0x0103, // 0x65, e - 0xF66C, 0x0031, 0x0F66, 0x0000, // 0x66, f + 0x6C00, 0x6300, 0x0C6E, 0x0307, // 0x65, e + 0xECC8, 0x1063, 0x0ECC, 0x0100, // 0x66, f 0x3E00, 0x3600, 0xF0E3, 0x1333, // 0x67, g 0xE667, 0x6300, 0x0766, 0x0666, // 0x68, h - 0xCE0C, 0x0000, 0x0ECC, 0x0100, // 0x69, i - 0x0000, 0x3303, 0xE330, 0x1333, // 0x6A, j + 0x8C08, 0x1101, 0x0C88, 0x0311, // 0x69, i + 0x0C00, 0x3303, 0xC600, 0x1333, // 0x6A, j 0x6667, 0x3600, 0x076E, 0x0631, // 0x6B, k - 0xCCCE, 0x0000, 0x0ECC, 0x0100, // 0x6C, l - 0xF300, 0x7300, 0x03BF, 0x0667, // 0x6D, m - 0x3F00, 0x3100, 0x0333, 0x0333, // 0x6E, n + 0x888C, 0x1111, 0x0C88, 0x0311, // 0x6C, l + 0xF700, 0x7300, 0x033B, 0x0666, // 0x6D, m + 0x6E00, 0x6300, 0x0666, 0x0666, // 0x6E, n 0x3E00, 0x3100, 0x0E33, 0x0133, // 0x6F, o 0x6B00, 0x6300, 0xF6E6, 0x0036, // 0x70, p 0x3E00, 0x3600, 0x80E3, 0x7333, // 0x71, q - 0xEB00, 0x6300, 0x0F66, 0x0006, // 0x72, r - 0x3E00, 0x0300, 0x0F0E, 0x0131, // 0x73, s + 0xC600, 0x6300, 0x0ECC, 0x0106, // 0x72, r + 0x6C00, 0x0700, 0x0E0C, 0x0363, // 0x73, s 0xCEC8, 0x0300, 0x08CC, 0x0120, // 0x74, t 0x3300, 0x3300, 0x0E33, 0x0633, // 0x75, u - 0x3300, 0x3300, 0x0CE3, 0x0013, // 0x76, v - 0xB300, 0x6600, 0x06FF, 0x0377, // 0x77, w + 0x6600, 0x6600, 0x08C6, 0x0136, // 0x76, v + 0x3300, 0x6600, 0x06FB, 0x0376, // 0x77, w 0x6300, 0x3600, 0x036C, 0x0631, // 0x78, x - 0x3300, 0x3300, 0xF0E3, 0x1333, // 0x79, y - 0x9F00, 0x1300, 0x0F6C, 0x0320, // 0x7A, z - 0x7CC8, 0x0003, 0x08CC, 0x0300, // 0x7B, { + 0x6600, 0x6600, 0xE0C6, 0x3676, // 0x79, y + 0x2E00, 0x3700, 0x0EC8, 0x0741, // 0x7A, z + 0x6CC8, 0x0003, 0x08CC, 0x0300, // 0x7B, { 0x0888, 0x0111, 0x0888, 0x0111, // 0x7C, | - 0x8CC7, 0x3000, 0x07CC, 0x0000, // 0x7D, } + 0x088E, 0x3110, 0x0E88, 0x0011, // 0x7D, } 0x00BE, 0x0036, 0x0000, 0x0000, // 0x7E, ~ - 0x6C80, 0x3100, 0x0F33, 0x0766, // 0x7F, DEL, HOUSE - 0x333E, 0x3031, 0xE08E, 0x1311, // 0x80, Ç + 0xC800, 0x3100, 0x0E66, 0x0766, // 0x7F, HOUSE + 0x333E, 0x0031, 0x6CE3, 0x0013, // 0x80, Ç 0x3030, 0x3030, 0x0E33, 0x0733, // 0x81, ü - 0x3E08, 0x3103, 0x0E3F, 0x0103, // 0x82, é + 0x6C80, 0x6313, 0x0C6E, 0x0307, // 0x82, é 0x0C3E, 0x63C7, 0x0C6C, 0x0F67, // 0x83, â 0x0E03, 0x3103, 0x0E3E, 0x0733, // 0x84, ä - 0x0E07, 0x3100, 0x0E3E, 0x0733, // 0x85, à - 0x0ECC, 0x3100, 0x0E3E, 0x0733, // 0x86, å - 0x3E00, 0x0100, 0xC0E3, 0x1310, // 0x87, ç + 0x0EC6, 0x3100, 0x0E3E, 0x0733, // 0x85, à + 0x0C6C, 0x6363, 0x0C6C, 0x0F67, // 0x86, å + 0x66C0, 0x0630, 0xC8C6, 0x0136, // 0x87, ç 0x6C3E, 0x63C7, 0x0C6E, 0x0307, // 0x88, ê - 0x3E03, 0x3103, 0x0E3F, 0x0103, // 0x89, ë - 0x3E07, 0x3100, 0x0E3F, 0x0103, // 0x8A, è - 0xCE03, 0x0003, 0x0ECC, 0x0100, // 0x8B, ï + 0x6C06, 0x6306, 0x0C6E, 0x0307, // 0x89, ë + 0x6C8C, 0x6310, 0x0C6E, 0x0307, // 0x8A, è + 0x8C06, 0x1106, 0x0C88, 0x0311, // 0x8B, ï 0x8C3E, 0x1163, 0x0C88, 0x0311, // 0x8C, î - 0xCE07, 0x0000, 0x0ECC, 0x0100, // 0x8D, ì - 0x36C3, 0x6316, 0x033F, 0x0667, // 0x8E, Ä - 0xE0CC, 0x1000, 0x03F3, 0x0333, // 0x8F, Å - 0x6F08, 0x0303, 0x0F6E, 0x0301, // 0x90, É - 0x0E00, 0x3F00, 0x0E3E, 0x0F3F, // 0x91, æ + 0x8C8C, 0x1110, 0x0C88, 0x0311, // 0x8D, ì + 0x6C86, 0x6316, 0x06E6, 0x0676, // 0x8E, Ä + 0xC848, 0x3121, 0x06E6, 0x0676, // 0x8F, Å + 0x6FC8, 0x0301, 0x0F6E, 0x0301, // 0x90, É + 0x0E00, 0x3700, 0x0E3E, 0x0737, // 0x91, æ 0xF36C, 0x7337, 0x0333, 0x0733, // 0x92, Æ - 0xE03E, 0x1031, 0x0E33, 0x0133, // 0x93, ô - 0xE030, 0x1030, 0x0E33, 0x0133, // 0x94, ö - 0xE070, 0x1000, 0x0E33, 0x0133, // 0x95, ò + 0xC06C, 0x3063, 0x0C66, 0x0366, // 0x93, ô + 0xC060, 0x3060, 0x0C66, 0x0366, // 0x94, ö + 0xC08C, 0x3010, 0x0C66, 0x0366, // 0x95, ò 0x303E, 0x3031, 0x0E33, 0x0733, // 0x96, û - 0x3070, 0x3000, 0x0E33, 0x0733, // 0x97, ù - 0x3030, 0x3030, 0xF0E3, 0x1333, // 0x98, ÿ - 0x6C83, 0x631C, 0x08C6, 0x0136, // 0x99, Ö - 0x3303, 0x3303, 0x0E33, 0x0133, // 0x9A, Ü + 0x30C6, 0x3000, 0x0E33, 0x0733, // 0x97, ù + 0x6060, 0x6060, 0xE0E6, 0x3676, // 0x98, ÿ + 0x3E03, 0x6306, 0x0E33, 0x0366, // 0x99, Ö + 0x6606, 0x6606, 0x0C66, 0x0366, // 0x9A, Ü 0x3E88, 0x0711, 0x88E3, 0x1170, // 0x9B, ¢ 0xF66C, 0x0231, 0x0F76, 0x0360, // 0x9C, £ - 0xFE33, 0x3133, 0xCCFC, 0x0030, // 0x9D, ¥ - 0xF33F, 0x5331, 0x3333, 0xE6F6, // 0x9E, ₧ - 0xC880, 0x31D7, 0xEB88, 0x0111, // 0x9F, ƒ - 0x0E08, 0x3103, 0x0E3E, 0x0733, // 0xA0, á - 0xCE0C, 0x0001, 0x0ECC, 0x0100, // 0xA1, í - 0xE080, 0x1030, 0x0E33, 0x0133, // 0xA2, ó - 0x3080, 0x3030, 0x0E33, 0x0733, // 0xA3, ú - 0xF0F0, 0x1010, 0x0333, 0x0333, // 0xA4, ñ - 0x730F, 0x3303, 0x03BF, 0x0333, // 0xA5, Ñ + 0xEC66, 0x7366, 0x88E8, 0x1171, // 0x9D, ¥ + 0xE22E, 0x1221, 0x02A2, 0x0713, // 0x9E, ₧ + 0xE880, 0x71D7, 0x0EB8, 0x0011, // 0x9F, ƒ + 0x0EC8, 0x3101, 0x0E3E, 0x0733, // 0xA0, á + 0x8C80, 0x1113, 0x0C88, 0x0311, // 0xA1, í + 0xC000, 0x3036, 0x0C66, 0x0366, // 0xA2, ó + 0x3080, 0x3013, 0x0E33, 0x0733, // 0xA3, ú + 0xF0BE, 0x1036, 0x0333, 0x0333, // 0xA4, ñ + 0x70BE, 0x3036, 0x03BF, 0x0333, // 0xA5, Ñ 0xC66C, 0x7333, 0x00E0, 0x0070, // 0xA6, ª - 0xC66C, 0x1331, 0x00E0, 0x0030, // 0xA7, º - 0x6C0C, 0x0000, 0x0E33, 0x0130, // 0xA8, ¿ - 0xF000, 0x3000, 0x0033, 0x0000, // 0xA9, ⌐ - 0xF000, 0x3000, 0x0000, 0x0033, // 0xAA, ¬ + 0xC66C, 0x3663, 0x00E0, 0x0070, // 0xA7, º + 0xC808, 0x0101, 0x0C66, 0x0360, // 0xA8, ¿ + 0xE000, 0x7000, 0x0066, 0x0000, // 0xA9, ⌐ + 0xE000, 0x7000, 0x0000, 0x0066, // 0xAA, ¬ 0xB333, 0x736C, 0x036C, 0xF36C, // 0xAB, ½ 0xB333, 0xD36C, 0x036C, 0xCFFE, // 0xAC, ¼ - 0x8088, 0x1011, 0x0888, 0x0111, // 0xAD, ¡ + 0x8080, 0x1010, 0x8CC8, 0x1331, // 0xAD, ¡ 0x36C0, 0x36C0, 0x00C6, 0x00C6, // 0xAE, « 0xC630, 0xC630, 0x0036, 0x0036, // 0xAF, » - 0x1414, 0x1414, 0x1414, 0x1414, // 0xB0, ░ + 0x8282, 0x8282, 0x8282, 0x8282, // 0xB0, ░ 0x5A5A, 0x5A5A, 0x5A5A, 0x5A5A, // 0xB1, ▒ - 0xBEBE, 0xBEBE, 0xBEBE, 0xBEBE, // 0xB2, ▓ + 0xEBEB, 0xEBEB, 0xEBEB, 0xEBEB, // 0xB2, ▓ 0x8888, 0x1111, 0x8888, 0x1111, // 0xB3, │ - 0x8888, 0x1111, 0x888F, 0x1111, // 0xB4, ┤ - 0x8F88, 0x1111, 0x888F, 0x1111, // 0xB5, ╡ - 0xCCCC, 0x6666, 0xCCCF, 0x6666, // 0xB6, ╢ - 0x0000, 0x0000, 0xCCCF, 0x6667, // 0xB7, ╖ - 0x8F00, 0x1100, 0x888F, 0x1111, // 0xB8, ╕ - 0x0FCC, 0x6666, 0xCCCF, 0x6666, // 0xB9, ╣ - 0xCCCC, 0x6666, 0xCCCC, 0x6666, // 0xBA, ║ - 0x0F00, 0x6700, 0xCCCF, 0x6666, // 0xBB, ╗ - 0x0FCC, 0x6666, 0x000F, 0x0007, // 0xBC, ╝ - 0xCCCC, 0x6666, 0x000F, 0x0007, // 0xBD, ╜ - 0x8F88, 0x1111, 0x000F, 0x0001, // 0xBE, ╛ - 0x0000, 0x0000, 0x888F, 0x1111, // 0xBF, ┐ - 0x8888, 0x1111, 0x0008, 0x000F, // 0xC0, └ - 0x8888, 0x1111, 0x000F, 0x000F, // 0xC1, ┴ - 0x0000, 0x0000, 0x888F, 0x111F, // 0xC2, ┬ - 0x8888, 0x1111, 0x8888, 0x111F, // 0xC3, ├ - 0x0000, 0x0000, 0x000F, 0x000F, // 0xC4, ─ - 0x8888, 0x1111, 0x888F, 0x111F, // 0xC5, ┼ - 0x8888, 0x1F11, 0x8888, 0x111F, // 0xC6, ╞ - 0xCCCC, 0x6666, 0xCCCC, 0x666E, // 0xC7, ╟ - 0xCCCC, 0x0E66, 0x000C, 0x000F, // 0xC8, ╚ - 0xCC00, 0x0F00, 0xCCCC, 0x666E, // 0xC9, ╔ - 0x0FCC, 0x0E66, 0x000F, 0x000F, // 0xCA, ╩ - 0x0F00, 0x0F00, 0xCCCF, 0x666E, // 0xCB, ╦ - 0xCCCC, 0x0E66, 0xCCCC, 0x666E, // 0xCC, ╠ - 0x0F00, 0x0F00, 0x000F, 0x000F, // 0xCD, ═ - 0x0FCC, 0x0E66, 0xCCCF, 0x666E, // 0xCE, ╬ - 0x0F88, 0x0F11, 0x000F, 0x000F, // 0xCF, ╧ - 0xCCCC, 0x6666, 0x000F, 0x000F, // 0xD0, ╨ - 0x0F00, 0x0F00, 0x888F, 0x111F, // 0xD1, ╤ - 0x0000, 0x0000, 0xCCCF, 0x666F, // 0xD2, ╥ - 0xCCCC, 0x6666, 0x000C, 0x000F, // 0xD3, ╙ - 0x8888, 0x1F11, 0x0008, 0x000F, // 0xD4, ╘ - 0x8800, 0x1F00, 0x8888, 0x111F, // 0xD5, ╒ - 0x0000, 0x0000, 0xCCCC, 0x666F, // 0xD6, ╓ - 0xCCCC, 0x6666, 0xCCCF, 0x666F, // 0xD7, ╫ - 0x8F88, 0x1F11, 0x888F, 0x111F, // 0xD8, ╪ - 0x8888, 0x1111, 0x000F, 0x0001, // 0xD9, ┘ - 0x0000, 0x0000, 0x8888, 0x111F, // 0xDA, ┌ + 0xF888, 0x1111, 0x888F, 0x1111, // 0xB4, ┤ + 0x8FF8, 0x1111, 0x8FF8, 0x1111, // 0xB5, ╡ + 0x7666, 0x6666, 0x6667, 0x6666, // 0xB6, ╢ + 0xF000, 0x7000, 0x666F, 0x6667, // 0xB7, ╖ + 0x8FF0, 0x1110, 0x8FF8, 0x1111, // 0xB8, ╕ + 0x0776, 0x6666, 0x6770, 0x6666, // 0xB9, ╣ + 0x6666, 0x6666, 0x6666, 0x6666, // 0xBA, ║ + 0x0FF0, 0x6770, 0x6770, 0x6666, // 0xBB, ╗ + 0x0776, 0x6666, 0x0FF0, 0x0776, // 0xBC, ╝ + 0xF666, 0x7666, 0x000F, 0x0007, // 0xBD, ╜ + 0x8FF8, 0x1111, 0x0FF8, 0x0111, // 0xBE, ╛ + 0xF000, 0x1000, 0x888F, 0x1111, // 0xBF, ┐ + 0x8888, 0xF111, 0x0008, 0x000F, // 0xC0, └ + 0xF888, 0xF111, 0x000F, 0x000F, // 0xC1, ┴ + 0xF000, 0xF000, 0x888F, 0x111F, // 0xC2, ┬ + 0x8888, 0xF111, 0x8888, 0x111F, // 0xC3, ├ + 0xF000, 0xF000, 0x000F, 0x000F, // 0xC4, ─ + 0xF888, 0xF111, 0x888F, 0x111F, // 0xC5, ┼ + 0x8888, 0x1FF1, 0x8888, 0x1FF1, // 0xC6, ╞ + 0x6666, 0xE666, 0x6666, 0x666E, // 0xC7, ╟ + 0x6666, 0x0EE6, 0x0EE6, 0x0FF0, // 0xC8, ╚ + 0x6EE0, 0x0FF0, 0x6666, 0x6EE0, // 0xC9, ╔ + 0x0776, 0x0EE6, 0x0FF0, 0x0FF0, // 0xCA, ╩ + 0x0FF0, 0x0FF0, 0x6770, 0x6EE0, // 0xCB, ╦ + 0x6666, 0x0EE6, 0x6666, 0x6EE0, // 0xCC, ╠ + 0x0FF0, 0x0FF0, 0x0FF0, 0x0FF0, // 0xCD, ═ + 0x0776, 0x0EE6, 0x6770, 0x6EE0, // 0xCE, ╬ + 0x0FF8, 0x0FF1, 0x0FF0, 0x0FF0, // 0xCF, ╧ + 0xF666, 0xF666, 0x000F, 0x000F, // 0xD0, ╨ + 0x0FF0, 0x0FF0, 0x8FF0, 0x1FF0, // 0xD1, ╤ + 0x0000, 0x0000, 0x6FF0, 0x6FF0, // 0xD2, ╥ + 0xE666, 0xF666, 0x000E, 0x000F, // 0xD3, ╙ + 0x8888, 0x1FF1, 0x0888, 0x0FF1, // 0xD4, ╘ + 0x8880, 0x1FF0, 0x8888, 0x1FF1, // 0xD5, ╒ + 0xE000, 0xF000, 0x666E, 0x666F, // 0xD6, ╓ + 0xF666, 0xF666, 0x666F, 0x666F, // 0xD7, ╫ + 0x8FF8, 0x1FF1, 0x8FF8, 0x1FF1, // 0xD8, ╪ + 0xF888, 0x1111, 0x000F, 0x0001, // 0xD9, ┘ + 0x8000, 0xF000, 0x8888, 0x111F, // 0xDA, ┌ 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0xDB, █ 0x0000, 0x0000, 0xFFFF, 0xFFFF, // 0xDC, ▄ 0xFFFF, 0x0000, 0xFFFF, 0x0000, // 0xDD, ▌ 0x0000, 0xFFFF, 0x0000, 0xFFFF, // 0xDE, ▐ 0xFFFF, 0xFFFF, 0x0000, 0x0000, // 0xDF, ▀ - 0xBE00, 0x3600, 0x0EB3, 0x0631, // 0xE0, α - 0xF3E0, 0x1310, 0x33F3, 0x0013, // 0xE1, ß - 0x33F0, 0x0330, 0x0333, 0x0000, // 0xE2, Γ - 0x66F0, 0x3370, 0x0666, 0x0333, // 0xE3, π - 0xC63F, 0x0033, 0x0F36, 0x0330, // 0xE4, Σ - 0xBE00, 0x1700, 0x0EBB, 0x0011, // 0xE5, σ - 0x6660, 0x6660, 0x36E6, 0x0036, // 0xE6, µ - 0x8BE0, 0x1360, 0x0888, 0x0111, // 0xE7, τ - 0x3ECF, 0x3103, 0xFCE3, 0x3013, // 0xE8, Φ - 0xF36C, 0x7631, 0x0C63, 0x0136, // 0xE9, Θ + 0xBE00, 0x3600, 0x00EB, 0x0063, // 0xE0, α + 0xE6C0, 0x3630, 0x0CE6, 0x0036, // 0xE1, ß + 0x66E0, 0x0670, 0x0066, 0x0000, // 0xE2, Γ + 0x66F0, 0x3370, 0x0666, 0x0633, // 0xE3, π + 0xC6E0, 0x0470, 0x0E6C, 0x0740, // 0xE4, Σ + 0x6C00, 0x3700, 0x0C66, 0x0133, // 0xE5, σ + 0x6600, 0x6600, 0x36E6, 0x0036, // 0xE6, µ + 0xBE00, 0x3600, 0x0888, 0x0111, // 0xE7, τ + 0x6C8E, 0x6317, 0x0E8C, 0x0713, // 0xE8, Φ + 0xE66C, 0x3331, 0x0C66, 0x0133, // 0xE9, Θ 0x336C, 0x6631, 0x0766, 0x0733, // 0xEA, Ω - 0xE8C8, 0x3103, 0x0E33, 0x0133, // 0xEB, δ - 0xBE00, 0xD700, 0x00EB, 0x007D, // 0xEC, ∞ - 0xBE00, 0xD736, 0x36EB, 0x007D, // 0xED, φ - 0xF36C, 0x1001, 0x0C63, 0x0100, // 0xEE, ε - 0x333E, 0x3331, 0x0333, 0x0333, // 0xEF, ∩ - 0xF0F0, 0x3030, 0x00F0, 0x0030, // 0xF0, ≡ + 0xC8C8, 0x3103, 0x0C66, 0x0366, // 0xEB, δ + 0xBE00, 0x6300, 0x00EB, 0x0036, // 0xEC, ∞ + 0xBE80, 0x6313, 0x36EB, 0x0036, // 0xED, φ + 0xE6C8, 0x3003, 0x08C6, 0x0300, // 0xEE, ε + 0x66C0, 0x6630, 0x0666, 0x0666, // 0xEF, ∩ + 0xE0E0, 0x7070, 0x00E0, 0x0070, // 0xF0, ≡ 0xCFCC, 0x0300, 0x0F0C, 0x0300, // 0xF1, ± 0xC8C6, 0x0100, 0x0F06, 0x0300, // 0xF2, ≥ 0xC6C8, 0x0001, 0x0F08, 0x0301, // 0xF3, ≤ - 0x8880, 0x1DD7, 0x8888, 0x1111, // 0xF4, ⌠ - 0x8888, 0x1111, 0xEBB8, 0x0111, // 0xF5, ⌡ - 0xF0CC, 0x3000, 0x0CC0, 0x0000, // 0xF6, ÷ + 0x66C0, 0x3310, 0x6666, 0x0000, // 0xF4, ⌠ + 0x0000, 0x3333, 0x0C66, 0x0133, // 0xF5, ⌡ + 0xE088, 0x7011, 0x0880, 0x0110, // 0xF6, ÷ 0x0BE0, 0x0360, 0x00BE, 0x0036, // 0xF7, ≈ 0xC66C, 0x1331, 0x0000, 0x0000, // 0xF8, ° 0x8000, 0x1000, 0x0008, 0x0001, // 0xF9, ∙ 0x0000, 0x0000, 0x0008, 0x0001, // 0xFA, · - 0x0000, 0x333F, 0x8C67, 0x3333, // 0xFB, √ - 0x666E, 0x3331, 0x0006, 0x0003, // 0xFC, ⁿ - 0x6C8E, 0x0010, 0x000E, 0x0001, // 0xFD, ² - 0xCC00, 0x3300, 0x00CC, 0x0033, // 0xFE, ■ - 0x0000, 0x0000, 0x0000, 0x0000 // 0xFF, NBSP + 0x2000, 0x1117, 0x08C6, 0x0111, // 0xFB, √ + 0x666E, 0x3331, 0x0000, 0x0000, // 0xFC, ⁿ + 0xC80C, 0x3131, 0x0000, 0x0000, // 0xFD, ² + 0xEEE0, 0x7770, 0x0EEE, 0x0777, // 0xFE, ■ + 0x22E0, 0x4470, 0x0E22, 0x0744 // 0xFF, NBSP ); -const int charsets[] = int[18]( - 0x30, 10, // NUMBERS - 0x41, 26, // UPPERCASE LETTERS - 0x61, 26, // LOWERCASE LETTERS - 0x01, 15, // SYMBOLS - 0x18, 4, // ARROWS - 0xB3, 40, // BARS - 0xE0, 16, // GREEK - 0x80, 28, // ACCENTS - 0xB0, 3 // SHADES +#define CP437_SETS 10 + +const int cp437_sets[] = int[20]( + 0x00, 256, // ALL + 0x30, 10, // NUMBERS + 0x41, 26, // UPPERCASE LETTERS + 0x61, 26, // LOWERCASE LETTERS + 0x01, 15, // SYMBOLS + 0x18, 4, // ARROWS + 0xB3, 40, // BARS + 0xE0, 16, // GREEK + 0x80, 28, // ACCENTS + 0xB0, 3 // SHADES ); -#define CHARSETS 8 - -const int hex_chars[] = int[16]( - 0x30, - 0x31, - 0x32, - 0x33, - 0x34, - 0x35, - 0x36, - 0x37, - 0x38, - 0x39, - 0x41, - 0x42, - 0x43, - 0x44, - 0x45, - 0x46 -); - -bool chr(vec2 pos, int code) +bool cp437(vec2 pos, int code) { - if (pos.x < .0 || pos.y < .0 || pos.x >= 1. || pos.y >= 1.) { + if (pos.x < .0 || pos.y < .0 || pos.x >= 1. || pos.y >= 1. || code < 0 || code >= CP437_COUNT) { return false; } ivec2 pos2 = ivec2(pos.x * 8., (1 - pos.y) * 8.); ivec2 subpos = pos2 % 4; int v = int(pow(2., subpos.y * 4. + subpos.x)); int d = int(pos2.y * .25) * 2 + int(pos2.x * .25); - return (cp437[code * 4 + d] & v) > 0; + return (cp437_glyphs[code * 4 + d] & v) > 0; } -float char_at(vec2 uv, vec2 pos, int code) +float cp437_at(vec2 uv, vec2 pos, int code) { - return chr(uv - pos, code) ? 1. : 0.; + return cp437(uv - pos, code) ? 1. : 0.; } -float write_5(vec2 uv, vec2 pos, int str[5]) +int cp437_set_glyph(int set, float v) { - float d = 0.; - int i; - - for (i = 0; i < 5; i++) { - if (str[i] == 0) { - return d; - } - - d += char_at(uv, pos + vec2(i, 0.), str[i]); + if (v < .0 || v >= 1. || set < 0. || set >= CP437_SETS) { + return 0; } - - return d; + return cp437_sets[set * 2] + int(v * cp437_sets[set * 2 + 1]); } -float write_10(vec2 uv, vec2 pos, int str[10]) -{ - float d = 0.; - int i; - - for (i = 0; i < 10; i++) { - if (str[i] == 0) { - return d; - } - - d += char_at(uv, pos + vec2(i, 0.), str[i]); - } - - return d; -} - -float write_20(vec2 uv, vec2 pos, int str[20]) -{ - float d = 0.; - int i; - - for (i = 0; i < 20; i++) { - if (str[i] == 0) { - return d; - } - - d += char_at(uv, pos + vec2(i, 0.), str[i]); - } - - return d; -} - -float write_int(vec2 uv, vec2 pos, int value, int magnitude) -{ - value = max(0, value); - int i; - int m = 1; - float d = 0.; - for (i = 0; i < magnitude; i++) { - if (i == 0 || value >= m) { - d += char_at(uv, pos + vec2(magnitude - i - 1, 0.), int(0x30 + (value % (m * 10)) / m)); - m *= 10; - } - } - return d; -} - -float write_int_left(vec2 uv, vec2 pos, int value, int magnitude) -{ - value = max(0, value); - int i; - int m = 1; - float d = 0.; - pos.x -= magnitude; - for (i = 0; i < magnitude; i++) { - if (i == 0 || value >= m) { - pos.x += 1.; - m *= 10; - } - } - return write_int(uv, pos, value, magnitude); -} - -float write_sentence(vec2 uv, vec2 pos, int n) -{ - float d = 0.; - int i; - - for (i = 0; i < SENTENCE_MAX_LENGTH; i++) { - if (sentences[n * SENTENCE_MAX_LENGTH + i] == 0) { - return d; - } - - d += char_at(uv, pos + vec2(i, 0.), sentences[n * SENTENCE_MAX_LENGTH + i]); - } - - return d; -} - -#endif +#endif /* INC_CP437 */ \ No newline at end of file diff --git a/default/inc_debug.glsl b/default/inc_debug.glsl index f35c521..fa7adaa 100644 --- a/default/inc_debug.glsl +++ b/default/inc_debug.glsl @@ -1,7 +1,7 @@ #include inc_magic.glsl #include inc_functions.glsl #include inc_yuyv.glsl -#include inc_cp437.glsl +#include inc_write.glsl #ifndef INC_DEBUG #define INC_DEBUG @@ -146,17 +146,17 @@ vec4 debug(vec2 vUV) } // show selected src/fx - f += char_at(uv2, vec2(-5.4, 1.45), hex_chars[selected_srca]); + f += cp437_at(uv2, vec2(-5.4, 1.45), hex_chars[selected_srca]); f += random_srca ? circle(uv2, vec2(-4.25, 2.7), .1) : 0.; - f += char_at(uv2, vec2(-5.4, -2.55), hex_chars[selected_srcb]); + f += cp437_at(uv2, vec2(-5.4, -2.55), hex_chars[selected_srcb]); f += random_srcb ? circle(uv2, vec2(-4.25, -1.3), .1) : 0.; - f += char_at(uv2, vec2(-2.4, 1.45), hex_chars[selected_fxa]); + f += cp437_at(uv2, vec2(-2.4, 1.45), hex_chars[selected_fxa]); f += fxa_invert ? rect(uv2, vec2(-2., 2.7), vec2(.5, .05)) : 0.; f += random_fxa ? circle(uv2, vec2(-1.25, 2.7), .1) : 0.; - f += char_at(uv2, vec2(-2.4, -2.55), hex_chars[selected_fxb]); + f += cp437_at(uv2, vec2(-2.4, -2.55), hex_chars[selected_fxb]); f += fxb_invert ? rect(uv2, vec2(-2., -1.3), vec2(.5, .05)) : 0.; f += random_fxb ? circle(uv2, vec2(-1.25, -1.3), .1) : 0.; - f += char_at(uv2, vec2(4.6, -.55), hex_chars[selected_mfx]); + f += cp437_at(uv2, vec2(4.6, -.55), hex_chars[selected_mfx]); f += mfx_invert ? rect(uv2, vec2(5., .7), vec2(.5, .05)) : 0.; f += random_mfx ? circle(uv2, vec2(5.75, .7), .1) : 0.; @@ -178,8 +178,8 @@ vec4 debug(vec2 vUV) f += write_5(uv3 * .75, vec2(-11.6, -1.8), textSRC); f += write_5(uv3 * .75, vec2(-4.2, -1.8), textFX); - f += char_at(uv3 * .5, vec2(-11.5, 3.5), 0x41); - f += char_at(uv3 * .5, vec2(-11.5, -6.), 0x42); + f += cp437_at(uv3 * .5, vec2(-11.5, 3.5), 0x41); + f += cp437_at(uv3 * .5, vec2(-11.5, -6.), 0x42); if (iDemo < 1 && (iInputFormat1 == YUYV_FOURCC || iInputFormat2 == YUYV_FOURCC)) { f += write_5(uv3 * .75, vec2(-19.7, -1.8), textIN); } @@ -221,7 +221,7 @@ vec4 debug(vec2 vUV) f = mix(f, 1 - f, rect(uv2, vec2(5., -.9 + .9 * mfx_value), vec2(.9, .9 * mfx_value))); // show mix - f += char_at(uv2, vec2(1.55, -.6), mix_type ? 0x4B : 0x4D); + f += cp437_at(uv2, vec2(1.55, -.6), mix_type ? 0x4B : 0x4D); f = mix(f, 1 - f, rect(uv2, vec2(2., -.9 + .9 * mix_value), vec2(.9, .9 * mix_value))); // show debug info diff --git a/default/inc_fx.glsl b/default/inc_fx.glsl index b150b64..91e0b8b 100644 --- a/default/inc_fx.glsl +++ b/default/inc_fx.glsl @@ -271,8 +271,8 @@ subroutine(fx_stage_sub) vec4 fx_9(vec2 vUV, sampler2D previous, sampler2D feedb float k1 = 100. * (1. - zoom) + 10.; float inv_k = 1. / k1; uv2 = floor(uv2 * k1) * inv_k; - int start_char = charset_ctrl.x > 0. ? charsets[int(charset.x * CHARSETS) * 2] : 0x01; - int char_span = int((charset_ctrl.x > 0. ? charsets[int(charset.x * CHARSETS) * 2 + 1] : 255)); + int start_char = charset_ctrl.x > 0. ? cp437_sets[int(charset.x * CP437_SETS) * 2] : 0x01; + int char_span = int((charset_ctrl.x > 0. ? cp437_sets[int(charset.x * CP437_SETS) * 2 + 1] : 255)); char_span = int(char_span * max(1. - charset.y, 1. / (char_span * .75))); ivec2 uv2i = ivec2(uv2 * k1); int code = ((charset_ctrl.y < 1. || (uv2i.x % 2 ^ uv2i.y % 2) > 0) ? 1 : 0) * (start_char + int((rand(uv2i) + char_delta) * char_span) % char_span); @@ -281,7 +281,7 @@ subroutine(fx_stage_sub) vec4 fx_9(vec2 vUV, sampler2D previous, sampler2D feedb + reframe(previous, uv2 + vec2(1., 1.) * inv_k * .125).xyz * .2 + reframe(previous, uv2 + vec2(0., 1.) * inv_k * .125).xyz * .2 + reframe(previous, uv2 + vec2(.5, .5) * inv_k * .125).xyz * .2; - c = chr(mod(uv1 * k1, 1.), code) ? c : vec3(0.); + c = cp437(mod(uv1 * k1, 1.), code) ? c : vec3(0.); return fx_master(c0, c, seed, m0); } diff --git a/default/inc_sentences.glsl b/default/inc_sentences.glsl index e24b5ad..0cc5b2c 100644 --- a/default/inc_sentences.glsl +++ b/default/inc_sentences.glsl @@ -1,30 +1,49 @@ -#ifndef INC_SENTENCES -#define INC_SENTENCES +#include inc_cp437.glsl -#define SENTENCE_COUNT 17 -#define SENTENCE_MAX_LENGTH 20 +#ifndef INC_CP437_SENTENCES +#define INC_CP437_SENTENCES -const int sentences[] = int[SENTENCE_COUNT * SENTENCE_MAX_LENGTH]( - 0x66, 0x6F, 0x72, 0x67, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x46, 0x4F, 0x52, 0x47, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x46, 0x2E, 0x4F, 0x2E, 0x52, 0x2E, 0x47, 0x2E, 0x45, 0x2E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x46, 0x75, 0x73, 0x69, 0x6F, 0x6E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x4F, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x52, 0x65, 0x61, 0x6C, 0x2D, 0x74, 0x69, 0x6D, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x47, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x74, 0x69, 0x76, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x45, 0x76, 0x65, 0x72, 0x79, 0x74, 0x68, 0x69, 0x6E, 0x67, 0x20, 0x79, 0x6F, 0x75, 0x20, 0x73, 0x65, 0x65, 0x00, 0x00, - 0x50, 0x69, 0x78, 0x65, 0x6C, 0x20, 0x62, 0x79, 0x20, 0x70, 0x69, 0x78, 0x65, 0x6C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x4C, 0x69, 0x76, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x47, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x6C, 0x65, 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xE3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x4B, 0x6C, 0x65, 0xE3, 0x65, 0x6B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x43, 0x6F, 0x64, 0x65, 0x20, 0x61, 0x73, 0x20, 0x61, 0x72, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x41, 0x72, 0x74, 0x20, 0x61, 0x73, 0x20, 0x63, 0x6F, 0x64, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +#define CP437_SENTENCE_COUNT 17 +#define CP437_SENTENCE_MAX_LEN 18 + +const int cp437_sentences[] = int[306]( + 0x66, 0x6F, 0x72, 0x67, 0x65, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // forge + 0x46, 0x4F, 0x52, 0x47, 0x45, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // FORGE + 0x46, 0x2E, 0x4F, 0x2E, 0x52, 0x2E, 0x47, 0x2E, 0x45, 0x2E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // F.O.R.G.E. + 0x46, 0x75, 0x73, 0x69, 0x6F, 0x6E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Fusion + 0x4F, 0x66, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Of + 0x52, 0x65, 0x61, 0x6C, 0x2D, 0x74, 0x69, 0x6D, 0x65, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Real-time + 0x47, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x74, 0x69, 0x76, 0x65, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Generative + 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x73, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Effects + 0x45, 0x76, 0x65, 0x72, 0x79, 0x74, 0x68, 0x69, 0x6E, 0x67, 0x00, 0x79, 0x6F, 0x75, 0x00, 0x73, 0x65, 0x65, // Everything you see + 0x50, 0x69, 0x78, 0x65, 0x6C, 0x00, 0x62, 0x79, 0x00, 0x70, 0x69, 0x78, 0x65, 0x6C, 0xFF, 0xFF, 0xFF, 0xFF, // Pixel by pixel + 0x4C, 0x69, 0x76, 0x65, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Live + 0x47, 0x65, 0x6E, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Generated + 0x43, 0x6F, 0x6E, 0x74, 0x72, 0x6F, 0x6C, 0x6C, 0x65, 0x64, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Controlled + 0xE3, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // π + 0x4B, 0x6C, 0x65, 0xE3, 0x65, 0x6B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Kleπek + 0x43, 0x6F, 0x64, 0x65, 0x00, 0x61, 0x73, 0x00, 0x61, 0x72, 0x74, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // Code as art + 0x41, 0x72, 0x74, 0x00, 0x61, 0x73, 0x00, 0x63, 0x6F, 0x64, 0x65, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF // Art as code ); -const int lengths[] = int[SENTENCE_COUNT]( +const int cp437_sentences_lengths[] = int[17]( 5, 5, 10, 6, 2, 9, 10, 7, 18, 14, 4, 9, 10, 1, 6, 11, 11 ); -#endif \ No newline at end of file + +float cp437_sentence(vec2 uv, vec2 pos, int n) +{ + float d = 0.; + int i; + + if (n < .0 || n > CP437_SENTENCE_COUNT) { + return d; + } + + for (i = 0; i < cp437_sentences_lengths[n]; i++) { + d += cp437_at(uv, pos + vec2(i, 0.), cp437_sentences[n * CP437_SENTENCE_MAX_LEN + i]); + } + + return d; +} + +#endif /* INC_CP437_SENTENCES */ \ No newline at end of file diff --git a/default/inc_src.glsl b/default/inc_src.glsl index 843caa3..9da653f 100644 --- a/default/inc_src.glsl +++ b/default/inc_src.glsl @@ -2,6 +2,7 @@ #include inc_magic.glsl #include inc_functions.glsl #include inc_cp437.glsl +#include inc_sentences.glsl #ifndef INC_SRC #define INC_SRC @@ -195,13 +196,13 @@ subroutine(src_stage_sub) vec4 src_7(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 uv2 *= zoom * 20. + 3.; uv2 += iBeats; uv2 = mod(uv2, 100.) + 100.; - int start_char = charset_ctrl.x > 0. ? charsets[int(charset.x * CHARSETS) * 2] : 0x01; - int char_span = int((charset_ctrl.x > 0. ? charsets[int(charset.x * CHARSETS) * 2 + 1] : 255)); + int start_char = charset_ctrl.x > 0. ? cp437_sets[int(charset.x * CP437_SETS) * 2] : 0x01; + int char_span = int((charset_ctrl.x > 0. ? cp437_sets[int(charset.x * CP437_SETS) * 2 + 1] : 255)); char_span = int(char_span * max(1. - charset.y, 1. / (char_span * .75))); ivec2 uv2i = ivec2(uv2); int code = ((charset_ctrl.y < 1. || (uv2i.x % 2 ^ uv2i.y % 2) > 0) ? 1 : 0) * (start_char + int((rand(uv2i) + char_delta) * char_span) % char_span); uv2 = mod(uv2, 1.); - float f = chr(uv2, code) ? 1. : 0.; + float f = cp437(uv2, code) ? 1. : 0.; return vec4(f); } @@ -228,10 +229,10 @@ subroutine(src_stage_sub) vec4 src_8(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 vec2 uv2 = uv1; uv2 *= (1. + zoom) * 12.; uv2.y += .5; - int s = int(sentence * (SENTENCE_COUNT - 1)); + int s = int(sentence * (CP437_SENTENCE_COUNT - 1)); uv2.x += floor(uv2.y) * (h_delta - .5) * 2.; uv2.y = mix(uv2.y, mod(uv2.y, 1.), h_delta_b.x); - float f = write_sentence(uv2, vec2(-float(lengths[s]) * .5, 0.), s); + float f = cp437_sentence(uv2, vec2(-float(cp437_sentences_lengths[s]) * .5, 0.), s); return vec4(f); } @@ -258,13 +259,13 @@ subroutine(src_stage_sub) vec4 src_9(vec2 vUV, int seed, vec3 b1, vec2 f1, vec3 uv2.x += h_shift; uv2 *= 15.; uv2.y += .5; - int s = int(sentence * (SENTENCE_COUNT - 1)); - float slen = float(lengths[s]); + int s = int(sentence * (CP437_SENTENCE_COUNT - 1)); + float slen = float(cp437_sentences_lengths[s]); uv2.x += floor(uv2.y) * (h_delta - .5) * 2.; uv2.x = cmod(uv2.x, slen + 1.); vec2 uv3 = uv2; uv3.y = mix(uv3.y, mod(uv3.y, 1.), h_delta_b.x); - float f = write_sentence(uv3, vec2(-slen * .5, 0.), s); + float f = cp437_sentence(uv3, vec2(-slen * .5, 0.), s); f *= (1. - abs(floor(uv2.y) * .125)) * (1. - abs(floor(uv2.y) * .125)); diff --git a/default/inc_write.glsl b/default/inc_write.glsl new file mode 100644 index 0000000..c1dfcc3 --- /dev/null +++ b/default/inc_write.glsl @@ -0,0 +1,104 @@ +#include inc_cp437.glsl + +#ifndef INC_WRITE +#define INC_WRITE + +const int hex_chars[] = int[16]( + 0x30, + 0x31, + 0x32, + 0x33, + 0x34, + 0x35, + 0x36, + 0x37, + 0x38, + 0x39, + 0x41, + 0x42, + 0x43, + 0x44, + 0x45, + 0x46 +); + +float write_5(vec2 uv, vec2 pos, int str[5]) +{ + float d = 0.; + int i; + + for (i = 0; i < 5; i++) { + if (str[i] == 0) { + return d; + } + + d += cp437_at(uv, pos + vec2(i, 0.), str[i]); + } + + return d; +} + +float write_10(vec2 uv, vec2 pos, int str[10]) +{ + float d = 0.; + int i; + + for (i = 0; i < 10; i++) { + if (str[i] == 0) { + return d; + } + + d += cp437_at(uv, pos + vec2(i, 0.), str[i]); + } + + return d; +} + +float write_20(vec2 uv, vec2 pos, int str[20]) +{ + float d = 0.; + int i; + + for (i = 0; i < 20; i++) { + if (str[i] == 0) { + return d; + } + + d += cp437_at(uv, pos + vec2(i, 0.), str[i]); + } + + return d; +} + +float write_int(vec2 uv, vec2 pos, int value, int magnitude) +{ + value = max(0, value); + int i; + int m = 1; + float d = 0.; + for (i = 0; i < magnitude; i++) { + if (i == 0 || value >= m) { + d += cp437_at(uv, pos + vec2(magnitude - i - 1, 0.), int(0x30 + (value % (m * 10)) / m)); + m *= 10; + } + } + return d; +} + +float write_int_left(vec2 uv, vec2 pos, int value, int magnitude) +{ + value = max(0, value); + int i; + int m = 1; + float d = 0.; + pos.x -= magnitude; + for (i = 0; i < magnitude; i++) { + if (i == 0 || value >= m) { + pos.x += 1.; + m *= 10; + } + } + return write_int(uv, pos, value, magnitude); +} + +#endif diff --git a/default/sentences.txt b/default/sentences.txt new file mode 100644 index 0000000..351e01d --- /dev/null +++ b/default/sentences.txt @@ -0,0 +1,17 @@ +forge +FORGE +F.O.R.G.E. +Fusion +Of +Real-time +Generative +Effects +Everything you see +Pixel by pixel +Live +Generated +Controlled +π +Kleπek +Code as art +Art as code