sunrize 1.11.8 → 1.11.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "sunrize",
   "productName": "Sunrize X3D Editor",
-  "version": "1.11.8",
+  "version": "1.11.9",
   "description": "A Multi-Platform X3D Editor",
   "main": "src/main.js",
   "bin": {
@@ -91,7 +91,7 @@
     "@vscode/codicons": "^0.0.42",
     "capitalize": "^2.0.4",
     "console": "^0.7.2",
-    "electron": "^39.2.1",
+    "electron": "^39.2.2",
     "electron-prompt": "^1.7.0",
     "electron-squirrel-startup": "^1.0.1",
     "electron-tabs": "^1.0.4",
@@ -100,7 +100,7 @@
     "jquery-ui-dist": "^1.13.3",
     "jstree": "^3.3.17",
     "material-icons": "^1.13.14",
-    "material-symbols": "^0.39.3",
+    "material-symbols": "^0.39.4",
     "md5": "^2.3.0",
     "mime-types": "^3.0.1",
     "monaco-editor": "^0.54.0",
@@ -110,7 +110,7 @@
     "string-similarity": "^4.0.4",
     "tweakpane": "^3.1.10",
     "update-electron-app": "^3.1.1",
-    "x_ite": "^12.1.8",
+    "x_ite": "^12.1.9",
     "x3d-traverse": "^1.0.22"
   }
 }

package/src/Application/Document.js

@@ -80,6 +80,8 @@ module .exports = class Document extends Interface
       electron .ipcRenderer .on ("scene-properties", (event)           => require ("../Editors/SceneProperties") .open ());
       electron .ipcRenderer .on ("close",            (event)           => this .close ());
 
+      $(window) .on ("beforeunload", () => this .close ());
+
       // Edit Menu
 
       electron .ipcRenderer .on ("undo", () => this .undo ());
