Skip to content

Commit ba379f9

Browse files
author
Hannes Barfuss
committed
2 parents faa169f + f9a94e8 commit ba379f9

File tree

12 files changed

+47
-34
lines changed

12 files changed

+47
-34
lines changed

‎.gitignore

+11
Original file line numberDiff line numberDiff line change
@@ -450,3 +450,14 @@ user.keystore
450450
/Assets/SoundStageNative/SoundStageNative/x64/Release/SoundStageNative.tlog/
451451
/Assets/SoundStageNative/SoundStageNative/x64/Release/SoundStageNative.tlog/*
452452
/Assets/SoundStageNative/SoundStageNative/x64/Release/SoundStageNative.vcxproj.FileListAbsolute.txt.meta
453+
454+
455+
/Assets/SoundStageNative/x64/Release/SoundStageNative.exp
456+
/Assets/SoundStageNative/x64/Release/SoundStageNative.exp.meta
457+
/Assets/SoundStageNative/x64/Release/SoundStageNative.iobj
458+
/Assets/SoundStageNative/x64/Release/SoundStageNative.iobj.meta
459+
/Assets/SoundStageNative/x64/Release/SoundStageNative.ipdb
460+
/Assets/SoundStageNative/x64/Release/SoundStageNative.ipdb.meta
461+
/Assets/SoundStageNative/x64/Release/SoundStageNative.lib.meta
462+
463+
/SoundStageNative/x64/Release/SoundStageNative.tlog/*

‎Assets/Materials/coreMaterials/coreMat.mat

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Material:
1111
m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
1212
m_ShaderKeywords: _EMISSION
1313
m_LightmapFlags: 1
14-
m_EnableInstancingVariants: 0
14+
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
1616
m_CustomRenderQueue: -1
1717
stringTagMap: {}

‎Assets/Materials/uncategorized/OmniJack.mat

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: OmniJack
11-
m_Shader: {fileID: 4800000, guid: fb944acb6ea5b6b4e961e6f8feb2b64a, type: 3}
11+
m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
1212
m_ShaderKeywords:
1313
m_LightmapFlags: 5
14-
m_EnableInstancingVariants: 0
14+
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 2000
16+
m_CustomRenderQueue: -1
1717
stringTagMap: {}
1818
disabledShaderPasses: []
1919
m_SavedProperties:
@@ -44,7 +44,7 @@ Material:
4444
m_Scale: {x: 1, y: 1}
4545
m_Offset: {x: 0, y: 0}
4646
- _MainTex:
47-
m_Texture: {fileID: 2800000, guid: 5cc53a8d45203414fac0966f7dddcff6, type: 3}
47+
m_Texture: {fileID: 2800000, guid: 942488de02b268f4bb5bc3e24973bb7f, type: 3}
4848
m_Scale: {x: 1, y: 1}
4949
m_Offset: {x: 0, y: 0}
5050
- _MetallicGlossMap:

‎Assets/Materials/uncategorized/OmniPlug.mat

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: OmniPlug
11-
m_Shader: {fileID: 4800000, guid: 31bfda934c27bd54a96d5f3f1ae1d398, type: 3}
11+
m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
1212
m_ShaderKeywords:
1313
m_LightmapFlags: 5
14-
m_EnableInstancingVariants: 0
14+
m_EnableInstancingVariants: 1
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 3000
16+
m_CustomRenderQueue: -1
1717
stringTagMap: {}
1818
disabledShaderPasses: []
1919
m_SavedProperties:
@@ -40,7 +40,7 @@ Material:
4040
m_Scale: {x: 1, y: 1}
4141
m_Offset: {x: 0, y: 0}
4242
- _MainTex:
43-
m_Texture: {fileID: 2800000, guid: 90fe7bcd4d7704e458a78e72426e5163, type: 3}
43+
m_Texture: {fileID: 2800000, guid: 942488de02b268f4bb5bc3e24973bb7f, type: 3}
4444
m_Scale: {x: 1, y: 1}
4545
m_Offset: {x: 0, y: 0}
4646
- _MetallicGlossMap:

‎Assets/Resources/OVRBuildConfig.asset

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3}
1313
m_Name: OVRBuildConfig
1414
m_EditorClassIdentifier:
15-
androidSDKPath: C:\Program Files\Unity\Hub\Editor\2019.3.0f6\Editor\Data\PlaybackEngines\AndroidPlayer\SDK
15+
androidSDKPath:
1616
gradlePath:
1717
jdkPath:

‎Assets/Scripts/CoreClasses/omniJack.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ public override void Awake() {
4444
jackTargetHue = findHue();
4545
jackColor = Color.HSVToRGB(jackTargetHue, 0.8f, 0.5f);
4646
if (homesignal == null) homesignal = transform.parent.GetComponent<signalGenerator>();
47-
mat.SetColor("_EmissionColor", jackColor);
47+
//mat.SetColor("_EmissionColor", jackColor);
4848

4949
if (masterControl.instance != null) {
5050
if (!masterControl.instance.jacksEnabled) GetComponent<Collider>().enabled = false;
5151
}
5252
}
5353

5454
public void setColor(Color c) {
55-
mat.SetColor("_EmissionColor", c);
55+
//mat.SetColor("_EmissionColor", c);
5656
}
5757

5858
public override void setState(manipState state) {
@@ -90,9 +90,9 @@ public override void setState(manipState state) {
9090
else near.mouseoverEvent(false);
9191
} else if (curState == manipState.selected) {
9292
if (dimCoroutine != null) StopCoroutine(dimCoroutine);
93-
jackColor = Color.HSVToRGB(findHue(), 0.8f, 0.2f);
94-
jackRepRend.material.SetFloat("_EmissionGain", .1f);
95-
jackRepRend.material.SetColor("_TintColor", jackColor);
93+
//jackColor = Color.HSVToRGB(findHue(), 0.8f, 0.2f);
94+
//jackRepRend.material.SetFloat("_EmissionGain", .1f);
95+
//jackRepRend.material.SetColor("_TintColor", jackColor);
9696

9797
if (near == null) plugRep.SetActive(true);
9898
else near.mouseoverEvent(true);
@@ -136,8 +136,8 @@ IEnumerator dimRoutine() {
136136
float t = 0;
137137
while (t < 1) {
138138
t = Mathf.Clamp01(t + Time.deltaTime * 2);
139-
jackRepRend.material.SetFloat("_EmissionGain", Mathf.Lerp(.1f, 0, t));
140-
jackRepRend.material.SetColor("_TintColor", Color.Lerp(jackColor, Color.black, t));
139+
//jackRepRend.material.SetFloat("_EmissionGain", Mathf.Lerp(.1f, 0, t));
140+
//jackRepRend.material.SetColor("_TintColor", Color.Lerp(jackColor, Color.black, t));
141141
yield return null;
142142
}
143143
plugRep.SetActive(false);
@@ -148,7 +148,7 @@ IEnumerator dimRoutine() {
148148
public void flash(Color c) {
149149
if (flashCoroutine != null)
150150
StopCoroutine(flashCoroutine);
151-
mat.SetColor("_EmissionColor", jackColor);
151+
//mat.SetColor("_EmissionColor", jackColor);
152152
if (c != Color.black) {
153153
targColor = c;
154154
flashCoroutine = StartCoroutine(flashRoutine());
@@ -160,7 +160,7 @@ IEnumerator flashRoutine() {
160160
float t = 0;
161161
while (true) {
162162
t += Time.deltaTime * 6;
163-
mat.SetColor("_EmissionColor", Color.Lerp(Color.black, targColor, Mathf.Abs(Mathf.Sin(t))));
163+
//mat.SetColor("_EmissionColor", Color.Lerp(Color.black, targColor, Mathf.Abs(Mathf.Sin(t))));
164164
yield return null;
165165
}
166166
}

‎Assets/Scripts/CoreClasses/omniPlug.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public override void Awake() {
4747
mat = transform.GetChild(0).GetChild(0).GetComponent<Renderer>().material;
4848
lr = GetComponent<LineRenderer>();
4949
cordColor = new Color(Random.value, Random.value, Random.value);
50-
lr.material.SetColor("_TintColor", cordColor);
51-
mat.SetColor("_TintColor", cordColor);
52-
mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", cordColor);
50+
//lr.material.SetColor("_TintColor", cordColor);
51+
//mat.SetColor("_TintColor", cordColor);
52+
//mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", cordColor);
5353
mouseoverFeedback.SetActive(false);
5454
plugTrans = transform.GetChild(0);
5555

@@ -62,14 +62,14 @@ public void Setup(float c, bool outputting, omniPlug other) {
6262
Color jackColor = Color.HSVToRGB(c, .8f, .5f);
6363
cordColor = Color.HSVToRGB(c, .8f, .2f);
6464

65-
mat.SetColor("_TintColor", jackColor);
66-
mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", jackColor);
65+
//mat.SetColor("_TintColor", jackColor);
66+
//mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", jackColor);
6767
wireType = masterControl.instance.WireSetting;
6868
outputPlug = outputting;
6969
otherPlug = other;
7070

7171
if (outputPlug) {
72-
lr.material.SetColor("_TintColor", cordColor);
72+
//lr.material.SetColor("_TintColor", cordColor);
7373
plugPath.Add(otherPlug.transform.position);
7474

7575
updateLineVerts();
@@ -79,7 +79,7 @@ public void Setup(float c, bool outputting, omniPlug other) {
7979

8080
public void setLineColor(Color c) {
8181
cordColor = c;
82-
lr.material.SetColor("_TintColor", c);
82+
//lr.material.SetColor("_TintColor", c);
8383
}
8484

8585
public void Activate(omniPlug siblingPlug, omniJack jackIn, Vector3[] tempPath, Color tempColor) {
@@ -90,9 +90,9 @@ public void Activate(omniPlug siblingPlug, omniJack jackIn, Vector3[] tempPath,
9090
Color c2 = Color.HSVToRGB(h, .8f, .2f);
9191

9292
cordColor = tempColor;
93-
lr.material.SetColor("_TintColor", c2);
94-
mat.SetColor("_TintColor", c1);
95-
mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", c1);
93+
//lr.material.SetColor("_TintColor", c2);
94+
//mat.SetColor("_TintColor", c1);
95+
//mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", c1);
9696

9797
if (outputPlug) {
9898

@@ -209,8 +209,8 @@ void Update() {
209209
float flowVal = 0;
210210
void lrFlowEffect() {
211211
flowVal = Mathf.Repeat(flowVal - Time.deltaTime, 1);
212-
lr.material.mainTextureOffset = new Vector2(flowVal, 0);
213-
lr.material.SetFloat("_EmissionGain", .1f);
212+
//lr.material.mainTextureOffset = new Vector2(flowVal, 0);
213+
//lr.material.SetFloat("_EmissionGain", .1f);
214214
}
215215

216216
Transform closestJack;

‎Assets/SoundStageNative/arm64/Release/libSoundStageNative.so

100755100644
File mode changed.

‎Assets/SoundStageNative/x64/Release/SoundStageNative.dll

0 Bytes
Binary file not shown.

‎Assets/Text/Materials/GlowTextMat.mat

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Material:
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
1010
m_Name: GlowTextMat
11-
m_Shader: {fileID: 4800000, guid: 660cfd2973aa3554ab459fb9fe85a3bd, type: 3}
11+
m_Shader: {fileID: 10101, guid: 0000000000000000e000000000000000, type: 0}
1212
m_ShaderKeywords:
1313
m_LightmapFlags: 5
1414
m_EnableInstancingVariants: 0
1515
m_DoubleSidedGI: 0
16-
m_CustomRenderQueue: 3000
16+
m_CustomRenderQueue: -1
1717
stringTagMap: {}
1818
disabledShaderPasses: []
1919
m_SavedProperties:

‎ProjectSettings/ProjectSettings.asset

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ PlayerSettings:
119119
16:9: 1
120120
Others: 1
121121
bundleVersion: 0.1.9
122-
preloadedAssets: []
122+
preloadedAssets:
123+
- {fileID: 8207365043489784020, guid: 93c4f4428c8e3814dbf9d469c39e85d4, type: 2}
123124
metroInputSource: 0
124125
wsaTransparentSwapchain: 0
125126
m_HolographicPauseOnTrackingLoss: 1

‎SoundStageNative/SoundStageNative.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
</PropertyGroup>
117117
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
118118
<LinkIncremental>false</LinkIncremental>
119+
<OutDir>$(SolutionDir)\..\Assets\SoundStageNative\$(Platform)\$(Configuration)\</OutDir>
119120
</PropertyGroup>
120121
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
121122
<ClCompile>

0 commit comments

Comments
 (0)