diff options
author | Nivesh Rajbhandari | 2012-04-04 15:53:53 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-04 15:53:53 -0700 |
commit | b06dbed626994db7bf41e12a712b5289a1306b50 (patch) | |
tree | bee299aae4f4dcac507236f59fdfc3768f9a6b05 /js/lib/geom/brush-stroke.js | |
parent | db0fa4e454b76d8a2bd6ba47c6f10166761179e7 (diff) | |
parent | e721a7c1009f298a1bd8fea583da14535e039880 (diff) | |
download | ninja-b06dbed626994db7bf41e12a712b5289a1306b50.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
Diffstat (limited to 'js/lib/geom/brush-stroke.js')
-rwxr-xr-x | js/lib/geom/brush-stroke.js | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/js/lib/geom/brush-stroke.js b/js/lib/geom/brush-stroke.js index 22209815..26ac42e9 100755 --- a/js/lib/geom/brush-stroke.js +++ b/js/lib/geom/brush-stroke.js | |||
@@ -711,18 +711,6 @@ var BrushStroke = function GLBrushStroke() { | |||
711 | this.update(); //after this, the stroke is ready to be rendered | 711 | this.update(); //after this, the stroke is ready to be rendered |
712 | }; | 712 | }; |
713 | 713 | ||
714 | |||
715 | this.export = function() { | ||
716 | var jsonObject = this.exportJSON(); | ||
717 | var stringified = JSON.stringify(jsonObject); | ||
718 | return "type: " + this.geomType() + "\n" + stringified; | ||
719 | }; | ||
720 | |||
721 | this.import = function( importStr ) { | ||
722 | var jsonObject = JSON.parse(importStr); | ||
723 | this.importJSON(jsonObject); | ||
724 | } | ||
725 | |||
726 | this.collidesWithPoint = function (x, y, z) { | 714 | this.collidesWithPoint = function (x, y, z) { |
727 | if (x < this._BBoxMin[0]) return false; | 715 | if (x < this._BBoxMin[0]) return false; |
728 | if (x > this._BBoxMax[0]) return false; | 716 | if (x > this._BBoxMax[0]) return false; |