Joise updated to 1.0.2

Former-commit-id: 8fdfe95a5a2be895b55785b1cfc57ae16e10100a
Former-commit-id: 52248306c1b226bca423415d76b0f929e285103e

src/com/sudoplay/joise/module/ModuleBrightContrast.java

@@ -85,7 +85,7 @@ public class ModuleBrightContrast extends SourcedModule {
   @Override
   public double get(double x, double y) {
     double val = source.get(x, y);
-    // apply colourKey
+    // apply brightness
     val += bright.get(x, y);
     // subtract threshold, scale by factor, add threshold
     double t = threshold.get(x, y);
@@ -98,7 +98,7 @@ public class ModuleBrightContrast extends SourcedModule {
   @Override
   public double get(double x, double y, double z) {
     double val = source.get(x, y, z);
-    // apply colourKey
+    // apply brightness
     val += bright.get(x, y, z);
     // subtract threshold, scale by factor, add threshold
     double t = threshold.get(x, y, z);
@@ -111,7 +111,7 @@ public class ModuleBrightContrast extends SourcedModule {
   @Override
   public double get(double x, double y, double z, double w) {
     double val = source.get(x, y, z, w);
-    // apply colourKey
+    // apply brightness
     val += bright.get(x, y, z, w);
     // subtract threshold, scale by factor, add threshold
     double t = threshold.get(x, y, z, w);
@@ -124,7 +124,7 @@ public class ModuleBrightContrast extends SourcedModule {
   @Override
   public double get(double x, double y, double z, double w, double u, double v) {
     double val = source.get(x, y, z, w, u, v);
-    // apply colourKey
+    // apply brightness
     val += bright.get(x, y, z, w, u, v);
     // subtract threshold, scale by factor, add threshold
     double t = threshold.get(x, y, z, w, u, v);
@@ -139,7 +139,7 @@ public class ModuleBrightContrast extends SourcedModule {
 
     ModulePropertyMap props = new ModulePropertyMap(this);
 
-    writeScalar("colourKey", bright, props, map);
+    writeScalar("brightness", bright, props, map);
     writeScalar("contrastFactor", factor, props, map);
     writeScalar("contrastThreshold", threshold, props, map);
     writeSource(props, map);
@@ -152,7 +152,7 @@ public class ModuleBrightContrast extends SourcedModule {
   public Module buildFromPropertyMap(ModulePropertyMap props,
       ModuleInstanceMap map) {
 
-    readScalar("colourKey", "setBrightness", props, map);
+    readScalar("brightness", "setBrightness", props, map);
     readScalar("contrastFactor", "setContrastFactor", props, map);
     readScalar("contrastThreshold", "setContrastThreshold", props, map);
     readSource(props, map);

src/net/torvald/terrarum/COPYING.md

@@ -16,18 +16,50 @@ Released as public domain
 *Joise* modular noise library
 
 Copyright (C) 2013 Jason Taylor.
+Released as open-source under the Apache License, Version 2.0.
 
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    
-    http://www.apache.org/licenses/LICENSE-2.0
-    
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+============================================================================
+| Joise
+============================================================================
+
+Copyright (C) 2013 Jason Taylor
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+============================================================================
+| Accidental Noise Library
+| --------------------------------------------------------------------------
+| Joise is a derivative work based on Josua Tippetts' C++ library:
+| http://accidentalnoise.sourceforge.net/index.html
+============================================================================
+
+Copyright (C) 2011 Joshua Tippetts
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
 
 ----