From 35116eac447f73a510149e3068d5365dd05c1fbb Mon Sep 17 00:00:00 2001
From: Christoph Stahl <christoph.stahl@uni-dortmund.de>
Date: Fri, 15 Jun 2018 23:46:21 +0200
Subject: [PATCH] updated for current version of HeroForge

---
 README.md        |  1 +
 herosaver.js     | 23 ++++++++++++-----------
 herosaver.min.js | 19 ++++++++++++++++++-
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index c7ce361..656169d 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,7 @@ Usage
   3. Paste the following
   
 ```
+$("<script>").load("https://raw.githubusercontent.com/mrdoob/three.js/dev/build/three.min.js").appendTo($("body"))
 $("<script>").load("https://raw.githubusercontent.com/christofsteel/herosaver/master/herosaver.min.js").appendTo($("body"))
 ```
 
diff --git a/herosaver.js b/herosaver.js
index bd1b193..06433b6 100644
--- a/herosaver.js
+++ b/herosaver.js
@@ -15,9 +15,9 @@
 if(typeof THREE == 'undefined' && typeof require != 'undefined')
     var THREE = require('three')
 
-THREE.STLExporter = function () {};
+RK.STLExporter = function () {};
 
-THREE.STLExporter.prototype = {
+RK.STLExporter.prototype = {
 
     constructor: THREE.STLExporter,
 
@@ -30,7 +30,7 @@ THREE.STLExporter.prototype = {
             var output = '';
             output += 'solid exported\n';
             scene.traverse( function ( object ) {
-                if(object instanceof THREE.Mesh){
+                if(object instanceof RK.Mesh){
 
                     // if object is hidden - exit
                     if(object.visible == false) return; 
@@ -40,9 +40,9 @@ THREE.STLExporter.prototype = {
                     var skeleton = object.skeleton;
                     var mesh = object;
 
-                    if(geometry instanceof THREE.BufferGeometry){
+                    if(geometry instanceof RK.BufferGeometry){
                         var oldgeometry = geometry.clone();
-                        geometry = new THREE.Geometry().fromBufferGeometry(geometry);
+                        geometry = new RK.Geometry().fromBufferGeometry(geometry);
                         var skinIndex = oldgeometry.getAttribute('skinIndex');
                         var skinWeight = oldgeometry.getAttribute('skinWeight');
                         var morphTarget = oldgeometry.getAttribute('morphTarget0');
@@ -60,16 +60,16 @@ THREE.STLExporter.prototype = {
                                 geometry.morphTargets[j].vertices = [];
                             }
                             for(var i = 0; i < geometry.vertices.length; i++) {
-                                geometry.skinIndices.push((new THREE.Vector4 ()).fromAttribute(skinIndex,i));
-                                geometry.skinWeights.push((new THREE.Vector4 ()).fromAttribute(skinWeight,i));
+                                geometry.skinIndices.push((new THREE.Vector4 ()).fromBufferAttribute(skinIndex,i));
+                                geometry.skinWeights.push((new THREE.Vector4 ()).fromBufferAttribute(skinWeight,i));
                                 for(var j = 0; j < mtcount; j++) {
-                                    geometry.morphTargets[j].vertices.push((new THREE.Vector3 ()).fromAttribute(oldgeometry.getAttribute('morphTarget' + j)));
+                                    geometry.morphTargets[j].vertices.push((new THREE.Vector3 ()).fromBufferAttribute(oldgeometry.getAttribute('morphTarget' + j)));
                                 }
                             }
                         }
                     }
 
-                    if ( geometry instanceof THREE.Geometry) {
+                    if ( geometry instanceof RK.Geometry) {
 
                         var vertices = geometry.vertices;
                         var faces = geometry.faces;
@@ -185,7 +185,7 @@ THREE.STLExporter.prototype = {
 };
 
 if (typeof module !== "undefined" && module.exports) {
-    module.exports = THREE.STLExporter
+    module.exports = RK.STLExporter
 } 
 else if ((typeof define !== "undefined" && define !== null) && (define.amd !== null)) {
     define([], function() {
@@ -205,7 +205,7 @@ var labelljson  = $("<label/>").attr({"for": "ljson"}).addClass("shop-button").c
 
 stl.click(function(e) {
     e.preventDefault();
-    var exporter = new THREE.STLExporter();
+    var exporter = new RK.STLExporter();
     var objs = CK.activeCharacter.threeObj.children;
     var max_obj = 0;
     var i;
@@ -245,3 +245,4 @@ $("#print-my-mini").append(stl);
 $("#print-my-mini").append(sjson);
 $("#print-my-mini").append(ljson);
 $("#print-my-mini").append(labelljson);
+
diff --git a/herosaver.min.js b/herosaver.min.js
index 8cfd0a0..5b6e104 100644
--- a/herosaver.min.js
+++ b/herosaver.min.js
@@ -1 +1,18 @@
-if(function(e,t){"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?module.exports=t():e.download=t()}(this,function(){return function e(t,n,r){function o(e){var t=e.split(/[:;,]/);e=t[1];var n=(t=("base64"==t[2]?atob:decodeURIComponent)(t.pop())).length,r=0,o=new Uint8Array(n);for(r;r<n;++r)o[r]=t.charCodeAt(r);return new c([o],{type:e})}function a(e,t){if("download"in l)return l.href=e,l.setAttribute("download",p),l.className="download-js-link",l.innerHTML="downloading...",l.style.display="none",document.body.appendChild(l),setTimeout(function(){l.click(),document.body.removeChild(l),!0===t&&setTimeout(function(){i.URL.revokeObjectURL(l.href)},250)},66),!0;if(/(Version)\/(\d+)\.(\d+)(?:\.(\d+))?.*Safari\//.test(navigator.userAgent))return/^data:/.test(e)&&(e="data:"+e.replace(/^data:([\w\/\-\+]+)/,"application/octet-stream")),!window.open(e)&&confirm("Displaying New Document\n\nUse Save As... to download, then click back to return to this page.")&&(location.href=e),!0;var n=document.createElement("iframe");document.body.appendChild(n),!t&&/^data:/.test(e)&&(e="data:"+e.replace(/^data:([\w\/\-\+]+)/,"application/octet-stream")),n.src=e,setTimeout(function(){document.body.removeChild(n)},333)}var i=window,s=r||"application/octet-stream",d=!n&&!r&&t,l=document.createElement("a");r=function(e){return String(e)};var c=i.Blob||i.MozBlob||i.WebKitBlob||r,p=n||"download",c=c.call?c.bind(i):Blob;if("true"===String(this)&&(t=[t,s],s=t[0],t=t[1]),d&&2048>d.length&&(p=d.split("/").pop().split("?")[0],l.href=d,-1!==l.href.indexOf(d))){var f=new XMLHttpRequest;return f.open("GET",d,!0),f.responseType="blob",f.onload=function(t){e(t.target.response,p,"application/octet-stream")},setTimeout(function(){f.send()},0),f}if(/^data:([\w+-]+\/[\w+.-]+)?[,;]/.test(t)){if(!(2096103.424<t.length&&c!==r))return navigator.msSaveBlob?navigator.msSaveBlob(o(t),p):a(t);t=o(t),s=t.type||"application/octet-stream"}else if(/([\x80-\xff])/.test(t)){n=0;var u=(d=new Uint8Array(t.length)).length;for(n;n<u;++n)d[n]=t.charCodeAt(n);t=new c([d],{type:s})}if(t=t instanceof c?t:new c([t],{type:s}),navigator.msSaveBlob)return navigator.msSaveBlob(t,p);if(i.URL)a(i.URL.createObjectURL(t),!0);else{if("string"==typeof t||t.constructor===r)try{return a("data:"+s+";base64,"+i.btoa(t))}catch(e){return a("data:"+s+","+encodeURIComponent(t))}(s=new FileReader).onload=function(e){a(this.result)},s.readAsDataURL(t)}return!0}}),void 0===THREE&&"undefined"!=typeof require)var THREE=require("three");THREE.STLExporter=function(){},THREE.STLExporter.prototype={constructor:THREE.STLExporter,parse:function(){var e=new THREE.Vector3,t=new THREE.Matrix3;return function(n){var r="";return r+="solid exported\n",n.traverse(function(n){if(n instanceof THREE.Mesh){if(0==n.visible)return;var o=n.geometry,a=n.matrixWorld,i=n.skeleton,s=n;if(o instanceof THREE.BufferGeometry){var d=o.clone();o=(new THREE.Geometry).fromBufferGeometry(o);for(var l=d.getAttribute("skinIndex"),c=d.getAttribute("skinWeight"),p=d.getAttribute("morphTarget0"),f=0;void 0!==p;)f++,p=d.getAttribute("morphTarget"+f);if(void 0!==l){o.skinIndices=[],o.skinWeights=[],o.morphTargets=[];for(b=0;b<f;b++)o.morphTargets[b]={},o.morphTargets[b].vertices=[];for(v=0;v<o.vertices.length;v++){o.skinIndices.push((new THREE.Vector4).fromAttribute(l,v)),o.skinWeights.push((new THREE.Vector4).fromAttribute(c,v));for(b=0;b<f;b++)o.morphTargets[b].vertices.push((new THREE.Vector3).fromAttribute(d.getAttribute("morphTarget"+b)))}}}if(o instanceof THREE.Geometry){var u=o.vertices,m=o.faces;if(t.getNormalMatrix(a),void 0!==m)for(var v=0,h=m.length;v<h;v++){var g=m[v];e.copy(g.normal).applyMatrix3(t).normalize(),r+="\tfacet normal "+e.x+" "+e.y+" "+e.z+"\n",r+="\t\touter loop\n";for(var y=[g.a,g.b,g.c],b=0;b<3;b++){var T=y[b];if(void 0!==o.skinIndices&&0==o.skinIndices.length)e.copy(u[T]).applyMatrix4(a),r+="\t\t\tvertex "+e.x+" "+e.y+" "+e.z+"\n";else{e.copy(u[T]);var E=[o.skinIndices[T].x,o.skinIndices[T].y,o.skinIndices[T].z,o.skinIndices[T].w],x=[o.skinWeights[T].x,o.skinWeights[T].y,o.skinWeights[T].z,o.skinWeights[T].w],w=[i.boneInverses[E[0]],i.boneInverses[E[1]],i.boneInverses[E[2]],i.boneInverses[E[3]]],R=[i.bones[E[0]].matrixWorld,i.bones[E[1]].matrixWorld,i.bones[E[2]].matrixWorld,i.bones[E[3]].matrixWorld];if("undefined"!==o.morphTargets)for(var k=[],C=[],H=[],S=[],A=0;A<o.morphTargets.length;A++)k[A]=o.morphTargets[A].vertices[T].x,C[A]=o.morphTargets[A].vertices[T].y,H[A]=o.morphTargets[A].vertices[T].z,S[A]=s.morphTargetInfluences[A];var j=new THREE.Vector4;if("undefined"!==s.geometry.morphTargets)for(var I=new THREE.Vector4(e.x,e.y,e.z),A=0;A<o.morphTargets.length;A++)I.lerp(new THREE.Vector4(k[A],C[A],H[A],1),S[A]);for(var L=0;L<4;L++){var W=new THREE.Vector4(e.x,e.y,e.z);W.multiplyScalar(x[L]),W.applyMatrix4(w[L]).applyMatrix4(R[L]),j.add(W)}r+="\t\t\tvertex "+j.x+" "+j.y+" "+j.z+"\n"}}r+="\t\tendloop\n",r+="\tendfacet\n"}}}}),r+="endsolid exported\n"}}()},"undefined"!=typeof module&&module.exports?module.exports=THREE.STLExporter:"undefined"!=typeof define&&null!==define&&null!==define.amd&&define([],function(){return saveAs}),$("#add").css({display:"none"});var stl=$("<a/>").addClass("shop-button").css({margin:"5px","pointer-events":"auto"}).text("Download STL"),sjson=$("<a/>").addClass("shop-button").css({margin:"5px","pointer-events":"auto"}).text("Save JSON"),ljson=$("<input/>").attr({type:"file",id:"ljson"}).css({display:"none"}).text("Load JSON"),labelljson=$("<label/>").attr({for:"ljson"}).addClass("shop-button").css({margin:"5px","pointer-events":"auto"}).text("Load JSON");stl.click(function(e){e.preventDefault();var t,n=new THREE.STLExporter,r=CK.activeCharacter.threeObj.children,o=0;for(t in r)r[t].children.length>r[o].children.length&&(o=t);var a=n.parse(CK.activeCharacter.threeObj.children[o]),i=CK.activeCharacter.name;i=""===i?"unnamed":i,download(a,i+".stl","text/plain")}),sjson.click(function(e){e.preventDefault();var t=JSON.stringify(CK.activeCharacter.characterData),n=CK.activeCharacter.name;n=""===n?"unnamed":n,download(t,n+".json","text/plain")}),ljson.on("change",function(e){e.preventDefault();var t=e.target.files[0],n=new FileReader;n.onload=function(e){e.preventDefault(),CK.change(JSON.parse(e.target.result))},n.readAsText(t)}),$("#print-my-mini").append(stl),$("#print-my-mini").append(sjson),$("#print-my-mini").append(ljson),$("#print-my-mini").append(labelljson);
\ No newline at end of file
+;(function(r,l){"function"==typeof define&&define.amd?define([],l):"object"==typeof exports?module.exports=l():r.download=l()})(this,function(){return function l(a,e,k){function q(a){var h=a.split(/[:;,]/);a=h[1];var h=("base64"==h[2]?atob:decodeURIComponent)(h.pop()),d=h.length,b=0,c=new Uint8Array(d);for(b;b<d;++b)c[b]=h.charCodeAt(b);return new f([c],{type:a})}function m(a,b){if("download"in d)return d.href=a,d.setAttribute("download",n),d.className="download-js-link",d.innerHTML="downloading...",d.style.display="none",document.body.appendChild(d),setTimeout(function(){d.click(),document.body.removeChild(d),!0===b&&setTimeout(function(){g.URL.revokeObjectURL(d.href)},250)},66),!0;if(/(Version)\/(\d+)\.(\d+)(?:\.(\d+))?.*Safari\//.test(navigator.userAgent))return/^data:/.test(a)&&(a="data:"+a.replace(/^data:([\w\/\-\+]+)/,"application/octet-stream")),!window.open(a)&&confirm("Displaying New Document\n\nUse Save As... to download, then click back to return to this page.")&&(location.href=a),!0;var c=document.createElement("iframe");document.body.appendChild(c),!b&&/^data:/.test(a)&&(a="data:"+a.replace(/^data:([\w\/\-\+]+)/,"application/octet-stream")),c.src=a,setTimeout(function(){document.body.removeChild(c)},333)}var g=window,b=k||"application/octet-stream",c=!e&&!k&&a,d=document.createElement("a");k=function(a){return String(a)};var f=g.Blob||g.MozBlob||g.WebKitBlob||k,n=e||"download",f=f.call?f.bind(g):Blob;"true"===String(this)&&(a=[a,b],b=a[0],a=a[1]);if(c&&2048>c.length&&(n=c.split("/").pop().split("?")[0],d.href=c,-1!==d.href.indexOf(c))){var p=new XMLHttpRequest;return p.open("GET",c,!0),p.responseType="blob",p.onload=function(a){l(a.target.response,n,"application/octet-stream")},setTimeout(function(){p.send()},0),p}if(/^data:([\w+-]+\/[\w+.-]+)?[,;]/.test(a)){if(!(2096103.424<a.length&&f!==k))return navigator.msSaveBlob?navigator.msSaveBlob(q(a),n):m(a);a=q(a),b=a.type||"application/octet-stream"}else if(/([\x80-\xff])/.test(a)){e=0;var c=new Uint8Array(a.length),t=c.length;for(e;e<t;++e)c[e]=a.charCodeAt(e);a=new f([c],{type:b})}a=a instanceof f?a:new f([a],{type:b});if(navigator.msSaveBlob)return navigator.msSaveBlob(a,n);if(g.URL)m(g.URL.createObjectURL(a),!0);else{if("string"==typeof a||a.constructor===k)try{return m("data:"+b+";base64,"+g.btoa(a))}catch(h){return m("data:"+b+","+encodeURIComponent(a))}b=new FileReader,b.onload=function(a){m(this.result)},b.readAsDataURL(a)}return!0}});if(typeof THREE=='undefined'&&typeof require!='undefined')
+var THREE=require('three')
+RK.STLExporter=function(){};RK.STLExporter.prototype={constructor:THREE.STLExporter,parse:(function(){var vector=new THREE.Vector3();var normalMatrixWorld=new THREE.Matrix3();return function(scene){var output='';output+='solid exported\n';scene.traverse(function(object){if(object instanceof RK.Mesh){if(object.visible==false)return;var geometry=object.geometry;var matrixWorld=object.matrixWorld;var skeleton=object.skeleton;var mesh=object;if(geometry instanceof RK.BufferGeometry){var oldgeometry=geometry.clone();geometry=new RK.Geometry().fromBufferGeometry(geometry);var skinIndex=oldgeometry.getAttribute('skinIndex');var skinWeight=oldgeometry.getAttribute('skinWeight');var morphTarget=oldgeometry.getAttribute('morphTarget0');var mtcount=0;while(typeof morphTarget!=='undefined'){mtcount++;morphTarget=oldgeometry.getAttribute('morphTarget'+mtcount);}
+if(typeof skinIndex!=='undefined'){geometry.skinIndices=[];geometry.skinWeights=[];geometry.morphTargets=[];for(var j=0;j<mtcount;j++){geometry.morphTargets[j]={};geometry.morphTargets[j].vertices=[];}
+for(var i=0;i<geometry.vertices.length;i++){geometry.skinIndices.push((new THREE.Vector4()).fromBufferAttribute(skinIndex,i));geometry.skinWeights.push((new THREE.Vector4()).fromBufferAttribute(skinWeight,i));for(var j=0;j<mtcount;j++){geometry.morphTargets[j].vertices.push((new THREE.Vector3()).fromBufferAttribute(oldgeometry.getAttribute('morphTarget'+j)));}}}}
+if(geometry instanceof RK.Geometry){var vertices=geometry.vertices;var faces=geometry.faces;normalMatrixWorld.getNormalMatrix(matrixWorld);if(typeof faces!='undefined'){for(var i=0,l=faces.length;i<l;i++){var face=faces[i];vector.copy(face.normal).applyMatrix3(normalMatrixWorld).normalize();output+='\tfacet normal '+vector.x+' '+vector.y+' '+vector.z+'\n';output+='\t\touter loop\n';var indices=[face.a,face.b,face.c];for(var j=0;j<3;j++){var vertexIndex=indices[j];if(typeof geometry.skinIndices!=='undefined'&&geometry.skinIndices.length==0){vector.copy(vertices[vertexIndex]).applyMatrix4(matrixWorld);output+='\t\t\tvertex '+vector.x+' '+vector.y+' '+vector.z+'\n';}else{vector.copy(vertices[vertexIndex]);var boneIndices=[geometry.skinIndices[vertexIndex].x,geometry.skinIndices[vertexIndex].y,geometry.skinIndices[vertexIndex].z,geometry.skinIndices[vertexIndex].w];var weights=[geometry.skinWeights[vertexIndex].x,geometry.skinWeights[vertexIndex].y,geometry.skinWeights[vertexIndex].z,geometry.skinWeights[vertexIndex].w];var inverses=[skeleton.boneInverses[boneIndices[0]],skeleton.boneInverses[boneIndices[1]],skeleton.boneInverses[boneIndices[2]],skeleton.boneInverses[boneIndices[3]]];var skinMatrices=[skeleton.bones[boneIndices[0]].matrixWorld,skeleton.bones[boneIndices[1]].matrixWorld,skeleton.bones[boneIndices[2]].matrixWorld,skeleton.bones[boneIndices[3]].matrixWorld];if(geometry.morphTargets!=='undefined'){var morphMatricesX=[];var morphMatricesY=[];var morphMatricesZ=[];var morphMatricesInfluence=[];for(var mt=0;mt<geometry.morphTargets.length;mt++){morphMatricesX[mt]=geometry.morphTargets[mt].vertices[vertexIndex].x;morphMatricesY[mt]=geometry.morphTargets[mt].vertices[vertexIndex].y;morphMatricesZ[mt]=geometry.morphTargets[mt].vertices[vertexIndex].z;morphMatricesInfluence[mt]=mesh.morphTargetInfluences[mt];}}
+var finalVector=new THREE.Vector4();if(mesh.geometry.morphTargets!=='undefined'){var morphVector=new THREE.Vector4(vector.x,vector.y,vector.z);for(var mt=0;mt<geometry.morphTargets.length;mt++){morphVector.lerp(new THREE.Vector4(morphMatricesX[mt],morphMatricesY[mt],morphMatricesZ[mt],1),morphMatricesInfluence[mt]);}}
+for(var k=0;k<4;k++){var tempVector=new THREE.Vector4(vector.x,vector.y,vector.z);tempVector.multiplyScalar(weights[k]);tempVector.applyMatrix4(inverses[k]).applyMatrix4(skinMatrices[k]);finalVector.add(tempVector);}
+output+='\t\t\tvertex '+finalVector.x+' '+finalVector.y+' '+finalVector.z+'\n';}}
+output+='\t\tendloop\n';output+='\tendfacet\n';}}}}});output+='endsolid exported\n';return output;};}())};if(typeof module!=="undefined"&&module.exports){module.exports=RK.STLExporter}
+else if((typeof define!=="undefined"&&define!==null)&&(define.amd!==null)){define([],function(){return saveAs;});}
+$("#add").css({"display":"none"});var stl=$("<a/>").addClass("shop-button").css({"margin":"5px","pointer-events":"auto"}).text("Download STL");var sjson=$("<a/>").addClass("shop-button").css({"margin":"5px","pointer-events":"auto"}).text("Save JSON");var ljson=$("<input/>").attr({"type":"file","id":"ljson"}).css({"display":"none"}).text("Load JSON");var labelljson=$("<label/>").attr({"for":"ljson"}).addClass("shop-button").css({"margin":"5px","pointer-events":"auto"}).text("Load JSON");stl.click(function(e){e.preventDefault();var exporter=new RK.STLExporter();var objs=CK.activeCharacter.threeObj.children;var max_obj=0;var i;for(i in objs){if(objs[i].children.length>objs[max_obj].children.length){max_obj=i;}}
+var stlString=exporter.parse(CK.activeCharacter.threeObj.children[max_obj])
+var name=CK.activeCharacter.name
+name=name===""?"unnamed":name
+download(stlString,name+'.stl','text/plain');});sjson.click(function(e){e.preventDefault();var char_json=JSON.stringify(CK.activeCharacter.characterData);var name=CK.activeCharacter.name
+name=name===""?"unnamed":name
+download(char_json,name+".json","text/plain");});ljson.on('change',function(e){e.preventDefault();var file=e.target.files[0];var reader=new FileReader();reader.onload=(function(theFile){return function(e){e.preventDefault();CK.change(JSON.parse(e.target.result));};})(file);reader.readAsText(file);});$("#print-my-mini").append(stl);$("#print-my-mini").append(sjson);$("#print-my-mini").append(ljson);$("#print-my-mini").append(labelljson);
\ No newline at end of file