Release 1.0.1

shivanmodha · shivanmodha · commit 63f1d293497b · 2017-08-29T15:13:25.000-04:00
diff --git a/release/component/component.js b/release/component/component.js
@@ -64,8 +64,8 @@ function Main()
 }
 function UpdateURL()
 {
-    let url = "@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);
-    //url += "?graph=" + JSON.stringify(graph.ToJson());
+    let url = "?@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);
+    //url += "&graph=" + JSON.stringify(graph.ToJson());
     
     window.dispatchEvent(new CustomEvent("_event_onURLChange", { detail: { camera: round(ME.Camera.Location.X, 2) + ", " + round(ME.Camera.Location.Y, 2) + ", " + round(ME.Camera.Location.Z, 2) } }));
     window.history.replaceState({ "html": url }, "", url)
@@ -80,7 +80,7 @@ function ParseURL()
     if (url.includes("@"))
     {
         let paramstr = url.substring(url.indexOf("@") + 1);
-        if (paramstr.includes("?"))
+        if (paramstr.includes("&"))
         {
             paramstr = paramstr.substring(0, url.indexOf("?"));
         }
@@ -353,9 +353,10 @@ function _event_onNavigationSelect(event)
     }
     else if (navigation === "_navigation_file_link")
     {
-        let url = window.location;
-        url += "@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);
-        url += "?graph=" + JSON.stringify(graph.ToJson());
+        console.log(window.location);
+        let url = window.location.origin;
+        url += "/bench/?@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);
+        url += "&graph=" + JSON.stringify(graph.ToJson());
         alert(url);
     }
     else if (navigation === "_navigation_about")
diff --git a/src/public/component/component.js b/src/public/component/component.js
@@ -64,8 +64,8 @@ function Main()
 }
 function UpdateURL()
 {
-    let url = "@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);
-    //url += "?graph=" + JSON.stringify(graph.ToJson());
+    let url = "?@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);
+    //url += "&graph=" + JSON.stringify(graph.ToJson());
     
     window.dispatchEvent(new CustomEvent("_event_onURLChange", { detail: { camera: round(ME.Camera.Location.X, 2) + ", " + round(ME.Camera.Location.Y, 2) + ", " + round(ME.Camera.Location.Z, 2) } }));
     window.history.replaceState({ "html": url }, "", url)
@@ -80,7 +80,7 @@ function ParseURL()
     if (url.includes("@"))
     {
         let paramstr = url.substring(url.indexOf("@") + 1);
-        if (paramstr.includes("?"))
+        if (paramstr.includes("&"))
         {
             paramstr = paramstr.substring(0, url.indexOf("?"));
         }
@@ -353,9 +353,10 @@ function _event_onNavigationSelect(event)
     }
     else if (navigation === "_navigation_file_link")
     {
-        let url = window.location;
-        url += "@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);
-        url += "?graph=" + JSON.stringify(graph.ToJson());
+        console.log(window.location);
+        let url = window.location.origin;
+        url += "/bench/?@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);
+        url += "&graph=" + JSON.stringify(graph.ToJson());
         alert(url);
     }
     else if (navigation === "_navigation_about")

Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ function Main()`
`64`	`64`	`}`
`65`	`65`	`function UpdateURL()`
`66`	`66`	`{`
`67`		`- let url = "@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);`
`68`		`- //url += "?graph=" + JSON.stringify(graph.ToJson());`
	`67`	`+ let url = "?@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);`
	`68`	`+ //url += "&graph=" + JSON.stringify(graph.ToJson());`
`69`	`69`
`70`	`70`	`window.dispatchEvent(new CustomEvent("_event_onURLChange", { detail: { camera: round(ME.Camera.Location.X, 2) + ", " + round(ME.Camera.Location.Y, 2) + ", " + round(ME.Camera.Location.Z, 2) } }));`
`71`	`71`	`window.history.replaceState({ "html": url }, "", url)`
`@@ -80,7 +80,7 @@ function ParseURL()`
`80`	`80`	`if (url.includes("@"))`
`81`	`81`	`{`
`82`	`82`	`let paramstr = url.substring(url.indexOf("@") + 1);`
`83`		`- if (paramstr.includes("?"))`
	`83`	`+ if (paramstr.includes("&"))`
`84`	`84`	`{`
`85`	`85`	`paramstr = paramstr.substring(0, url.indexOf("?"));`
`86`	`86`	`}`
`@@ -353,9 +353,10 @@ function _event_onNavigationSelect(event)`
`353`	`353`	`}`
`354`	`354`	`else if (navigation === "_navigation_file_link")`
`355`	`355`	`{`
`356`		`- let url = window.location;`
`357`		`- url += "@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);`
`358`		`- url += "?graph=" + JSON.stringify(graph.ToJson());`
	`356`	`+ console.log(window.location);`
	`357`	`+ let url = window.location.origin;`
	`358`	`+ url += "/bench/?@" + round(ME.Camera.Location.X, 2) + "," + round(ME.Camera.Location.Y, 2) + "," + round(ME.Camera.Location.Z, 2) + "z" + ((RenderedFloor / 2) + 1);`
	`359`	`+ url += "&graph=" + JSON.stringify(graph.ToJson());`
`359`	`360`	`alert(url);`
`360`	`361`	`}`
`361`	`362`	`else if (navigation === "_navigation_about")`