Merge pull request #1 from keijiro/develop

Develop branch
keijiro · Aug 9, 2014 · 7d48202 · 7d48202
2 parents bca57d6 + 8be0f34
commit 7d48202
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/Assets/SonarFx/Shader/SonarFx.shader b/Assets/SonarFx/Shader/SonarFx.shader
@@ -61,8 +61,9 @@ Shader "Hidden/SonarFX"
             // Moving wave.
             w -= _Time.y * _SonarWaveParams.w;
 
-            // Divide with the interval.
-            w = mod(w, _SonarWaveParams.z) / _SonarWaveParams.z;
+            // Get modulo (w % params.z / params.z)
+            w /= _SonarWaveParams.z;
+            w = w - floor(w);
 
             // Make the gradient steeper.
             float p = _SonarWaveParams.y;

diff --git a/Assets/SonarFx/SonarFx.cs b/Assets/SonarFx/SonarFx.cs
@@ -87,13 +87,13 @@ void Awake()
 
     void OnEnable()
     {
-        camera.SetReplacementShader(shader, null);
+        GetComponent<Camera>().SetReplacementShader(shader, null);
         Update();
     }
 
     void OnDisable()
     {
-        camera.ResetReplacementShader();
+        GetComponent<Camera>().ResetReplacementShader();
     }
 
     void Update()

diff --git a/SonarFx.unitypackage b/SonarFx.unitypackage