diff options
author | Eric Guzman | 2012-08-21 10:27:08 -0700 |
---|---|---|
committer | Eric Guzman | 2012-08-21 10:27:08 -0700 |
commit | 2f4593e8a797898bb5c478eb8a14dac4660e8751 (patch) | |
tree | 741022dbc6a0e24cfc0ba65eb5c02f83092562c3 /js/lib | |
parent | b3567811595f33f8fa8bcf36cd5aaf749120334d (diff) | |
parent | ebb22628692375ce3bfce21353aaf5b820723f40 (diff) | |
download | ninja-2f4593e8a797898bb5c478eb8a14dac4660e8751.tar.gz |
Merge branch 'refs/heads/master' into minorFixes_7.1
Diffstat (limited to 'js/lib')
-rw-r--r-- | js/lib/rdge/materials/cloud-material.js | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/js/lib/rdge/materials/cloud-material.js b/js/lib/rdge/materials/cloud-material.js index 748e26dd..11372d12 100644 --- a/js/lib/rdge/materials/cloud-material.js +++ b/js/lib/rdge/materials/cloud-material.js | |||
@@ -34,7 +34,6 @@ var Material = require("js/lib/rdge/materials/material").Material; | |||
34 | var GLWorld = require("js/lib/drawing/world").World; | 34 | var GLWorld = require("js/lib/drawing/world").World; |
35 | var Texture = require("js/lib/rdge/texture").Texture; | 35 | var Texture = require("js/lib/rdge/texture").Texture; |
36 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; | 36 | var ElementMediator = require("js/mediators/element-mediator").ElementMediator; |
37 | var TagTool = require("js/tools/TagTool").TagTool; | ||
38 | 37 | ||
39 | /////////////////////////////////////////////////////////////////////// | 38 | /////////////////////////////////////////////////////////////////////// |
40 | // Class GLMaterial | 39 | // Class GLMaterial |
@@ -152,8 +151,7 @@ var CloudMaterial = function CloudMaterial() | |||
152 | 151 | ||
153 | ////////////////////////////////////////////////////////////////////////////////// | 152 | ////////////////////////////////////////////////////////////////////////////////// |
154 | // IS THIS NECESSARY?? | 153 | // IS THIS NECESSARY?? |
155 | // var elementModel = TagTool.makeElement(~~srcCanvas.width, ~~srcCanvas.height, | 154 | // var elementModel = TagTool.makeElement(~~srcCanvas.width, ~~srcCanvas.height, Matrix.I(4), [0,0,0], srcCanvas); |
156 | // Matrix.I(4), [0,0,0], srcCanvas); | ||
157 | // ElementMediator.addElement(srcCanvas, elementModel.data, true); | 155 | // ElementMediator.addElement(srcCanvas, elementModel.data, true); |
158 | ////////////////////////////////////////////////////////////////////////////////// | 156 | ////////////////////////////////////////////////////////////////////////////////// |
159 | 157 | ||