diff options
author | John Mayhew | 2012-04-03 13:39:32 -0700 |
---|---|---|
committer | John Mayhew | 2012-04-03 13:39:32 -0700 |
commit | 18609d375e7aab9cb48c9b3f5b291f85cbd28683 (patch) | |
tree | deca3dc7277c154782f451fbd5b960c3d5c9dba7 /js/lib/geom/circle.js | |
parent | d5d4dcac78ebf8ba3163a8c7055d783b6397a435 (diff) | |
download | ninja-18609d375e7aab9cb48c9b3f5b291f85cbd28683.tar.gz |
removed old unused import and export functions.
Diffstat (limited to 'js/lib/geom/circle.js')
-rwxr-xr-x | js/lib/geom/circle.js | 94 |
1 files changed, 0 insertions, 94 deletions
diff --git a/js/lib/geom/circle.js b/js/lib/geom/circle.js index e8c94b64..4bf37474 100755 --- a/js/lib/geom/circle.js +++ b/js/lib/geom/circle.js | |||
@@ -636,100 +636,6 @@ var Circle = function GLCircle() { | |||
636 | this.importMaterialsJSON( jObj.materials ); | 636 | this.importMaterialsJSON( jObj.materials ); |
637 | }; | 637 | }; |
638 | 638 | ||
639 | |||
640 | this.export = function() | ||
641 | { | ||
642 | var rtnStr = "type: " + this.geomType() + "\n"; | ||
643 | |||
644 | rtnStr += "xoff: " + this._xOffset + "\n"; | ||
645 | rtnStr += "yoff: " + this._yOffset + "\n"; | ||
646 | rtnStr += "width: " + this._width + "\n"; | ||
647 | rtnStr += "height: " + this._height + "\n"; | ||
648 | rtnStr += "strokeWidth: " + this._strokeWidth + "\n"; | ||
649 | rtnStr += "innerRadius: " + this._innerRadius + "\n"; | ||
650 | rtnStr += "strokeStyle: " + this._strokeStyle + "\n"; | ||
651 | |||
652 | if(this._strokeColor.gradientMode) { | ||
653 | rtnStr += "strokeGradientMode: " + this._strokeColor.gradientMode + "\n"; | ||
654 | rtnStr += "strokeColor: " + this.gradientToString(this._strokeColor.color) + "\n"; | ||
655 | } else { | ||
656 | rtnStr += "strokeColor: " + String(this._strokeColor) + "\n"; | ||
657 | } | ||
658 | |||
659 | if(this._fillColor.gradientMode) { | ||
660 | rtnStr += "fillGradientMode: " + this._fillColor.gradientMode + "\n"; | ||
661 | rtnStr += "fillColor: " + this.gradientToString(this._fillColor.color) + "\n"; | ||
662 | } else { | ||
663 | rtnStr += "fillColor: " + String(this._fillColor) + "\n"; | ||
664 | } | ||
665 | |||
666 | rtnStr += "strokeMat: "; | ||
667 | if (this._strokeMaterial) { | ||
668 | rtnStr += this._strokeMaterial.getName(); | ||
669 | } else { | ||
670 | rtnStr += MaterialsModel.getDefaultMaterialName(); | ||
671 | } | ||
672 | |||
673 | rtnStr += "\n"; | ||
674 | |||
675 | rtnStr += "fillMat: "; | ||
676 | if (this._fillMaterial) { | ||
677 | rtnStr += this._fillMaterial.getName(); | ||
678 | } else { | ||
679 | rtnStr += MaterialsModel.getDefaultMaterialName(); | ||
680 | } | ||
681 | rtnStr += "\n"; | ||
682 | |||
683 | rtnStr += this.exportMaterials(); | ||
684 | |||
685 | return rtnStr; | ||
686 | }; | ||
687 | |||
688 | this.import = function( importStr ) { | ||
689 | this._xOffset = Number( this.getPropertyFromString( "xoff: ", importStr ) ); | ||
690 | this._yOffset = Number( this.getPropertyFromString( "yoff: ", importStr ) ); | ||
691 | this._width = Number( this.getPropertyFromString( "width: ", importStr ) ); | ||
692 | this._height = Number( this.getPropertyFromString( "height: ", importStr ) ); | ||
693 | this._strokeWidth = Number( this.getPropertyFromString( "strokeWidth: ", importStr ) ); | ||
694 | this._innerRadius = Number( this.getPropertyFromString( "innerRadius: ", importStr ) ); | ||
695 | this._strokeStyle = this.getPropertyFromString( "strokeStyle: ", importStr ); | ||
696 | var strokeMaterialName = this.getPropertyFromString( "strokeMat: ", importStr ); | ||
697 | var fillMaterialName = this.getPropertyFromString( "fillMat: ", importStr ); | ||
698 | if(importStr.indexOf("fillGradientMode: ") < 0) { | ||
699 | this._fillColor = eval( "[" + this.getPropertyFromString( "fillColor: ", importStr ) + "]" ); | ||
700 | } else { | ||
701 | this._fillColor = {}; | ||
702 | this._fillColor.gradientMode = this.getPropertyFromString( "fillGradientMode: ", importStr ); | ||
703 | this._fillColor.color = this.stringToGradient(this.getPropertyFromString( "fillColor: ", importStr )); | ||
704 | } | ||
705 | |||
706 | if(importStr.indexOf("strokeGradientMode: ") < 0) | ||
707 | { | ||
708 | this._strokeColor = eval( "[" + this.getPropertyFromString( "strokeColor: ", importStr ) + "]" ); | ||
709 | } else { | ||
710 | this._strokeColor = {}; | ||
711 | this._strokeColor.gradientMode = this.getPropertyFromString( "strokeGradientMode: ", importStr ); | ||
712 | this._strokeColor.color = this.stringToGradient(this.getPropertyFromString( "strokeColor: ", importStr )); | ||
713 | } | ||
714 | |||
715 | var strokeMat = MaterialsModel.getMaterial( strokeMaterialName ); | ||
716 | if (!strokeMat) { | ||
717 | console.log( "object material not found in library: " + strokeMaterialName ); | ||
718 | strokeMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ); | ||
719 | } | ||
720 | |||
721 | this._strokeMaterial = strokeMat; | ||
722 | |||
723 | var fillMat = MaterialsModel.getMaterial( fillMaterialName ); | ||
724 | if (!fillMat) { | ||
725 | console.log( "object material not found in library: " + fillMaterialName ); | ||
726 | fillMat = MaterialsModel.getMaterial( MaterialsModel.getDefaultMaterialName() ); | ||
727 | } | ||
728 | this._fillMaterial = fillMat; | ||
729 | |||
730 | this.importMaterials( importStr ); | ||
731 | }; | ||
732 | |||
733 | this.collidesWithPoint = function( x, y ) { | 639 | this.collidesWithPoint = function( x, y ) { |
734 | // if(x < this._xOffset) return false; | 640 | // if(x < this._xOffset) return false; |
735 | // if(x > (this._xOffset + this._width)) return false; | 641 | // if(x > (this._xOffset + this._width)) return false; |