From 9b27108a93b2093a348a17e2d354f9cdd240693c Mon Sep 17 00:00:00 2001 From: yum Date: Sat, 5 Nov 2022 20:58:46 -0700 Subject: Expand character set from 80 to 64K characters Each character is now addressed with 2 bytes instead of 1. The number of bytes per character is configured in (I think) exactly one spot, so increasing or decreasing this is trivial. English speakers can just set it to 1. The animator seems a little unstable; if I leave my character in a public for a while, the board becomes unresponsive. Oh well. * Check in fonts. Did this so users don't have to remember to set the resolution or to disable mipmaps. --- generate_utils.py | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'generate_utils.py') diff --git a/generate_utils.py b/generate_utils.py index 171857b..119714d 100644 --- a/generate_utils.py +++ b/generate_utils.py @@ -13,6 +13,7 @@ BOARD_ROWS=4 BOARD_COLS=44 INDEX_BITS=4 CHARS_PER_CELL=256 +BYTES_PER_CHAR=2 NUM_LAYERS=ceil((BOARD_ROWS * BOARD_COLS) / (2**INDEX_BITS)) @@ -63,29 +64,29 @@ def getLockWorldParam(): # Each layer controls a group of cells. There's only one letter per layer, thus # this is also the name of the parameter which sets the letter for a layer. -def getLayerParam(which_layer: int) -> str: - return "TaSTT_L%02d" % which_layer +def getLayerParam(which_layer: int, byte: int) -> str: + return "TaSTT_L%02dB%01d" % (which_layer, byte) -def getLayerName(which_layer: int) -> str: - return getLayerParam(which_layer) +def getLayerName(which_layer: int, byte: int) -> str: + return getLayerParam(which_layer, byte) -def getBlendParam(which_layer: int) -> str: - return "TaSTT_L%02d_Blend" % which_layer +def getBlendParam(which_layer: int, byte: int) -> str: + return "TaSTT_L%02dB%01d_Blend" % (which_layer, byte) -def getDefaultStateName(which_layer): - return "TaSTT_L%02d_Do_Nothing" % which_layer +def getDefaultStateName(which_layer:int , byte: int): + return "TaSTT_L%02dB%01d_Do_Nothing" % (which_layer, byte) -def getActiveStateName(which_layer): - return "TaSTT_L%02d_Active" % which_layer +def getActiveStateName(which_layer: int, byte: int): + return "TaSTT_L%02dB%01d_Active" % (which_layer, byte) def getSelectStateName(which_layer, select): - return "TaSTT_L%02d_S%02d" % (which_layer, select) + return "TaSTT_L%02d_S%02d_B%01d" % (which_layer, select, byte) -def getBlendStateName(which_layer, select): - return "TaSTT_L%02d_S%02d_Blend" % (which_layer, select) +def getBlendStateName(which_layer, select, byte): + return "TaSTT_L%02d_S%02d_B%01d_Blend" % (which_layer, select, byte) -def getLetterStateName(which_layer, select, letter): - return "TaSTT_L%02d_S%02d_L%03d" % (which_layer, select, letter) +def getLetterStateName(which_layer, select, letter, byte): + return "TaSTT_L%02d_S%02d_L%03d_B%01d" % (which_layer, select, letter, byte) def getSelectParam() -> str: return "TaSTT_Select" @@ -101,34 +102,34 @@ def getBoardIndex(which_layer, select): # those cells. return (select * NUM_LAYERS + which_layer) % (BOARD_ROWS * BOARD_COLS) -def getShaderParamByRowCol(row, col): - return "_Letter_Row%02d_Col%02d" % (row, col) +def getShaderParamByRowColByte(row, col, byte): + return "_Letter_Row%02d_Col%02d_Byte%01d" % (row, col, byte) # Mapping from layer to shader param. -def getShaderParam(which_layer, select): +def getShaderParam(which_layer, select, byte): index = getBoardIndex(which_layer, select) col = index % BOARD_COLS row = floor(index / BOARD_COLS) - return getShaderParamByRowCol(row, col) + return getShaderParamByRowCol(row, col, byte) # The name of the animation which writes `letter` at a specific position in the # display. -def getLetterAnimationName(row, col, letter): - return "R%02dC%02dL%02d" % (row, col, letter) +def getLetterAnimationName(row, col, letter, nth_byte): + return "R%02dC%02dL%02dB%01d" % (row, col, letter, nth_byte) # The name of the animation which clears the entire board. def getClearAnimationName(): return "TaSTT_Clear_Board" -def getAnimationNameByLayerAndIndex(which_layer, select, letter): +def getAnimationNameByLayerAndIndex(which_layer, select, letter, nth_byte): index = getBoardIndex(which_layer, select) col = index % BOARD_COLS row = floor(index / BOARD_COLS) - return "R%02dC%02dL%02d" % (row, col, letter) + return "R%02dC%02dL%02dB%01d" % (row, col, letter, nth_byte) # Returns the path to the animation for the given shader parameter + letter. def getAnimationPath(shader_param, letter): -- cgit v1.2.3