Skip to content

Commit 828854d

Browse files
committed
Sequencer bug fix on addColumn, metronome bigger, better touchability of sidemenu.
1 parent 341c229 commit 828854d

File tree

9 files changed

+9432
-8256
lines changed

9 files changed

+9432
-8256
lines changed

Assets/Prefabs/singletons/MC.prefab

+209-176
Large diffs are not rendered by default.

Assets/Prefabs/singletons/MenuRoot.prefab

+8,844-7,062
Large diffs are not rendered by default.

Assets/Prefabs/ui/Panel.prefab

+203-171
Large diffs are not rendered by default.

Assets/Resources/Prefabs/SequencerCV.prefab

+2-3
Original file line numberDiff line numberDiff line change
@@ -2269,7 +2269,7 @@ Transform:
22692269
m_PrefabAsset: {fileID: 0}
22702270
m_GameObject: {fileID: 1000013326465882}
22712271
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
2272-
m_LocalPosition: {x: -0.02756, y: -0.0006, z: -0.00404}
2272+
m_LocalPosition: {x: -0.0288, y: -0.0006, z: 0.001}
22732273
m_LocalScale: {x: 0.08520513, y: 0.08520479, z: 0.08520474}
22742274
m_Children: []
22752275
m_Father: {fileID: 4000014003536200}
@@ -2329,7 +2329,7 @@ TextMesh:
23292329
m_CharacterSize: 0.03
23302330
m_LineSpacing: 1
23312331
m_Anchor: 4
2332-
m_Alignment: 1
2332+
m_Alignment: 2
23332333
m_TabSize: 4
23342334
m_FontSize: 30
23352335
m_FontStyle: 0
@@ -2768,7 +2768,6 @@ MonoBehaviour:
27682768
yBounds: {x: -Infinity, y: 0}
27692769
percent: {x: 0, y: 0}
27702770
onMat: {fileID: 2100000, guid: cdf1d0020a6fee847a4d094468453ae8, type: 2}
2771-
usingGlowMat: 1
27722771
usePercent: 0
27732772
_interface: {fileID: 0}
27742773
--- !u!1 &1294162313138962

Assets/Scripts/Sequencer/sequencerCVDeviceInterface.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ public void readAllDials(){
265265
{
266266
//cubeFloats[i][i2] = cubeList[i2][i].GetComponentInChildren<dial>().percent;
267267
cubeFloats[i][i2] = cubeDials[i2][i].percent; // read from local registry of dials, avoid searching
268+
// please note: i2 and i are swapped for these cube lists, but works fine
268269
}
269270
}
270271
}
@@ -365,7 +366,7 @@ void addColumns(int c)
365366

366367
float Hval = (float)i2 / max;
367368
t.GetComponent<button>().Setup(curDimensions[0], i2, cubeBools[curDimensions[0]][i2], Color.HSVToRGB(Hval, .9f, .05f));
368-
t.GetComponent<dial>().setPercent(cubeFloats[0][i2]);
369+
t.GetComponentInChildren<dial>().setPercent(cubeFloats[0][i2]);
369370

370371
Vector3 pJ = jackTriggerList[i2].localPosition;
371372
pJ.x -= cubeConst;

Assets/Scripts/Unorganized/xyHandle.cs

+14-18
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,28 @@ public class xyHandle : manipObject {
2121
public Vector2 xBounds = new Vector2(-Mathf.Infinity, -.05f);
2222
public Vector2 yBounds = new Vector2(-Mathf.Infinity, 0);
2323
public Vector2 percent = Vector2.zero;
24-
public Material onMat;
24+
2525
Renderer rend;
26+
public Material onMat;
2627
Material offMat;
27-
Material glowMat;
28+
//Material glowMat;
2829

29-
public bool usingGlowMat = true;
30+
//public bool usingGlowMat = true;
3031
public bool usePercent = true;
3132

3233
public componentInterface _interface;
3334

34-
Color glowColor = Color.HSVToRGB(0, .5f, .1f);
35+
//Color glowColor = Color.HSVToRGB(0, .5f, .1f);
3536

3637
public override void Awake() {
3738
base.Awake();
3839
rend = GetComponent<Renderer>();
39-
40-
if (usingGlowMat) {
41-
offMat = rend.material;
42-
glowMat = new Material(onMat);
43-
glowMat.SetColor("_TintColor", glowColor);
44-
} else rend.material.SetColor("_TintColor", glowColor * .25f);
40+
offMat = rend.sharedMaterial;
41+
//if (usingGlowMat) {
42+
// offMat = rend.sharedMaterial;
43+
// //glowMat = new Material(onMat);
44+
// //glowMat.SetColor("_TintColor", glowColor);
45+
//} else rend.material.SetColor("_TintColor", glowColor * .25f);
4546
}
4647

4748
void Start() {
@@ -107,18 +108,13 @@ public override void setState(manipState state) {
107108
curState = state;
108109
if (curState == manipState.none) {
109110
if (_interface != null) _interface.onSelect(false, ID);
110-
if (usingGlowMat) rend.material = offMat;
111-
else rend.material.SetColor("_TintColor", glowColor * 0.25f);
111+
rend.sharedMaterial = offMat;
112112
} else if (curState == manipState.selected) {
113113
if (_interface != null) _interface.onSelect(true, ID);
114-
if (usingGlowMat) {
115-
rend.material = glowMat;
116-
glowMat.SetColor("_TintColor", glowColor * .25f);
117-
} else rend.material.SetColor("_TintColor", glowColor * 0.5f);
114+
rend.sharedMaterial = onMat;
118115
} else if (curState == manipState.grabbed) {
119116
if (_interface != null) _interface.onSelect(true, ID);
120-
if (usingGlowMat) rend.material = glowMat;
121-
else rend.material.SetColor("_TintColor", glowColor * 0.5f);
117+
rend.sharedMaterial = onMat;
122118

123119
posstart = (Vector2)transform.localPosition;
124120
offset.x = transform.localPosition.x - transform.parent.InverseTransformPoint(manipulatorObj.position).x;

Assets/Text/Materials/DarkTextMat.mat

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: DarkTextMat
11+
m_Shader: {fileID: 4800000, guid: 9d835a5dc0e62a140b94813ee7325f82, type: 3}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 5
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _Illum:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MainTex:
47+
m_Texture: {fileID: 2800000, guid: 31a7f34e01049fa479a7f2d4c8942f55, type: 3}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _MetallicGlossMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _OcclusionMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
- _ParallaxMap:
59+
m_Texture: {fileID: 0}
60+
m_Scale: {x: 1, y: 1}
61+
m_Offset: {x: 0, y: 0}
62+
m_Floats:
63+
- _BumpScale: 1
64+
- _Cutoff: 0.5
65+
- _DetailNormalMapScale: 1
66+
- _DstBlend: 0
67+
- _EmissionGain: 0
68+
- _EmissionTextureContrast: 1
69+
- _Glossiness: 0.5
70+
- _InvFade: 1
71+
- _Metallic: 0
72+
- _Mode: 0
73+
- _OcclusionStrength: 1
74+
- _Parallax: 0.02
75+
- _SrcBlend: 1
76+
- _UVSec: 0
77+
- _ZWrite: 1
78+
m_Colors:
79+
- _Color: {r: 0, g: 0, b: 0, a: 1}
80+
- _DiffuseColor: {r: 1, g: 1, b: 1, a: 1}
81+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
82+
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5}

Assets/Text/Materials/DarkTextMat.mat.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)