Cleaning things up

keijiro · Dec 16, 2018 · b311533 · b311533
1 parent bf70b28
commit b311533
Show file tree

Hide file tree

Showing 20 changed files with 212 additions and 539 deletions.
diff --git a/Assets/VideolabTest/Boing.unity b/Assets/VideolabTest/Boing.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_IndirectSpecularColor: {r: 0.37311992, g: 0.38074034, b: 0.35872716, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -151,25 +151,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _wiringNodePosition: {x: 864, y: 204}
-  _useResponseCurve: 0
   _responseCurve:
     serializedVersion: 2
     m_Curve:
     - serializedVersion: 2
-      time: 0
-      value: 0
+      time: -100
+      value: -100
       inSlope: 0
       outSlope: 1
-      tangentMode: 0
+      tangentMode: 69
     - serializedVersion: 2
-      time: 1
-      value: 1
+      time: 100
+      value: 100
       inSlope: 1
-      outSlope: 0
-      tangentMode: 0
+      outSlope: 1
+      tangentMode: 69
     m_PreInfinity: 2
     m_PostInfinity: 2
-    m_RotationOrder: 4
+    m_RotationOrder: 0
   _interpolator:
     _interpolationType: 0
     _interpolationSpeed: 10
@@ -255,7 +254,7 @@ Transform:
   m_GameObject: {fileID: 105866301}
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 2
@@ -631,11 +630,6 @@ MonoBehaviour:
         m_CallState: 2
     m_TypeName: Klak.Wiring.NodeBase+VoidEvent, Assembly-CSharp, Version=0.0.0.0,
       Culture=neutral, PublicKeyToken=null
-  _noteOnNumberEvent:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: Klak.Wiring.NodeBase+FloatEvent, Assembly-CSharp, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   _noteOnVelocityEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -835,7 +829,7 @@ Transform:
   m_GameObject: {fileID: 840589225}
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 4
@@ -996,11 +990,6 @@ MonoBehaviour:
         m_CallState: 2
     m_TypeName: Klak.Wiring.NodeBase+VoidEvent, Assembly-CSharp, Version=0.0.0.0,
       Culture=neutral, PublicKeyToken=null
-  _noteOnNumberEvent:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: Klak.Wiring.NodeBase+FloatEvent, Assembly-CSharp, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   _noteOnVelocityEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -1240,7 +1229,7 @@ Transform:
   m_GameObject: {fileID: 1177064403}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 2, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 5
@@ -1437,25 +1426,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _wiringNodePosition: {x: 864, y: 108}
-  _useResponseCurve: 0
   _responseCurve:
     serializedVersion: 2
     m_Curve:
     - serializedVersion: 2
-      time: 0
-      value: 0
+      time: -100
+      value: -100
       inSlope: 0
       outSlope: 1
-      tangentMode: 0
+      tangentMode: 69
     - serializedVersion: 2
-      time: 1
-      value: 1
+      time: 100
+      value: 100
       inSlope: 1
-      outSlope: 0
-      tangentMode: 0
+      outSlope: 1
+      tangentMode: 69
     m_PreInfinity: 2
     m_PostInfinity: 2
-    m_RotationOrder: 4
+    m_RotationOrder: 0
   _interpolator:
     _interpolationType: 0
     _interpolationSpeed: 10
@@ -1961,11 +1949,6 @@ MonoBehaviour:
         m_CallState: 2
     m_TypeName: Klak.Wiring.NodeBase+VoidEvent, Assembly-CSharp, Version=0.0.0.0,
       Culture=neutral, PublicKeyToken=null
-  _noteOnNumberEvent:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: Klak.Wiring.NodeBase+FloatEvent, Assembly-CSharp, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   _noteOnVelocityEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -2222,11 +2205,6 @@ MonoBehaviour:
         m_CallState: 2
     m_TypeName: Klak.Wiring.NodeBase+VoidEvent, Assembly-CSharp, Version=0.0.0.0,
       Culture=neutral, PublicKeyToken=null
-  _noteOnNumberEvent:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: Klak.Wiring.NodeBase+FloatEvent, Assembly-CSharp, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   _noteOnVelocityEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -2339,11 +2317,6 @@ MonoBehaviour:
         m_CallState: 2
     m_TypeName: Klak.Wiring.NodeBase+VoidEvent, Assembly-CSharp, Version=0.0.0.0,
       Culture=neutral, PublicKeyToken=null
-  _noteOnNumberEvent:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: Klak.Wiring.NodeBase+FloatEvent, Assembly-CSharp, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   _noteOnVelocityEvent:
     m_PersistentCalls:
       m_Calls: []

diff --git a/Assets/VideolabTest/Boing/Ah.mat b/Assets/VideolabTest/Boing/Ah.mat
@@ -72,7 +72,7 @@ Material:
     - _SpecularHighlights: 1
     - _SrcBlend: 1
     - _UVSec: 0
-    - _Width: 0.1
+    - _Width: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 0.04411763, g: 0.5649086, b: 1, a: 1}

diff --git a/Assets/VideolabTest/Boing/Boing.shader b/Assets/VideolabTest/Boing/Boing.shader
@@ -1,4 +1,4 @@
-Shader "VideoLabTest/Boing"
+Shader "VideolabTest/Boing"
 {
     Properties
     {

diff --git a/Assets/VideolabTest/Common/Editor/MeshGenerator.cs b/Assets/VideolabTest/Common/Editor/MeshGenerator.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace VideoLabTest
+namespace VideolabTest
 {
     static class MeshGenerator
     {
@@ -13,7 +13,7 @@ static void GenerateMesh()
             for (var i = 1; i < 15; i++)
             {
                 var count = (int)Mathf.Pow(2, i);
-                var path = "Assets/VideoLabTest/Mesh/Mesh" + count + ".asset";
+                var path = "Assets/VideolabTest/Mesh/Mesh" + count + ".asset";
                 AssetDatabase.CreateAsset(CreateMesh(count), path);
             }
         }