summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Hickey <brendan@bhickey.net>2012-12-21 15:46:33 -0500
committerBrendan Hickey <brendan@bhickey.net>2012-12-30 19:06:47 -0800
commita8ee98a52a4166c3fb29ef981192b9740d06e2a8 (patch)
tree0f893ffb34a756b342d18e1ddd283457b950ebfc
parentdcadfdb8eec9c40abb65b09e115e33f0dfed5558 (diff)
downloadcrawl-ref-a8ee98a52a4166c3fb29ef981192b9740d06e2a8.tar.gz
crawl-ref-a8ee98a52a4166c3fb29ef981192b9740d06e2a8.zip
Clarify Perlin Noise Licensing
Explicitly release perlin.cc under CC0. This file is a C++ port of Stefan Gustavson's public domain java noise implementation. The original can be retrieved at: http://webstaff.itn.liu.se/~stegu/simplexnoise/SimplexNoise.java
-rw-r--r--crawl-ref/licence.txt2
-rw-r--r--crawl-ref/source/perlin.cc10
2 files changed, 10 insertions, 2 deletions
diff --git a/crawl-ref/licence.txt b/crawl-ref/licence.txt
index 83fd6fdaa6..8399076ca2 100644
--- a/crawl-ref/licence.txt
+++ b/crawl-ref/licence.txt
@@ -11,7 +11,7 @@ Certain pieces come with different licenses, all compatible with the GPL.
These include:
* 3-clause BSD: MSVC/stdint.h
* 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
-* Public Domain|CC0: most of tiles
+* Public Domain|CC0: most of tiles, perlin.cc, perlin.h
* MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
worley.{cc,h}
* zlib: webserver/static/scripts/contrib/inflate.js
diff --git a/crawl-ref/source/perlin.cc b/crawl-ref/source/perlin.cc
index 9aec519f81..1266319b47 100644
--- a/crawl-ref/source/perlin.cc
+++ b/crawl-ref/source/perlin.cc
@@ -1,5 +1,13 @@
/*
- * A speed-improved simplex noise algorithm for 2D, 3D and 4D in Java.
+ * This is a C++ port of version Stefan Gustavson's public domain
+ * implementation of simplex noise (Version 2012-03-09).
+ *
+ * It was ported by Brendan Hickey (brendan@bhickey.net) and released on
+ * 2012-09-16.
+ *
+ * It is made available under the Creative Commons CC0 license.
+ *
+ * A speed-improved simplex noise algorithm for 2D, 3D and 4D in C++.
*
* Based on example code by Stefan Gustavson (stegu@itn.liu.se).
* Optimisations by Peter Eastman (peastman@drizzle.stanford.edu).