1 files changed, 45 insertions, 4 deletions

diff --git a/js/lib/rdge/materials/uber-material.js b/js/lib/rdge/materials/uber-material.js
index e1c6781d..d242f8f5 100755
--- a/js/lib/rdge/materials/uber-material.js
+++ b/js/lib/rdge/materials/uber-material.js
@@ -1,7 +1,31 @@
 /* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+Copyright (c) 2012, Motorola Mobility, Inc
+All Rights Reserved.
+BSD License.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+  - Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+  - Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+  - Neither the name of Motorola Mobility nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+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> */
 
 var MaterialParser = require("js/lib/rdge/materials/material-parser").MaterialParser;
@@ -62,6 +86,23 @@ var UberMaterial = function UberMaterial() {
     this._propValues[this._propNames[7]] = this._environmentMapOb['texture'];
     this._propValues[this._propNames[8]] = this._environmentMapOb['envReflection'];
 
+        this.resetToDefault = function()
+        {
+                this._propValues[this._propNames[0]] = this._ambientColor.slice(0);
+                this._propValues[this._propNames[1]] = this._diffuseColor.slice(0);
+                this._propValues[this._propNames[2]] = this._specularColor.slice(0);
+                this._propValues[this._propNames[3]] = this._specularPower;
+                this._propValues[this._propNames[4]] = this._diffuseMapOb['texture'];
+                this._propValues[this._propNames[5]] = this._normalMapOb['texture'];
+                this._propValues[this._propNames[6]] = this._specularMapOb['texture'];
+                this._propValues[this._propNames[7]] = this._environmentMapOb['texture'];
+                this._propValues[this._propNames[8]] = this._environmentMapOb['envReflection'];
+        
+                var nProps = this._propNames.length;
+                for (var i=0; i<nProps;  i++)
+                        this.setProperty( this._propNames[i],  this._propValues[this._propNames[i]]  );
+        };
+
     this.setProperty = function (prop, value) {
         if (prop == "color") prop = "ambientColor";
         var valid = this.validateProperty(prop, value);
@@ -823,4 +864,4 @@ UberMaterial.prototype = new Material();
 
 if (typeof exports === "object") {
     exports.UberMaterial = UberMaterial;
-}
\ No newline at end of file
+}