x_ite 4.2.17 → 4.7.7

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

package/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+   // Verwendet IntelliSense zum Ermitteln möglicher Attribute.
+   // Zeigen Sie auf vorhandene Attribute, um die zugehörigen Beschreibungen anzuzeigen.
+   // Weitere Informationen finden Sie unter https://go.microsoft.com/fwlink/?linkid=830387
+   "version": "0.2.0",
+   "configurations": [
+      {
+         "type": "pwa-chrome",
+         "request": "launch",
+         "name": "Launch Chrome against localhost",
+         "url": "http://localhost/src/x_ite.html",
+         "webRoot": "${workspaceFolder}"
+      }
+   ]
+}

package/.vscode/settings.json

@@ -0,0 +1,12 @@
+{
+   "files.exclude": {
+      "**/*~": true
+   },
+   "files.watcherExclude": {
+      "**/.bzr/**": true
+   },
+   "files.insertFinalNewline": true,
+   "files.trimFinalNewlines": true,
+   "files.trimTrailingWhitespace": true,
+   "files.eol": "\n"
+}

package/.vscode/tasks.json

@@ -0,0 +1,25 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Make Dist",
+            "type": "shell",
+            "command": "make",
+            "problemMatcher": [],
+        },
+        {
+            "label": "Make Version",
+            "type": "shell",
+            "command": "make version",
+            "problemMatcher": []
+        },
+        {
+            "label": "Git List Untracked Files",
+            "type": "shell",
+            "command": "git ls-files --others --exclude-standard",
+            "problemMatcher": []
+        }
+    ]
+}

package/Makefile

@@ -6,19 +6,34 @@ configure:
 	sudo npm install
 
 all:
+	perl build/bin/version-number.pl
+
 	perl -pi -e 's/return (?:true|false);/return false;/sg' src/x_ite/DEBUG.js
 
 	node_modules/requirejs/bin/r.js -o build/x_ite.build.js
-	node_modules/uglify-js-es6/bin/uglifyjs --compress --mangle -- dist/x_ite.js > dist/x_ite.min.js
+	perl -pi -e "s|define\\('text/text!assets/shaders/webgl.*?\\n||sg;" dist/x_ite.js
+	node_modules/uglify-js-es6/bin/uglifyjs --mangle --compress -- dist/x_ite.js > dist/x_ite.min.js
 	node_modules/requirejs/bin/r.js -o cssIn=src/x_ite.css out=dist/x_ite.css
 
-	$(call generate_component,cad-geometry)
-	$(call generate_component,geospatial)
-	$(call generate_component,h-anim)
-	$(call generate_component,nurbs)
-	$(call generate_component,particle-systems)
+	$(call generate_component,annotation,--compress)
+	$(call generate_component,cad-geometry,--compress)
+	$(call generate_component,cube-map-texturing,--compress)
+	$(call generate_component,dis,--compress)
+	$(call generate_component,event-utilities,--compress)
+	$(call generate_component,geometry2d,--compress)
+	$(call generate_component,geospatial,--compress)
+	$(call generate_component,h-anim,--compress)
+	$(call generate_component,key-device-sensor,--compress)
+	$(call generate_component,layout,--compress)
+	$(call generate_component,nurbs,--compress)
+	$(call generate_component,particle-systems,--compress)
+	$(call generate_component,picking,--compress)
+	$(call generate_component,projective-texture-mapping,--compress)
 	$(call generate_component,rigid-body-physics)
-	$(call generate_component,texturing-3d)
+	$(call generate_component,scripting,--compress)
+	$(call generate_component,texturing-3d,--compress)
+	$(call generate_component,volume-rendering,--compress)
+	$(call generate_component,x_ite,--compress)
 
 	perl -pi -e 's|text/text!|text!|sg' dist/x_ite.js
 	perl -pi -e 's|text/text!|text!|sg' dist/x_ite.min.js
@@ -58,7 +73,9 @@ clean:
 	rm x_ite.min.js
 
 define generate_component