@@ -577,6 +579,8 @@ Viewpoint {
 
    close ()
    {
+      this .footer .scriptEditor ?.apply ();
+
       if (UndoManager .shared .saveNeeded)
          this .saveFile ();
 

package/src/Editors/ScriptEditor.js

@@ -189,19 +189,23 @@ module .exports = class ScriptEditor extends Interface
       };
 
       const keywords = [
-         'const', 'uniform', 'break', 'continue',
-         'do', 'for', 'while', 'if', 'else', 'switch', 'case', 'in', 'out', 'inout', 'true', 'false',
-         'invariant', 'discard', 'return', 'sampler2D', 'samplerCube', 'sampler3D', 'struct',
-         'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'pow', 'sinh', 'cosh', 'tanh', 'asinh', 'acosh', 'atanh',
-         'exp', 'log', 'exp2', 'log2', 'sqrt', 'inversesqrt', 'abs', 'sign', 'floor', 'ceil', 'round', 'roundEven', 'trunc', 'fract', 'mod', 'modf',
-         'min', 'max', 'clamp', 'mix', 'step', 'smoothstep', 'length', 'distance', 'dot', 'cross ',
-         'determinant', 'inverse', 'normalize', 'faceforward', 'reflect', 'refract', 'matrixCompMult', 'outerProduct', 'transpose', 'lessThan ',
-         'lessThanEqual', 'greaterThan', 'greaterThanEqual', 'equal', 'notEqual', 'any', 'all', 'not', 'packUnorm2x16', 'unpackUnorm2x16', 'packSnorm2x16', 'unpackSnorm2x16', 'packHalf2x16', 'unpackHalf2x16',
-         'dFdx', 'dFdy', 'fwidth', 'textureSize', 'texture', 'textureProj', 'textureLod', 'textureGrad', 'texelFetch', 'texelFetchOffset',
-         'textureProjLod', 'textureLodOffset', 'textureGradOffset', 'textureProjLodOffset', 'textureProjGrad', 'intBitsToFloat', 'uintBitsToFloat', 'floatBitsToInt', 'floatBitsToUint', 'isnan', 'isinf',
-         'vec2', 'vec3', 'vec4', 'ivec2', 'ivec3', 'ivec4', 'uvec2', 'uvec3', 'uvec4', 'bvec2', 'bvec3', 'bvec4',
-         'mat2', 'mat3', 'mat2x2', 'mat2x3', 'mat2x4', 'mat3x2', 'mat3x3', 'mat3x4', 'mat4x2', 'mat4x3', 'mat4x4', 'mat4',
-         'float', 'int', 'uint', 'void', 'bool',
+         'break', 'case', 'const', 'continue', 'discard', 'do', 'else', 'flat', 'for', 'highp', 'if', 'in', 'inout', 'invariant', 'lowp', 'mediump', 'out', 'precision', 'return', 'smooth', 'struct', 'switch', 'uniform', 'while',
+      ];
+
+      const types = [
+         'bool', 'bvec2', 'bvec3', 'bvec4', 'float', 'int', 'ivec2', 'ivec3', 'ivec4', 'mat2', 'mat2x2', 'mat2x3', 'mat2x4', 'mat3', 'mat3x2', 'mat3x3', 'mat3x4', 'mat4', 'mat4x2', 'mat4x3', 'mat4x4', 'sampler2D', 'sampler3D', 'samplerCube', 'uint', 'uvec2', 'uvec3', 'uvec4', 'vec2', 'vec3', 'vec4', 'void',
+      ];
+
+      const functions = [
+         'abs', 'acos', 'acosh', 'all', 'any', 'asin', 'asinh', 'atan', 'atanh', 'ceil', 'clamp', 'cos', 'cosh', 'cross ', 'degrees', 'determinant', 'dFdx', 'dFdy', 'distance', 'dot', 'equal', 'exp', 'exp2', 'faceforward', 'floatBitsToInt', 'floatBitsToUint', 'floor', 'fract', 'fwidth', 'greaterThan', 'greaterThanEqual', 'intBitsToFloat', 'inverse', 'inversesqrt', 'isinf', 'isnan', 'length', 'lessThan ', 'lessThanEqual', 'log', 'log2', 'main', 'matrixCompMult', 'max', 'min', 'mix', 'mod', 'modf', 'normalize', 'not', 'notEqual', 'outerProduct', 'packUnorm2x16', 'pow', 'radians', 'reflect', 'refract', 'round', 'roundEven', 'sign', 'sin', 'sinh', 'smoothstep', 'sqrt', 'step', 'tan', 'tanh', 'texelFetch', 'texelFetchOffset', 'texture', 'textureGrad', 'textureGradOffset', 'textureLod', 'textureLodOffset', 'textureProj', 'textureProjGrad', 'textureProjLod', 'textureProjLodOffset', 'textureSize', 'transpose', 'trunc', 'uintBitsToFloat',
+      ];
+
+      const constants = [
+         'false', 'true',
+      ];
+
+      const builtins = [
+         'gl_ClipDistance', 'gl_CullDistance', 'gl_FragCoord', 'gl_FragDepth', 'gl_FrontFacing', 'gl_GlobalInvocationID', 'gl_HelperInvocation', 'gl_InstanceID', 'gl_InvocationID', 'gl_Layer', 'gl_LocalInvocationID', 'gl_LocalInvocationIndex', 'gl_NumSamples', 'gl_NumWorkGroups', 'gl_PatchVerticesIn', 'gl_PointCoord', 'gl_PointSize', 'gl_Position', 'gl_PrimitiveID', 'gl_PrimitiveIDIn', 'gl_SampleID', 'gl_SampleMask', 'gl_SampleMaskIn', 'gl_SamplePosition', 'gl_TessCoord', 'gl_TessLevelInner', 'gl_TessLevelOuter', 'gl_VertexID', 'gl_ViewportIndex', 'gl_WorkGroupID', 'gl_WorkGroupSize',
       ];
 
       const language = {
@@ -209,6 +213,10 @@ module .exports = class ScriptEditor extends Interface
          // Set defaultToken to invalid to see what you do not tokenize yet
          defaultToken: 'invalid',
          keywords,
+         types,
+         functions,
+         constants,
+         builtins,
          operators: [
             '=',
             '>',
@@ -256,33 +264,43 @@ module .exports = class ScriptEditor extends Interface
 
          tokenizer: {
             root: [
+               // data:mime-type,
+               [/data:x-shader\/x-(?:vertex|fragment),/, 'string'],
+
+               // x3d_SpecialVariable
+               [/x3d_\w+/, 'keyword'],
+
                // identifiers and keywords
-               [
-               /[a-zA-Z_]\w*/,
+
+               [/[a-zA-Z_]\w*/,
                {
                   cases: {
                      '@keywords': { token: 'keyword.$0' },
-                     '@default': 'identifier'
+                     '@types': { token: 'type.identifier' },
+                     '@functions': { token: 'attribute.name' },
+                     '@constants': { token: 'constant' },
+                     '@builtins': { token: 'regexp' },
+                     '@default': 'identifier',
                   }
-               }
-               ],
-
-               // Preprocessor directive (#define)
-               [/^\s*#\s*\w+/, 'keyword.directive'],
+               }],
 
                // Version
                [/#version\s+\d+\s+es/, 'keyword.directive'],
 
+               // Preprocessor directive (#define)
+               [/^\s*#\s*\w+/, 'keyword.directive'],
+
                // whitespace
                { include: '@whitespace' },
 
                // delimiters and operators
                [/[{}()\[\]]/, '@brackets'],
-               [/@symbols/, {
-               cases: {
-                  '@operators': 'operator',
-                  '@default': ''
-               }
+               [/@symbols/,
+               {
+                  cases: {
+                     '@operators': 'operator',
+                     '@default': ''
+                  }
                }],
 
                // numbers
@@ -305,18 +323,6 @@ module .exports = class ScriptEditor extends Interface
                [/[\/*]/, 'comment']
             ],
 
-            // Does it have strings?
-            string: [
-               [/[^\\"]+/, 'string'],
-               [/@escapes/, 'string.escape'],
-               [/\\./, 'string.escape.invalid'],
-               [/"/, {
-               token: 'string.quote',
-               bracket: '@close',
-               next: '@pop'
-               }]
-            ],
-
             whitespace: [
                [/[ \t\r\n]+/, 'white'],
                [/\/\*/, 'comment', '@comment'],

package/src/Undo/Editor.js

@@ -465,16 +465,38 @@ module .exports = class Editor
     <meta charset="utf-8">
     <script defer src="https://cdn.jsdelivr.net/npm/x_ite@latest/dist/x_ite.min.js"></script>
     <style>
+@import url("https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,400&family=Source+Sans+3:ital,wght@0,400&display=swap");
+
+@media (prefers-color-scheme: light) {
+  :root {
+    --text-color: rgb(42, 42, 42);
+    --background-color: white;
+    --link-color: rgb(0, 86, 178);
+    --link-hover-color: rgb(210, 96, 58);
+  }
+}
+
+@media (prefers-color-scheme: dark) {
+  :root {
+    --text-color: rgb(175, 176, 177);
+    --background-color: rgb(27, 27, 30);
+    --link-color: rgb(82, 108, 150);
+    --link-hover-color: rgb(210, 96, 58);
+  }
+}
+
 body {
   color-scheme: light dark;
+  box-sizing: border-box;
   display: flex;
   flex-direction: column;
   margin: 0px;
   padding: 0px;
   height: 100vh;
-  background-color: light-dark(white, rgb(27, 27, 30));
-  color: light-dark(rgb(42, 42, 42), rgb(175, 176, 177));
-  font-family: sans-serif;
+  background-color: var(--background-color);
+  color: var(--text-color);
+  font-family: "Source Sans 3", sans-serif;
+  font-size: 1.08rem;
 }
 
 body > * {
@@ -482,21 +504,26 @@ body > * {
   padding: 0px 1rem;
 }
 
+h1 {
+   font-family: Lato, sans-serif;
+}
+
 x3d-canvas {
   flex: 1 1 auto;
-  border-top: 2px solid light-dark(rgb(42, 42, 42), rgb(175, 176, 177));
-  border-bottom: 2px solid light-dark(rgb(42, 42, 42), rgb(175, 176, 177));
+  box-sizing: border-box;
+  border-top: 1px solid color-mix(in srgb, var(--text-color), transparent 90%);
+  border-bottom: 1px solid color-mix(in srgb, var(--text-color), transparent 90%);
   padding: 0px;
   width: 100%;
   height: 100%;
 }
 
 a {
-  color: light-dark(rgb(0, 86, 178), rgb(82, 108, 150));
+  color: var(--link-color);
 }
 
 a:hover {
-  color: light-dark(rgb(210, 96, 58), rgb(210, 96, 58))
+  color: var(--link-hover-color);
 }
     </style>
   </head>
@@ -505,7 +532,7 @@ a:hover {
     <x3d-canvas>
 ${scene .toXMLString ({ html: true, indent: " " .repeat (6) }) .trimEnd () }
     </x3d-canvas>
-    <p>Made with <a href="https://create3000.github.io/sunrize/" target="_blank">Sunrize X3D Editor.</a></p>
+    <p>Made with <a href="https://create3000.github.io/sunrize/" target="_blank">Sunrize X3D Editor</a>. If local files are not loaded <a href="https://create3000.github.io/x_ite/setup-a-localhost-server">consider setup a localhost server</a> or use <a href="https://create3000.github.io/x_ite/dom-integration">DOM integration methods</a>.</p>
   </body>
 </html>`
    }

package/src/assets/themes/default.css

@@ -4,6 +4,7 @@
 @import url(system-colors.css);
 
 html {
+  color-scheme: light dark;
   overflow: hidden;
   height: 100%;
 }

package/src/assets/themes/system-colors.css

@@ -2,8 +2,6 @@
 
 @media (prefers-color-scheme: light) {
   :root {
-    color-scheme: light;
-
     /* Colors */
 
     --system-red: rgb(255, 56, 60);
@@ -43,8 +41,8 @@
     /* Special Colors */
 
     --sidebar-background-color: rgb(208, 219, 231);
-    --tint-color1: rgba(255, 255, 255, 0.5);
-    --tint-color2: rgba(255, 255, 255, 1);
+    --tint-color1: rgba(255, 255, 255, 0.4);
+    --tint-color2: rgba(255, 255, 255, 0.6);
 
     /* TweakPanel colors */
 
@@ -79,8 +77,6 @@
 
 @media (prefers-color-scheme: dark) {
   :root {
-    color-scheme: dark;
-
     /* Colors */
 
     --system-red: rgb(255, 66, 69);