From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- .../RDGE/src/core/script/precompiled.js | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'js/helper-classes/RDGE/src/core/script/precompiled.js') diff --git a/js/helper-classes/RDGE/src/core/script/precompiled.js b/js/helper-classes/RDGE/src/core/script/precompiled.js index a83631b9..22b82adb 100755 --- a/js/helper-classes/RDGE/src/core/script/precompiled.js +++ b/js/helper-classes/RDGE/src/core/script/precompiled.js @@ -29,14 +29,14 @@ POSSIBILITY OF SUCH DAMAGE. */ /* -* A list of shared parameters that all shaders can support (the engine always try to bind these uniforms) -* These parameters are compiled into all jshaders and can be set from any jshader -* with a call to jshader.global.u_matDiffuse.set([1,0,0,1]) if the jshader depends on that parameter. -* To set directly call rdgeGlobalParameters.'param'.set(x), for example rdgeGlobalParameters.u_lightPos.set([1,1,1]) -* The values can be added to a jshaders params list - this will creating local jshader memory that binds to the parameter -* this parameter can be used to set the value for that shader but will not override the global setting -* The values set here are the default global values. -* note: the rdge_lights substructure can be ignored, the final parameter list contains only the uniform objects +* A list of shared parameters that all shaders can support (the engine always try to bind these uniforms) +* These parameters are compiled into all jshaders and can be set from any jshader +* with a call to jshader.global.u_matDiffuse.set([1,0,0,1]) if the jshader depends on that parameter. +* To set directly call rdgeGlobalParameters.'param'.set(x), for example rdgeGlobalParameters.u_lightPos.set([1,1,1]) +* The values can be added to a jshaders params list - this will creating local jshader memory that binds to the parameter +* this parameter can be used to set the value for that shader but will not override the global setting +* The values set here are the default global values. +* note: the rdge_lights substructure can be ignored, the final parameter list contains only the uniform objects */ var RDGE = RDGE || {}; @@ -77,11 +77,11 @@ RDGE.rdgeGlobalParameters = "u_light3Spec": { 'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0] } }, "colMap": { 'type': 'tex2d', 'data': "assets/images/white.png" }, - //"envMap": {'type': 'tex2d', 'data': null}, - //"normalMap": {'type': 'tex2d', 'data': null}, - //"glowMap": {'type': 'tex2d', 'data': "assets/images/black.png"}, - //"u_shadowDepthMap": {'type': 'tex2d', 'data': null}, - //"u_depthMap": {'type': 'tex2d', 'data': null}, + //"envMap": {'type': 'tex2d', 'data': null}, + //"normalMap": {'type': 'tex2d', 'data': null}, + //"glowMap": {'type': 'tex2d', 'data': "assets/images/black.png"}, + //"u_shadowDepthMap": {'type': 'tex2d', 'data': null}, + //"u_depthMap": {'type': 'tex2d', 'data': null}, "u_matAmbient": { 'type': 'vec4', 'data': [1.00, 1.00, 1.00, 1] }, "u_matDiffuse": { 'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0] }, "u_matSpecular": { 'type': 'vec4', 'data': [1.0, 1.0, 1.0, 1.0] }, -- cgit v1.2.3