aboutsummaryrefslogtreecommitdiff
path: root/js/tools/RectTool.js
diff options
context:
space:
mode:
authorArmen Kesablyan2012-02-13 13:36:52 -0800
committerArmen Kesablyan2012-02-13 13:36:52 -0800
commitda32190d5dd91fa2c26f8cabb746980c3d06035c (patch)
treed923299208c84b1071b58e7eb9c0515b2e1c844a /js/tools/RectTool.js
parent36cefa3526988cb4dfea107fedaa954a2703260d (diff)
parent90d0c8c0e98d062c628c061fe5765ce991fda409 (diff)
downloadninja-da32190d5dd91fa2c26f8cabb746980c3d06035c.tar.gz
Merge branch 'refs/heads/master' into text-tool
Diffstat (limited to 'js/tools/RectTool.js')
-rw-r--r--js/tools/RectTool.js15
1 files changed, 7 insertions, 8 deletions
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index 94d80b53..31ac7faa 100644
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -62,16 +62,16 @@ exports.RectTool = Montage.create(ShapeTool, {
62 var strokeMaterial = null; 62 var strokeMaterial = null;
63 var fillMaterial = null; 63 var fillMaterial = null;
64 64
65 var strokeIndex = parseInt(this.options.strokeMaterial); 65 var strokeM = this.options.strokeMaterial;
66 if(strokeIndex > 0) 66 if(strokeM)
67 { 67 {
68 strokeMaterial = Object.create(MaterialsLibrary.getMaterialAt(strokeIndex-1)); 68 strokeMaterial = Object.create(MaterialsLibrary.getMaterial(strokeM));
69 } 69 }
70 70
71 var fillIndex = parseInt(this.options.fillMaterial); 71 var fillM = this.options.fillMaterial;
72 if(fillIndex > 0) 72 if(fillM)
73 { 73 {
74 fillMaterial = Object.create(MaterialsLibrary.getMaterialAt(fillIndex-1)); 74 fillMaterial = Object.create(MaterialsLibrary.getMaterial(fillM));
75 } 75 }
76 76
77 var world = this.getGLWorld(canvas, this.options.use3D); 77 var world = this.getGLWorld(canvas, this.options.use3D);
@@ -110,13 +110,12 @@ exports.RectTool = Montage.create(ShapeTool, {
110 110
111 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial; 111 canvas.elementModel.shapeModel.strokeMaterial = strokeMaterial;
112 canvas.elementModel.shapeModel.fillMaterial = fillMaterial; 112 canvas.elementModel.shapeModel.fillMaterial = fillMaterial;
113 canvas.elementModel.shapeModel.strokeMaterialIndex = strokeIndex;
114 canvas.elementModel.shapeModel.fillMaterialIndex = fillIndex;
115 113
116 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex; 114 canvas.elementModel.shapeModel.strokeStyleIndex = strokeStyleIndex;
117 canvas.elementModel.shapeModel.strokeStyle = strokeStyle; 115 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
118 116
119 canvas.elementModel.shapeModel.GLGeomObj = rect; 117 canvas.elementModel.shapeModel.GLGeomObj = rect;
118 canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
120 } 119 }
121 else 120 else
122 { 121 {