dial fine tune not both hands linked anymore, alpha fix for multimix, Tutorials no autostart

Author: ludzeller

Assets/Materials/diagramSymbols/multipleSplitterNode.mat

@@ -84,7 +84,7 @@ Material:
     - _BlendOp: 0
     - _BumpScale: 1
     - _Cull: 2
-    - _Cutoff: 0.495
+    - _Cutoff: 0.476
     - _DetailNormalMapScale: 1
     - _DstBlend: 10
     - _EmissionGain: 0

Assets/Scripts/CoreClasses/beatTracker.cs

@@ -42,7 +42,7 @@ public class beatTracker : ScriptableObject {
   public delegate void ResetEvent();
   public ResetEvent resetEvent;
 
-  int[] beatVals = new int[] { 1, 2, 4, 8, 12, 16, 24, 32, 64 }; //1,2,4,8,16,32,64
+  int[] beatVals = new int[] { 1, 2, 4, 8, 12, 16, 24, 32, 64 }; 
   int curBeat = 0;
   float[] timeValues = new float[] { };
   float lastTime = 0;

Assets/Scripts/CoreClasses/manipulator.cs

@@ -42,7 +42,7 @@
 
 public class manipulator : MonoBehaviour
 {
-  int controllerIndex = -1;
+  int controllerIndex = -1; // 0 => left, 1 => right
   public GameObject activeTip;
   public Transform tipL, tipR;
   public Transform triggerTrans;
@@ -113,6 +113,10 @@ public void SetDeviceIndex(int index)
     }
   }
 
+  public bool isLeftController() {
+    return controllerIndex == 0 ? true : false;
+  }
+
   bool grabbing;
   public bool emptyGrab;
 

Assets/Scripts/Sequencer/sequencerCVDeviceInterface.cs

@@ -335,7 +335,7 @@ private void OnAudioFilterRead(float[] buffer, int channels)
     int selectedStep = 0;
     void UpdateStepSelect()
     {
-        // bugfix for randomly skipped / missed steps. 
+        // bugfix for randomly skipped / missed steps in sequencer. 
         // this routine would fire even if the step selector handle was not touched or grabbed. 
         // this could be due to an multithread issue between main and audio thread, which is still unsolved.
         if (stepSelect.curState != manipObject.manipState.grabbed) return; 

Assets/Scripts/Tutorials/tutorialsDeviceInterface.cs

@@ -85,7 +85,8 @@ void Start()
       tutorials[i].setVideo(tutorialRecords[i].videoString);
     }
 
-    triggerOpenTutorial(tutorials[0]);
+
+    triggerOpenTutorial(tutorials[0], true);
 
   }
   Vector3 scaleVector = new Vector3(0f, 1f, 1f);
@@ -152,13 +153,13 @@ public override void hit(bool on, int ID = -1)
 
   }
 
-  public void triggerOpenTutorial(tutorialPanel tut)
+  public void triggerOpenTutorial(tutorialPanel tut, bool startPaused = false)
   {
     playButton.keyHit(false);
-    StartCoroutine(openTutorial(tut));
+    StartCoroutine(openTutorial(tut, startPaused));
   }
 
-  IEnumerator openTutorial(tutorialPanel tut)
+  IEnumerator openTutorial(tutorialPanel tut, bool startPaused = false)
   {
 
     selectedTutorial = tut;
@@ -179,11 +180,11 @@ IEnumerator openTutorial(tutorialPanel tut)
     {
       yield return new WaitForSeconds(.1f);
     }
-
+    videoPlayer.skipOnDrop = false;
     videoPlayer.renderMode = VideoRenderMode.MaterialOverride;
     videoPlayer.targetMaterialRenderer = videoPlayer.GetComponentInChildren<Renderer>();
     videoPlayer.targetMaterialProperty = "_MainTex";
-    forcePlay();
+    if(!startPaused) forcePlay();
   }
 
   public void playPauseVideo()

Assets/Scripts/UI/dial/dial.cs

@@ -216,12 +216,14 @@ public override void grabUpdate(Transform t)
     // only raw input worked properly
     //if ((t.parent.parent.name == "ControllerLeft" && OVRInput.Get(OVRInput.RawAxis1D.LHandTrigger) > 0.1f)
     //|| (t.parent.parent.name == "ControllerRight" && OVRInput.Get(OVRInput.RawAxis1D.RHandTrigger) > 0.1f)) {
-    if (OVRInput.Get(OVRInput.RawAxis1D.LHandTrigger) > 0.1f || OVRInput.Get(OVRInput.RawAxis1D.RHandTrigger) > 0.1f) {
+    if ( ( OVRInput.Get(OVRInput.RawAxis1D.LHandTrigger) > 0.1f && manipulatorObjScript.isLeftController() ) 
+      || ( OVRInput.Get(OVRInput.RawAxis1D.RHandTrigger) > 0.1f && !manipulatorObjScript.isLeftController()) ) {
       curRot += (controllerRot - lastControllerRot) / fineMult;
     } else {
       curRot += controllerRot - lastControllerRot;
     }
 
+
     lastControllerRot = controllerRot;
 
     curRot = Mathf.Clamp(curRot, -150f, 150f);

Assets/Text/Materials/MenuMat.mat

@@ -81,5 +81,5 @@ Material:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _DiffuseColor: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _TintColor: {r: 0.27, g: 0.5219999, b: 0.9, a: 1}
+    - _TintColor: {r: 0.9, g: 0.27, b: 0.27, a: 1}
   m_BuildTextureStacks: []

Assets/Textures/Decals/arrow-90CW.png.meta

@@ -774,7 +774,7 @@ PlayerSettings:
   allowUnsafeCode: 0
   useDeterministicCompilation: 1
   enableRoslynAnalyzers: 1
-  selectedPlatform: 0
+  selectedPlatform: 2
   additionalIl2CppArgs: 
   scriptingRuntimeVersion: 1
   gcIncremental: 1
@@ -807,6 +807,7 @@ PlayerSettings:
   metroSplashScreenUseBackgroundColor: 1
   platformCapabilities:
     WindowsStoreApps:
+      EnterpriseAuthentication: False
       VideosLibrary: False
       HumanInterfaceDevice: False
       Location: False
@@ -817,7 +818,6 @@ PlayerSettings:
       LowLevelDevices: False
       PrivateNetworkClientServer: False
       InternetClientServer: False
-      Proximity: False
       Objects3D: False
       RemoteSystem: False
       BlockedChatMessages: False
@@ -839,10 +839,10 @@ PlayerSettings:
       PointOfService: False
       RecordedCallsFolder: False
       Contacts: False
-      InternetClient: False
+      Proximity: False
       CodeGeneration: False
       BackgroundMediaPlayback: False
-      EnterpriseAuthentication: False
+      InternetClient: False
   metroTargetDeviceFamilies:
     Desktop: False
     Holographic: False