merge fixes and cleanups

.gitignore

@@ -3,3 +3,4 @@ serverapps/project_deployer/deploy
 serverapps/project_deployer/config.php
 node_modules
 
+*.orig

.gitmodules

@@ -1,12 +1,3 @@
-[submodule "litegl"]
-	path = litegl
-	url = http://realmaxdemos.com:3000/realweb/litegl.js.git
 [submodule "liteserver"]
-	path = liteserver
-	url = http://realmaxdemos.com:3000/realweb/litefilesystem.js.git
-[submodule "litescene"]
-	path = litescene
-	url = http://realmaxdemos.com:3000/realweb/litescene.js.git
-[submodule "litegui"]
-	path = litegui
-	url = http://realmaxdemos.com:3000/realweb/litegui.js.git
+	path = editor/liteserver
+	url = git@gitlab.com:thorstenbux1/litefilesystem-js.git

editor/debug.html

@@ -7,7 +7,7 @@
 	<meta property="og:description" content="Edit 3D on the web" />
 	<meta property="og:image" content="" />
 
-	<link rel="icon" type="image/png" href="favicon.ico">
+	<link rel="icon" type="image/png" href="favicon.png">
 
 	<title>WebGLStudio [ DEBUG ]</title>
 	<style type='text/css'></style>

editor/index.html

@@ -12,7 +12,7 @@
 	<meta property="og:description" content="Create augmented reality on the web" />
 	<meta property="og:image" content="" />
 
-	<link rel="icon" type="image/png" href="favicon.ico">
+	<link rel="icon" type="image/png" href="favicon.png">
 
 	<title>AR Studio</title>
 	<style type='text/css'></style>

editor/js/extra/litefileserver.js

@@ -263,6 +263,7 @@ var LiteFileServer = {
 				}
 				catch (err)
 				{
+          console.log("ERROR: " + response);
 					console.error(err); 
 				}
 			}

editor/js/extra/note

@@ -0,0 +1,4 @@
+<br />
+<b>Notice</b>:  A non well formed numeric value encountered in <b>/Users/thorstenbux/repos/2dTracking/arStudio/editor/liteserver/src/include/modules/user.php</b> on line <b>936</b><br />
+{"debug":["getUnits"],"msg":"retrieving units","status":1,"data_type":"units","data":[{"id":1,"user_id":"1","unit_id":"1","timestamp":"2019-03-20 19:56:22","mode":"ADMIN","name":"public","invite_token":"af246d8de8a813ea98ab5ebd8dbb8d24","author_id":1,"metadata":"{\"name\":\"Public\"}","used_size":0,"total_size":1048576000,"folders":null},{"id":2,"user_id":"1","unit_id":"2","timestamp":"2019-03-20 19:56:22","mode":"ADMIN","name":"admin","invite_token":"9fc3bc6f4525572dc7b5a86f91028e13","author_id":1,"metadata":"{\"name\":\"admin unit\"}","used_size":0,"total_size":10485760,"folders":{"projects":null}}]}
+"

editor/js/modules/about.js

