diff options
author | Nivesh Rajbhandari | 2012-04-17 10:19:20 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-17 10:19:20 -0700 |
commit | 2a87a750f06003fc62e8e0e73983e14ce24fc7a7 (patch) | |
tree | 9566a079910cd08542ac7b35e8bc417dcecf8d1e /js/lib/geom | |
parent | c253192a08b499ea7be46fa5438d273e51f7ec5a (diff) | |
download | ninja-2a87a750f06003fc62e8e0e73983e14ce24fc7a7.tar.gz |
IKNinja-1477 - Cannot preflight Fill color if WebGL Line shape is selected.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/lib/geom')
-rwxr-xr-x | js/lib/geom/brush-stroke.js | 3 | ||||
-rwxr-xr-x | js/lib/geom/geom-obj.js | 3 | ||||
-rwxr-xr-x | js/lib/geom/line.js | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js index 26ac42e9..743dab85 100755 --- a/js/lib/geom/brush-stroke.js +++ b/js/lib/geom/brush-stroke.js | |||
@@ -44,6 +44,9 @@ var BrushStroke = function GLBrushStroke() { | |||
44 | this._strokeAngle = 0; | 44 | this._strokeAngle = 0; |
45 | this._strokeAmountSmoothing = 0; | 45 | this._strokeAmountSmoothing = 0; |
46 | 46 | ||
47 | // currently, brush does not support a fill region | ||
48 | this.canFill = false; | ||
49 | |||
47 | //threshold that tells us whether two samples are too far apart | 50 | //threshold that tells us whether two samples are too far apart |
48 | this._MAX_SAMPLE_DISTANCE_THRESHOLD = 5; | 51 | this._MAX_SAMPLE_DISTANCE_THRESHOLD = 5; |
49 | 52 | ||
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js index 2cde8a75..f2991bdb 100755 --- a/js/lib/geom/geom-obj.js +++ b/js/lib/geom/geom-obj.js | |||
@@ -47,6 +47,9 @@ var GeomObj = function GLGeomObj() { | |||
47 | this._fillMaterial = null; | 47 | this._fillMaterial = null; |
48 | this._strokeMaterial = null; | 48 | this._strokeMaterial = null; |
49 | 49 | ||
50 | // Shapes (such as lines) that don't support fill should set this to false | ||
51 | this.canFill = true; | ||
52 | |||
50 | // array of primitives - used in RDGE | 53 | // array of primitives - used in RDGE |
51 | this._primArray = []; | 54 | this._primArray = []; |
52 | this._materialNodeArray = []; | 55 | this._materialNodeArray = []; |
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js index 8ee39098..bb198d83 100755 --- a/js/lib/geom/line.js +++ b/js/lib/geom/line.js | |||
@@ -33,6 +33,8 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok | |||
33 | this._scaleX = 1.0; | 33 | this._scaleX = 1.0; |
34 | this._scaleY = 1.0; | 34 | this._scaleY = 1.0; |
35 | 35 | ||
36 | this.canFill = false; | ||
37 | |||
36 | if (arguments.length > 0) { | 38 | if (arguments.length > 0) { |
37 | this._width = width; | 39 | this._width = width; |
38 | this._height = height; | 40 | this._height = height; |