From 5b4f6b1618cf571a6bce5a631f976a008e04a64e Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Thu, 29 Mar 2012 15:52:08 -0700
Subject: Updated shapes to always check for its stroke and fill colors and
materials instead of relying on the shapeModel cache because it can get out
of sync.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/lib/geom/line.js | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'js/lib/geom/line.js')
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index e839e229..2b2434f5 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -137,6 +137,14 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
this._strokeStyle = jObj.strokeStyle;
this._strokeColor = jObj.strokeColor;
var strokeMaterialName = jObj.strokeMat;
+
+ var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
+ if (!strokeMat) {
+ console.log( "object material not found in library: " + strokeMaterialName );
+ strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
+ }
+ this._strokeMaterial = strokeMat;
+
this.importMaterialsJSON( jObj.materials );
};
--
cgit v1.2.3
From eae317815e15a7ffc2dd1bd1e39b208eaa02fd2b Mon Sep 17 00:00:00 2001
From: Nivesh Rajbhandari
Date: Fri, 30 Mar 2012 13:53:47 -0700
Subject: Update PI and Color Panel to reflect default LinearGradient and
RadialGradient materials' colors.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
---
js/lib/geom/line.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'js/lib/geom/line.js')
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index 2b2434f5..f3806fac 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -44,7 +44,7 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
this._slope = slope;
this._strokeWidth = strokeSize;
- if (strokeColor) this._strokeColor = strokeColor.slice();
+ this._strokeColor = strokeColor;
this._strokeStyle = strokeStyle;
this._scaleX = (world.getViewportWidth())/(world.getViewportHeight());
--
cgit v1.2.3
From dc9650af5760b1f93d6e93a383eabceacfdc0ad8 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Mon, 2 Apr 2012 15:40:25 -0700
Subject: Snapping fixes.
---
js/lib/geom/line.js | 70 -----------------------------------------------------
1 file changed, 70 deletions(-)
(limited to 'js/lib/geom/line.js')
diff --git a/js/lib/geom/line.js b/js/lib/geom/line.js
index e839e229..1848218d 100755
--- a/js/lib/geom/line.js
+++ b/js/lib/geom/line.js
@@ -140,76 +140,6 @@ var Line = function GLLine( world, xOffset, yOffset, width, height, slope, strok
this.importMaterialsJSON( jObj.materials );
};
- this.export = function() {
- var rtnStr = "type: " + this.geomType() + "\n";
-
- rtnStr += "xoff: " + this._xOffset + "\n";
- rtnStr += "yoff: " + this._yOffset + "\n";
- rtnStr += "width: " + this._width + "\n";
- rtnStr += "height: " + this._height + "\n";
- rtnStr += "xAdj: " + this._xAdj + "\n";
- rtnStr += "yAdj: " + this._yAdj + "\n";
- rtnStr += "strokeWidth: " + this._strokeWidth + "\n";
-
- if(this._strokeColor.gradientMode) {
- rtnStr += "strokeGradientMode: " + this._strokeColor.gradientMode + "\n";
- rtnStr += "strokeColor: " + this.gradientToString(this._strokeColor.color) + "\n";
- } else {
- rtnStr += "strokeColor: " + String(this._strokeColor) + "\n";
- }
-
- rtnStr += "strokeStyle: " + this._strokeStyle + "\n";
- rtnStr += "slope: " + String(this._slope) + "\n";
-
- rtnStr += "strokeMat: ";
- if (this._strokeMaterial) {
- rtnStr += this._strokeMaterial.getName();
- } else {
- rtnStr += MaterialsModel.getDefaultMaterialName();
- }
-
- rtnStr += "\n";
- return rtnStr;
- };
-
- this.import = function( importStr ) {
- this._xOffset = Number( this.getPropertyFromString( "xoff: ", importStr ) );
- this._yOffset = Number( this.getPropertyFromString( "yoff: ", importStr ) );
- this._width = Number( this.getPropertyFromString( "width: ", importStr ) );
- this._height = Number( this.getPropertyFromString( "height: ", importStr ) );
- this._xAdj = Number( this.getPropertyFromString( "xAdj: ", importStr ) );
- this._yAdj = Number( this.getPropertyFromString( "yAdj: ", importStr ) );
- this._strokeWidth = Number( this.getPropertyFromString( "strokeWidth: ", importStr ) );
- var slope = this.getPropertyFromString( "slope: ", importStr );
-
- if(isNaN(Number(slope))) {
- this._slope = slope;
- } else {
- this._slope = Number(slope);
- }
-
- var strokeMaterialName = this.getPropertyFromString( "strokeMat: ", importStr );
- this._strokeStyle = this.getPropertyFromString( "strokeStyle: ", importStr );
-
- if(importStr.indexOf("strokeGradientMode: ") < 0)
- {
- this._strokeColor = eval( "[" + this.getPropertyFromString( "strokeColor: ", importStr ) + "]" );
- } else {
- this._strokeColor = {};
- this._strokeColor.gradientMode = this.getPropertyFromString( "strokeGradientMode: ", importStr );
- this._strokeColor.color = this.stringToGradient(this.getPropertyFromString( "strokeColor: ", importStr ));
- }
-
- var strokeMat = MaterialsModel.getMaterial( strokeMaterialName );
- if (!strokeMat) {
- console.log( "object material not found in library: " + strokeMaterialName );
- strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() );
- }
-
- this._strokeMaterial = strokeMat;
-
- };
-
///////////////////////////////////////////////////////////////////////
// Methods
///////////////////////////////////////////////////////////////////////
--
cgit v1.2.3