@@ -7,19 +7,12 @@ var AboutModule = {
 
 			var dialog = new LiteGUI.Dialog("intro_dialog",{ width: 400, height: 400, closable: true });
 			dialog.content.innerHTML = ""+
-					//	"<p class='center'><img height='150' target='_blank' src='http://webglstudio.org/images/logo.png'/></p>" +
-				"<img src='imgs/realmax200.png' style='float:left;'>"+
-				"<p class='header center'>Welcome to Realmax AR Editor!</p>" +
-				"<p class='msg center'>Bringing AR to the Web.</p><br><br><br>" +
-				"<p class='msg center'>Create your own AR scenes to be triggered and played back using the Realmax AR system.</p>";
+				"<img src='imgs/icon200.png' style='float:left;'>"+
+				"<p class='header center'>Welcome to AR studio!</p>" +
+				"<p class='msg center'>The editor for webAR</p>" +
+        "<p class='msg center'>Design and develop your own AR scenes and share them with your audience.</p><br><br>" + 
+        "<p class='msg center'>The only system that supports pictures as targets</p>";
 
-
-/*			var dialog = new LiteGUI.Dialog({ title: "About Realmax AR Editor", closable: true, width: 400, height: 240} );
-			dialog.content.style.fontSize = "2em";
-			dialog.content.style.backgroundColor = "black";
-			dialog.content.innerHTML = "<p>Realmax AR Editor v0.1</p><p>(c) Realmax 2017</p><p>Bringing AR to the web</p>";
-//cwx		dialog.content.innerHTML = "<p>Realmax AR Editor v0.1"+CORE.config.version+"</p><p>Created by <a href='http://blog.tamats.com' target='_blank'>Javi Agenjo</a></p><p><a href='http://gti.upf.edu/' target='_blank'>GTI department</a> of <a href='http://www.upf.edu' target='_blank'>Universitat Pompeu Fabra</a></p><p><a target='_blank' href='https://github.com/jagenjo/webglstudio.js'>Fork me in Github</a></a>";
-*/
 			dialog.root.addEventListener("click",close_this);
 			dialog.addButton("Close");
 			dialog.show();

editor/js/modules/intro.js

@@ -14,12 +14,13 @@ var IntroModule = {
 	showIntroDialog: function()
 	{
 		var dialog = new LiteGUI.Dialog("intro_dialog",{ width: 400, height: 400, closable: true });
-		dialog.content.innerHTML = ""+
-		//	"<p class='center'><img height='150' target='_blank' src='http://webglstudio.org/images/logo.png'/></p>" +
-			"<img src='imgs/realmax200.png' style='float:left;'>"+
-			"<p class='header center'>Welcome to Realmax AR Editor!</p>" +
-			"<p class='msg center'>Bringing AR to the Web.</p><br><br>" +
-			"<p class='msg center'>Create your own AR scenes to be triggered and played back using the Realmax AR system.</p>";
+    dialog.content.innerHTML = ""+
+    "<img src='imgs/icon200.png' style='float:left;'>"+
+    "<p class='header center'>Welcome to AR studio!</p>" +
+    "<p class='msg left'>The editor for webAR</p>" +
+    "<p class='msg left'>Design and develop your own AR scenes and share them with your audience.</p><br><br>" + 
+    "<p class='msg center'>The only system that supports pictures as targets!</p>";
+
 
 		dialog.on_close = function()
 		{

editor/js/widgets/ui/codingPad.js

@@ -623,26 +623,27 @@ CodingPadWidget.prototype.markLine = function(num)
 {
 	var cm = this.editor;
 
-    // Monaco editor already marks lines with syntax errors 
-    if(cm.name !== "Monaco"){
-        if(typeof(num) == "undefined" && this.last_error_line != null)
-        {
-            var lines = cm.lineCount();
-            for(var i = 0; i < lines; i++)
-                cm.removeLineClass( i, "background", "error-line");
-            //cm.removeLineClass( this.last_error_line, "background", "error-line");
-            this.last_error_line = null;
-            return;
-        }
+  // Monaco editor already marks lines with syntax errors 
+  if(cm.name !== "Monaco"){
+    if(typeof(num) == "undefined" && this.last_error_line != null)
+    {
+        var lines = cm.lineCount();
+        for(var i = 0; i < lines; i++)
+            cm.removeLineClass( i, "background", "error-line");
+        //cm.removeLineClass( this.last_error_line, "background", "error-line");
+        this.last_error_line = null;
+        return;
+    }
 
-	if(typeof(num) != "undefined")
-	{
-		if(this.last_error_line != null)
-			cm.removeLineClass( this.last_error_line, "background", "error-line");
+    if(typeof(num) != "undefined")
+    {
+      if(this.last_error_line != null)
+        cm.removeLineClass( this.last_error_line, "background", "error-line");
 
-		this.last_error_line = num;
-		cm.addLineClass(num, "background", "error-line");
-	}
+      this.last_error_line = num;
+      cm.addLineClass(num, "background", "error-line");
+    }
+  }
 }
 
 CodingPadWidget.prototype.getState = function(skip_content)

editor/player.html

@@ -17,7 +17,7 @@
 <meta property="og:description" content="Play augmented reality on the web" />
 <meta property="og:image" content="" />
 
-<link rel="icon" type="image/png" href="favicon.ico">
+<link rel="icon" type="image/png" href="favicon.png">
 
 </head>
 <body>