aboutsummaryrefslogtreecommitdiff
path: root/js/tools
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-09 12:15:26 -0700
committerValerio Virgillito2012-07-09 12:15:26 -0700
commit1839f24e8dcbad38d1381bbcd65c17a9caa45987 (patch)
tree516a29ca99d4aae0d5228223fff438c1a3c4e0d3 /js/tools
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
parentfebfdb18042d1c73ac58ee4e35c5f176428dee00 (diff)
downloadninja-1839f24e8dcbad38d1381bbcd65c17a9caa45987.tar.gz
Merge pull request #346 from mqg734/MaterialsUI
UI support for preview, edit, duplicate and delete of WebGL Materials.
Diffstat (limited to 'js/tools')
-rwxr-xr-xjs/tools/LineTool.js6
-rwxr-xr-xjs/tools/OvalTool.js12
-rwxr-xr-xjs/tools/RectTool.js12
3 files changed, 25 insertions, 5 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 89f33a16..d2ee0b43 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -268,7 +268,11 @@ exports.LineTool = Montage.create(ShapeTool, {
268 { 268 {
269 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 269 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
270 } 270 }
271 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; 271 if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) {
272 strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops};
273 } else {
274 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
275 }
272 } 276 }
273 277
274 var world = this.getGLWorld(canvas, this.options.use3D); 278 var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 94e4745e..44598ed7 100755
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -78,14 +78,22 @@ exports.OvalTool = Montage.create(ShapeTool, {
78 { 78 {
79 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 79 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
80 } 80 }
81 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; 81 if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) {
82 strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops};
83 } else {
84 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
85 }
82 86
83 fillM = this.options.fillMaterial; 87 fillM = this.options.fillMaterial;
84 if(fillM) 88 if(fillM)
85 { 89 {
86 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); 90 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
87 } 91 }
88 fillColor = ShapesController.getMaterialColor(fillM) || fillColor; 92 if (fillMaterial && this.options.fill.color && (fillMaterial.gradientType === this.options.fill.color.gradientMode)) {
93 fillColor = {gradientMode:fillMaterial.gradientType, color:this.options.fill.color.stops};
94 } else {
95 fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
96 }
89 } 97 }
90 98
91 var world = this.getGLWorld(canvas, this.options.use3D); 99 var world = this.getGLWorld(canvas, this.options.use3D);
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index babd623a..f53e78b6 100755
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -98,14 +98,22 @@ exports.RectTool = Montage.create(ShapeTool, {
98 { 98 {
99 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM)); 99 strokeMaterial = Object.create(MaterialsModel.getMaterial(strokeM));
100 } 100 }
101 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor; 101 if (strokeMaterial && this.options.stroke.color && (strokeMaterial.gradientType === this.options.stroke.color.gradientMode)) {
102 strokeColor = {gradientMode:strokeMaterial.gradientType, color:this.options.stroke.color.stops};
103 } else {
104 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
105 }
102 106
103 fillM = this.options.fillMaterial; 107 fillM = this.options.fillMaterial;
104 if(fillM) 108 if(fillM)
105 { 109 {
106 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM)); 110 fillMaterial = Object.create(MaterialsModel.getMaterial(fillM));
107 } 111 }
108 fillColor = ShapesController.getMaterialColor(fillM) || fillColor; 112 if (fillMaterial && this.options.fill.color && (fillMaterial.gradientType === this.options.fill.color.gradientMode)) {
113 fillColor = {gradientMode:fillMaterial.gradientType, color:this.options.fill.color.stops};
114 } else {
115 fillColor = ShapesController.getMaterialColor(fillM) || fillColor;
116 }
109 } 117 }
110 118
111 var world = this.getGLWorld(canvas, this.options.use3D); 119 var world = this.getGLWorld(canvas, this.options.use3D);