Merge branch 'Taper' of https://github.com/ericmueller/ninja-internal

Conflicts:
	js/lib/geom/circle.js
	js/lib/rdge/materials/linear-gradient-material.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

23 files changed, 316 insertions, 14 deletions

diff --git a/js/lib/rdge/materials/bump-metal-material.js b/js/lib/rdge/materials/bump-metal-material.js
index 3db3df1d..97efe441 100755
--- a/js/lib/rdge/materials/bump-metal-material.js
+++ b/js/lib/rdge/materials/bump-metal-material.js
@@ -44,6 +44,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this._shaderName = "bumpMetal";
 
 
+        this._defaultLightDiff = [0.3, 0.3, 0.3, 1.0];
     this._defaultDiffuseTexture = "assets/images/metal.png";
     this._defaultSpecularTexture = "assets/images/silver.png";
         this._defaultNormalTexture = "assets/images/normalMap.png";
@@ -67,7 +68,7 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
         this._propTypes                 = ["color",                             "file",                         "file",                 "file" ];
         this._propValues                = [];
 
-        this._propValues[ this._propNames[0] ] = [0.3, 0.3, 0.3, 1.0];
+        this._propValues[ this._propNames[0] ] = this._defaultLightDiff;
         this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
         this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
         this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
@@ -96,8 +97,19 @@ var BumpMetalMaterial = function BumpMetalMaterial() {
                 this.setShaderValues();
                 this.update(0);
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[ this._propNames[0] ] = this._defaultLightDiff;
+                this._propValues[ this._propNames[1] ] = this._defaultDiffuseTexture.slice(0);
+                this._propValues[ this._propNames[2] ] = this._defaultNormalTexture.slice(0);
+                this._propValues[ this._propNames[3] ] = this._defaultSpecularTexture.slice(0);
+                for (var i=0; i<4;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
+
 ///////////////////////////////////////////////////////////////////////////////////////
 // RDGE shader
  
diff --git a/js/lib/rdge/materials/deform-material.js b/js/lib/rdge/materials/deform-material.js
index 234f22e4..6145f1a6 100644
--- a/js/lib/rdge/materials/deform-material.js
+++ b/js/lib/rdge/materials/deform-material.js
@@ -98,6 +98,16 @@ var DeformMaterial = function DeformMaterial() {
         this.setResolution([world.getViewportWidth(), world.getViewportHeight()]);
         this.update(0);
     };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = this._defaultTexMap.slice(0);
+                this._propValues[this._propNames[1]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/flag-material.js b/js/lib/rdge/materials/flag-material.js
index b87013ba..eb5e59df 100644
--- a/js/lib/rdge/materials/flag-material.js
+++ b/js/lib/rdge/materials/flag-material.js
@@ -102,6 +102,18 @@ var FlagMaterial = function FlagMaterial() {
                 this.setShaderValues();
                 this.update( 0 );
         }
+
+        this.resetToDefault = function()
+        {
+                this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
+                this._propValues[ this._propNames[1] ] = this._waveWidth;
+                this._propValues[ this._propNames[2] ] = this._waveHeight;
+                this._propValues[ this._propNames[3] ] = this._speed;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/fly-material.js b/js/lib/rdge/materials/fly-material.js
index b4bf0972..eabc32ea 100644
--- a/js/lib/rdge/materials/fly-material.js
+++ b/js/lib/rdge/materials/fly-material.js
@@ -93,6 +93,16 @@ var FlyMaterial = function FlyMaterial() {
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
+                this._propValues[this._propNames[u_speed_index]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/julia-material.js b/js/lib/rdge/materials/julia-material.js
index eed9e79a..35ae980a 100644
--- a/js/lib/rdge/materials/julia-material.js
+++ b/js/lib/rdge/materials/julia-material.js
@@ -86,6 +86,15 @@ var JuliaMaterial = function JuliaMaterial() {
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[u_speed_index]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/keleidoscope-material.js b/js/lib/rdge/materials/keleidoscope-material.js
index 648bf401..8ad02963 100644
--- a/js/lib/rdge/materials/keleidoscope-material.js
+++ b/js/lib/rdge/materials/keleidoscope-material.js
@@ -96,6 +96,16 @@ var KeleidoscopeMaterial = function KeleidoscopeMaterial() {
                 this.setResolution( [world.getViewportWidth(),world.getViewportHeight()] );
                 this.update( 0 );
         };
+
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[u_tex0_index]] = this._defaultTexMap.slice(0);
+                this._propValues[this._propNames[u_speed_index]] = 1.0;
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/js/lib/rdge/materials/linear-gradient-material.js b/js/lib/rdge/materials/linear-gradient-material.js
index 50ef56f0..137ced27 100755
--- a/js/lib/rdge/materials/linear-gradient-material.js
+++ b/js/lib/rdge/materials/linear-gradient-material.js
@@ -26,7 +26,7 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-</copyright> */
+ </copyright> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
 var Material = require("js/lib/rdge/materials/material").Material;
@@ -104,6 +104,26 @@ var LinearGradientMaterial = function LinearGradientMaterial() {
                 this.update( 0 );
     };