From 486d9a31a85dd833a1c798049a00403756703034 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Mon, 6 Feb 2012 11:35:49 -0800 Subject: Support use WebGL checkbox in the PI. Signed-off-by: Nivesh Rajbhandari --- js/models/shape-model.js | 1 + 1 file changed, 1 insertion(+) (limited to 'js/models/shape-model.js') diff --git a/js/models/shape-model.js b/js/models/shape-model.js index b643a7b5..1175538f 100644 --- a/js/models/shape-model.js +++ b/js/models/shape-model.js @@ -10,6 +10,7 @@ var Montage = require("montage/core/core").Montage, exports.ShapeModel = Montage.create(Component, { shapeCount: { value: 0 }, + useWebGl: { value: false }, GLWorld: { value: null }, GLGeomObj: { value: null }, -- cgit v1.2.3 From 486842239c71e7964f38a09aacda4970f2a82e1a Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 7 Feb 2012 10:58:14 -0800 Subject: Updated tools and PI to get/set materials by binding to appModel's materials property. This requires us to add FlatMaterial to the list of materials in the MaterialsLibrary. Signed-off-by: Nivesh Rajbhandari --- js/models/shape-model.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/models/shape-model.js') diff --git a/js/models/shape-model.js b/js/models/shape-model.js index 1175538f..58a88fd0 100644 --- a/js/models/shape-model.js +++ b/js/models/shape-model.js @@ -18,14 +18,12 @@ exports.ShapeModel = Montage.create(Component, { strokeSize: { value: null }, stroke: { value: null }, strokeMaterial: { value: null }, - strokeMaterialIndex: { value: null }, strokeStyle: { value: null }, strokeStyleIndex: { value: null }, border: { value: null }, // Store css value for ColorController fill: { value: null }, fillMaterial: { value: null }, - fillMaterialIndex: { value: null }, background: { value: null }, // Store css value for ColorController // Line-specific -- cgit v1.2.3