aboutsummaryrefslogtreecommitdiff
path: root/js/tools/LineTool.js
diff options
context:
space:
mode:
authorKris Kowal2012-07-06 11:52:06 -0700
committerKris Kowal2012-07-06 15:01:48 -0700
commit648ee61ae84216d0236e0dbc211addc13b2cfa3a (patch)
tree8f0f55557bd0c47a84e49c1977c950645d284607 /js/tools/LineTool.js
parentaedd14b18695d031f695d27dfbd94df5614495bb (diff)
downloadninja-648ee61ae84216d0236e0dbc211addc13b2cfa3a.tar.gz
Expand tabs
Diffstat (limited to 'js/tools/LineTool.js')
-rwxr-xr-xjs/tools/LineTool.js24
1 files changed, 12 insertions, 12 deletions
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 89f33a16..b0681af7 100755
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -28,23 +28,23 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
28POSSIBILITY OF SUCH DAMAGE. 28POSSIBILITY OF SUCH DAMAGE.
29</copyright> */ 29</copyright> */
30 30
31var Montage = require("montage/core/core").Montage, 31var Montage = require("montage/core/core").Montage,
32 ShapeTool = require("js/tools/ShapeTool").ShapeTool, 32 ShapeTool = require("js/tools/ShapeTool").ShapeTool,
33 DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase, 33 DrawingToolBase = require("js/tools/drawing-tool-base").DrawingToolBase,
34 NJUtils = require("js/lib/NJUtils").NJUtils, 34 NJUtils = require("js/lib/NJUtils").NJUtils,
35 TagTool = require("js/tools/TagTool").TagTool, 35 TagTool = require("js/tools/TagTool").TagTool,
36 ShapesController = require("js/controllers/elements/shapes-controller").ShapesController, 36 ShapesController = require("js/controllers/elements/shapes-controller").ShapesController,
37 ShapeModel = require("js/models/shape-model").ShapeModel; 37 ShapeModel = require("js/models/shape-model").ShapeModel;
38 38
39var Line = require("js/lib/geom/line").Line; 39var Line = require("js/lib/geom/line").Line;
40var MaterialsModel = require("js/models/materials-model").MaterialsModel; 40var MaterialsModel = require("js/models/materials-model").MaterialsModel;
41 41
42exports.LineTool = Montage.create(ShapeTool, { 42exports.LineTool = Montage.create(ShapeTool, {
43 _toolID: { value: "lineTool" }, 43 _toolID: { value: "lineTool" },
44 _imageID: { value: "lineToolImg" }, 44 _imageID: { value: "lineToolImg" },
45 _toolImageClass: { value: "lineToolUp" }, 45 _toolImageClass: { value: "lineToolUp" },
46 _selectedToolImageClass: { value: "lineToolDown" }, 46 _selectedToolImageClass: { value: "lineToolDown" },
47 _toolTipText: { value: "Line Tool (L)" }, 47 _toolTipText: { value: "Line Tool (L)" },
48 48
49 _tmpDrawIndex : { value : 1, writable:true}, 49 _tmpDrawIndex : { value : 1, writable:true},
50 50
@@ -174,9 +174,9 @@ exports.LineTool = Montage.create(ShapeTool, {
174 dx, 174 dx,
175 dy; 175 dy;
176 176
177 if (hitRec0 && hitRec1) { 177 if (hitRec0 && hitRec1) {
178 var p0 = hitRec0.getLocalPoint(), 178 var p0 = hitRec0.getLocalPoint(),
179 p1 = hitRec1.getLocalPoint(); 179 p1 = hitRec1.getLocalPoint();
180 180
181 dx = Math.floor(p0[0] - p1[0]); 181 dx = Math.floor(p0[0] - p1[0]);
182 dy = Math.floor(p0[1] - p1[1]); 182 dy = Math.floor(p0[1] - p1[1]);
@@ -246,7 +246,7 @@ exports.LineTool = Montage.create(ShapeTool, {
246 }, 246 },
247 247
248 RenderShape: { 248 RenderShape: {
249 value: function (w, h, planeMat, midPt, canvas, slope, xAdj, yAdj) 249 value: function (w, h, planeMat, midPt, canvas, slope, xAdj, yAdj)
250 { 250 {
251 251
252 var strokeStyleIndex = this.options.strokeStyleIndex; 252 var strokeStyleIndex = this.options.strokeStyleIndex;
@@ -268,7 +268,7 @@ 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 strokeColor = ShapesController.getMaterialColor(strokeM) || strokeColor;
272 } 272 }
273 273
274 var world = this.getGLWorld(canvas, this.options.use3D); 274 var world = this.getGLWorld(canvas, this.options.use3D);