Fixed shader dependency issue.

keijiro · Aug 5, 2014 · bca57d6 · bca57d6
1 parent b948eea
commit bca57d6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/Assets/SonarFx/SonarFx.cs b/Assets/SonarFx/SonarFx.cs
@@ -66,8 +66,10 @@ public enum SonarMode { Directional, Spherical }
     [SerializeField] Color _addColor = Color.black;
     public Color addColor { get { return _addColor; } set { _addColor = value; } }
 
+    // Reference to the shader.
+    [SerializeField] Shader shader;
+
     // Private shader variables
-    Shader shader;
     int baseColorID;
     int waveColorID;
     int waveParamsID;
@@ -76,7 +78,6 @@ public enum SonarMode { Directional, Spherical }
 
     void Awake()
     {
-        shader = Shader.Find("Hidden/SonarFX");
         baseColorID = Shader.PropertyToID("_SonarBaseColor");
         waveColorID = Shader.PropertyToID("_SonarWaveColor");
         waveParamsID = Shader.PropertyToID("_SonarWaveParams");

diff --git a/Assets/SonarFx/SonarFx.cs.meta b/Assets/SonarFx/SonarFx.cs.meta
diff --git a/Assets/Test.unity b/Assets/Test.unity
@@ -316,6 +316,7 @@ MonoBehaviour:
   _waveInterval: 20
   _waveSpeed: 10
   _addColor: {r: 0, g: 0, b: 0, a: 1}
+  shader: {fileID: 4800000, guid: 6d12e7ab487bf49d18b89038af741a18, type: 3}
 --- !u!114 &768017763
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
@@ -4,4 +4,6 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Test.unity
diff --git a/SonarFx.unitypackage b/SonarFx.unitypackage