diff options
author | Valerio Virgillito | 2012-03-29 15:40:59 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-03-29 15:40:59 -0700 |
commit | f4949cab544886702e7ad6eeaa6215125c7b067a (patch) | |
tree | b62d6319d6e9aa2c447597c3a2ccde5472da4738 /js/lib/drawing | |
parent | 3fd2cdb59027b3f973b9165db9db4fdd22026941 (diff) | |
parent | fa5c9dbdc3e8618d494e142e0967fa69049d0c97 (diff) | |
download | ninja-f4949cab544886702e7ad6eeaa6215125c7b067a.tar.gz |
Merge pull request #147 from pushkarjoshi/brushtool
Brushtool
Diffstat (limited to 'js/lib/drawing')
-rwxr-xr-x | js/lib/drawing/world.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/js/lib/drawing/world.js b/js/lib/drawing/world.js index fec6a478..5a054224 100755 --- a/js/lib/drawing/world.js +++ b/js/lib/drawing/world.js | |||
@@ -942,6 +942,7 @@ World.prototype.importObjectsJSON = function( jObj, parentGeomObj ) | |||
942 | World.prototype.importObjectJSON = function( jObj, parentGeomObj ) | 942 | World.prototype.importObjectJSON = function( jObj, parentGeomObj ) |
943 | { | 943 | { |
944 | var type = jObj.type; | 944 | var type = jObj.type; |
945 | var BrushStroke = require("js/lib/geom/brush-stroke").BrushStroke; | ||
945 | 946 | ||
946 | var obj; | 947 | var obj; |
947 | switch (type) | 948 | switch (type) |
@@ -961,6 +962,11 @@ World.prototype.importObjectJSON = function( jObj, parentGeomObj ) | |||
961 | obj.importJSON( jObj ); | 962 | obj.importJSON( jObj ); |
962 | break; | 963 | break; |
963 | 964 | ||
965 | case 6: //brush stroke | ||
966 | obj = new BrushStroke(); | ||
967 | obj.importJSON(jObj); | ||
968 | break; | ||
969 | |||
964 | default: | 970 | default: |
965 | throw new Error( "Unrecognized object type: " + type ); | 971 | throw new Error( "Unrecognized object type: " + type ); |
966 | break; | 972 | break; |