diff options
author | Pushkar Joshi | 2012-04-06 12:13:59 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-06 12:13:59 -0700 |
commit | 6cce5e9367676f5b452c28dd7d960aa46f4e464c (patch) | |
tree | 779125b7c1fc668c02e0dfbb661494a16242c329 /js/lib/geom/brush-stroke.js | |
parent | f61545fd7054088efc88aafffd78e11df80d750d (diff) | |
parent | 7656b6eac7aec59697c6cddbe2a507fe9e4aa187 (diff) | |
download | ninja-6cce5e9367676f5b452c28dd7d960aa46f4e464c.tar.gz |
Merge branch 'master' into pentool
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 2a751a89..8c5ffef3 100755 --- a/js/lib/geom/brush-stroke.js +++ b/js/lib/geom/brush-stroke.js | |||
@@ -715,18 +715,6 @@ var BrushStroke = function GLBrushStroke() { | |||
715 | this.update(); //after this, the stroke is ready to be rendered | 715 | this.update(); //after this, the stroke is ready to be rendered |
716 | }; | 716 | }; |
717 | 717 | ||
718 | |||
719 | this.export = function() { | ||
720 | var jsonObject = this.exportJSON(); | ||
721 | var stringified = JSON.stringify(jsonObject); | ||
722 | return "type: " + this.geomType() + "\n" + stringified; | ||
723 | }; | ||
724 | |||
725 | this.import = function( importStr ) { | ||
726 | var jsonObject = JSON.parse(importStr); | ||
727 | this.importJSON(jsonObject); | ||
728 | } | ||
729 | |||
730 | this.collidesWithPoint = function (x, y, z) { | 718 | this.collidesWithPoint = function (x, y, z) { |
731 | if (x < this._BBoxMin[0]) return false; | 719 | if (x < this._BBoxMin[0]) return false; |
732 | if (x > this._BBoxMax[0]) return false; | 720 | if (x > this._BBoxMax[0]) return false; |