summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev_cheatsheat.txt4
-rw-r--r--generate_params.py22
-rw-r--r--generate_utils.py4
-rw-r--r--libtastt.py12
-rw-r--r--osc_ctrl.py32
5 files changed, 38 insertions, 36 deletions
diff --git a/dev_cheatsheat.txt b/dev_cheatsheat.txt
index cf9f39a..c1832ea 100644
--- a/dev_cheatsheat.txt
+++ b/dev_cheatsheat.txt
@@ -12,8 +12,8 @@ rm -rf generated/animations
./libunity.py guid_map --project_root=$(cd ..; pwd) --save_to guid.map
./libtastt.py gen_anims
./libtastt.py gen_fx > TaSTT_fx.controller
-#./libunity.py merge --fx0 ../FXGeneric.controller --fx1 ../FXSpecific.controller > FX0.controller
-cp ../FXGeneric.controller FX0.controller
+./libunity.py merge --fx0 ../FXGeneric.controller --fx1 ../FXSpecific.controller > FX0.controller
+#cp ../FXGeneric.controller FX0.controller
./libunity.py add_toggle --fx0 FX0.controller > FX1.controller
./libunity.py merge --fx0 FX1.controller --fx1 TaSTT_fx.controller > FX2.controller
./libunity.py set_noop_anim --fx0 FX2.controller --guid_map guid.map > FX3.controller
diff --git a/generate_params.py b/generate_params.py
index d09be63..e9b29d5 100644
--- a/generate_params.py
+++ b/generate_params.py
@@ -72,18 +72,18 @@ print(generate_utils.replaceMacros(BOOL_PARAM, params))
params["PARAM_NAME"] = generate_utils.getClearBoardParam()
print(generate_utils.replaceMacros(BOOL_PARAM, params))
-for i in range(0, generate_utils.NUM_LAYERS):
- params["PARAM_NAME"] = generate_utils.getLayerParam(i)
- print(generate_utils.replaceMacros(INT_PARAM, params))
+params["PARAM_NAME"] = generate_utils.getSelectParam(0)
+print(generate_utils.replaceMacros(BOOL_PARAM, params))
- params["PARAM_NAME"] = generate_utils.getSelectParam(i, 0)
- print(generate_utils.replaceMacros(BOOL_PARAM, params))
+params["PARAM_NAME"] = generate_utils.getSelectParam(1)
+print(generate_utils.replaceMacros(BOOL_PARAM, params))
- params["PARAM_NAME"] = generate_utils.getSelectParam(i, 1)
- print(generate_utils.replaceMacros(BOOL_PARAM, params))
+params["PARAM_NAME"] = generate_utils.getSelectParam(2)
+print(generate_utils.replaceMacros(BOOL_PARAM, params))
- params["PARAM_NAME"] = generate_utils.getSelectParam(i, 2)
- print(generate_utils.replaceMacros(BOOL_PARAM, params))
+params["PARAM_NAME"] = generate_utils.getSelectParam(3)
+print(generate_utils.replaceMacros(BOOL_PARAM, params))
- params["PARAM_NAME"] = generate_utils.getSelectParam(i, 3)
- print(generate_utils.replaceMacros(BOOL_PARAM, params))
+for i in range(0, generate_utils.NUM_LAYERS):
+ params["PARAM_NAME"] = generate_utils.getLayerParam(i)
+ print(generate_utils.replaceMacros(INT_PARAM, params))
diff --git a/generate_utils.py b/generate_utils.py
index 3ad8050..78ff512 100644
--- a/generate_utils.py
+++ b/generate_utils.py
@@ -90,8 +90,8 @@ def getS3StateName(which_layer, s0, s1, s2, s3):
def getLetterStateName(which_layer, s0, s1, s2, s3, letter):
return "TaSTT_L%02d_S%02d_S%02d_S%02d_S%02d_L%03d" % (which_layer, s0, s1, s2, s3, letter)
-def getSelectParam(which_layer: int, which_select: int) -> str:
- return "TaSTT_L%02d_S%02d" % (which_layer, which_select)
+def getSelectParam(which_select: int) -> str:
+ return "TaSTT_S%02d" % (which_select)
def getEnableParam():
return "TaSTT_Enable"
diff --git a/libtastt.py b/libtastt.py
index a9b9fe8..4fc273b 100644
--- a/libtastt.py
+++ b/libtastt.py
@@ -256,11 +256,11 @@ def generateFXController(anim: libunity.UnityAnimator) -> typing.Dict[int, libun
layers = {}
for i in range(0, generate_utils.NUM_LAYERS):
anim.addParameter(generate_utils.getLayerParam(i), int)
- for j in range(0, generate_utils.INDEX_BITS):
- anim.addParameter(generate_utils.getSelectParam(i, j), bool)
layer = anim.addLayer(generate_utils.getLayerName(i))
layers[i] = layer
+ for i in range(0, generate_utils.INDEX_BITS):
+ anim.addParameter(generate_utils.getSelectParam(i), bool)
return layers
@@ -289,7 +289,7 @@ def generateFXLayer(which_layer: int, anim: libunity.UnityAnimator, layer:
state = s0_states[s0]
s0_state_transition = anim.addTransition(state)
- s0_param = generate_utils.getSelectParam(which_layer, 0)
+ s0_param = generate_utils.getSelectParam(0)
anim.addTransitionBooleanCondition(active_state, s0_state_transition,
s0_param, s0 != 0)
@@ -305,7 +305,7 @@ def generateFXLayer(which_layer: int, anim: libunity.UnityAnimator, layer:
state = s1_states[s0][s1]
s1_state_transition = anim.addTransition(state)
- s1_param = generate_utils.getSelectParam(which_layer, 1)
+ s1_param = generate_utils.getSelectParam(1)
anim.addTransitionBooleanCondition(s0_states[s0], s1_state_transition,
s1_param, s1 != 0)
@@ -323,7 +323,7 @@ def generateFXLayer(which_layer: int, anim: libunity.UnityAnimator, layer:
state = s2_states[s0][s1][s2]
s2_state_transition = anim.addTransition(state)
- s2_param = generate_utils.getSelectParam(which_layer, 2)
+ s2_param = generate_utils.getSelectParam(2)
anim.addTransitionBooleanCondition(s1_states[s0][s1], s2_state_transition,
s2_param, s2 != 0)
@@ -343,7 +343,7 @@ def generateFXLayer(which_layer: int, anim: libunity.UnityAnimator, layer:
state = s3_states[s0][s1][s2][s3]
s3_state_transition = anim.addTransition(state)
- s3_param = generate_utils.getSelectParam(which_layer, 3)
+ s3_param = generate_utils.getSelectParam(3)
anim.addTransitionBooleanCondition(s2_states[s0][s1][s2], s3_state_transition,
s3_param, s3 != 0)
diff --git a/osc_ctrl.py b/osc_ctrl.py
index 259a8c2..4c243f0 100644
--- a/osc_ctrl.py
+++ b/osc_ctrl.py
@@ -73,22 +73,10 @@ def encodeMessage(lines):
result += [state.encoding[' ']] * (BOARD_COLS - len(line))
return result
-def updateCell(client, cell_idx, letter_encoded, s0, s1, s2, s3):
+def updateCell(client, cell_idx, letter_encoded):
addr="/avatar/parameters/" + getLayerParam(cell_idx)
client.send_message(addr, letter_encoded)
- addr="/avatar/parameters/" + getSelectParam(cell_idx, 0)
- client.send_message(addr, s0)
-
- addr="/avatar/parameters/" + getSelectParam(cell_idx, 1)
- client.send_message(addr, s1)
-
- addr="/avatar/parameters/" + getSelectParam(cell_idx, 2)
- client.send_message(addr, s2)
-
- addr="/avatar/parameters/" + getSelectParam(cell_idx, 3)
- client.send_message(addr, s3)
-
def enable(client):
addr="/avatar/parameters/" + getEnableParam()
client.send_message(addr, True)
@@ -118,9 +106,23 @@ def sendMessageCellDiscrete(client, msg_cell, which_cell):
s2 = ((floor(which_cell / 2) % 2) == 1)
s3 = ((floor(which_cell / 1) % 2) == 1)
- # Seek each layer to the current cell.
+ # Seek to the current cell.
+ addr="/avatar/parameters/" + getSelectParam(0)
+ client.send_message(addr, s0)
+
+ addr="/avatar/parameters/" + getSelectParam(1)
+ client.send_message(addr, s1)
+
+ addr="/avatar/parameters/" + getSelectParam(2)
+ client.send_message(addr, s2)
+
+ addr="/avatar/parameters/" + getSelectParam(3)
+ client.send_message(addr, s3)
+
+ # Update each letter
for i in range(0, len(msg_cell)):
- updateCell(client, i, msg_cell[i], s0, s1, s2, s3)
+ updateCell(client, i, msg_cell[i])
+
if msg_cell != empty_cell:
addr="/avatar/parameters/" + generate_utils.getSpeechNoiseToggleParam()
client.send_message(addr, False)
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 21:39:46 +0000