diff options
author | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-05 08:09:18 -0700 |
commit | e186c49247689b5c2df6125037e2473636701d17 (patch) | |
tree | e626b006027949f87b5aa1e76eb0ed719adb99bb /js/lib/geom/brush-stroke.js | |
parent | 135c5257e2a4d5f1b25f62758c6783fd2ebe5e19 (diff) | |
parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
download | ninja-e186c49247689b5c2df6125037e2473636701d17.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
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; |