Fix mixing basin; Upgrade color gem to teardrop

leapmotion · Feb 22, 2018 · 22e6771 · 22e6771
1 parent 2e75c77
commit 22e6771
Show file tree

Hide file tree

Showing 10 changed files with 714 additions and 682 deletions.
diff --git a/Assets/AppModules/AssetTools/Material Library/Outline/Shaders/Outline.shader b/Assets/AppModules/AssetTools/Material Library/Outline/Shaders/Outline.shader
@@ -45,7 +45,7 @@
   ENDCG
 
 	SubShader {
-		Tags { "Queue"="Transparent" "RenderType"="Transparent" }
+		Tags { "Queue"="Geometry" "RenderType"="Opaque" }
 		LOD 100
 
     Pass {

diff --git a/Assets/Editor/PanicButton/reloader.cs b/Assets/Editor/PanicButton/reloader.cs
@@ -1 +1 @@
-//  dadb192f-7f29-48c7-ac20-ab0789c7bc72 636548622047207485
+//  3d466677-cf7a-45c8-9845-f0f18f103284 636548630794391009
diff --git a/.../LeapPaint (v3 archive)/zzOld_LeapPaint/Materials/Hands/Capsule Hand Gray R Ghostable.mat b/.../LeapPaint (v3 archive)/zzOld_LeapPaint/Materials/Hands/Capsule Hand Gray R Ghostable.mat
@@ -72,5 +72,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.6397059, g: 0.6397059, b: 0.6397059, a: 0.9890286}
+    - _Color: {r: 0.6397059, g: 0.6397059, b: 0.6397059, a: 0.956958}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/archives/LeapPaint (v3 archive)/zzOld_LeapPaint/Materials/UI Specific/Color Gem R.mat b/Assets/archives/LeapPaint (v3 archive)/zzOld_LeapPaint/Materials/UI Specific/Color Gem R.mat
@@ -7,7 +7,7 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Color Gem R
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 4800000, guid: 0e13ca9228cac994fa787d54dde8f83d, type: 3}
   m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -70,7 +70,9 @@ Material:
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
+    - _Width: 0.002
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.6392157, g: 0.10980393, b: 0.08627451, a: 1}
+    - _Color: {r: 0, g: 0.7843138, b: 0.2784314, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Outline: {r: 1, g: 1, b: 1, a: 1}
diff --git a/... archive)/zzOld_LeapPaint/Materials/UI Specific/Icons/Ghost Icons/Circle Icon (Ghost).mat b/... archive)/zzOld_LeapPaint/Materials/UI Specific/Icons/Ghost Icons/Circle Icon (Ghost).mat
@@ -7,7 +7,7 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Circle Icon (Ghost)
-  m_Shader: {fileID: 4800000, guid: 9fecd65398b75b043a4f93eb47f6b32d, type: 3}
+  m_Shader: {fileID: 4800000, guid: ad2516e7199ed3948b31a35e788a9114, type: 3}
   m_ShaderKeywords: _EMISSION
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
@@ -73,5 +73,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 0.422}
+    - _Color: {r: 1, g: 1, b: 1, a: 0.347}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/archives/LeapPaint (v3 archive)/zzOld_LeapPaint/Scenes/LeapPaint.unity b/Assets/archives/LeapPaint (v3 archive)/zzOld_LeapPaint/Scenes/LeapPaint.unity
diff --git a/Assets/archives/LeapPaint (v3 archive)/zzOld_LeapPaint/Scripts/IndexTipColor.cs b/Assets/archives/LeapPaint (v3 archive)/zzOld_LeapPaint/Scripts/IndexTipColor.cs
@@ -66,8 +66,14 @@ public class IndexTipColor : MonoBehaviour {
     }
 
     protected void OnTriggerStay(Collider other) {
-      ColorMixingBasin mixingLiquid = other.GetComponentInParent<ColorMixingBasin>();
+      Debug.Log("IndexTipColor go On Trigger Stay for " + other.name, other.gameObject);
+
+      var rigidbody = other.attachedRigidbody;
+      if (rigidbody == null) return;
+
+      ColorMixingBasin mixingLiquid = rigidbody.GetComponent<ColorMixingBasin>();
       if (mixingLiquid != null && mixingLiquid.enabled) {
+        Debug.Log("ONTRIGGERSTAY FOUND MIXING LIQUID IN INDEXTIPCOLOR");
         if (IsClean) {
           this.SetColor(mixingLiquid.GetColor());
         }

diff --git a/...apPaint/Scripts/Util/PassTriggerEvents.cs → ...til/IndexUIActivator_PassTriggerEvents.cs b/...apPaint/Scripts/Util/PassTriggerEvents.cs → ...til/IndexUIActivator_PassTriggerEvents.cs
@@ -8,7 +8,7 @@ namespace Leap.Unity.LeapPaint_v3 {
   [System.Serializable]
   public class ColliderEvent : UnityEvent<Collider> { }
 
-  public class PassTriggerEvents : MonoBehaviour {
+  public class IndexUIActivator_PassTriggerEvents : MonoBehaviour {
 
     public ColliderEvent PassedOnTriggerEnter = new ColliderEvent();
     public ColliderEvent PassedOnTriggerStay = new ColliderEvent();

diff --git a/...nt/Scripts/Util/PassTriggerEvents.cs.meta → ...ndexUIActivator_PassTriggerEvents.cs.meta b/...nt/Scripts/Util/PassTriggerEvents.cs.meta → ...ndexUIActivator_PassTriggerEvents.cs.meta
diff --git a/Assets/archives/LeapPaint (v3 archive)/zzOld_PaperUI/Scripts/WearableUI.cs b/Assets/archives/LeapPaint (v3 archive)/zzOld_PaperUI/Scripts/WearableUI.cs
@@ -300,9 +300,9 @@ public class WearableUI : AnchoredBehaviour, IWearable, IRuntimeGizmoComponent {
     private Pulsator _marblePulsator;
 
     private void InitMarbleTouch() {
-      PassTriggerEvents triggerEvents = _marbleCollider.GetComponent<PassTriggerEvents>();
+      IndexUIActivator_PassTriggerEvents triggerEvents = _marbleCollider.GetComponent<IndexUIActivator_PassTriggerEvents>();
       if (triggerEvents == null) {
-        triggerEvents = _marbleCollider.gameObject.AddComponent<PassTriggerEvents>();
+        triggerEvents = _marbleCollider.gameObject.AddComponent<IndexUIActivator_PassTriggerEvents>();
       }
       triggerEvents.PassedOnTriggerEnter.AddListener(NotifyFingerEnterMarble);
       triggerEvents.PassedOnTriggerExit.AddListener(NotifyFingerExitMarble);
@@ -319,7 +319,7 @@ public class WearableUI : AnchoredBehaviour, IWearable, IRuntimeGizmoComponent {
         _marbleDepthCollider.radius = 0.96F;
         _marbleDepthCollider.height = 2.88F;
         _marbleDepthCollider.transform.localPosition = new Vector3(0F, 0F, -1.144F);
-        triggerEvents = depthColliderObj.AddComponent<PassTriggerEvents>();
+        triggerEvents = depthColliderObj.AddComponent<IndexUIActivator_PassTriggerEvents>();
         triggerEvents.PassedOnTriggerEnter.AddListener(NotifyFingerEnterDepthCollider);
         triggerEvents.PassedOnTriggerExit.AddListener(NotifyFingerExitDepthCollider);
       }