server and client side up

dist/r3.js

@@ -1,6 +1,30 @@
 
 
-console.log('r3.js - version ' + R3.Version + ' compiled ' + R3.CompileDate);
+//GENERATED_SOURCE_START
+
+class R3 {
+
+  constructor(options) {
+
+    if (typeof options === 'undefined') {
+      options = {};
+    }
+
+    Object.assign(this, options);
+
+  }
+
+}
+
+/**
+ * static Version - Current R3 version
+ */
+R3.Version = '3.0.171';
+
+/**
+ * static CompileDate - Current compile date of R3
+ */
+R3.CompileDate = '2021 Oct 01 - 08:36:23 am';
 
 class System {
 
@@ -7563,6 +7587,10 @@ class Utils {
 
 }
 
+//GENERATED_SOURCE_END
+
+console.log('r3.js - version ' + R3.Version + ' compiled ' + R3.CompileDate);
+
 Component.Code = ComponentCode;
 Component.DOM = ComponentDOM;
 Component.DOM.Canvas = ComponentCanvas;
@@ -7633,30 +7661,3 @@ R3.System.Render.Start();
 R3.System.Runtime.Start();
 R3.System.Socket.Start();
 R3.System.Storage.Start();
-
-R3.System = System;
-R3.Runtime = Runtime;
-R3.Event = Event;
-R3.Utils = Utils;
-R3.Object = R3Object;
-R3.Project = Project;
-R3.Entity = Entity;
-R3.Component = Component;
-R3.Code = R3Object.Component.Code;
-R3.Canvas = R3Object.Component.DOM.Canvas;
-R3.Image = R3Object.Component.Graphics.Image;
-R3.Material = R3Object.Component.Graphics.Material;
-R3.Mesh = R3Object.Component.Graphics.Mesh;
-R3.Texture = R3Object.Component.Graphics.Texture;
-R3.Touch = R3Object.Component.Input.Touch;
-
-console.log('r3.js - version ' + R3.Version + ' compiled ' + R3.CompileDate);
-
-R3.System.DOM.Start();
-R3.System.Input.Start();
-R3.System.Linking.Start();
-R3.System.Render.Start();
-R3.System.Runtime.Start();
-R3.System.Socket.Start();
-R3.System.Storage.Start();
-

r3.php

@@ -1439,6 +1439,7 @@ function generateR3($nodes, $graph)
 
   file_put_contents($r3Index, $template);
 
+  deleteSavedFile($r3Index . '.saved');
 
   $version = file_get_contents('version');
 
@@ -1564,12 +1565,12 @@ function generateEvents()
 
 }
 
-function writeSource($node, $file)
+function getSource($node, &$source)
 {
+  $contents = file_get_contents($node->file);
+  array_push($source, $contents);
   foreach ($node->children as $child) {
-    $contents = file_get_contents($child->file);
-    fwrite($file, $contents);
-    writeSource($child, $file);
+    getSource($child, $source);
   }
 }
 
@@ -1589,31 +1590,25 @@ function generateR3Dist($nodes)
 {
   global $graph;
 
-  $r3jsFile = 'dist/r3.js';
-  $r3jsSource = 'src/r3/index.js';
+  $r3jsDist = 'dist/r3.js';
   $r3IndexTemplate = 'src/templates/r3_index.template';
-  $r3js = fopen($r3jsFile, "w");
+  $r3jsIndex = 'src/r3/index.js';
 
-  ftruncate($r3js, 0);
-
-//  $version = file_get_contents('version');
-//  $packageJson = file_get_contents('package.json');
-//  $packageJson = preg_replace('/(.*version.*: ").*(".*)/', '${1}' . $version . '${2}', $packageJson);
-//  file_put_contents('package.json', $packageJson);
-
-  $version = file_get_contents('version');
   $template = file_get_contents($r3IndexTemplate);
-  $template = str_replace('DATE', date("Y M d - H:i:s a"), $template);
-  $template = str_replace('VERSION', $version, $template);
-  fwrite($r3js, $template);
+  file_put_contents($r3jsDist, $template);
+
+  $r3 = $graph->search('name', 'R3');
+  $source = [];
+
+  getSource($r3,$source);
+
+  updateSection($r3jsDist, 'GENERATED_SOURCE', $source);
+
+  $r3jsDistPointer = fopen($r3jsDist, "a");
 
   $generateTokens = getTokens(['GENERATED']);
   $customTokens = getTokens(['CUSTOM']);
 
-  $r3 = $graph->search('name', 'R3');
-
-  writeSource($r3, $r3js);
-
   $indexFiles = [
     'src/r3/r3-component/index.js',
     'src/r3/r3-entity/index.js',
@@ -1633,7 +1628,7 @@ function generateR3Dist($nodes)
       }
 
       foreach ($store as $line) {
-        fwrite($r3js, $line);
+        fwrite($r3jsDistPointer, $line);
       }
 
     }
@@ -1641,8 +1636,8 @@ function generateR3Dist($nodes)
     deleteSavedFile($indexFile . '.saved');
   }
 
-  $savedGenerate = save($r3jsSource, $generateTokens)[1];
-  $savedCustom = save($r3jsSource, $customTokens)[1];
+  $savedGenerate = save($r3jsIndex, $generateTokens)[1];
+  $savedCustom = save($r3jsIndex, $customTokens)[1];
   foreach ($savedGenerate as $key => $store)
   {
 
@@ -1651,27 +1646,25 @@ function generateR3Dist($nodes)
     }
 
     foreach ($store as $line) {
-      fwrite($r3js, $line);
+      fwrite($r3jsDistPointer, $line);
     }
   }
 
   foreach ($savedCustom as $key => $store)
   {
     foreach ($store as $line) {
-      fwrite($r3js, $line);
+      fwrite($r3jsDistPointer, $line);
     }
   }
 
-  $contents = file_get_contents('src/r3/index.js');
+  fclose($r3jsDistPointer);
 
-  fwrite($r3js, $contents);
-
-  fclose($r3js);
+  deleteSavedFile($indexFile . '.saved');
 
   /**
    * Now start cleaning up the file
    */
-  $contents = file_get_contents($r3jsFile);
+  $contents = file_get_contents($r3jsDist);
 
   $tokensForRemoval = [
     'GENERATED_IMPORTS',
@@ -1720,7 +1713,7 @@ function generateR3Dist($nodes)
 
   $contents = str_replace('__API_URL__', $_ENV['API_URL'], $contents);
 
-  file_put_contents($r3jsFile, $contents);
+  file_put_contents($r3jsDist, $contents);
 
 }
 

src/r3/index.js

@@ -31,6 +31,9 @@ R3.Touch = R3Object.Component.Input.Touch;
 //CUSTOM_DEFINES_START
 //CUSTOM_DEFINES_END
 
+//GENERATED_SOURCE_START
+//GENERATED_SOURCE_END
+
 console.log('r3.js - version ' + R3.Version + ' compiled ' + R3.CompileDate);
 
 //GENERATED_SYSTEM_START

src/templates/r3_index.template

@@ -7,6 +7,9 @@
 //CUSTOM_DEFINES_START
 //CUSTOM_DEFINES_END
 
+//GENERATED_SOURCE_START
+//GENERATED_SOURCE_END
+
 console.log('r3.js - version ' + R3.Version + ' compiled ' + R3.CompileDate);
 
 //GENERATED_SYSTEM_START