Merge branch 'master' of https://github.com/ludzeller/soundstagevr-quest

SphericalLabs · Jan 19, 2022 · ba379f9 · ba379f9
2 parents faa169f + f9a94e8
commit ba379f9
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -450,3 +450,14 @@ user.keystore
 /Assets/SoundStageNative/SoundStageNative/x64/Release/SoundStageNative.tlog/
 /Assets/SoundStageNative/SoundStageNative/x64/Release/SoundStageNative.tlog/*
 /Assets/SoundStageNative/SoundStageNative/x64/Release/SoundStageNative.vcxproj.FileListAbsolute.txt.meta
+
+
+/Assets/SoundStageNative/x64/Release/SoundStageNative.exp
+/Assets/SoundStageNative/x64/Release/SoundStageNative.exp.meta
+/Assets/SoundStageNative/x64/Release/SoundStageNative.iobj
+/Assets/SoundStageNative/x64/Release/SoundStageNative.iobj.meta
+/Assets/SoundStageNative/x64/Release/SoundStageNative.ipdb
+/Assets/SoundStageNative/x64/Release/SoundStageNative.ipdb.meta
+/Assets/SoundStageNative/x64/Release/SoundStageNative.lib.meta
+
+/SoundStageNative/x64/Release/SoundStageNative.tlog/*
diff --git a/Assets/Materials/coreMaterials/coreMat.mat b/Assets/Materials/coreMaterials/coreMat.mat
@@ -11,7 +11,7 @@ Material:
   m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}

diff --git a/Assets/Materials/uncategorized/OmniJack.mat b/Assets/Materials/uncategorized/OmniJack.mat
@@ -8,12 +8,12 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: OmniJack
-  m_Shader: {fileID: 4800000, guid: fb944acb6ea5b6b4e961e6f8feb2b64a, type: 3}
+  m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 5
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 2000
+  m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
   m_SavedProperties:
@@ -44,7 +44,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 5cc53a8d45203414fac0966f7dddcff6, type: 3}
+        m_Texture: {fileID: 2800000, guid: 942488de02b268f4bb5bc3e24973bb7f, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

diff --git a/Assets/Materials/uncategorized/OmniPlug.mat b/Assets/Materials/uncategorized/OmniPlug.mat
@@ -8,12 +8,12 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: OmniPlug
-  m_Shader: {fileID: 4800000, guid: 31bfda934c27bd54a96d5f3f1ae1d398, type: 3}
+  m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 5
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
   m_SavedProperties:
@@ -40,7 +40,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 90fe7bcd4d7704e458a78e72426e5163, type: 3}
+        m_Texture: {fileID: 2800000, guid: 942488de02b268f4bb5bc3e24973bb7f, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

diff --git a/Assets/Resources/OVRBuildConfig.asset b/Assets/Resources/OVRBuildConfig.asset
@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 20553fac56ec59645857c0732b787431, type: 3}
   m_Name: OVRBuildConfig
   m_EditorClassIdentifier: 
-  androidSDKPath: C:\Program Files\Unity\Hub\Editor\2019.3.0f6\Editor\Data\PlaybackEngines\AndroidPlayer\SDK
+  androidSDKPath: 
   gradlePath: 
   jdkPath: 
diff --git a/Assets/Scripts/CoreClasses/omniJack.cs b/Assets/Scripts/CoreClasses/omniJack.cs
@@ -44,15 +44,15 @@ public override void Awake() {
     jackTargetHue = findHue();
     jackColor = Color.HSVToRGB(jackTargetHue, 0.8f, 0.5f);
     if (homesignal == null) homesignal = transform.parent.GetComponent<signalGenerator>();
-    mat.SetColor("_EmissionColor", jackColor);
+    //mat.SetColor("_EmissionColor", jackColor);
 
     if (masterControl.instance != null) {
       if (!masterControl.instance.jacksEnabled) GetComponent<Collider>().enabled = false;
     }
   }
 
   public void setColor(Color c) {
-    mat.SetColor("_EmissionColor", c);
+    //mat.SetColor("_EmissionColor", c);
   }
 
   public override void setState(manipState state) {
@@ -90,9 +90,9 @@ public override void setState(manipState state) {
       else near.mouseoverEvent(false);
     } else if (curState == manipState.selected) {
       if (dimCoroutine != null) StopCoroutine(dimCoroutine);
-      jackColor = Color.HSVToRGB(findHue(), 0.8f, 0.2f);
-      jackRepRend.material.SetFloat("_EmissionGain", .1f);
-      jackRepRend.material.SetColor("_TintColor", jackColor);
+      //jackColor = Color.HSVToRGB(findHue(), 0.8f, 0.2f);
+      //jackRepRend.material.SetFloat("_EmissionGain", .1f);
+      //jackRepRend.material.SetColor("_TintColor", jackColor);
 
       if (near == null) plugRep.SetActive(true);
       else near.mouseoverEvent(true);
@@ -136,8 +136,8 @@ IEnumerator dimRoutine() {
     float t = 0;
     while (t < 1) {
       t = Mathf.Clamp01(t + Time.deltaTime * 2);
-      jackRepRend.material.SetFloat("_EmissionGain", Mathf.Lerp(.1f, 0, t));
-      jackRepRend.material.SetColor("_TintColor", Color.Lerp(jackColor, Color.black, t));
+      //jackRepRend.material.SetFloat("_EmissionGain", Mathf.Lerp(.1f, 0, t));
+      //jackRepRend.material.SetColor("_TintColor", Color.Lerp(jackColor, Color.black, t));
       yield return null;
     }
     plugRep.SetActive(false);
@@ -148,7 +148,7 @@ IEnumerator dimRoutine() {
   public void flash(Color c) {
     if (flashCoroutine != null)
       StopCoroutine(flashCoroutine);
-    mat.SetColor("_EmissionColor", jackColor);
+    //mat.SetColor("_EmissionColor", jackColor);
     if (c != Color.black) {
       targColor = c;
       flashCoroutine = StartCoroutine(flashRoutine());
@@ -160,7 +160,7 @@ IEnumerator flashRoutine() {
     float t = 0;
     while (true) {
       t += Time.deltaTime * 6;
-      mat.SetColor("_EmissionColor", Color.Lerp(Color.black, targColor, Mathf.Abs(Mathf.Sin(t))));
+      //mat.SetColor("_EmissionColor", Color.Lerp(Color.black, targColor, Mathf.Abs(Mathf.Sin(t))));
       yield return null;
     }
   }

diff --git a/Assets/Scripts/CoreClasses/omniPlug.cs b/Assets/Scripts/CoreClasses/omniPlug.cs
@@ -47,9 +47,9 @@ public override void Awake() {
     mat = transform.GetChild(0).GetChild(0).GetComponent<Renderer>().material;
     lr = GetComponent<LineRenderer>();
     cordColor = new Color(Random.value, Random.value, Random.value);
-    lr.material.SetColor("_TintColor", cordColor);
-    mat.SetColor("_TintColor", cordColor);
-    mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", cordColor);
+    //lr.material.SetColor("_TintColor", cordColor);
+    //mat.SetColor("_TintColor", cordColor);
+    //mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", cordColor);
     mouseoverFeedback.SetActive(false);
     plugTrans = transform.GetChild(0);
 
@@ -62,14 +62,14 @@ public void Setup(float c, bool outputting, omniPlug other) {
     Color jackColor = Color.HSVToRGB(c, .8f, .5f);
     cordColor = Color.HSVToRGB(c, .8f, .2f);
 
-    mat.SetColor("_TintColor", jackColor);
-    mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", jackColor);
+    //mat.SetColor("_TintColor", jackColor);
+    //mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", jackColor);
     wireType = masterControl.instance.WireSetting;
     outputPlug = outputting;
     otherPlug = other;
 
     if (outputPlug) {
-      lr.material.SetColor("_TintColor", cordColor);
+      //lr.material.SetColor("_TintColor", cordColor);
       plugPath.Add(otherPlug.transform.position);
 
       updateLineVerts();
@@ -79,7 +79,7 @@ public void Setup(float c, bool outputting, omniPlug other) {
 
   public void setLineColor(Color c) {
     cordColor = c;
-    lr.material.SetColor("_TintColor", c);
+    //lr.material.SetColor("_TintColor", c);
   }
 
   public void Activate(omniPlug siblingPlug, omniJack jackIn, Vector3[] tempPath, Color tempColor) {
@@ -90,9 +90,9 @@ public void Activate(omniPlug siblingPlug, omniJack jackIn, Vector3[] tempPath,
     Color c2 = Color.HSVToRGB(h, .8f, .2f);
 
     cordColor = tempColor;
-    lr.material.SetColor("_TintColor", c2);
-    mat.SetColor("_TintColor", c1);
-    mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", c1);
+    //lr.material.SetColor("_TintColor", c2);
+    //mat.SetColor("_TintColor", c1);
+    //mouseoverFeedback.GetComponent<Renderer>().material.SetColor("_TintColor", c1);
 
     if (outputPlug) {
 
@@ -209,8 +209,8 @@ void Update() {
   float flowVal = 0;
   void lrFlowEffect() {
     flowVal = Mathf.Repeat(flowVal - Time.deltaTime, 1);
-    lr.material.mainTextureOffset = new Vector2(flowVal, 0);
-    lr.material.SetFloat("_EmissionGain", .1f);
+    //lr.material.mainTextureOffset = new Vector2(flowVal, 0);
+    //lr.material.SetFloat("_EmissionGain", .1f);
   }
 
   Transform closestJack;

diff --git a/Assets/SoundStageNative/arm64/Release/libSoundStageNative.so b/Assets/SoundStageNative/arm64/Release/libSoundStageNative.so
diff --git a/Assets/SoundStageNative/x64/Release/SoundStageNative.dll b/Assets/SoundStageNative/x64/Release/SoundStageNative.dll
diff --git a/Assets/Text/Materials/GlowTextMat.mat b/Assets/Text/Materials/GlowTextMat.mat
@@ -8,12 +8,12 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: GlowTextMat
-  m_Shader: {fileID: 4800000, guid: 660cfd2973aa3554ab459fb9fe85a3bd, type: 3}
+  m_Shader: {fileID: 10101, guid: 0000000000000000e000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
   m_SavedProperties:

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -119,7 +119,8 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 0.1.9
-  preloadedAssets: []
+  preloadedAssets:
+  - {fileID: 8207365043489784020, guid: 93c4f4428c8e3814dbf9d469c39e85d4, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

diff --git a/SoundStageNative/SoundStageNative.vcxproj b/SoundStageNative/SoundStageNative.vcxproj
@@ -116,6 +116,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)\..\Assets\SoundStageNative\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>