Added copyrights c/o code-cite.

shanecelis · Dec 29, 2018 · d0cf7d8 · d0cf7d8
1 parent 9a53906
commit d0cf7d8
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,14 @@
 Water Demo
 ==========
 
+![Water demo GIF showing caustics.](water-demo.gif)
+
 This is a port of Evan Wallace's [Water Demo](http://madebyevan.com/webgl-water/) from WebGL to Unity.
 
 Motivation
 ----------
 
-I ported this as an exercise to investigate different caustics implementations.  Having surveyed research papers on real-time caustics, I believe Evan's work supercedes many published algorithms in terms of simplicity and performance and is suitable for publication.
+I ported this as an exercise to investigate different real-time caustics implementations.  I've only surveyed a handful of research papers on real-time caustics, but it seems like [Evan's work](https://medium.com/@evanwallace/rendering-realtime-caustics-in-webgl-2a99a29a0b2c) would be suitable for publication for both its simplicity and performance.
 
 Requirements
 ------------
@@ -29,7 +31,13 @@ A lot of this is smoke and mirrors. The cube knows where the sphere is, so it re
 Bugs
 ----
 
-See the `todo.org` file.
+* WebGL build not working (major regression from original project).
+
+* Not all UI from original are preserved.
+
+* Underside of water does not reflect like it should.  Seems like a HLSL lerp problem.
+
+See the `todo.org` file for more details.
 
 License
 -------

diff --git a/Scripts/CameraOrbit.cs b/Scripts/CameraOrbit.cs
@@ -1,4 +1,11 @@
-//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+/* Original code[1] Copyright (c) 2018 Shane Celis[2]
+   Licensed under the MIT License[3]
+
+   [1]: https://github.com/shanecelis/water-demo
+   [2]: https://github.com/shanecelis
+   [3]: https://opensource.org/licenses/MIT
+*/
 
 using System.Collections;
 using System.Collections.Generic;

diff --git a/Scripts/GeometryBuilder.cs b/Scripts/GeometryBuilder.cs
@@ -1,4 +1,11 @@
-//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+/* Original code[1] Copyright (c) 2018 Shane Celis[2]
+   Licensed under the MIT License[3]
+
+   [1]: https://github.com/shanecelis/water-demo
+   [2]: https://github.com/shanecelis
+   [3]: https://opensource.org/licenses/MIT
+*/
 
 // #define HAS_PROCEDURAL_TOOLKIT
 using System.Collections;

diff --git a/Scripts/MaterialUpdater.cs b/Scripts/MaterialUpdater.cs
@@ -1,4 +1,11 @@
-//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+/* Original code[1] Copyright (c) 2018 Shane Celis[2]
+   Licensed under the MIT License[3]
+
+   [1]: https://github.com/shanecelis/water-demo
+   [2]: https://github.com/shanecelis
+   [3]: https://opensource.org/licenses/MIT
+*/
 
 using System.Collections;
 using System.Collections.Generic;

diff --git a/Scripts/WaterSimulation.cs b/Scripts/WaterSimulation.cs
@@ -1,4 +1,11 @@
-//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+/* Original code[1] Copyright (c) 2018 Shane Celis[2]
+   Licensed under the MIT License[3]
+
+   [1]: https://github.com/shanecelis/water-demo
+   [2]: https://github.com/shanecelis
+   [3]: https://opensource.org/licenses/MIT
+*/
 
 using System.Collections;
 using System.Collections.Generic;

diff --git a/Shaders/Caustics.shader b/Shaders/Caustics.shader
@@ -1,5 +1,14 @@
 //$ cite -u https://github.com/evanw/webgl-water -U https://github.com/shanecelis/water-demo -mC -l mit
+/* Original code[1] Copyright (c) 2015 Evan Wallace[2]
+   Modified code[3] Copyright (c) 2018 Shane Celis[4]
+   Licensed under the MIT License[5]
 
+   [1]: https://github.com/evanw/webgl-water
+   [2]: https://github.com/evanw
+   [3]: https://github.com/shanecelis/water-demo
+   [4]: http://twitter.com/shanecelis
+   [5]: https://opensource.org/licenses/MIT
+*/
 Shader "Unlit/Caustics"
 {
   Properties

diff --git a/Shaders/Cube.shader b/Shaders/Cube.shader
@@ -1,5 +1,14 @@
-//$ cite -u https://github.com/evanw/webgl-water -U https://github.com/shanecelis/water-demo -mC -l mit
+//$ cite -u https://github.com/evanw/webgl-water -U https://github.com/shanecelis/water-demo -mC -l mit
+/* Original code[1] Copyright (c) 2015 Evan Wallace[2]
+   Modified code[3] Copyright (c) 2018 Shane Celis[4]
+   Licensed under the MIT License[5]
 
+   [1]: https://github.com/evanw/webgl-water
+   [2]: https://github.com/evanw
+   [3]: https://github.com/shanecelis/water-demo
+   [4]: http://twitter.com/shanecelis
+   [5]: https://opensource.org/licenses/MIT
+*/
 Shader "Unlit/Cube"
 {
   Properties

diff --git a/Shaders/Sphere.shader b/Shaders/Sphere.shader
@@ -1,5 +1,14 @@
-//$ cite -u https://github.com/evanw/webgl-water -U https://github.com/shanecelis/water-demo -mC -l mit
+//$ cite -u https://github.com/evanw/webgl-water -U https://github.com/shanecelis/water-demo -mC -l mit
+/* Original code[1] Copyright (c) 2015 Evan Wallace[2]
+   Modified code[3] Copyright (c) 2018 Shane Celis[4]
+   Licensed under the MIT License[5]
 
+   [1]: https://github.com/evanw/webgl-water
+   [2]: https://github.com/evanw
+   [3]: https://github.com/shanecelis/water-demo
+   [4]: http://twitter.com/shanecelis
+   [5]: https://opensource.org/licenses/MIT
+*/
 Shader "Unlit/Sphere"
 {
   Properties

diff --git a/Shaders/TextureView.shader b/Shaders/TextureView.shader
@@ -1,5 +1,11 @@
-//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+//$ cite -u https://github.com/shanecelis/water-demo -C -l mit
+/* Original code[1] Copyright (c) 2018 Shane Celis[2]
+   Licensed under the MIT License[3]
 
+   [1]: https://github.com/shanecelis/water-demo
+   [2]: https://github.com/shanecelis
+   [3]: https://opensource.org/licenses/MIT
+*/
 /**
  Shader to view the render textures like water and caustics.
 */

diff --git a/Shaders/Water.shader b/Shaders/Water.shader
@@ -1,5 +1,14 @@
 //$ cite -u https://github.com/evanw/webgl-water -U https://github.com/shanecelis/water-demo -mC -l mit
-
+/* Original code[1] Copyright (c) 2015 Evan Wallace[2]
+   Modified code[3] Copyright (c) 2018 Shane Celis[4]
+   Licensed under the MIT License[5]
+
+   [1]: https://github.com/evanw/webgl-water
+   [2]: https://github.com/evanw
+   [3]: https://github.com/shanecelis/water-demo
+   [4]: http://twitter.com/shanecelis
+   [5]: https://opensource.org/licenses/MIT
+*/
 Shader "Unlit/Water"
 {
   Properties

diff --git a/Shaders/WaterIntegrate.shader b/Shaders/WaterIntegrate.shader
@@ -1,5 +1,14 @@
 //$ cite -u https://github.com/evanw/webgl-water -U https://github.com/shanecelis/water-demo -mC -l mit
-
+/* Original code[1] Copyright (c) 2015 Evan Wallace[2]
+   Modified code[3] Copyright (c) 2018 Shane Celis[4]
+   Licensed under the MIT License[5]
+
+   [1]: https://github.com/evanw/webgl-water
+   [2]: https://github.com/evanw
+   [3]: https://github.com/shanecelis/water-demo
+   [4]: http://twitter.com/shanecelis
+   [5]: https://opensource.org/licenses/MIT
+*/
 Shader "CustomRenderTexture/WaterIntegrate"
 {
   Properties

diff --git a/water-demo.gif b/water-demo.gif
diff --git a/water-demo.gif.meta b/water-demo.gif.meta