From f775fb752cac57a0c1f6c42c8c60f5ff329eab32 Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Wed, 22 Feb 2012 11:36:19 -0800
Subject: Revert "Integrating canvas-2d drawing and WebGL fixes, including
adding back WebGL materials."
This reverts commit 96a0a8c916533eb5625816192ed38488f639326d.
---
.../RDGE/Materials/KeleidoscopeMaterial.js | 149 ---------------------
1 file changed, 149 deletions(-)
delete mode 100644 js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
(limited to 'js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js')
diff --git a/js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js b/js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
deleted file mode 100644
index 1547aca9..00000000
--- a/js/helper-classes/RDGE/Materials/KeleidoscopeMaterial.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- This file contains proprietary software owned by Motorola Mobility, Inc.
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.
- (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
- */
-
-
-
-///////////////////////////////////////////////////////////////////////
-// Class GLMaterial
-// RDGE representation of a material.
-///////////////////////////////////////////////////////////////////////
-function KeleidoscopeMaterial()
-{
- // initialize the inherited members
- this.inheritedFrom = PulseMaterial;
- this.inheritedFrom();
-
- ///////////////////////////////////////////////////////////////////////
- // Instance variables
- ///////////////////////////////////////////////////////////////////////
- this._name = "KeleidoscopeMaterial";
- this._shaderName = "keleidoscope";
-
- this._texMap = 'assets/images/rocky-normal.jpg';
-
- this._time = 0.0;
- this._dTime = 0.01;
-
- ///////////////////////////////////////////////////////////////////////
- // Properties
- ///////////////////////////////////////////////////////////////////////
- // all defined in parent PulseMaterial.js
- // load the local default value
- this._propValues[ this._propNames[0] ] = this._texMap.slice(0);
-
- ///////////////////////////////////////////////////////////////////////
- // Material Property Accessors
- ///////////////////////////////////////////////////////////////////////
-
- ///////////////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////////////////////////////////
- // Methods
- ///////////////////////////////////////////////////////////////////////
- // duplcate method requirde
- this.dup = function( world )
- {
- // allocate a new uber material
- var newMat = new KeleidoscopeMaterial();
-
- // copy over the current values;
- var propNames = [], propValues = [], propTypes = [], propLabels = [];
- this.getAllProperties( propNames, propValues, propTypes, propLabels);
- var n = propNames.length;
- for (var i=0; i