diff options
Diffstat (limited to 'js')
102 files changed, 11500 insertions, 339 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index 749a1dd9..3423a5a7 100755 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js | |||
@@ -8,6 +8,9 @@ var Montage = require("montage/core/core").Montage, | |||
8 | CanvasController = require("js/controllers/elements/canvas-controller").CanvasController, | 8 | CanvasController = require("js/controllers/elements/canvas-controller").CanvasController, |
9 | njModule = require("js/lib/NJUtils"); | 9 | njModule = require("js/lib/NJUtils"); |
10 | 10 | ||
11 | var World = require("js/lib/drawing/world").World; | ||
12 | var MaterialsModel = require("js/models/materials-model").MaterialsModel; | ||
13 | |||
11 | exports.ShapesController = Montage.create(CanvasController, { | 14 | exports.ShapesController = Montage.create(CanvasController, { |
12 | 15 | ||
13 | setProperty: { | 16 | setProperty: { |
@@ -78,7 +81,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
78 | this.application.ninja.selectionController.selectElement(el); | 81 | this.application.ninja.selectionController.selectElement(el); |
79 | return; | 82 | return; |
80 | case "strokeMaterial": | 83 | case "strokeMaterial": |
81 | var sm = Object.create(MaterialsLibrary.getMaterial(value)); | 84 | var sm = Object.create(MaterialsModel.getMaterial(value)); |
82 | if(sm) | 85 | if(sm) |
83 | { | 86 | { |
84 | el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm); | 87 | el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm); |
@@ -88,7 +91,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
88 | } | 91 | } |
89 | break; | 92 | break; |
90 | case "fillMaterial": | 93 | case "fillMaterial": |
91 | var fm = Object.create(MaterialsLibrary.getMaterial(value)); | 94 | var fm = Object.create(MaterialsModel.getMaterial(value)); |
92 | if(fm) | 95 | if(fm) |
93 | { | 96 | { |
94 | el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm); | 97 | el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm); |
@@ -317,7 +320,7 @@ exports.ShapesController = Montage.create(CanvasController, { | |||
317 | optionItem.innerText = "Default"; | 320 | optionItem.innerText = "Default"; |
318 | cb.appendChild(optionItem); | 321 | cb.appendChild(optionItem); |
319 | 322 | ||
320 | var materials = MaterialsLibrary.materials; | 323 | var materials = this.application.ninja.appModel.materials; |