-	node_modules/requirejs/bin/r.js -o build/$(1).build.js
-	perl -pi -e "s|'components/$(1)',||" dist/components/$(1).js
-	node_modules/uglify-js-es6/bin/uglifyjs --mangle -- dist/components/$(1).js > dist/components/$(1).min.js
+	node_modules/requirejs/bin/r.js -o build/components/$(1).build.js
+	perl -pi -e "s|'assets/components/$(1)',||" dist/assets/components/$(1).js
+	perl -pi -e "s|text/text!|text!|" dist/assets/components/$(1).js
+	perl -pi -e "s|define\\s+\\(\\[|define (require .getComponentUrl (\"$(1)\"), [|" dist/assets/components/$(1).js
+	node_modules/uglify-js-es6/bin/uglifyjs --mangle $(2) -- dist/assets/components/$(1).js > dist/assets/components/$(1).min.js
 endef

package/README.md

@@ -1,159 +1,27 @@
-<img alt="X_ITE" src="https://rawgit.com/create3000/x_ite/master/meta/logo/logo.svg" width="60" height="60"/>
-
-[X_ITE](http://create3000.de/x_ite/) — X_ITE WebGL Browser
+[X_ITE](https://create3000.github.io/x_ite/) — X_ITE X3D Browser
 ==================================================
 
-
-Introduction
---------------------------------------
-
-X_ITE is a work in progress. The goal is a full standard WebGL X3D browser for all major web browsers.
-
-For more information and live preview please visit [http://create3000.de/x_ite/](http://create3000.de/x_ite/).
-
-
-Links
---------------------------------------
-* [Getting Started](http://create3000.de/x_ite/getting-started/)
-* [What’s New](http://create3000.de/x_ite/whats-new/)
-* [Supported Nodes](http://create3000.de/x_ite/supported-nodes/)
-* [Accessing the External Browser](http://create3000.de/x_ite/accessing-the-external-browser/)
-* [XHTML DOM Integration](http://create3000.de/x_ite/xhtml-dom-integration/)
-* [Custom Shaders](http://create3000.de/x_ite/shaders/)
-
-Embedding X_ITE within a Web Page
---------------------------------------
-
-To display your X3D scene in a HTML5 page first save your scene as X3D XML Encoded file or as X3D Classic Encoded file, i.e. create a file with the extension .x3d ,.x3dv or .wrl. 
-
-The HTML5 page is quite easy to create, the HTML5 code below shows you the minimum requirements. The path to the X3D scene is specified in the src attribute of the <X3DCanvas> tag. 
-
-    <!DOCTYPE html>
-    <html>
-      <head>
-        <meta charset="utf-8"/>
-        <link rel="stylesheet" type="text/css" href="http://code.create3000.de/x_ite/latest/dist/x_ite.css"/>
-        <script type="text/javascript" src="http://code.create3000.de/x_ite/latest/dist/x_ite.min.js"></script>
-        <style>
-        X3DCanvas {
-          width: 768px;
-          height: 432px;
-        }
-        </style>
-      </head>
-      <body>
-        <X3DCanvas src="path/to/your/X3D/world.x3d">
-          <p>Your browser may not support all features required by X_ITE!</p>
-        </X3DCanvas>
-      </body>
-    </html>
-
-To get X_ITE working you must include the CSS file »x_ite.css« and the JavaScript file »x_ite.min.js «. After x_ite is successfully loaded a new HTML tag <X3DCanvas> is available on your page.
-
-You can style the <X3DCanvas> tag as every HTML tag with CSS as well as you can place it everywhere within the DOM tree. 
-
-
-### Supported File Formats
-
-As of version 1.19, X_ITE can now parse either X3D XML Encoding or X3D Classic Encoding. This gives authors the capability to display their existing projects like .wrl worlds, too.
-
-Additionally files can be compressed using GZip compression.
-
-
-### Fallback Content
-
-The <X3DCanvas> element is equal to the <canvas> element in that, it is easy to define some fallback content, to be displayed in older browsers not supporting it, like currently all other browsers than the recent version of Firefox or older versions of that. You should always provide fallback content to be displayed by those browsers.
-
-Providing fallback content is very straightforward: just insert the alternate content inside the <X3DCanvas> element. Browsers that don't support <X3DCanvas> will ignore the container and render the fallback content inside it. Browsers that do support <X3DCanvas> will ignore the content inside the container, and just render the canvas normally.
-
-For example, we could provide a text description of the X3D element or provide a static image of the dynamically rendered content. This can look something like this: 
-
-    <X3DCanvas src="world.x3d">
-       <p>Current stock price: $3.15 +0.15</p>
-    </X3DCanvas>
-
-    <X3DCanvas src="world.x3dv">
-       <img src="images/clock.png"/>
-    </X3DCanvas>
-
-
-Attributes of the X3DCanvas Tag
+🛑 Attention!
 --------------------------------------
 
-The HTML **X3DCanvas tag** defines the main content of the X3D document. The X3DCanvas tag has two attributes that define different behaviours. All of these attributes are optional. 
-
-
-### cache
-
-A Boolean value (true or false) to indicate whether files transferred over the internet should be cached on the local computer. The default value for the cache attribute is true. It works by appending „_={timestamp}“ to the GET parameters of every request.
-
-
-### contextMenu
+👉 X_ITE is now hosted on create3000.github.io, see https://create3000.github.io/x_ite/#github-cdn. The domain http://create3000.de will be shutdown 2022 in May 😱.
 
-A Boolean value (true or false) to indicate whether a context menu should be displayed on right click. The default value for the contextMenu attribute is true.
-
-
-### notifications
-
-A Boolean value (true or false) to indicate whether the notification bubble should be displayed. The default value for the notifications attribute is true.
-
-
-### onerror
-
-Type: script code. This event is sent to an X3DCanvas element when an error occurs loading a scene.
-
-
-### onload
-
-Type: script code. This event handler will be called on the X3DCanvas element when a scene has finished loading. This applies whether the scene is applied via the src attribute or when a scene is loaded or replaced by another world. If you change the scene, the event will fire again when the new scene loads. This event will not bubble up the element tree.
-
-
-### onshutdown
-
-Type: script code. This event handler will be called on the X3DCanvas element when a scene is unloaded or replaced by another world.
-
-
-### src
-
-A String value with the URL that should be loaded on page load. If no src attribute is specified or the src attribute is empty an empty scene is displayed.
-
-
-### splashScreen
-
-A Boolean value (true or false) to indicate whether the splash screen should be displayed. The default value for the splashScreen attribute is true. The display of Learn more about how HTML and X3D can operate together.the splash screen can also be toggled via the browser option »SplashScreen« in JavaScript. Call Browser.setBrowserOption(„SplashScreen“, booleanValue) to toggle the display of the splash screen.
-
-
-### timings
-
-A Boolean value (true or false) to indicate whether the browser timings bubble should be displayed if the context menu option is enabled. The default value for the timings attribute is true. This attribute changes the facility if browsers timings can be displayed, if browser timings are really displayed is in the hand of the user if he toggles the context menu option to true.
-
-
-### url
-
-A MFString value with urls that should be loaded on page load. If no url attribute is specified or the attribute is empty an empty scene is displayed. If both src and url attribute are specified the src attribute takes precedence.
-
-
-## Example
-
-`<X3DCanvas cache="true" src="path/to/your/X3D/world.x3d"></X3DCanvas>`
-
-
-Programmer's Style Guide
+Introduction
 --------------------------------------
-Programmers who want to work on X_ITE shall first read the [Style Guide](STYLE_GUIDE.md).
-
 
-Tests
---------------------------------------
-[X_ITE Test Page](http://rawgit.com/create3000/x_ite/master/x_ite.min.html)
+X_ITE is an X3D JavaScript WebGL Browser. It is a full standard X3D WebGL browser for all major web browsers, which also can be used as a VRML viewer.
 
+For more information and live preview please have a look at the [Home Page](https://create3000.github.io/x_ite/).
 
-Authors
+Quick Links
 --------------------------------------
-All authors contributed to this project can be found in the [list of authors](AUTHORS.md).
-
+* [Getting Started](https://create3000.github.io/x_ite/)
+* [Supported Nodes](https://create3000.github.io/x_ite/Supported-Nodes.html)
+* [Accessing the External Browser](https://create3000.github.io/x_ite/Accessing-the-External-Browser.html)
+* [XHTML DOM Integration](https://create3000.github.io/x_ite/XHTML-DOM-Integration.html)
+* [Custom Shaders](https://create3000.github.io/x_ite/Custom-Shaders.html)
 
 License
 --------------------------------------
-X_ITE is free software: you can redistribute it and/or modify it under the terms of 
+X_ITE is free software: you can redistribute it and/or modify it under the terms of
 the [GNU General Public License version 3](LICENSE.md) only, as published by the Free Software Foundation.

package/build/bin/dist.pl

@@ -4,8 +4,11 @@
 use strict;
 use warnings;
 use v5.10.0;
+use utf8;
 use open qw/:std :utf8/;
 
+use File::Basename qw (dirname basename);
+
 my $CWD = `pwd`;
 chomp $CWD;
 
@@ -21,19 +24,61 @@ sub check_version {
 	$VERSION = $1;
 
 	$ALPHA = $VERSION =~ /a$/;
-	
+
 	$REVISION = `cat package.json`;
 	$REVISION =~ /"revision":\s*"(.*?)"/;
 	$REVISION = $1 + 1;
 
 	say "VERSION »$VERSION«";
+}
+
+sub shader_source {
+	my $filename = shift;
+
+	my $dirname = dirname ($filename);
+	my @lines   = `cat $filename`;
+	my $source  = "";
+
+	foreach my $line (@lines)
+	{
+		if ($line =~ /^#pragma\s+X3D\s+include\s+"(.*?[^\/]+\.glsl)"\s*$/)
+		{
+			$source .= shader_source ("$dirname/$1");
+		}
+		else
+		{
+			$line =~ s|^\s+||;
+
+			$source .= $line;
+		}
+	}
+
+	$source =~ s|//.*?\n|\n|sg;
+	$source =~ s|/\*.*?\*/||sg;
+	$source =~ s|[ \t]+| |sg;
+	$source =~ s|\n+|\n|sg;
+
+	return $source;
+}
+
+sub shader {
+	my $filename = shift;
+	my $dist     = shift;
+	chomp $filename;
+
+	return if -d $filename;
 
-	my $BROWSER = `cat src/x_ite/Browser/VERSION.js`;
-	$BROWSER =~ s/"(.*?a?)"/"$VERSION"/;
+	my $basename = basename ($filename);
+	my $source   = shader_source $filename;
 
-	open BROWSER, ">", "src/x_ite/Browser/VERSION.js";
-	print BROWSER $BROWSER;
-	close $BROWSER;
+	open FILE, ">", "$dist/$basename";
+	print FILE $source;
+	close FILE;
+}
+
+sub shaders {
+	shader ("src/assets/shaders/webgl1/$_", "dist/assets/shaders/webgl1") foreach `ls -C1 src/assets/shaders/webgl1`;
+	shader ("src/assets/shaders/webgl2/$_", "dist/assets/shaders/webgl2") foreach `ls -C1 src/assets/shaders/webgl2`;
 }
 
 sub dist {
@@ -52,12 +97,23 @@ sub dist {
 	print JS "/* X_ITE X3D v$VERSION-$REVISION\n * See LICENSE.txt for a detailed listing of used licences. */\n", $js_min;
 	close JS;
 
+	$css = `cat dist/x_ite.css`;
+	open CSS, ">", "dist/x_ite.css";
+	$css =~ s/content: "X_ITE Browser";/content: "X_ITE Browser v$VERSION";/;
+	print CSS $css;
+	close CSS;
+
 	say "Copying files";
-	system "rsync", "-r", "-x", "-c", "-v", "-t", "--progress", "--delete", "src/images", "dist/";
+	system "rsync", "-r", "-x", "-c", "-v", "-t", "--progress", "--delete", "src/assets/fonts",    "dist/assets/";
+	system "rsync", "-r", "-x", "-c", "-v", "-t", "--progress", "--delete", "src/assets/hatching", "dist/assets/";
+	system "rsync", "-r", "-x", "-c", "-v", "-t", "--progress", "--delete", "src/assets/images",   "dist/assets/";
+	system "rsync", "-r", "-x", "-c", "-v", "-t", "--progress", "--delete", "src/assets/linetype", "dist/assets/";
 	system "cp", "-v", "src/example.html",  "dist/";
-	
+
 	system "perl", "-pi", "-e", "s|/latest/|/alpha/|sg", "dist/example.html" if $ALPHA;
 	system "perl", "-pi", "-e", "s|/latest/|/$VERSION/|sg", "dist/example.html" unless $ALPHA;
+
+	shaders;
 }
 
 sub licenses {
@@ -94,6 +150,7 @@ check_version;
 
 say "Making version '$VERSION' now.";
 
+shaders;
 licenses;
 dist;
 zip;

package/build/bin/version-number.pl

@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+# -*- Mode: Perl; coding: utf-8; tab-width: 3; indent-tabs-mode: t; c-basic-offset: 3 -*-
+
+use strict;
+use warnings;
+use v5.10.0;
+use utf8;
+use open qw/:std :utf8/;
+
+sub check_version {
+	my $VERSION = `cat package.json`;
+	$VERSION =~ /"version":\s*"(.*?)"/;
+	$VERSION = $1;
+
+	say "VERSION »$VERSION«";
+
+	my $BROWSER = `cat src/x_ite/Browser/VERSION.js`;
+	$BROWSER =~ s/"(.*?a?)"/"$VERSION"/;
+
+	open BROWSER, ">", "src/x_ite/Browser/VERSION.js";
+	print BROWSER $BROWSER;
+	close $BROWSER;
+}
+
+check_version;

package/build/bin/version.pl

@@ -4,11 +4,12 @@
 use strict;
 use warnings;
 use v5.10.0;
+use utf8;
 use open qw/:std :utf8/;
 
-my $CWD = `pwd`;
-chomp $CWD;
+use Cwd;
 
+my $CWD = cwd;
 say $CWD;
 
 my $VERSION;
@@ -30,7 +31,6 @@ sub commit
 	system "git", "commit", "-am", "Published version $VERSION-$REVISION";
 	system "git", "push";
 	system "git", "push", "origin";
-	system "git", "push", "github";
 }
 
 sub publish
@@ -39,22 +39,56 @@ sub publish
 
 	system "git", "tag", "--delete", "$version";
 	system "git", "push", "--delete", "origin", "$version";
-	system "git", "push", "--delete", "github", "$version";
 
 	system "git", "tag", "$version";
 	system "git", "push", "origin", "--tags";
-	system "git", "push", "github", "--tags";
 }
 
-sub rsync
+sub update
 {
 	my $release = shift;
-	my $ftp      = "/run/user/1000/gvfs/ftp:host=create3000.de/html/create3000.de/code/htdocs/x_ite";
+	my $dist    = "$CWD/dist";
+	my $code    = "$CWD/../code/docs/x_ite/$release";
 
 	say "Uploading $release";
 
-	system "mkdir", "-p", "$ftp/$release/dist/";
-	system "rsync", "-r", "-x", "-c", "-v", "--progress", "--delete", "/home/holger/Projekte/X_ITE/dist/", "$ftp/$release/dist/";
+	system "rm", "-r", "$code/dist";
+
+	system "mkdir", "-p", $code;
+	system "cp", "-r", $dist, "$code/dist";
+}
+
+sub upload
+{
+	my $code = "$CWD/../code";
+
+	chdir $code;
+
+	system "git", "add", "-A";
+	system "git", "commit", "-am", "Published version $VERSION-$REVISION";
+	system "git", "push";
+	system "git", "push", "origin";
+}
+
+sub docs
+{
+	my $VERSION = shift;
+
+	my $config = `cat '$CWD/docs/_config.yml'`;
+
+	$config =~ s|"Version\s+.*?"|"Version $VERSION"|sgo;
+
+	open CONFIG, ">", "$CWD/docs/_config.yml";
+	print CONFIG $config;
+	close CONFIG;
+
+	my $home = `cat '$CWD/docs/index.md'`;
+
+	$home =~ s|/x_ite/\d+\.\d+\.\d+/dist/|/x_ite/$VERSION/dist/|sgo;
+
+	open HOME, ">", "$CWD/docs/index.md";
+	print HOME $home;
+	close HOME;
 }
 
 my $result = system "zenity", "--question", "--text=Do you really want to publish X_ITE X3D v$VERSION-$REVISION now?", "--ok-label=Yes", "--cancel-label=No";
@@ -66,23 +100,29 @@ if ($result == 0)
 	# Increment revision number.
 	system "perl", "-pi", "-e", "s|\"revision\":\\s*\"(.*?)\"|\"revision\": \"$REVISION\"|sg", "package.json";
 
+	# docs
+
+	docs ($VERSION) unless $ALPHA;
+
 	# GitHub
 
 	commit;
 
 	unless ($ALPHA)
 	{
-		publish ("$VERSION");
+		publish ($VERSION);
 		publish ("latest");
 	}
 
-	# FTP
+	# code
 
-	rsync ("alpha");
+	update ("alpha");
 
 	unless ($ALPHA)
 	{
-		rsync ("latest");
-		rsync ($VERSION);
+		update ("latest");
+		update ($VERSION);
 	}
+
+	upload;
 }

package/build/components/annotation.build.js

@@ -0,0 +1,15 @@
+
+({
+	baseUrl: "../../src",
+	name: "assets/components/annotation",
+	out: "../../dist/assets/components/annotation.js",
+	optimize: "none",
+	mainConfigFile: "../../src/x_ite.config.js",
+	exclude: [
+		"x_ite"
+	],
+	wrap: {
+		startFile: "../parts/default.start.frag.js",
+		endFile: "../parts/default.end.frag.js"
+	},
+})

package/build/components/cad-geometry.build.js

@@ -0,0 +1,15 @@
+
+({
+	baseUrl: "../../src",
+	name: "assets/components/cad-geometry",
+	out: "../../dist/assets/components/cad-geometry.js",
+	optimize: "none",
+	mainConfigFile: "../../src/x_ite.config.js",
+	exclude: [
+		"x_ite"
+	],
+	wrap: {
+		startFile: "../parts/default.start.frag.js",
+		endFile: "../parts/default.end.frag.js"
+	},
+})

package/build/components/cube-map-texturing.build.js

@@ -0,0 +1,15 @@
+
+({
+	baseUrl: "../../src",
+	name: "assets/components/cube-map-texturing",
+	out: "../../dist/assets/components/cube-map-texturing.js",
+	optimize: "none",
+	mainConfigFile: "../../src/x_ite.config.js",
+	exclude: [
+		"x_ite"
+	],
+	wrap: {
+		startFile: "../parts/default.start.frag.js",
+		endFile: "../parts/default.end.frag.js"
+	},
+})

package/build/components/dis.build.js

@@ -0,0 +1,15 @@
+
+({
+	baseUrl: "../../src",
+	name: "assets/components/dis",
+	out: "../../dist/assets/components/dis.js",
+	optimize: "none",
+	mainConfigFile: "../../src/x_ite.config.js",
+	exclude: [
+		"x_ite"
+	],
+	wrap: {
+		startFile: "../parts/default.start.frag.js",
+		endFile: "../parts/default.end.frag.js"
+	},
+})

package/build/components/event-utilities.build.js

@@ -0,0 +1,15 @@
+
+({
+	baseUrl: "../../src",
+	name: "assets/components/event-utilities",
+	out: "../../dist/assets/components/event-utilities.js",
+	optimize: "none",
+	mainConfigFile: "../../src/x_ite.config.js",
+	exclude: [
+		"x_ite"
+	],
+	wrap: {
+		startFile: "../parts/default.start.frag.js",
+		endFile: "../parts/default.end.frag.js"
+	},
+})