diff options
| -rw-r--r-- | SetLetters.cs | 54 | ||||
| -rw-r--r-- | TaSTT.shader | 174 | ||||
| -rw-r--r-- | TaSTT_params.asset | 48 | ||||
| -rw-r--r-- | cell_names.txt | 42 | ||||
| -rw-r--r-- | generate_animations.sh | 6 | ||||
| -rw-r--r-- | generate_fx.py | 107 | ||||
| -rw-r--r-- | group_names.txt | 12 |
7 files changed, 411 insertions, 32 deletions
diff --git a/SetLetters.cs b/SetLetters.cs index c14fe31..558e3c2 100644 --- a/SetLetters.cs +++ b/SetLetters.cs @@ -74,6 +74,48 @@ public class SetLetters : StateMachineBehaviour "_Letter_Row02_Col11", "_Letter_Row02_Col12", "_Letter_Row02_Col13", + "_Letter_Row03_Col00", + "_Letter_Row03_Col01", + "_Letter_Row03_Col02", + "_Letter_Row03_Col03", + "_Letter_Row03_Col04", + "_Letter_Row03_Col05", + "_Letter_Row03_Col06", + "_Letter_Row03_Col07", + "_Letter_Row03_Col08", + "_Letter_Row03_Col09", + "_Letter_Row03_Col10", + "_Letter_Row03_Col11", + "_Letter_Row03_Col12", + "_Letter_Row03_Col13", + "_Letter_Row04_Col00", + "_Letter_Row04_Col01", + "_Letter_Row04_Col02", + "_Letter_Row04_Col03", + "_Letter_Row04_Col04", + "_Letter_Row04_Col05", + "_Letter_Row04_Col06", + "_Letter_Row04_Col07", + "_Letter_Row04_Col08", + "_Letter_Row04_Col09", + "_Letter_Row04_Col10", + "_Letter_Row04_Col11", + "_Letter_Row04_Col12", + "_Letter_Row04_Col13", + "_Letter_Row05_Col00", + "_Letter_Row05_Col01", + "_Letter_Row05_Col02", + "_Letter_Row05_Col03", + "_Letter_Row05_Col04", + "_Letter_Row05_Col05", + "_Letter_Row05_Col06", + "_Letter_Row05_Col07", + "_Letter_Row05_Col08", + "_Letter_Row05_Col09", + "_Letter_Row05_Col10", + "_Letter_Row05_Col11", + "_Letter_Row05_Col12", + "_Letter_Row05_Col13", }; group_parameters_ = new List<string> { "_Letter_Row00_Col00_03", @@ -88,6 +130,18 @@ public class SetLetters : StateMachineBehaviour "_Letter_Row02_Col04_07", "_Letter_Row02_Col08_11", "_Letter_Row02_Col12_13", + "_Letter_Row03_Col00_03", + "_Letter_Row03_Col04_07", + "_Letter_Row03_Col08_11", + "_Letter_Row03_Col12_13", + "_Letter_Row04_Col00_03", + "_Letter_Row04_Col04_07", + "_Letter_Row04_Col08_11", + "_Letter_Row04_Col12_13", + "_Letter_Row05_Col00_03", + "_Letter_Row05_Col04_07", + "_Letter_Row05_Col08_11", + "_Letter_Row05_Col12_13", }; bool got_match = false; diff --git a/TaSTT.shader b/TaSTT.shader index 747eb2f..8f18dae 100644 --- a/TaSTT.shader +++ b/TaSTT.shader @@ -46,6 +46,48 @@ _Letter_Row02_Col11("_Letter_Row02_Col11", float) = 0
_Letter_Row02_Col12("_Letter_Row02_Col12", float) = 0
_Letter_Row02_Col13("_Letter_Row02_Col13", float) = 0
+ _Letter_Row03_Col00("_Letter_Row03_Col00", float) = 0
+ _Letter_Row03_Col01("_Letter_Row03_Col01", float) = 0
+ _Letter_Row03_Col02("_Letter_Row03_Col02", float) = 0
+ _Letter_Row03_Col03("_Letter_Row03_Col03", float) = 0
+ _Letter_Row03_Col04("_Letter_Row03_Col04", float) = 0
+ _Letter_Row03_Col05("_Letter_Row03_Col05", float) = 0
+ _Letter_Row03_Col06("_Letter_Row03_Col06", float) = 0
+ _Letter_Row03_Col07("_Letter_Row03_Col07", float) = 0
+ _Letter_Row03_Col08("_Letter_Row03_Col08", float) = 0
+ _Letter_Row03_Col09("_Letter_Row03_Col09", float) = 0
+ _Letter_Row03_Col10("_Letter_Row03_Col10", float) = 0
+ _Letter_Row03_Col11("_Letter_Row03_Col11", float) = 0
+ _Letter_Row03_Col12("_Letter_Row03_Col12", float) = 0
+ _Letter_Row03_Col13("_Letter_Row03_Col13", float) = 0
+ _Letter_Row04_Col00("_Letter_Row04_Col00", float) = 0
+ _Letter_Row04_Col01("_Letter_Row04_Col01", float) = 0
+ _Letter_Row04_Col02("_Letter_Row04_Col02", float) = 0
+ _Letter_Row04_Col03("_Letter_Row04_Col03", float) = 0
+ _Letter_Row04_Col04("_Letter_Row04_Col04", float) = 0
+ _Letter_Row04_Col05("_Letter_Row04_Col05", float) = 0
+ _Letter_Row04_Col06("_Letter_Row04_Col06", float) = 0
+ _Letter_Row04_Col07("_Letter_Row04_Col07", float) = 0
+ _Letter_Row04_Col08("_Letter_Row04_Col08", float) = 0
+ _Letter_Row04_Col09("_Letter_Row04_Col09", float) = 0
+ _Letter_Row04_Col10("_Letter_Row04_Col10", float) = 0
+ _Letter_Row04_Col11("_Letter_Row04_Col11", float) = 0
+ _Letter_Row04_Col12("_Letter_Row04_Col12", float) = 0
+ _Letter_Row04_Col13("_Letter_Row04_Col13", float) = 0
+ _Letter_Row03_Col00("_Letter_Row03_Col00", float) = 0
+ _Letter_Row03_Col01("_Letter_Row03_Col01", float) = 0
+ _Letter_Row03_Col02("_Letter_Row03_Col02", float) = 0
+ _Letter_Row03_Col03("_Letter_Row03_Col03", float) = 0
+ _Letter_Row03_Col04("_Letter_Row03_Col04", float) = 0
+ _Letter_Row03_Col05("_Letter_Row03_Col05", float) = 0
+ _Letter_Row03_Col06("_Letter_Row03_Col06", float) = 0
+ _Letter_Row03_Col07("_Letter_Row03_Col07", float) = 0
+ _Letter_Row03_Col08("_Letter_Row03_Col08", float) = 0
+ _Letter_Row03_Col09("_Letter_Row03_Col09", float) = 0
+ _Letter_Row03_Col10("_Letter_Row03_Col10", float) = 0
+ _Letter_Row03_Col11("_Letter_Row03_Col11", float) = 0
+ _Letter_Row03_Col12("_Letter_Row03_Col12", float) = 0
+ _Letter_Row03_Col13("_Letter_Row03_Col13", float) = 0
}
SubShader
{
@@ -118,6 +160,48 @@ float _Letter_Row02_Col11;
float _Letter_Row02_Col12;
float _Letter_Row02_Col13;
+ float _Letter_Row03_Col00;
+ float _Letter_Row03_Col01;
+ float _Letter_Row03_Col02;
+ float _Letter_Row03_Col03;
+ float _Letter_Row03_Col04;
+ float _Letter_Row03_Col05;
+ float _Letter_Row03_Col06;
+ float _Letter_Row03_Col07;
+ float _Letter_Row03_Col08;
+ float _Letter_Row03_Col09;
+ float _Letter_Row03_Col10;
+ float _Letter_Row03_Col11;
+ float _Letter_Row03_Col12;
+ float _Letter_Row03_Col13;
+ float _Letter_Row04_Col00;
+ float _Letter_Row04_Col01;
+ float _Letter_Row04_Col02;
+ float _Letter_Row04_Col03;
+ float _Letter_Row04_Col04;
+ float _Letter_Row04_Col05;
+ float _Letter_Row04_Col06;
+ float _Letter_Row04_Col07;
+ float _Letter_Row04_Col08;
+ float _Letter_Row04_Col09;
+ float _Letter_Row04_Col10;
+ float _Letter_Row04_Col11;
+ float _Letter_Row04_Col12;
+ float _Letter_Row04_Col13;
+ float _Letter_Row05_Col00;
+ float _Letter_Row05_Col01;
+ float _Letter_Row05_Col02;
+ float _Letter_Row05_Col03;
+ float _Letter_Row05_Col04;
+ float _Letter_Row05_Col05;
+ float _Letter_Row05_Col06;
+ float _Letter_Row05_Col07;
+ float _Letter_Row05_Col08;
+ float _Letter_Row05_Col09;
+ float _Letter_Row05_Col10;
+ float _Letter_Row05_Col11;
+ float _Letter_Row05_Col12;
+ float _Letter_Row05_Col13;
v2f vert (appdata v)
{
@@ -274,6 +358,96 @@ } else if (CHAR_COL == 13) {
return _Letter_Row02_Col13;
}
+ } else if (CHAR_ROW == 3) {
+ if (CHAR_COL == 0) {
+ return _Letter_Row03_Col00;
+ } else if (CHAR_COL == 1) {
+ return _Letter_Row03_Col01;
+ } else if (CHAR_COL == 2) {
+ return _Letter_Row03_Col02;
+ } else if (CHAR_COL == 3) {
+ return _Letter_Row03_Col03;
+ } else if (CHAR_COL == 4) {
+ return _Letter_Row03_Col04;
+ } else if (CHAR_COL == 5) {
+ return _Letter_Row03_Col05;
+ } else if (CHAR_COL == 6) {
+ return _Letter_Row03_Col06;
+ } else if (CHAR_COL == 7) {
+ return _Letter_Row03_Col07;
+ } else if (CHAR_COL == 8) {
+ return _Letter_Row03_Col08;
+ } else if (CHAR_COL == 9) {
+ return _Letter_Row03_Col09;
+ } else if (CHAR_COL == 10) {
+ return _Letter_Row03_Col10;
+ } else if (CHAR_COL == 11) {
+ return _Letter_Row03_Col11;
+ } else if (CHAR_COL == 12) {
+ return _Letter_Row03_Col12;
+ } else if (CHAR_COL == 13) {
+ return _Letter_Row03_Col13;
+ }
+ } else if (CHAR_ROW == 4) {
+ if (CHAR_COL == 0) {
+ return _Letter_Row04_Col00;
+ } else if (CHAR_COL == 1) {
+ return _Letter_Row04_Col01;
+ } else if (CHAR_COL == 2) {
+ return _Letter_Row04_Col02;
+ } else if (CHAR_COL == 3) {
+ return _Letter_Row04_Col03;
+ } else if (CHAR_COL == 4) {
+ return _Letter_Row04_Col04;
+ } else if (CHAR_COL == 5) {
+ return _Letter_Row04_Col05;
+ } else if (CHAR_COL == 6) {
+ return _Letter_Row04_Col06;
+ } else if (CHAR_COL == 7) {
+ return _Letter_Row04_Col07;
+ } else if (CHAR_COL == 8) {
+ return _Letter_Row04_Col08;
+ } else if (CHAR_COL == 9) {
+ return _Letter_Row04_Col09;
+ } else if (CHAR_COL == 10) {
+ return _Letter_Row04_Col10;
+ } else if (CHAR_COL == 11) {
+ return _Letter_Row04_Col11;
+ } else if (CHAR_COL == 12) {
+ return _Letter_Row04_Col12;
+ } else if (CHAR_COL == 13) {
+ return _Letter_Row04_Col13;
+ }
+ } else if (CHAR_ROW == 5) {
+ if (CHAR_COL == 0) {
+ return _Letter_Row05_Col00;
+ } else if (CHAR_COL == 1) {
+ return _Letter_Row05_Col01;
+ } else if (CHAR_COL == 2) {
+ return _Letter_Row05_Col02;
+ } else if (CHAR_COL == 3) {
+ return _Letter_Row05_Col03;
+ } else if (CHAR_COL == 4) {
+ return _Letter_Row05_Col04;
+ } else if (CHAR_COL == 5) {
+ return _Letter_Row05_Col05;
+ } else if (CHAR_COL == 6) {
+ return _Letter_Row05_Col06;
+ } else if (CHAR_COL == 7) {
+ return _Letter_Row05_Col07;
+ } else if (CHAR_COL == 8) {
+ return _Letter_Row05_Col08;
+ } else if (CHAR_COL == 9) {
+ return _Letter_Row05_Col09;
+ } else if (CHAR_COL == 10) {
+ return _Letter_Row05_Col10;
+ } else if (CHAR_COL == 11) {
+ return _Letter_Row05_Col11;
+ } else if (CHAR_COL == 12) {
+ return _Letter_Row05_Col12;
+ } else if (CHAR_COL == 13) {
+ return _Letter_Row05_Col13;
+ }
}
return float2(0, 0);
diff --git a/TaSTT_params.asset b/TaSTT_params.asset index 8809134..8a90a3e 100644 --- a/TaSTT_params.asset +++ b/TaSTT_params.asset @@ -61,3 +61,51 @@ MonoBehaviour: valueType: 0 saved: 0 defaultValue: 0 + - name: _Letter_Row03_Col00_03 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row03_Col04_07 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row03_Col08_11 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row03_Col12_13 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row04_Col00_03 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row04_Col04_07 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row04_Col08_11 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row04_Col12_13 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row05_Col00_03 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row05_Col04_07 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row05_Col08_11 + valueType: 0 + saved: 0 + defaultValue: 0 + - name: _Letter_Row05_Col12_13 + valueType: 0 + saved: 0 + defaultValue: 0 diff --git a/cell_names.txt b/cell_names.txt index f556d3c..1000cd1 100644 --- a/cell_names.txt +++ b/cell_names.txt @@ -40,3 +40,45 @@ _Letter_Row02_Col10 _Letter_Row02_Col11 _Letter_Row02_Col12 _Letter_Row02_Col13 +_Letter_Row03_Col00 +_Letter_Row03_Col01 +_Letter_Row03_Col02 +_Letter_Row03_Col03 +_Letter_Row03_Col04 +_Letter_Row03_Col05 +_Letter_Row03_Col06 +_Letter_Row03_Col07 +_Letter_Row03_Col08 +_Letter_Row03_Col09 +_Letter_Row03_Col10 +_Letter_Row03_Col11 +_Letter_Row03_Col12 +_Letter_Row03_Col13 +_Letter_Row04_Col00 +_Letter_Row04_Col01 +_Letter_Row04_Col02 +_Letter_Row04_Col03 +_Letter_Row04_Col04 +_Letter_Row04_Col05 +_Letter_Row04_Col06 +_Letter_Row04_Col07 +_Letter_Row04_Col08 +_Letter_Row04_Col09 +_Letter_Row04_Col10 +_Letter_Row04_Col11 +_Letter_Row04_Col12 +_Letter_Row04_Col13 +_Letter_Row05_Col00 +_Letter_Row05_Col01 +_Letter_Row05_Col02 +_Letter_Row05_Col03 +_Letter_Row05_Col04 +_Letter_Row05_Col05 +_Letter_Row05_Col06 +_Letter_Row05_Col07 +_Letter_Row05_Col08 +_Letter_Row05_Col09 +_Letter_Row05_Col10 +_Letter_Row05_Col11 +_Letter_Row05_Col12 +_Letter_Row05_Col13 diff --git a/generate_animations.sh b/generate_animations.sh index b3e6e78..12e49f3 100644 --- a/generate_animations.sh +++ b/generate_animations.sh @@ -2,7 +2,7 @@ # One animation per slot, per letter. # For upper-lower + a few symbols, this is roughly -# 3 * 12 * 60 \approx 2000 animations. +# 6 * 14 * 128 \approx 8000 animations. # Hopefully we don't hit some limit, lmao set -o errexit @@ -11,12 +11,12 @@ set -o pipefail [ -d generated/animations ] && rm -rf generated || true mkdir -p generated/animations -for row in `seq 0 2`; do +for row in `seq 0 5`; do ROW_PADDED=$(printf '%02d' $row) for col in `seq 0 13`; do COL_PADDED=$(printf '%02d' $col) LETTER_SHADER_PARAM=_Letter_Row${ROW_PADDED}_Col${COL_PADDED} - for letter in `seq 0 60`; do + for letter in `seq 0 128`; do LETTER_PADDED=$(printf '%02d' $letter) ANIM_NAME=${LETTER_SHADER_PARAM}_Letter${LETTER_PADDED} FILENAME=generated/animations/${ANIM_NAME}.anim diff --git a/generate_fx.py b/generate_fx.py index a39b618..2deadba 100644 --- a/generate_fx.py +++ b/generate_fx.py @@ -45,7 +45,7 @@ params["ANIMATOR_STATE_TRANSITION_U"] = "1101" # By default, the board shows an empty character in every group/cell. # Technically we only have to initialize groups, since SetLetters.cs will use # the groups to populate the cells. -DEFAULT_CHAR=1 +DEFAULT_CHAR=64 # 64 == space == blank params["DEFAULT_GROUP_VAL"] = str((DEFAULT_CHAR << 24) | (DEFAULT_CHAR << 16) | (DEFAULT_CHAR << 8) | DEFAULT_CHAR) params["DEFAULT_CELL_VAL"] = str(DEFAULT_CHAR) params["DEFAULT_INT_VAL"] = str(0) @@ -146,6 +146,18 @@ GROUP_NAMES = [ "_Letter_Row02_Col04_07", "_Letter_Row02_Col08_11", "_Letter_Row02_Col12_13", + "_Letter_Row03_Col00_03", + "_Letter_Row03_Col04_07", + "_Letter_Row03_Col08_11", + "_Letter_Row03_Col12_13", + "_Letter_Row04_Col00_03", + "_Letter_Row04_Col04_07", + "_Letter_Row04_Col08_11", + "_Letter_Row04_Col12_13", + "_Letter_Row05_Col00_03", + "_Letter_Row05_Col04_07", + "_Letter_Row05_Col08_11", + "_Letter_Row05_Col12_13", ] CELL_NAMES = [ @@ -191,28 +203,69 @@ CELL_NAMES = [ "_Letter_Row02_Col11", "_Letter_Row02_Col12", "_Letter_Row02_Col13", + "_Letter_Row03_Col00", + "_Letter_Row03_Col01", + "_Letter_Row03_Col02", + "_Letter_Row03_Col03", + "_Letter_Row03_Col04", + "_Letter_Row03_Col05", + "_Letter_Row03_Col06", + "_Letter_Row03_Col07", + "_Letter_Row03_Col08", + "_Letter_Row03_Col09", + "_Letter_Row03_Col10", + "_Letter_Row03_Col11", + "_Letter_Row03_Col12", + "_Letter_Row03_Col13", + "_Letter_Row04_Col00", + "_Letter_Row04_Col01", + "_Letter_Row04_Col02", + "_Letter_Row04_Col03", + "_Letter_Row04_Col04", + "_Letter_Row04_Col05", + "_Letter_Row04_Col06", + "_Letter_Row04_Col07", + "_Letter_Row04_Col08", + "_Letter_Row04_Col09", + "_Letter_Row04_Col10", + "_Letter_Row04_Col11", + "_Letter_Row04_Col12", + "_Letter_Row04_Col13", + "_Letter_Row05_Col00", + "_Letter_Row05_Col01", + "_Letter_Row05_Col02", + "_Letter_Row05_Col03", + "_Letter_Row05_Col04", + "_Letter_Row05_Col05", + "_Letter_Row05_Col06", + "_Letter_Row05_Col07", + "_Letter_Row05_Col08", + "_Letter_Row05_Col09", + "_Letter_Row05_Col10", + "_Letter_Row05_Col11", + "_Letter_Row05_Col12", + "_Letter_Row05_Col13", ] def genAnimator(state): - result = replaceMacros(ANIMATOR_HEADER, params) - result += ANIMATOR_PARAMETER_HEADER + print(replaceMacros(ANIMATOR_HEADER, params)) + print(ANIMATOR_PARAMETER_HEADER) for group_name in GROUP_NAMES: params["ANIMATOR_PARAMETER_NAME"] = group_name params["DEFAULT_INT_VAL"] = params["DEFAULT_GROUP_VAL"] - result += replaceMacros(ANIMATOR_PARAMETER_INT, params) + print(replaceMacros(ANIMATOR_PARAMETER_INT, params)) for cell_name in CELL_NAMES: params["ANIMATOR_PARAMETER_NAME"] = cell_name params["DEFAULT_INT_VAL"] = params["DEFAULT_CELL_VAL"] - result += replaceMacros(ANIMATOR_PARAMETER_INT, params) - result += replaceMacros(ANIMATOR_LAYER_HEADER, params) - result += replaceMacros(ANIMATOR_LAYER_EXPAND_GROUPS, params) + print(replaceMacros(ANIMATOR_PARAMETER_INT, params)) + print(replaceMacros(ANIMATOR_LAYER_HEADER, params)) + print(replaceMacros(ANIMATOR_LAYER_EXPAND_GROUPS, params)) for cell_name in CELL_NAMES: params[cell_name + "_U2"] = get_u2("1102", state) params["LAYER_NAME"] = cell_name params["LAYER_STATE_MACHINE_U2"] = params[cell_name + "_U2"] - result += replaceMacros(ANIMATOR_LAYER_CELL_ANIM, params) - return result -print(genAnimator(state)) + print(replaceMacros(ANIMATOR_LAYER_CELL_ANIM, params)) +genAnimator(state) EXPAND_GROUPS_LAYER = """ --- !u!%ANIMATOR_STATE_MACHINE_U% &%EXPAND_GROUPS_LAYER_U2% @@ -287,10 +340,9 @@ MonoBehaviour: # Generate the layer that converts our select few 32-bit int parameters into # 4x as many int parameters, each containing the letter value for one cell. def genExpandGroupsLayer(): - result = EXPAND_GROUPS_LAYER + EXPAND_GROUPS_LAYER_STATE + SET_LETTERS_SCRIPT - result = replaceMacros(result, params) - return result -print(genExpandGroupsLayer()) + tmp = EXPAND_GROUPS_LAYER + EXPAND_GROUPS_LAYER_STATE + SET_LETTERS_SCRIPT + print(replaceMacros(tmp, params)) +genExpandGroupsLayer() CELL_LAYER_HEADER=""" --- !u!%ANIMATOR_STATE_MACHINE_U% &%CELL_LAYER_U2% @@ -396,46 +448,43 @@ def getAnimationGuid(anim_meta_filename): return None def genCellAnimationLayers(state): - result = "" for layer in CELL_NAMES: params["CELL_LAYER_U2"] = params[layer + "_U2"] params["CELL_LAYER_U2" + layer] = params["CELL_LAYER_U2"] params["LAYER_NAME"] = layer - result += replaceMacros(CELL_LAYER_HEADER, params) + print(replaceMacros(CELL_LAYER_HEADER, params)) # Add a state for each animation, i.e. for each character writeable in this slot. - for i in range(0,60): + for i in range(0,128): params["CELL_LAYER_STATE_U2"] = get_u2(params["ANIMATOR_STATE_U"], state) params["CELL_LAYER_STATE_U2" + layer + ("_Letter%02d" % i)] = params["CELL_LAYER_STATE_U2"] params["STATE_Y"] = str(-190 - i * 40) - result += replaceMacros(CELL_LAYER_STATE_HEADER, params) + print(replaceMacros(CELL_LAYER_STATE_HEADER, params)) - result += CELL_LAYER_MIDDLE + print(CELL_LAYER_MIDDLE) - for i in range(0,60): + for i in range(0,128): params["CELL_LAYER_TRANSITION_U2"] = get_u2(params["ANIMATOR_STATE_TRANSITION_U"], state) params["CELL_LAYER_TRANSITION_U2" + layer + ("_Letter%02d" % i)] = params["CELL_LAYER_TRANSITION_U2"] - result += replaceMacros(CELL_LAYER_TRANSITION_HEADER, params) + print(replaceMacros(CELL_LAYER_TRANSITION_HEADER, params)) # Set the default layer to the 0th animation. params["CELL_LAYER_DEFAULT_STATE_U2"] = params["CELL_LAYER_STATE_U2" + layer + ("_Letter%02d" % 0)] - result += replaceMacros(CELL_LAYER_SUFFIX, params) + print(replaceMacros(CELL_LAYER_SUFFIX, params)) # Done creating the layer header! Phew. Let's make the states next. - for i in range(0,60): + for i in range(0,128): params["ANIMATION_NAME"] = layer + ("_Letter%02d" % i) params["CELL_LAYER_STATE_U2"] = params["CELL_LAYER_STATE_U2" + layer + ("_Letter%02d" % i)] # Get the GUID of the animation we will play at this state. anim_meta_filename = "generated/animations/" + layer + ("_Letter%02d" % i) + ".anim.meta" params["CELL_LAYER_STATE_ANIM_GUID"] = getAnimationGuid(anim_meta_filename) - result += replaceMacros(CELL_LAYER_STATE, params) + print(replaceMacros(CELL_LAYER_STATE, params)) # OK, finally, let's wire up the states. - for i in range(0,60): + for i in range(0,128): params["CELL_LAYER_TRANSITION_U2"] = params["CELL_LAYER_TRANSITION_U2" + layer + ("_Letter%02d" % i)] params["TRANSITION_THRESHOLD"] = str(i) params["CELL_LAYER_DST_STATE_U2"] = params["CELL_LAYER_STATE_U2" + layer + ("_Letter%02d" % i)] - result += replaceMacros(CELL_LAYER_TRANSITION, params) - - return result -print(genCellAnimationLayers(state)) + print(replaceMacros(CELL_LAYER_TRANSITION, params)) +genCellAnimationLayers(state) diff --git a/group_names.txt b/group_names.txt index cdf19e0..0c39082 100644 --- a/group_names.txt +++ b/group_names.txt @@ -10,3 +10,15 @@ _Letter_Row02_Col00_03 _Letter_Row02_Col04_07 _Letter_Row02_Col08_11 _Letter_Row02_Col12_13 +_Letter_Row03_Col00_03 +_Letter_Row03_Col04_07 +_Letter_Row03_Col08_11 +_Letter_Row03_Col12_13 +_Letter_Row04_Col00_03 +_Letter_Row04_Col04_07 +_Letter_Row04_Col08_11 +_Letter_Row04_Col12_13 +_Letter_Row05_Col00_03 +_Letter_Row05_Col04_07 +_Letter_Row05_Col08_11 +_Letter_Row05_Col12_13 |