diff options
author | hwc487 | 2012-04-19 13:01:43 -0700 |
---|---|---|
committer | hwc487 | 2012-04-19 13:01:43 -0700 |
commit | e6a20fe64574763483dc602bd759278ccf5e5e68 (patch) | |
tree | 69defe7200206f0257fe90697136fadef59d521e /js/helper-classes/RDGE/src/core/script/ScreenQuad.js | |
parent | ae7eb87564632ce7c676bd728b8ff2710ff0bb83 (diff) | |
parent | 9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff) | |
download | ninja-e6a20fe64574763483dc602bd759278ccf5e5e68.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/drawing/world.js
js/lib/geom/geom-obj.js
js/lib/rdge/materials/cloud-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
Diffstat (limited to 'js/helper-classes/RDGE/src/core/script/ScreenQuad.js')
-rwxr-xr-x | js/helper-classes/RDGE/src/core/script/ScreenQuad.js | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/js/helper-classes/RDGE/src/core/script/ScreenQuad.js b/js/helper-classes/RDGE/src/core/script/ScreenQuad.js index 2368d97a..6359f82e 100755 --- a/js/helper-classes/RDGE/src/core/script/ScreenQuad.js +++ b/js/helper-classes/RDGE/src/core/script/ScreenQuad.js | |||
@@ -4,28 +4,26 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | 4 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. |
5 | </copyright> */ | 5 | </copyright> */ |
6 | 6 | ||
7 | // RDGE namespaces | ||
8 | var RDGE = RDGE || {}; | ||
7 | 9 | ||
8 | function ScreenQuad(texture) | 10 | RDGE.ScreenQuad = function (texture) { |
9 | { | 11 | this.vertBuffer = null; |
10 | this.vertBuffer = null; | 12 | this.uvBuffer = null; |
11 | this.uvBuffer = null; | 13 | this.texture = texture; |
12 | this.texture = texture; | 14 | this.shader = null; |
13 | this.shader = null; | 15 | this.renderObj = null; |
14 | this.renderObj = null; | 16 | }; |
15 | } | ||
16 | 17 | ||
17 | ScreenQuad.prototype.initialize = function(initProc, shaderOpt) | 18 | RDGE.ScreenQuad.prototype.initialize = function (initProc, shaderOpt) { |
18 | { | 19 | initProc(this, shaderOpt); |
19 | initProc(this, shaderOpt); | ||
20 | }; | 20 | }; |
21 | 21 | ||
22 | ScreenQuad.prototype.setTexture = function(texture) | 22 | RDGE.ScreenQuad.prototype.setTexture = function (texture) { |
23 | { | 23 | this.texture = texture; |
24 | this.texture = texture; | ||
25 | }; | 24 | }; |
26 | 25 | ||
27 | 26 | ||
28 | ScreenQuad.prototype.render = function(renderProc) | 27 | RDGE.ScreenQuad.prototype.render = function (renderProc) { |
29 | { | 28 | renderProc(this); |
30 | renderProc(this); | ||
31 | }; \ No newline at end of file | 29 | }; \ No newline at end of file |