From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- js/lib/geom/geom-obj.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'js/lib/geom/geom-obj.js') diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index 4b8e1c69..c0c7504f 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js @@ -305,13 +305,13 @@ exports.GeomObj = Object.create(Object.prototype, { this._materialArray.push(strokeMaterial); this._materialTypeArray.push("stroke"); - // don't set the value here. The material editor may set a color directly - // to the material without setting this value in the obj. The following - // lines of code will clobber the value in the material + // don't set the value here. The material editor may set a color directly + // to the material without setting this value in the obj. The following + // lines of code will clobber the value in the material //if (this._strokeColor) // this.setStrokeColor(this._strokeColor); - this._strokeMaterial = strokeMaterial; + this._strokeMaterial = strokeMaterial; return strokeMaterial; } @@ -332,14 +332,14 @@ exports.GeomObj = Object.create(Object.prototype, { this._materialArray.push(fillMaterial); this._materialTypeArray.push("fill"); - - // don't set the value here. The material editor may set a color directly - // to the material without setting this value in the obj. The following - // lines of code will clobber the value in the material + + // don't set the value here. The material editor may set a color directly + // to the material without setting this value in the obj. The following + // lines of code will clobber the value in the material //if (this._fillColor) // this.setFillColor(this._fillColor); - this._fillMaterial = fillMaterial; + this._fillMaterial = fillMaterial; return fillMaterial; } @@ -347,7 +347,7 @@ exports.GeomObj = Object.create(Object.prototype, { exportMaterialsJSON: { value: function() { - MaterialsModel = require("js/models/materials-model").MaterialsModel; + MaterialsModel = require("js/models/materials-model").MaterialsModel; var jObj; if (this._materialArray && this._materialNodeArray && this.getWorld().isWebGL()) { @@ -379,7 +379,7 @@ exports.GeomObj = Object.create(Object.prototype, { importMaterialsJSON: { value: function(jObj) { - MaterialsModel = require("js/models/materials-model").MaterialsModel; + MaterialsModel = require("js/models/materials-model").MaterialsModel; this._materialArray = []; this._materialTypeArray = []; @@ -406,7 +406,7 @@ exports.GeomObj = Object.create(Object.prototype, { case "tunnel": case "reliefTunnel": case "squareTunnel": - case "flag": + case "flag": case "twist": case "fly": case "julia": @@ -416,8 +416,8 @@ exports.GeomObj = Object.create(Object.prototype, { case "keleidoscope": case "radialBlur": case "pulse": - case "twistVert": - case "taper": + case "twistVert": + case "taper": mat = MaterialsModel.getMaterialByShader(shaderName); if (mat) mat = mat.dup(); break; @@ -471,12 +471,12 @@ exports.GeomObj = Object.create(Object.prototype, { // get the normalized device coordinates (NDC) for // all position and dimensions. var world = this.getWorld(); - var vpw = world.getViewportWidth(), vph = world.getViewportHeight(); - var xNDC = 2*this._xOffset/vpw, yNDC = -2*this._yOffset/vph; + var vpw = world.getViewportWidth(), vph = world.getViewportHeight(); + var xNDC = 2*this._xOffset/vpw, yNDC = -2*this._yOffset/vph; var aspect = world.getAspect(); var zn = world.getZNear(), zf = world.getZFar(); - var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0), + var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0), b = -t, r = aspect*t, l = -r; @@ -501,12 +501,12 @@ exports.GeomObj = Object.create(Object.prototype, { // get the normalized device coordinates (NDC) for // all position and dimensions. var world = this.getWorld(); - var vpw = world.getViewportWidth(), vph = world.getViewportHeight(); - var xNDC = 2*preViewPt[0]/vpw, yNDC = -2*preViewPt[1]/vph; + var vpw = world.getViewportWidth(), vph = world.getViewportHeight(); + var xNDC = 2*preViewPt[0]/vpw, yNDC = -2*preViewPt[1]/vph; var aspect = world.getAspect(); var zn = world.getZNear(), zf = world.getZFar(); - var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0), + var t = zn * Math.tan(world.getFOV() * Math.PI / 360.0), b = -t, r = aspect*t, l = -r; -- cgit v1.2.3 From 04343eda8c2f870b0da55cfdc8003c99fe1cc4de Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:53:10 -0700 Subject: Remove trailing spaces --- js/lib/geom/geom-obj.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/lib/geom/geom-obj.js') diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index c0c7504f..fda071ee 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js @@ -332,7 +332,7 @@ exports.GeomObj = Object.create(Object.prototype, { this._materialArray.push(fillMaterial); this._materialTypeArray.push("fill"); - + // don't set the value here. The material editor may set a color directly // to the material without setting this value in the obj. The following // lines of code will clobber the value in the material -- cgit v1.2.3 From ac27d538af33ca8d67d3d88729f49c05793afda7 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 9 Jul 2012 11:43:36 -0700 Subject: PI, drawing and editing fixes for shapes and materials. IKNinja-1841 - Cannot change webgl shape with LinearGradient and RadialGradient to solid color. IKNINJA-1851 - Cannot draw webgl shapes with Linear/RadialGradient material. IKNINJA-1864 - PI doesn't update the color of shape if WebGL material switches to Flat. IKNINJA-1886 - Gradient edits not applied to WebGL Stage object. Signed-off-by: Nivesh Rajbhandari --- js/lib/geom/geom-obj.js | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) (limited to 'js/lib/geom/geom-obj.js') diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index 3a7a5619..66f557dd 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js @@ -191,27 +191,10 @@ exports.GeomObj = Object.create(Object.prototype, { nMats = this._materialArray.length; } - var stops = [], - colors = c.color; - - var len = colors.length; - // TODO - Current shaders only support 4 color stops - if (len > 4) { - len = 4; - } - - for (var n = 0; n < len; n++) { - var position = colors[n].position / 100; - var cs = colors[n].value; - var stop = [cs.r / 255, cs.g / 255, cs.b / 255, cs.a]; - stops.push(stop); - - if (nMats === this._materialTypeArray.length) { - for (i = 0; i < nMats; i++) { - if (this._materialTypeArray[i] == type) { - this._materialArray[i].setProperty("color" + (n + 1), stop.slice(0)); - this._materialArray[i].setProperty("colorStop" + (n + 1), position); - } + if (nMats === this._materialTypeArray.length) { + for (i = 0; i < nMats; i++) { + if (this._materialTypeArray[i] == type) { + this._materialArray[i].setGradientData(c.color); } } } -- cgit v1.2.3