aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/components/combobox.reel/combobox.js16
-rw-r--r--js/controllers/elements/shapes-controller.js10
-rw-r--r--js/helper-classes/RDGE/GLCircle.js79
-rw-r--r--js/helper-classes/RDGE/GLGeomObj.js51
-rw-r--r--js/helper-classes/RDGE/GLLine.js27
-rw-r--r--js/helper-classes/RDGE/GLRectangle.js57
6 files changed, 93 insertions, 147 deletions
diff --git a/js/components/combobox.reel/combobox.js b/js/components/combobox.reel/combobox.js
index ebbfbffa..3200b01c 100644
--- a/js/components/combobox.reel/combobox.js
+++ b/js/components/combobox.reel/combobox.js
@@ -174,6 +174,22 @@ exports.Combobox = Montage.create(Component, {
174 174
175 prepareForDraw: { 175 prepareForDraw: {
176 value: function() { 176 value: function() {
177 if( (this._value === null) && this._items.length )
178 {
179 var current = this._items[0];
180 if(this.dataFunction)
181 {
182 this.value = this.dataFunction(current);
183 }
184 else if(this.dataField)
185 {
186 this.value = current[this.dataField];
187 }
188 else
189 {
190 this.value = current;
191 }
192 }
177 this.element.addEventListener("change", this, false); 193 this.element.addEventListener("change", this, false);
178 } 194 }
179 } 195 }
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 21373aca..c6722dee 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -108,7 +108,15 @@ exports.ShapesController = Montage.create(CanvasController, {
108 return this.getShapeProperty(el, p); 108 return this.getShapeProperty(el, p);
109 case "strokeMaterial": 109 case "strokeMaterial":
110 case "fillMaterial": 110 case "fillMaterial":
111 return this.getShapeProperty(el, p).getName(); 111 var m = this.getShapeProperty(el, p);
112 if(m)
113 {
114 return this.getShapeProperty(el, p).getName();
115 }
116 else
117 {
118 return "FlatMaterial";
119 }
112 default: 120 default:
113 return CanvasController.getProperty(el, p); 121 return CanvasController.getProperty(el, p);
114 } 122 }
diff --git a/js/helper-classes/RDGE/GLCircle.js b/js/helper-classes/RDGE/GLCircle.js
index fc2e6460..e6bcba89 100644
--- a/js/helper-classes/RDGE/GLCircle.js
+++ b/js/helper-classes/RDGE/GLCircle.js
@@ -33,14 +33,6 @@ function GLCircle()
33 33
34 this._ovalHeight = this._ovalHeight = 2.0*this.radius; 34 this._ovalHeight = this._ovalHeight = 2.0*this.radius;
35 35
36 // stroke and fill colors
37 this._strokeColor = [0.4, 0.4, 0.4, 1.0];
38 this._fillColor = [0.0, 0.6, 0.0, 1.0];
39
40 // stroke and fill materials
41 this._fillMaterial;
42 this._strokeMaterial;
43
44 this._strokeStyle = "Solid"; 36 this._strokeStyle = "Solid";
45 37
46 this._aspectRatio = 1.0; 38 this._aspectRatio = 1.0;
@@ -189,19 +181,19 @@ function GLCircle()
189 var reverseRotMat = Matrix.RotationZ( -angle ); 181 var reverseRotMat = Matrix.RotationZ( -angle );
190 182
191 // calculate matrices to scale the circle and stroke to fit the bounds of the ellipse 183 // calculate matrices to scale the circle and stroke to fit the bounds of the ellipse
192 strokeScaleMat = Matrix.I(4); 184 var strokeScaleMat = Matrix.I(4);
193 strokeScaleMat[0] = xRad; 185 strokeScaleMat[0] = xRad;
194 strokeScaleMat[5] = yRad; 186 strokeScaleMat[5] = yRad;
195 187
196 fillScaleMat = Matrix.I(4); 188 var fillScaleMat = Matrix.I(4);
197 fillScaleMat[0] = xRad - xStroke; 189 fillScaleMat[0] = xRad - xStroke;
198 fillScaleMat[5] = yRad - yStroke; 190 fillScaleMat[5] = yRad - yStroke;
199 191
200 innerRadiusScaleMat = Matrix.I(4); 192 var innerRadiusScaleMat = Matrix.I(4);
201 innerRadiusScaleMat[0] = xInnRad; 193 innerRadiusScaleMat[0] = xInnRad;
202 innerRadiusScaleMat[5] = yInnRad; 194 innerRadiusScaleMat[5] = yInnRad;
203 195
204 innerStrokeScaleMat = Matrix.I(4); 196 var innerStrokeScaleMat = Matrix.I(4);
205 innerStrokeScaleMat[0] = xInnRad - xStroke; 197 innerStrokeScaleMat[0] = xInnRad - xStroke;
206 innerStrokeScaleMat[5] = yInnRad - yStroke; 198 innerStrokeScaleMat[5] = yInnRad - yStroke;
207 199
@@ -233,69 +225,24 @@ function GLCircle()
233 225
234 if (fillPrim) 226 if (fillPrim)
235 { 227 {
236 this._primArray.push( fillPrim ); 228 fillMaterial = this.makeFillMaterial();
237
238 if (this.getFillMaterial())
239 fillMaterial = this.getFillMaterial().dup();
240 else
241 fillMaterial = new FlatMaterial();
242 229
243 if (fillMaterial) 230 this._primArray.push( fillPrim );
244 { 231 this._materialNodeArray.push( fillMaterial.getMaterialNode() );
245 fillMaterial.init( this.getWorld() );
246 if(!this.getFillMaterial() && this._fillColor)
247 {
248 fillMaterial.setProperty("color", this._fillColor);
249 }
250 this._materialArray.push( fillMaterial );
251 this._materialTypeArray.push( "fill" );
252 var matNode = fillMaterial.getMaterialNode();
253 this._materialNodeArray.push( matNode );
254 }
255 } 232 }
256 if (strokePrim0) 233 if (strokePrim0)
257 { 234 {
258 if (this.getStrokeMaterial()) 235 strokeMaterial0 = this.makeStrokeMaterial();
259 strokeMaterial = this.getStrokeMaterial().dup();
260 else
261 strokeMaterial = new FlatMaterial();
262 236
263 if (strokeMaterial) 237 this._primArray.push( strokePrim0 );
264 { 238 this._materialNodeArray.push( strokeMaterial0.getMaterialNode() );
265 strokeMaterial.init( this.getWorld() );
266 if(!this.getStrokeMaterial() && this._strokeColor)
267 {
268 strokeMaterial.setProperty("color", this._strokeColor);
269 }
270 this._primArray.push( strokePrim0 );
271
272 var materialNode = createMaterialNode("ovalFillMaterial");
273 this._materialArray.push( strokeMaterial );
274 this._materialTypeArray.push( "stroke" );
275 this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
276 }
277 } 239 }
278 if (strokePrim1) 240 if (strokePrim1)
279 { 241 {
280 if (this.getStrokeMaterial()) 242 strokeMaterial2 = this.makeStrokeMaterial();
281 strokeMaterial = this.getStrokeMaterial().dup();
282 else
283 strokeMaterial = new FlatMaterial();
284 243
285 if (strokeMaterial) 244 this._primArray.push( strokePrim1 );
286 { 245 this._materialNodeArray.push( strokeMaterial2.getMaterialNode() );
287 strokeMaterial.init( this.getWorld() );
288 if(!this.getStrokeMaterial() && this._strokeColor)
289 {
290 strokeMaterial.setProperty("color", this._strokeColor);
291 }
292 this._primArray.push( strokePrim1 );
293
294 var materialNode = createMaterialNode("ovalFillMaterial");
295 this._materialArray.push( strokeMaterial );
296 this._materialTypeArray.push( "stroke" );
297 this._materialNodeArray.push( strokeMaterial.getMaterialNode() );
298 }
299 } 246 }
300 247
301 world.updateObject(this); 248 world.updateObject(this);
diff --git a/js/helper-classes/RDGE/GLGeomObj.js b/js/helper-classes/RDGE/GLGeomObj.js
index 72019703..62fbf562 100644
--- a/js/helper-classes/RDGE/GLGeomObj.js
+++ b/js/helper-classes/RDGE/GLGeomObj.js
@@ -37,6 +37,10 @@ function GLGeomObj()
37 37
38 this.m_world = null; 38 this.m_world = null;
39 39
40 // stroke and fill colors
41 this._strokeColor;
42 this._fillColor;
43
40 // stroke and fill materials 44 // stroke and fill materials
41 this._fillMaterial; 45 this._fillMaterial;
42 this._strokeMaterial; 46 this._strokeMaterial;
@@ -104,6 +108,53 @@ function GLGeomObj()
104 this.setFillColor = function(c) { this.setMaterialColor(c, "fill"); } 108 this.setFillColor = function(c) { this.setMaterialColor(c, "fill"); }
105 this.setStrokeColor = function(c) { this.setMaterialColor(c, "stroke"); } 109 this.setStrokeColor = function(c) { this.setMaterialColor(c, "stroke"); }
106 110
111 this.makeStrokeMaterial = function()
112 {
113 var strokeMaterial;
114 if (this.getStrokeMaterial())
115 strokeMaterial = this.getStrokeMaterial().dup();
116 else
117 strokeMaterial = new FlatMaterial();
118
119 if (strokeMaterial)
120 {
121 strokeMaterial.init( this.getWorld() );
122 if(this._strokeColor)
123 {
124 strokeMaterial.setProperty("color", this._strokeColor);
125 }
126 }
127
128 this._materialArray.push( strokeMaterial );
129 this._ma