diff options
| author | yum <yum.food.vr@gmail.com> | 2022-10-04 16:15:46 -0700 |
|---|---|---|
| committer | yum <yum.food.vr@gmail.com> | 2022-10-04 16:15:46 -0700 |
| commit | 5ec9add7c4bc74c8f0762ce3b1407732f3e76f7f (patch) | |
| tree | d85f4e437e0e40433b35d094871984b629d57191 | |
| parent | caf65aad0715a61fde28b712823d3cc28615eea2 (diff) | |
Add osc_ctrl.ResizeBoard
It's a little buggy; it likes to overwrite cells on the board. No idea
why.
| -rw-r--r-- | Animations/TaSTT_Do_Nothing.anim | 71 | ||||
| -rw-r--r-- | TaSTT.shader | 712 | ||||
| -rw-r--r-- | generate_fx.py | 10 | ||||
| -rw-r--r-- | osc_ctrl.py | 129 |
4 files changed, 455 insertions, 467 deletions
diff --git a/Animations/TaSTT_Do_Nothing.anim b/Animations/TaSTT_Do_Nothing.anim index 354d19e..1ec34ca 100644 --- a/Animations/TaSTT_Do_Nothing.anim +++ b/Animations/TaSTT_Do_Nothing.anim @@ -16,35 +16,7 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Dummy - path: CustomSTT - classID: 137 - script: {fileID: 0} + m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -52,21 +24,14 @@ AnimationClip: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 2794480623 - attribute: 2215457191 - script: {fileID: 0} - typeID: 137 - customType: 22 - isPPtrCurve: 0 + genericBindings: [] pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -81,35 +46,7 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.016666668 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: material._Dummy - path: CustomSTT - classID: 137 - script: {fileID: 0} + m_EditorCurves: [] m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/TaSTT.shader b/TaSTT.shader index eb87bcf..0d00abe 100644 --- a/TaSTT.shader +++ b/TaSTT.shader @@ -4,184 +4,184 @@ {
_MainTex ("Texture", 2D) = "white" {}
// software "engineering" LULW
- _Letter_Row00_Col00("_Letter_Row00_Col00", float) = 64
- _Letter_Row00_Col01("_Letter_Row00_Col01", float) = 64
- _Letter_Row00_Col02("_Letter_Row00_Col02", float) = 64
- _Letter_Row00_Col03("_Letter_Row00_Col03", float) = 64
- _Letter_Row00_Col04("_Letter_Row00_Col04", float) = 64
- _Letter_Row00_Col05("_Letter_Row00_Col05", float) = 64
- _Letter_Row00_Col06("_Letter_Row00_Col06", float) = 64
- _Letter_Row00_Col07("_Letter_Row00_Col07", float) = 64
- _Letter_Row00_Col08("_Letter_Row00_Col08", float) = 64
- _Letter_Row00_Col09("_Letter_Row00_Col09", float) = 64
- _Letter_Row00_Col10("_Letter_Row00_Col10", float) = 64
- _Letter_Row00_Col11("_Letter_Row00_Col11", float) = 64
- _Letter_Row00_Col12("_Letter_Row00_Col12", float) = 64
- _Letter_Row00_Col13("_Letter_Row00_Col13", float) = 64
- _Letter_Row00_Col14("_Letter_Row00_Col14", float) = 64
- _Letter_Row00_Col15("_Letter_Row00_Col15", float) = 64
- _Letter_Row00_Col16("_Letter_Row00_Col16", float) = 64
- _Letter_Row00_Col17("_Letter_Row00_Col17", float) = 64
- _Letter_Row00_Col18("_Letter_Row00_Col18", float) = 64
- _Letter_Row00_Col19("_Letter_Row00_Col19", float) = 64
- _Letter_Row00_Col20("_Letter_Row00_Col20", float) = 64
- _Letter_Row00_Col21("_Letter_Row00_Col21", float) = 64
- _Letter_Row01_Col00("_Letter_Row01_Col00", float) = 64
- _Letter_Row01_Col01("_Letter_Row01_Col01", float) = 64
- _Letter_Row01_Col02("_Letter_Row01_Col02", float) = 64
- _Letter_Row01_Col03("_Letter_Row01_Col03", float) = 64
- _Letter_Row01_Col04("_Letter_Row01_Col04", float) = 64
- _Letter_Row01_Col05("_Letter_Row01_Col05", float) = 64
- _Letter_Row01_Col06("_Letter_Row01_Col06", float) = 64
- _Letter_Row01_Col07("_Letter_Row01_Col07", float) = 64
- _Letter_Row01_Col08("_Letter_Row01_Col08", float) = 64
- _Letter_Row01_Col09("_Letter_Row01_Col09", float) = 64
- _Letter_Row01_Col10("_Letter_Row01_Col10", float) = 64
- _Letter_Row01_Col11("_Letter_Row01_Col11", float) = 64
- _Letter_Row01_Col12("_Letter_Row01_Col12", float) = 64
- _Letter_Row01_Col13("_Letter_Row01_Col13", float) = 64
- _Letter_Row01_Col14("_Letter_Row01_Col14", float) = 64
- _Letter_Row01_Col15("_Letter_Row01_Col15", float) = 64
- _Letter_Row01_Col16("_Letter_Row01_Col16", float) = 64
- _Letter_Row01_Col17("_Letter_Row01_Col17", float) = 64
- _Letter_Row01_Col18("_Letter_Row01_Col18", float) = 64
- _Letter_Row01_Col19("_Letter_Row01_Col19", float) = 64
- _Letter_Row01_Col20("_Letter_Row01_Col20", float) = 64
- _Letter_Row01_Col21("_Letter_Row01_Col21", float) = 64
- _Letter_Row02_Col00("_Letter_Row02_Col00", float) = 64
- _Letter_Row02_Col01("_Letter_Row02_Col01", float) = 64
- _Letter_Row02_Col02("_Letter_Row02_Col02", float) = 64
- _Letter_Row02_Col03("_Letter_Row02_Col03", float) = 64
- _Letter_Row02_Col04("_Letter_Row02_Col04", float) = 64
- _Letter_Row02_Col05("_Letter_Row02_Col05", float) = 64
- _Letter_Row02_Col06("_Letter_Row02_Col06", float) = 64
- _Letter_Row02_Col07("_Letter_Row02_Col07", float) = 64
- _Letter_Row02_Col08("_Letter_Row02_Col08", float) = 64
- _Letter_Row02_Col09("_Letter_Row02_Col09", float) = 64
- _Letter_Row02_Col10("_Letter_Row02_Col10", float) = 64
- _Letter_Row02_Col11("_Letter_Row02_Col11", float) = 64
- _Letter_Row02_Col12("_Letter_Row02_Col12", float) = 64
- _Letter_Row02_Col13("_Letter_Row02_Col13", float) = 64
- _Letter_Row02_Col14("_Letter_Row02_Col14", float) = 64
- _Letter_Row02_Col15("_Letter_Row02_Col15", float) = 64
- _Letter_Row02_Col16("_Letter_Row02_Col16", float) = 64
- _Letter_Row02_Col17("_Letter_Row02_Col17", float) = 64
- _Letter_Row02_Col18("_Letter_Row02_Col18", float) = 64
- _Letter_Row02_Col19("_Letter_Row02_Col19", float) = 64
- _Letter_Row02_Col20("_Letter_Row02_Col20", float) = 64
- _Letter_Row02_Col21("_Letter_Row02_Col21", float) = 64
- _Letter_Row03_Col00("_Letter_Row03_Col00", float) = 64
- _Letter_Row03_Col01("_Letter_Row03_Col01", float) = 64
- _Letter_Row03_Col02("_Letter_Row03_Col02", float) = 64
- _Letter_Row03_Col03("_Letter_Row03_Col03", float) = 64
- _Letter_Row03_Col04("_Letter_Row03_Col04", float) = 64
- _Letter_Row03_Col05("_Letter_Row03_Col05", float) = 64
- _Letter_Row03_Col06("_Letter_Row03_Col06", float) = 64
- _Letter_Row03_Col07("_Letter_Row03_Col07", float) = 64
- _Letter_Row03_Col08("_Letter_Row03_Col08", float) = 64
- _Letter_Row03_Col09("_Letter_Row03_Col09", float) = 64
- _Letter_Row03_Col10("_Letter_Row03_Col10", float) = 64
- _Letter_Row03_Col11("_Letter_Row03_Col11", float) = 64
- _Letter_Row03_Col12("_Letter_Row03_Col12", float) = 64
- _Letter_Row03_Col13("_Letter_Row03_Col13", float) = 64
- _Letter_Row03_Col14("_Letter_Row03_Col14", float) = 64
- _Letter_Row03_Col15("_Letter_Row03_Col15", float) = 64
- _Letter_Row03_Col16("_Letter_Row03_Col16", float) = 64
- _Letter_Row03_Col17("_Letter_Row03_Col17", float) = 64
- _Letter_Row03_Col18("_Letter_Row03_Col18", float) = 64
- _Letter_Row03_Col19("_Letter_Row03_Col19", float) = 64
- _Letter_Row03_Col20("_Letter_Row03_Col20", float) = 64
- _Letter_Row03_Col21("_Letter_Row03_Col21", float) = 64
- _Letter_Row04_Col00("_Letter_Row04_Col00", float) = 64
- _Letter_Row04_Col01("_Letter_Row04_Col01", float) = 64
- _Letter_Row04_Col02("_Letter_Row04_Col02", float) = 64
- _Letter_Row04_Col03("_Letter_Row04_Col03", float) = 64
- _Letter_Row04_Col04("_Letter_Row04_Col04", float) = 64
- _Letter_Row04_Col05("_Letter_Row04_Col05", float) = 64
- _Letter_Row04_Col06("_Letter_Row04_Col06", float) = 64
- _Letter_Row04_Col07("_Letter_Row04_Col07", float) = 64
- _Letter_Row04_Col08("_Letter_Row04_Col08", float) = 64
- _Letter_Row04_Col09("_Letter_Row04_Col09", float) = 64
- _Letter_Row04_Col10("_Letter_Row04_Col10", float) = 64
- _Letter_Row04_Col11("_Letter_Row04_Col11", float) = 64
- _Letter_Row04_Col12("_Letter_Row04_Col12", float) = 64
- _Letter_Row04_Col13("_Letter_Row04_Col13", float) = 64
- _Letter_Row04_Col14("_Letter_Row04_Col14", float) = 64
- _Letter_Row04_Col15("_Letter_Row04_Col15", float) = 64
- _Letter_Row04_Col16("_Letter_Row04_Col16", float) = 64
- _Letter_Row04_Col17("_Letter_Row04_Col17", float) = 64
- _Letter_Row04_Col18("_Letter_Row04_Col18", float) = 64
- _Letter_Row04_Col19("_Letter_Row04_Col19", float) = 64
- _Letter_Row04_Col20("_Letter_Row04_Col20", float) = 64
- _Letter_Row04_Col21("_Letter_Row04_Col21", float) = 64
- _Letter_Row05_Col00("_Letter_Row05_Col00", float) = 64
- _Letter_Row05_Col01("_Letter_Row05_Col01", float) = 64
- _Letter_Row05_Col02("_Letter_Row05_Col02", float) = 64
- _Letter_Row05_Col03("_Letter_Row05_Col03", float) = 64
- _Letter_Row05_Col04("_Letter_Row05_Col04", float) = 64
- _Letter_Row05_Col05("_Letter_Row05_Col05", float) = 64
- _Letter_Row05_Col06("_Letter_Row05_Col06", float) = 64
- _Letter_Row05_Col07("_Letter_Row05_Col07", float) = 64
- _Letter_Row05_Col08("_Letter_Row05_Col08", float) = 64
- _Letter_Row05_Col09("_Letter_Row05_Col09", float) = 64
- _Letter_Row05_Col10("_Letter_Row05_Col10", float) = 64
- _Letter_Row05_Col11("_Letter_Row05_Col11", float) = 64
- _Letter_Row05_Col12("_Letter_Row05_Col12", float) = 64
- _Letter_Row05_Col13("_Letter_Row05_Col13", float) = 64
- _Letter_Row05_Col14("_Letter_Row05_Col14", float) = 64
- _Letter_Row05_Col15("_Letter_Row05_Col15", float) = 64
- _Letter_Row05_Col16("_Letter_Row05_Col16", float) = 64
- _Letter_Row05_Col17("_Letter_Row05_Col17", float) = 64
- _Letter_Row05_Col18("_Letter_Row05_Col18", float) = 64
- _Letter_Row05_Col19("_Letter_Row05_Col19", float) = 64
- _Letter_Row05_Col20("_Letter_Row05_Col20", float) = 64
- _Letter_Row05_Col21("_Letter_Row05_Col21", float) = 64
- _Letter_Row06_Col00("_Letter_Row06_Col00", float) = 64
- _Letter_Row06_Col01("_Letter_Row06_Col01", float) = 64
- _Letter_Row06_Col02("_Letter_Row06_Col02", float) = 64
- _Letter_Row06_Col03("_Letter_Row06_Col03", float) = 64
- _Letter_Row06_Col04("_Letter_Row06_Col04", float) = 64
- _Letter_Row06_Col05("_Letter_Row06_Col05", float) = 64
- _Letter_Row06_Col06("_Letter_Row06_Col06", float) = 64
- _Letter_Row06_Col07("_Letter_Row06_Col07", float) = 64
- _Letter_Row06_Col08("_Letter_Row06_Col08", float) = 64
- _Letter_Row06_Col09("_Letter_Row06_Col09", float) = 64
- _Letter_Row06_Col10("_Letter_Row06_Col10", float) = 64
- _Letter_Row06_Col11("_Letter_Row06_Col11", float) = 64
- _Letter_Row06_Col12("_Letter_Row06_Col12", float) = 64
- _Letter_Row06_Col13("_Letter_Row06_Col13", float) = 64
- _Letter_Row06_Col14("_Letter_Row06_Col14", float) = 64
- _Letter_Row06_Col15("_Letter_Row06_Col15", float) = 64
- _Letter_Row06_Col16("_Letter_Row06_Col16", float) = 64
- _Letter_Row06_Col17("_Letter_Row06_Col17", float) = 64
- _Letter_Row06_Col18("_Letter_Row06_Col18", float) = 64
- _Letter_Row06_Col19("_Letter_Row06_Col19", float) = 64
- _Letter_Row06_Col20("_Letter_Row06_Col20", float) = 64
- _Letter_Row06_Col21("_Letter_Row06_Col21", float) = 64
- _Letter_Row07_Col00("_Letter_Row07_Col00", float) = 64
- _Letter_Row07_Col01("_Letter_Row07_Col01", float) = 64
- _Letter_Row07_Col02("_Letter_Row07_Col02", float) = 64
- _Letter_Row07_Col03("_Letter_Row07_Col03", float) = 64
- _Letter_Row07_Col04("_Letter_Row07_Col04", float) = 64
- _Letter_Row07_Col05("_Letter_Row07_Col05", float) = 64
- _Letter_Row07_Col06("_Letter_Row07_Col06", float) = 64
- _Letter_Row07_Col07("_Letter_Row07_Col07", float) = 64
- _Letter_Row07_Col08("_Letter_Row07_Col08", float) = 64
- _Letter_Row07_Col09("_Letter_Row07_Col09", float) = 64
- _Letter_Row07_Col10("_Letter_Row07_Col10", float) = 64
- _Letter_Row07_Col11("_Letter_Row07_Col11", float) = 64
- _Letter_Row07_Col12("_Letter_Row07_Col12", float) = 64
- _Letter_Row07_Col13("_Letter_Row07_Col13", float) = 64
- _Letter_Row07_Col14("_Letter_Row07_Col14", float) = 64
- _Letter_Row07_Col15("_Letter_Row07_Col15", float) = 64
- _Letter_Row07_Col16("_Letter_Row07_Col16", float) = 64
- _Letter_Row07_Col17("_Letter_Row07_Col17", float) = 64
- _Letter_Row07_Col18("_Letter_Row07_Col18", float) = 64
- _Letter_Row07_Col19("_Letter_Row07_Col19", float) = 64
- _Letter_Row07_Col20("_Letter_Row07_Col20", float) = 64
- _Letter_Row07_Col21("_Letter_Row07_Col21", float) = 64
+ _Letter_Row00_Col00("_Letter_Row00_Col00", int) = 64
+ _Letter_Row00_Col01("_Letter_Row00_Col01", int) = 64
+ _Letter_Row00_Col02("_Letter_Row00_Col02", int) = 64
+ _Letter_Row00_Col03("_Letter_Row00_Col03", int) = 64
+ _Letter_Row00_Col04("_Letter_Row00_Col04", int) = 64
+ _Letter_Row00_Col05("_Letter_Row00_Col05", int) = 64
+ _Letter_Row00_Col06("_Letter_Row00_Col06", int) = 64
+ _Letter_Row00_Col07("_Letter_Row00_Col07", int) = 64
+ _Letter_Row00_Col08("_Letter_Row00_Col08", int) = 64
+ _Letter_Row00_Col09("_Letter_Row00_Col09", int) = 64
+ _Letter_Row00_Col10("_Letter_Row00_Col10", int) = 64
+ _Letter_Row00_Col11("_Letter_Row00_Col11", int) = 64
+ _Letter_Row00_Col12("_Letter_Row00_Col12", int) = 64
+ _Letter_Row00_Col13("_Letter_Row00_Col13", int) = 64
+ _Letter_Row00_Col14("_Letter_Row00_Col14", int) = 64
+ _Letter_Row00_Col15("_Letter_Row00_Col15", int) = 64
+ _Letter_Row00_Col16("_Letter_Row00_Col16", int) = 64
+ _Letter_Row00_Col17("_Letter_Row00_Col17", int) = 64
+ _Letter_Row00_Col18("_Letter_Row00_Col18", int) = 64
+ _Letter_Row00_Col19("_Letter_Row00_Col19", int) = 64
+ _Letter_Row00_Col20("_Letter_Row00_Col20", int) = 64
+ _Letter_Row00_Col21("_Letter_Row00_Col21", int) = 64
+ _Letter_Row01_Col00("_Letter_Row01_Col00", int) = 64
+ _Letter_Row01_Col01("_Letter_Row01_Col01", int) = 64
+ _Letter_Row01_Col02("_Letter_Row01_Col02", int) = 64
+ _Letter_Row01_Col03("_Letter_Row01_Col03", int) = 64
+ _Letter_Row01_Col04("_Letter_Row01_Col04", int) = 64
+ _Letter_Row01_Col05("_Letter_Row01_Col05", int) = 64
+ _Letter_Row01_Col06("_Letter_Row01_Col06", int) = 64
+ _Letter_Row01_Col07("_Letter_Row01_Col07", int) = 64
+ _Letter_Row01_Col08("_Letter_Row01_Col08", int) = 64
+ _Letter_Row01_Col09("_Letter_Row01_Col09", int) = 64
+ _Letter_Row01_Col10("_Letter_Row01_Col10", int) = 64
+ _Letter_Row01_Col11("_Letter_Row01_Col11", int) = 64
+ _Letter_Row01_Col12("_Letter_Row01_Col12", int) = 64
+ _Letter_Row01_Col13("_Letter_Row01_Col13", int) = 64
+ _Letter_Row01_Col14("_Letter_Row01_Col14", int) = 64
+ _Letter_Row01_Col15("_Letter_Row01_Col15", int) = 64
+ _Letter_Row01_Col16("_Letter_Row01_Col16", int) = 64
+ _Letter_Row01_Col17("_Letter_Row01_Col17", int) = 64
+ _Letter_Row01_Col18("_Letter_Row01_Col18", int) = 64
+ _Letter_Row01_Col19("_Letter_Row01_Col19", int) = 64
+ _Letter_Row01_Col20("_Letter_Row01_Col20", int) = 64
+ _Letter_Row01_Col21("_Letter_Row01_Col21", int) = 64
+ _Letter_Row02_Col00("_Letter_Row02_Col00", int) = 64
+ _Letter_Row02_Col01("_Letter_Row02_Col01", int) = 64
+ _Letter_Row02_Col02("_Letter_Row02_Col02", int) = 64
+ _Letter_Row02_Col03("_Letter_Row02_Col03", int) = 64
+ _Letter_Row02_Col04("_Letter_Row02_Col04", int) = 64
+ _Letter_Row02_Col05("_Letter_Row02_Col05", int) = 64
+ _Letter_Row02_Col06("_Letter_Row02_Col06", int) = 64
+ _Letter_Row02_Col07("_Letter_Row02_Col07", int) = 64
+ _Letter_Row02_Col08("_Letter_Row02_Col08", int) = 64
+ _Letter_Row02_Col09("_Letter_Row02_Col09", int) = 64
+ _Letter_Row02_Col10("_Letter_Row02_Col10", int) = 64
+ _Letter_Row02_Col11("_Letter_Row02_Col11", int) = 64
+ _Letter_Row02_Col12("_Letter_Row02_Col12", int) = 64
+ _Letter_Row02_Col13("_Letter_Row02_Col13", int) = 64
+ _Letter_Row02_Col14("_Letter_Row02_Col14", int) = 64
+ _Letter_Row02_Col15("_Letter_Row02_Col15", int) = 64
+ _Letter_Row02_Col16("_Letter_Row02_Col16", int) = 64
+ _Letter_Row02_Col17("_Letter_Row02_Col17", int) = 64
+ _Letter_Row02_Col18("_Letter_Row02_Col18", int) = 64
+ _Letter_Row02_Col19("_Letter_Row02_Col19", int) = 64
+ _Letter_Row02_Col20("_Letter_Row02_Col20", int) = 64
+ _Letter_Row02_Col21("_Letter_Row02_Col21", int) = 64
+ _Letter_Row03_Col00("_Letter_Row03_Col00", int) = 64
+ _Letter_Row03_Col01("_Letter_Row03_Col01", int) = 64
+ _Letter_Row03_Col02("_Letter_Row03_Col02", int) = 64
+ _Letter_Row03_Col03("_Letter_Row03_Col03", int) = 64
+ _Letter_Row03_Col04("_Letter_Row03_Col04", int) = 64
+ _Letter_Row03_Col05("_Letter_Row03_Col05", int) = 64
+ _Letter_Row03_Col06("_Letter_Row03_Col06", int) = 64
+ _Letter_Row03_Col07("_Letter_Row03_Col07", int) = 64
+ _Letter_Row03_Col08("_Letter_Row03_Col08", int) = 64
+ _Letter_Row03_Col09("_Letter_Row03_Col09", int) = 64
+ _Letter_Row03_Col10("_Letter_Row03_Col10", int) = 64
+ _Letter_Row03_Col11("_Letter_Row03_Col11", int) = 64
+ _Letter_Row03_Col12("_Letter_Row03_Col12", int) = 64
+ _Letter_Row03_Col13("_Letter_Row03_Col13", int) = 64
+ _Letter_Row03_Col14("_Letter_Row03_Col14", int) = 64
+ _Letter_Row03_Col15("_Letter_Row03_Col15", int) = 64
+ _Letter_Row03_Col16("_Letter_Row03_Col16", int) = 64
+ _Letter_Row03_Col17("_Letter_Row03_Col17", int) = 64
+ _Letter_Row03_Col18("_Letter_Row03_Col18", int) = 64
+ _Letter_Row03_Col19("_Letter_Row03_Col19", int) = 64
+ _Letter_Row03_Col20("_Letter_Row03_Col20", int) = 64
+ _Letter_Row03_Col21("_Letter_Row03_Col21", int) = 64
+ _Letter_Row04_Col00("_Letter_Row04_Col00", int) = 64
+ _Letter_Row04_Col01("_Letter_Row04_Col01", int) = 64
+ _Letter_Row04_Col02("_Letter_Row04_Col02", int) = 64
+ _Letter_Row04_Col03("_Letter_Row04_Col03", int) = 64
+ _Letter_Row04_Col04("_Letter_Row04_Col04", int) = 64
+ _Letter_Row04_Col05("_Letter_Row04_Col05", int) = 64
+ _Letter_Row04_Col06("_Letter_Row04_Col06", int) = 64
+ _Letter_Row04_Col07("_Letter_Row04_Col07", int) = 64
+ _Letter_Row04_Col08("_Letter_Row04_Col08", int) = 64
+ _Letter_Row04_Col09("_Letter_Row04_Col09", int) = 64
+ _Letter_Row04_Col10("_Letter_Row04_Col10", int) = 64
+ _Letter_Row04_Col11("_Letter_Row04_Col11", int) = 64
+ _Letter_Row04_Col12("_Letter_Row04_Col12", int) = 64
+ _Letter_Row04_Col13("_Letter_Row04_Col13", int) = 64
+ _Letter_Row04_Col14("_Letter_Row04_Col14", int) = 64
+ _Letter_Row04_Col15("_Letter_Row04_Col15", int) = 64
+ _Letter_Row04_Col16("_Letter_Row04_Col16", int) = 64
+ _Letter_Row04_Col17("_Letter_Row04_Col17", int) = 64
+ _Letter_Row04_Col18("_Letter_Row04_Col18", int) = 64
+ _Letter_Row04_Col19("_Letter_Row04_Col19", int) = 64
+ _Letter_Row04_Col20("_Letter_Row04_Col20", int) = 64
+ _Letter_Row04_Col21("_Letter_Row04_Col21", int) = 64
+ _Letter_Row05_Col00("_Letter_Row05_Col00", int) = 64
+ _Letter_Row05_Col01("_Letter_Row05_Col01", int) = 64
+ _Letter_Row05_Col02("_Letter_Row05_Col02", int) = 64
+ _Letter_Row05_Col03("_Letter_Row05_Col03", int) = 64
+ _Letter_Row05_Col04("_Letter_Row05_Col04", int) = 64
+ _Letter_Row05_Col05("_Letter_Row05_Col05", int) = 64
+ _Letter_Row05_Col06("_Letter_Row05_Col06", int) = 64
+ _Letter_Row05_Col07("_Letter_Row05_Col07", int) = 64
+ _Letter_Row05_Col08("_Letter_Row05_Col08", int) = 64
+ _Letter_Row05_Col09("_Letter_Row05_Col09", int) = 64
+ _Letter_Row05_Col10("_Letter_Row05_Col10", int) = 64
+ _Letter_Row05_Col11("_Letter_Row05_Col11", int) = 64
+ _Letter_Row05_Col12("_Letter_Row05_Col12", int) = 64
+ _Letter_Row05_Col13("_Letter_Row05_Col13", int) = 64
+ _Letter_Row05_Col14("_Letter_Row05_Col14", int) = 64
+ _Letter_Row05_Col15("_Letter_Row05_Col15", int) = 64
+ _Letter_Row05_Col16("_Letter_Row05_Col16", int) = 64
+ _Letter_Row05_Col17("_Letter_Row05_Col17", int) = 64
+ _Letter_Row05_Col18("_Letter_Row05_Col18", int) = 64
+ _Letter_Row05_Col19("_Letter_Row05_Col19", int) = 64
+ _Letter_Row05_Col20("_Letter_Row05_Col20", int) = 64
+ _Letter_Row05_Col21("_Letter_Row05_Col21", int) = 64
+ _Letter_Row06_Col00("_Letter_Row06_Col00", int) = 64
+ _Letter_Row06_Col01("_Letter_Row06_Col01", int) = 64
+ _Letter_Row06_Col02("_Letter_Row06_Col02", int) = 64
+ _Letter_Row06_Col03("_Letter_Row06_Col03", int) = 64
+ _Letter_Row06_Col04("_Letter_Row06_Col04", int) = 64
+ _Letter_Row06_Col05("_Letter_Row06_Col05", int) = 64
+ _Letter_Row06_Col06("_Letter_Row06_Col06", int) = 64
+ _Letter_Row06_Col07("_Letter_Row06_Col07", int) = 64
+ _Letter_Row06_Col08("_Letter_Row06_Col08", int) = 64
+ _Letter_Row06_Col09("_Letter_Row06_Col09", int) = 64
+ _Letter_Row06_Col10("_Letter_Row06_Col10", int) = 64
+ _Letter_Row06_Col11("_Letter_Row06_Col11", int) = 64
+ _Letter_Row06_Col12("_Letter_Row06_Col12", int) = 64
+ _Letter_Row06_Col13("_Letter_Row06_Col13", int) = 64
+ _Letter_Row06_Col14("_Letter_Row06_Col14", int) = 64
+ _Letter_Row06_Col15("_Letter_Row06_Col15", int) = 64
+ _Letter_Row06_Col16("_Letter_Row06_Col16", int) = 64
+ _Letter_Row06_Col17("_Letter_Row06_Col17", int) = 64
+ _Letter_Row06_Col18("_Letter_Row06_Col18", int) = 64
+ _Letter_Row06_Col19("_Letter_Row06_Col19", int) = 64
+ _Letter_Row06_Col20("_Letter_Row06_Col20", int) = 64
+ _Letter_Row06_Col21("_Letter_Row06_Col21", int) = 64
+ _Letter_Row07_Col00("_Letter_Row07_Col00", int) = 64
+ _Letter_Row07_Col01("_Letter_Row07_Col01", int) = 64
+ _Letter_Row07_Col02("_Letter_Row07_Col02", int) = 64
+ _Letter_Row07_Col03("_Letter_Row07_Col03", int) = 64
+ _Letter_Row07_Col04("_Letter_Row07_Col04", int) = 64
+ _Letter_Row07_Col05("_Letter_Row07_Col05", int) = 64
+ _Letter_Row07_Col06("_Letter_Row07_Col06", int) = 64
+ _Letter_Row07_Col07("_Letter_Row07_Col07", int) = 64
+ _Letter_Row07_Col08("_Letter_Row07_Col08", int) = 64
+ _Letter_Row07_Col09("_Letter_Row07_Col09", int) = 64
+ _Letter_Row07_Col10("_Letter_Row07_Col10", int) = 64
+ _Letter_Row07_Col11("_Letter_Row07_Col11", int) = 64
+ _Letter_Row07_Col12("_Letter_Row07_Col12", int) = 64
+ _Letter_Row07_Col13("_Letter_Row07_Col13", int) = 64
+ _Letter_Row07_Col14("_Letter_Row07_Col14", int) = 64
+ _Letter_Row07_Col15("_Letter_Row07_Col15", int) = 64
+ _Letter_Row07_Col16("_Letter_Row07_Col16", int) = 64
+ _Letter_Row07_Col17("_Letter_Row07_Col17", int) = 64
+ _Letter_Row07_Col18("_Letter_Row07_Col18", int) = 64
+ _Letter_Row07_Col19("_Letter_Row07_Col19", int) = 64
+ _Letter_Row07_Col20("_Letter_Row07_Col20", int) = 64
+ _Letter_Row07_Col21("_Letter_Row07_Col21", int) = 64
// This does nothing, it's just used by the 'Do Nothing' animation.
- _Dummy("_Dummy", float) = 0
+ _Dummy("_Dummy", int) = 0
}
SubShader
{
@@ -215,182 +215,182 @@ SamplerState sampler_linear_repeat;
float4 _MainTex_ST;
- float _Letter_Row00_Col00;
- float _Letter_Row00_Col01;
- float _Letter_Row00_Col02;
- float _Letter_Row00_Col03;
- float _Letter_Row00_Col04;
- float _Letter_Row00_Col05;
- float _Letter_Row00_Col06;
- float _Letter_Row00_Col07;
- float _Letter_Row00_Col08;
- float _Letter_Row00_Col09;
- float _Letter_Row00_Col10;
- float _Letter_Row00_Col11;
- float _Letter_Row00_Col12;
- float _Letter_Row00_Col13;
- float _Letter_Row00_Col14;
- float _Letter_Row00_Col15;
- float _Letter_Row00_Col16;
- float _Letter_Row00_Col17;
- float _Letter_Row00_Col18;
- float _Letter_Row00_Col19;
- float _Letter_Row00_Col20;
- float _Letter_Row00_Col21;
- float _Letter_Row01_Col00;
- float _Letter_Row01_Col01;
- float _Letter_Row01_Col02;
- float _Letter_Row01_Col03;
- float _Letter_Row01_Col04;
- float _Letter_Row01_Col05;
- float _Letter_Row01_Col06;
- float _Letter_Row01_Col07;
- float _Letter_Row01_Col08;
- float _Letter_Row01_Col09;
- float _Letter_Row01_Col10;
- float _Letter_Row01_Col11;
- float _Letter_Row01_Col12;
- float _Letter_Row01_Col13;
- float _Letter_Row01_Col14;
- float _Letter_Row01_Col15;
- float _Letter_Row01_Col16;
- float _Letter_Row01_Col17;
- float _Letter_Row01_Col18;
- float _Letter_Row01_Col19;
- float _Letter_Row01_Col20;
- float _Letter_Row01_Col21;
- float _Letter_Row02_Col00;
- float _Letter_Row02_Col01;
- float _Letter_Row02_Col02;
- float _Letter_Row02_Col03;
- float _Letter_Row02_Col04;
- float _Letter_Row02_Col05;
- float _Letter_Row02_Col06;
- float _Letter_Row02_Col07;
- float _Letter_Row02_Col08;
- float _Letter_Row02_Col09;
- float _Letter_Row02_Col10;
- float _Letter_Row02_Col11;
- float _Letter_Row02_Col12;
- float _Letter_Row02_Col13;
- float _Letter_Row02_Col14;
- float _Letter_Row02_Col15;
- float _Letter_Row02_Col16;
- float _Letter_Row02_Col17;
- float _Letter_Row02_Col18;
- float _Letter_Row02_Col19;
- float _Letter_Row02_Col20;
- float _Letter_Row02_Col21;
- 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_Row03_Col14;
- float _Letter_Row03_Col15;
- float _Letter_Row03_Col16;
- float _Letter_Row03_Col17;
- float _Letter_Row03_Col18;
- float _Letter_Row03_Col19;
- float _Letter_Row03_Col20;
- float _Letter_Row03_Col21;
- 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_Row04_Col14;
- float _Letter_Row04_Col15;
- float _Letter_Row04_Col16;
- float _Letter_Row04_Col17;
- float _Letter_Row04_Col18;
- float _Letter_Row04_Col19;
- float _Letter_Row04_Col20;
- float _Letter_Row04_Col21;
- 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;
- float _Letter_Row05_Col14;
- float _Letter_Row05_Col15;
- float _Letter_Row05_Col16;
- float _Letter_Row05_Col17;
- float _Letter_Row05_Col18;
- float _Letter_Row05_Col19;
- float _Letter_Row05_Col20;
- float _Letter_Row05_Col21;
- float _Letter_Row06_Col00;
- float _Letter_Row06_Col01;
- float _Letter_Row06_Col02;
- float _Letter_Row06_Col03;
- float _Letter_Row06_Col04;
- float _Letter_Row06_Col05;
- float _Letter_Row06_Col06;
- float _Letter_Row06_Col07;
- float _Letter_Row06_Col08;
- float _Letter_Row06_Col09;
- float _Letter_Row06_Col10;
- float _Letter_Row06_Col11;
- float _Letter_Row06_Col12;
- float _Letter_Row06_Col13;
- float _Letter_Row06_Col14;
- float _Letter_Row06_Col15;
- float _Letter_Row06_Col16;
- float _Letter_Row06_Col17;
- float _Letter_Row06_Col18;
- float _Letter_Row06_Col19;
- float _Letter_Row06_Col20;
- float _Letter_Row06_Col21;
- float _Letter_Row07_Col00;
- float _Letter_Row07_Col01;
- float _Letter_Row07_Col02;
- float _Letter_Row07_Col03;
- float _Letter_Row07_Col04;
- float _Letter_Row07_Col05;
- float _Letter_Row07_Col06;
- float _Letter_Row07_Col07;
- float _Letter_Row07_Col08;
- float _Letter_Row07_Col09;
- float _Letter_Row07_Col10;
- float _Letter_Row07_Col11;
- float _Letter_Row07_Col12;
- float _Letter_Row07_Col13;
- float _Letter_Row07_Col14;
- float _Letter_Row07_Col15;
- float _Letter_Row07_Col16;
- float _Letter_Row07_Col17;
- float _Letter_Row07_Col18;
- float _Letter_Row07_Col19;
- float _Letter_Row07_Col20;
- float _Letter_Row07_Col21;
+ int _Letter_Row00_Col00;
+ int _Letter_Row00_Col01;
+ int _Letter_Row00_Col02;
+ int _Letter_Row00_Col03;
+ int _Letter_Row00_Col04;
+ int _Letter_Row00_Col05;
+ int _Letter_Row00_Col06;
+ int _Letter_Row00_Col07;
+ int _Letter_Row00_Col08;
+ int _Letter_Row00_Col09;
+ int _Letter_Row00_Col10;
+ int _Letter_Row00_Col11;
+ int _Letter_Row00_Col12;
+ int _Letter_Row00_Col13;
+ int _Letter_Row00_Col14;
+ int _Letter_Row00_Col15;
+ int _Letter_Row00_Col16;
+ int _Letter_Row00_Col17;
+ int _Letter_Row00_Col18;
+ int _Letter_Row00_Col19;
+ int _Letter_Row00_Col20;
+ int _Letter_Row00_Col21;
+ int _Letter_Row01_Col00;
+ int _Letter_Row01_Col01;
+ int _Letter_Row01_Col02;
+ int _Letter_Row01_Col03;
+ int _Letter_Row01_Col04;
+ int _Letter_Row01_Col05;
+ int _Letter_Row01_Col06;
+ int _Letter_Row01_Col07;
+ int _Letter_Row01_Col08;
+ int _Letter_Row01_Col09;
+ int _Letter_Row01_Col10;
+ int _Letter_Row01_Col11;
+ int _Letter_Row01_Col12;
+ int _Letter_Row01_Col13;
+ int _Letter_Row01_Col14;
+ int _Letter_Row01_Col15;
+ int _Letter_Row01_Col16;
+ int _Letter_Row01_Col17;
+ int _Letter_Row01_Col18;
+ int _Letter_Row01_Col19;
+ int _Letter_Row01_Col20;
+ int _Letter_Row01_Col21;
+ int _Letter_Row02_Col00;
+ int _Letter_Row02_Col01;
+ int _Letter_Row02_Col02;
+ int _Letter_Row02_Col03;
+ int _Letter_Row02_Col04;
+ int _Letter_Row02_Col05;
+ int _Letter_Row02_Col06;
+ int _Letter_Row02_Col07;
+ int _Letter_Row02_Col08;
+ int _Letter_Row02_Col09;
+ int _Letter_Row02_Col10;
+ int _Letter_Row02_Col11;
+ int _Letter_Row02_Col12;
+ int _Letter_Row02_Col13;
+ int _Letter_Row02_Col14;
+ int _Letter_Row02_Col15;
+ int _Letter_Row02_Col16;
+ int _Letter_Row02_Col17;
+ int _Letter_Row02_Col18;
+ int _Letter_Row02_Col19;
+ int _Letter_Row02_Col20;
+ int _Letter_Row02_Col21;
+ int _Letter_Row03_Col00;
+ int _Letter_Row03_Col01;
+ int _Letter_Row03_Col02;
+ int _Letter_Row03_Col03;
+ int _Letter_Row03_Col04;
+ int _Letter_Row03_Col05;
+ int _Letter_Row03_Col06;
+ int _Letter_Row03_Col07;
+ int _Letter_Row03_Col08;
+ int _Letter_Row03_Col09;
+ int _Letter_Row03_Col10;
+ int _Letter_Row03_Col11;
+ int _Letter_Row03_Col12;
+ int _Letter_Row03_Col13;
+ int _Letter_Row03_Col14;
+ int _Letter_Row03_Col15;
+ int _Letter_Row03_Col16;
+ int _Letter_Row03_Col17;
+ int _Letter_Row03_Col18;
+ int _Letter_Row03_Col19;
+ int _Letter_Row03_Col20;
+ int _Letter_Row03_Col21;
+ int _Letter_Row04_Col00;
+ int _Letter_Row04_Col01;
+ int _Letter_Row04_Col02;
+ int _Letter_Row04_Col03;
+ int _Letter_Row04_Col04;
+ int _Letter_Row04_Col05;
+ int _Letter_Row04_Col06;
+ int _Letter_Row04_Col07;
+ int _Letter_Row04_Col08;
+ int _Letter_Row04_Col09;
+ int _Letter_Row04_Col10;
+ int _Letter_Row04_Col11;
+ int _Letter_Row04_Col12;
+ int _Letter_Row04_Col13;
+ int _Letter_Row04_Col14;
+ int _Letter_Row04_Col15;
+ int _Letter_Row04_Col16;
+ int _Letter_Row04_Col17;
+ int _Letter_Row04_Col18;
+ int _Letter_Row04_Col19;
+ int _Letter_Row04_Col20;
+ int _Letter_Row04_Col21;
+ int _Letter_Row05_Col00;
+ int _Letter_Row05_Col01;
+ int _Letter_Row05_Col02;
+ int _Letter_Row05_Col03;
+ int _Letter_Row05_Col04;
+ int _Letter_Row05_Col05;
+ int _Letter_Row05_Col06;
+ int _Letter_Row05_Col07;
+ int _Letter_Row05_Col08;
+ int _Letter_Row05_Col09;
+ int _Letter_Row05_Col10;
+ int _Letter_Row05_Col11;
+ int _Letter_Row05_Col12;
+ int _Letter_Row05_Col13;
+ int _Letter_Row05_Col14;
+ int _Letter_Row05_Col15;
+ int _Letter_Row05_Col16;
+ int _Letter_Row05_Col17;
+ int _Letter_Row05_Col18;
+ int _Letter_Row05_Col19;
+ int _Letter_Row05_Col20;
+ int _Letter_Row05_Col21;
+ int _Letter_Row06_Col00;
+ int _Letter_Row06_Col01;
+ int _Letter_Row06_Col02;
+ int _Letter_Row06_Col03;
+ int _Letter_Row06_Col04;
+ int _Letter_Row06_Col05;
+ int _Letter_Row06_Col06;
+ int _Letter_Row06_Col07;
+ int _Letter_Row06_Col08;
+ int _Letter_Row06_Col09;
+ int _Letter_Row06_Col10;
+ int _Letter_Row06_Col11;
+ int _Letter_Row06_Col12;
+ int _Letter_Row06_Col13;
+ int _Letter_Row06_Col14;
+ int _Letter_Row06_Col15;
+ int _Letter_Row06_Col16;
+ int _Letter_Row06_Col17;
+ int _Letter_Row06_Col18;
+ int _Letter_Row06_Col19;
+ int _Letter_Row06_Col20;
+ int _Letter_Row06_Col21;
+ int _Letter_Row07_Col00;
+ int _Letter_Row07_Col01;
+ int _Letter_Row07_Col02;
+ int _Letter_Row07_Col03;
+ int _Letter_Row07_Col04;
+ int _Letter_Row07_Col05;
+ int _Letter_Row07_Col06;
+ int _Letter_Row07_Col07;
+ int _Letter_Row07_Col08;
+ int _Letter_Row07_Col09;
+ int _Letter_Row07_Col10;
+ int _Letter_Row07_Col11;
+ int _Letter_Row07_Col12;
+ int _Letter_Row07_Col13;
+ int _Letter_Row07_Col14;
+ int _Letter_Row07_Col15;
+ int _Letter_Row07_Col16;
+ int _Letter_Row07_Col17;
+ int _Letter_Row07_Col18;
+ int _Letter_Row07_Col19;
+ int _Letter_Row07_Col20;
+ int _Letter_Row07_Col21;
v2f vert (appdata v)
{
@@ -436,7 +436,7 @@ }
// Get the value of the parameter for the cell we're in.
- float GetLetterParameter(v2f i)
+ int GetLetterParameter(v2f i)
{
float CHAR_ROWS = 8.0;
float CHAR_COLS = 22.0;
@@ -814,12 +814,12 @@ }
}
- return float2(0, 0);
+ return 0;
}
fixed4 frag (v2f i) : SV_Target
{
- float letter = GetLetterParameter(i);
+ int letter = GetLetterParameter(i);
float2 uv = GetLetter(i, letter);
fixed4 ret = _MainTex.Sample(sampler_linear_repeat, uv);
return ret;
diff --git a/generate_fx.py b/generate_fx.py index 158a428..515d208 100644 --- a/generate_fx.py +++ b/generate_fx.py @@ -334,7 +334,7 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -363,9 +363,9 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 1.0 + m_TransitionDuration: 0.5 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -393,7 +393,7 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 @@ -458,7 +458,7 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 1 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 diff --git a/osc_ctrl.py b/osc_ctrl.py index 200ac54..844e311 100644 --- a/osc_ctrl.py +++ b/osc_ctrl.py @@ -62,10 +62,8 @@ generateEncoding(state) # lines sent is a multiple of the number of rows in the board. def encodeMessage(lines): result = [] - # Pad the number of lines up to a multiple of BOARD_ROWS. - #print("Pad {} lines".format(BOARD_ROWS - (len(lines) % BOARD_ROWS))) - lines += [" "] * ((BOARD_ROWS - len(lines)) % BOARD_ROWS) - for line in lines: + lines_tmp = lines + [" "] * ((BOARD_ROWS - len(lines)) % BOARD_ROWS) + for line in lines_tmp: #print("encode line {}".format(line)) for char in line: if not char in state.encoding: @@ -168,26 +166,103 @@ class OscTxState: last_msg_encoded = [] empty_cells_to_send_per_call = 1 + # 0 indicates it's closed. 1 indicates half size. 2 indicates full size. + board_size = 0 + +def resizeBoard(num_lines, tx_state, shrink_only): + + resize_params = [] + + resize_param0 = None + resize_param1 = None + + if num_lines > BOARD_ROWS / 2: + # Board must be expanded to full size. + if shrink_only: + return + + if tx_state.board_size == 2: + return + elif tx_state.board_size == 1: + resize_params.append((False, True)) + else: + resize_params.append((False, False)) + resize_params.append((False, True)) + tx_state.board_size = 2 + elif num_lines == 0: + if not shrink_only: + return + # Board must be shrunk to 0 size + if tx_state.board_size == 0: + return + elif tx_state.board_size == 1: + resize_params.append((True, True)) + else: + resize_params.append((True, False)) + resize_params.append((True, True)) + tx_state.board_size = 0 + else: + # Board must be expanded or shrunk to half size. + if tx_state.board_size == 0: + if shrink_only: + return + resize_params.append((False, False)) + elif tx_state.board_size == 1: + return + else: + if not shrink_only: + return + resize_params.append((True, False)) + tx_state.board_size = 1 + + for resize_param_pair in resize_params: + print("Resizing board... "), + addr="/avatar/parameters/" + generate_utils.getResize0Param() + client.send_message(addr, resize_param_pair[0]) + addr="/avatar/parameters/" + generate_utils.getResize1Param() + client.send_message(addr, resize_param_pair[1]) + + time.sleep(0.25) + + addr="/avatar/parameters/" + generate_utils.getResizeEnableParam() + client.send_message(addr, True) + + # The animation is 0.5 seconds, with another 0.5 second buffer after. We + # want to stop in that buffer. + time.sleep(0.5) + + addr="/avatar/parameters/" + generate_utils.getResizeEnableParam() + client.send_message(addr, False) + + # Wait a while for the animation to complete. + time.sleep(1) + print("done") + + # Send a message to the board, but only overwrite cells that we know need to # change. +# This may take multiple calls to complete. Returns True once it's done. def sendMessageLazy(msg, tx_state): lines = splitMessage(msg) + resizeBoard(len(lines), tx_state, shrink_only=False) + msg_encoded = encodeMessage(lines) msg_encoded_len = len(msg_encoded) empty_cells_sent = 0 n_cells = ceil(msg_encoded_len / NUM_LAYERS) for cell in range(0, n_cells): - if cell > 0 and cell % (2 ** generate_utils.INDEX_BITS) == 0: - # TODO(yum_food) support messages longer than one page - print("Page limit exceeded, no support yet") - return - cell_begin = cell * NUM_LAYERS cell_end = (cell + 1) * NUM_LAYERS cell_msg = msg_encoded[cell_begin:cell_end] last_cell_msg = [] + if cell > 0 and cell % (2 ** generate_utils.INDEX_BITS) == 0: + # TODO(yum_food) support messages longer than one page + print("Page limit exceeded, no support yet") + tx_state.last_msg_encoded = msg_encoded[0:cell_begin] + return True + # Skip cells we've already sent. This makes the board much more # responsive. if cell_end < len(tx_state.last_msg_encoded): @@ -199,12 +274,14 @@ def sendMessageLazy(msg, tx_state): if empty_cells_sent >= tx_state.empty_cells_to_send_per_call: print("empty cell budget exceeded") tx_state.last_msg_encoded = msg_encoded[0:cell_end] - return + return False empty_cells_sent += 1 sendMessageCellDiscrete(cell_msg, cell) tx_state.last_msg_encoded = msg_encoded + resizeBoard(len(lines), tx_state, shrink_only=True) + return True def sendMessage(msg, page_sleep_s): lines = splitMessage(msg) @@ -243,30 +320,6 @@ def sendRawMessage(msg): def clear(): sendRawMessage([state.encoding[' ']] * BOARD_ROWS * BOARD_COLS) -def openBoard(): - print("Opening board... "), - addr="/avatar/parameters/" + generate_utils.getResize0Param() - client.send_message(addr, False) - addr="/avatar/parameters/" + generate_utils.getResize1Param() - client.send_message(addr, False) - - time.sleep(CELL_TX_TIME_S / 3.0) - - addr="/avatar/parameters/" + generate_utils.getResizeEnableParam() - client.send_message(addr, True) - - # The animation is 0.5 seconds, with another 0.5 second buffer after. We - # want to stop in that buffer. - time.sleep(0.7) - - addr="/avatar/parameters/" + generate_utils.getResizeEnableParam() - client.send_message(addr, False) - - # Wait for the 1-second animation to complete, plus a wide margin for - # safety. - time.sleep(0.3 + 1) - print("done") - def closeBoard(): print("Closing board... "), addr="/avatar/parameters/" + generate_utils.getResize0Param() @@ -292,10 +345,8 @@ def closeBoard(): if __name__ == "__main__": generateEncoding(state) - #closeBoard() - clear() + tx_state = OscTxState() for line in fileinput.input(): - page_sleep_s = 3 - sendMessage(line, page_sleep_s) - #time.sleep(2 + len(line) / 40.0) + while not sendMessageLazy(line, tx_state): + continue clear() |
