repo: janusweb
action: commit
revision: 
path_from: 
revision_from: 50f05d3e56551b4410c7bfea297439bef65f68ba:
path_to: 
revision_to:
git.thebackupbox.net
janusweb
git clone git://git.thebackupbox.net/janusweb
commit 50f05d3e56551b4410c7bfea297439bef65f68ba
Author: James Baicoianu 
Date:   Tue Dec 10 14:27:25 2019 -0800

    Fixed janus object serialization

diff --git a/scripts/janusbase.js b/scripts/janusbase.js
index 9b0bc39574e2aae1a57a523e1709e0609fde24e3..
index ..48cb3253eae3c04d38d3b81ea9907429ccd0fe2a 100644
--- a/scripts/janusbase.js
+++ b/scripts/janusbase.js
@@ -1,7 +1,4 @@
 elation.require(['engine.things.generic', 'utils.template', 'janusweb.parts'], function() {
-  elation.template.add('janusweb.edit.object', 
-      '');
-
   elation.component.add('engine.things.janusbase', function() {
     this.defaultcolor = new THREE.Color(0xffffff);

@@ -235,30 +232,68 @@ console.log('got collider', collider, collision_id);
       this.refresh();
     } 
     this.summarizeXML = function() {
-      //'');
+      let proxy = this.getProxyObject(),

-      var matrix = new THREE.Matrix4().makeRotationFromQuaternion(this.properties.orientation);
-      var xdir = new THREE.Vector3(),
-          ydir = new THREE.Vector3(),
-          zdir = new THREE.Vector3();
-      matrix.extractBasis(xdir, ydir, zdir);
-
-      var objdef = {
-        id: this.properties.render.model,
-        js_id: this.properties.js_id,
-        pos: this.properties.position,
-        vel: this.properties.velocity,
-        accel: this.properties.acceleration,
-        scale: this.properties.scale,
-        xdir: xdir.toArray().join(' '),
-        ydir: ydir.toArray().join(' '),
-        zdir: zdir.toArray().join(' '),
-        col: this.properties.color,
-        lighting: this.properties.lighting,
-        visible: this.properties.visible,
-      };
+          propdefs = this._thingdef.properties,
+          proxydefs = proxy._proxydefs;
+      let attrs = {};

-      var xml = elation.template.get('janusweb.edit.object', objdef);
+      for (let k in proxydefs) {
+        let proxydef = proxydefs[k],
+            propdef = elation.utils.arrayget(propdefs, proxydef[1]);
+        if ( k != 'tagName' && k != 'classList' && proxydef[0] == 'property' && propdef) {
+          let val = elation.utils.arrayget(this.properties, proxydef[1]);
+          let defaultval = propdef.default;
+          if (val instanceof THREE.Vector2) {
+            if (defaultval instanceof THREE.Vector2) defaultval = defaultval.toArray();
+            if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1]))) {
+              attrs[k] = val.toArray().map(n => Math.round(n * 10000) / 10000).join(' ');
+            }
+          } else if (val instanceof THREE.Vector3) {
+            if (defaultval instanceof THREE.Vector3) defaultval = defaultval.toArray();
+            if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1] && val.z == defaultval[2]))) {
+              attrs[k] = val.toArray().map(n => Math.round(n * 10000) / 10000).join(' ');
+            }
+          } else if (val instanceof THREE.Color) {
+            if (defaultval instanceof THREE.Color) defaultval = defaultval.toArray();
+            if (!('default' in propdef) || ('default' in propdef && !(val.r == defaultval[0] && val.g == defaultval[1] && val.b == defaultval[2]))) {
+              attrs[k] = val.toArray().map(n => Math.round(n * 10000) / 10000).join(' ');
+            }
+          } else if (val instanceof THREE.Euler) {
+            if (defaultval instanceof THREE.Euler) defaultval = defaultval.toArray();
+            if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1] && val.z == defaultval[2]))) {
+              attrs[k] = val.toArray().slice(0, 3).map(n => Math.round((n * THREE.Math.RAD2DEG) * 10000) / 10000).join(' ');
+            }
+          } else if (val instanceof THREE.Quaternion) {
+            if (defaultval instanceof THREE.Quaternion) defaultval = defaultval.toArray();
+            if (!('default' in propdef) || ('default' in propdef && !(val.x == defaultval[0] && val.y == defaultval[1] && val.z == defaultval[2] && val.w == defaultval[3]))) {
+              attrs[k] = val.toArray().map(n => Math.round(n * 10000) / 10000).join(' ');
+            }
+          } else if (val !== propdef.default && val !== null && val !== '') {
+            attrs[k] = val;
+          }
+        }
+      }
+      let xml = '<' + this.tag.toLowerCase();
+      for (let k in attrs) {
+        xml += ' ' + k + '="' + attrs[k] + '"';
+      }
+      let children = [];
+      for (let k in this.children) {
+        if (this.children[k].persist) {
+          children.push(k);
+        }
+      }
+      if (children.length > 0) {
+        xml += '>\n';
+        for (let i = 0; i < children.length; i++) {
+          let k = children[i];
+          xml += '  ' + this.children[k].summarizeXML().replace(/\n/g, '\n  ').replace(/\s*$/, '\n');
+        }
+        xml += '\n';
+      } else {
+        xml += ' />\n';
+      }
       return xml;
     }
     this.getProxyObject = function(classdef) {


-----END OF PAGE-----