aboutsummaryrefslogtreecommitdiff
path: root/js/models
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-08 10:18:36 -0800
committerValerio Virgillito2012-02-08 10:18:36 -0800
commit763910b9d074137eb7dee80447b89407ce5750c9 (patch)
tree3c8820a06afd442fa5ba8e68665a4d2836230628 /js/models
parente5579374ff39b80b8c0c69faba37f6f581758fe0 (diff)
parent329a859e2666716c3a1d99c6bd2679e10c81fc8d (diff)
downloadninja-763910b9d074137eb7dee80447b89407ce5750c9.tar.gz
Merge pull request #20 from mqg734/ToolFixes
Hooked up materials code to go through the ShapesController and updated the PI to reflect the currently selected shape's materials. Also fixed the following bugs:
Diffstat (limited to 'js/models')
-rw-r--r--js/models/shape-model.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index b643a7b5..58a88fd0 100644
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js
@@ -10,6 +10,7 @@ var Montage = require("montage/core/core").Montage,
10exports.ShapeModel = Montage.create(Component, { 10exports.ShapeModel = Montage.create(Component, {
11 11
12 shapeCount: { value: 0 }, 12 shapeCount: { value: 0 },
13 useWebGl: { value: false },
13 14
14 GLWorld: { value: null }, 15 GLWorld: { value: null },
15 GLGeomObj: { value: null }, 16 GLGeomObj: { value: null },
@@ -17,14 +18,12 @@ exports.ShapeModel = Montage.create(Component, {
17 strokeSize: { value: null }, 18 strokeSize: { value: null },
18 stroke: { value: null }, 19 stroke: { value: null },
19 strokeMaterial: { value: null }, 20 strokeMaterial: { value: null },
20 strokeMaterialIndex: { value: null },
21 strokeStyle: { value: null }, 21 strokeStyle: { value: null },
22 strokeStyleIndex: { value: null }, 22 strokeStyleIndex: { value: null },
23 border: { value: null }, // Store css value for ColorController 23 border: { value: null }, // Store css value for ColorController
24 24
25 fill: { value: null }, 25 fill: { value: null },
26 fillMaterial: { value: null }, 26 fillMaterial: { value: null },
27 fillMaterialIndex: { value: null },
28 background: { value: null }, // Store css value for ColorController 27 background: { value: null }, // Store css value for ColorController
29 28
30 // Line-specific 29 // Line-specific