x_ite 4.7.14 → 5.0.2

package/.vscode/settings.json

@@ -1,6 +1,8 @@
 {
    "files.exclude": {
-      "**/*~": true
+      "**/*~": true,
+      "node_modules": true,
+      "package-lock.json": true
    },
    "files.watcherExclude": {
       "**/.bzr/**": true
@@ -8,5 +10,10 @@
    "files.insertFinalNewline": true,
    "files.trimFinalNewlines": true,
    "files.trimTrailingWhitespace": true,
-   "files.eol": "\n"
+   "files.eol": "\n",
+   "cSpell.words": [
+      "bbox",
+      "Catmull",
+      "tessellator"
+   ]
 }

package/Makefile

@@ -6,34 +6,36 @@ configure:
 	sudo npm install
 
 all:
-	perl build/bin/version-number.pl
+	$(eval X_ITE_VERSION=$(shell perl build/bin/version-number.pl))
+	echo "Making Version:" $(X_ITE_VERSION)
 
 	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
-	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
+	perl -pi -e "s|define\\s*\\('text/text!assets/shaders/webgl.*?\\n||sg;" dist/x_ite.js
+	perl -pi -e "s|\"X_ITE.X3D\"|\"X_ITE.X3D-"$(X_ITE_VERSION)"\"|" dist/x_ite.js
+	node_modules/terser/bin/terser --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,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,scripting,--compress)
-	$(call generate_component,texturing-3d,--compress)
-	$(call generate_component,volume-rendering,--compress)
-	$(call generate_component,x_ite,--compress)
+	$(call generate_component,annotation,$(X_ITE_VERSION),--compress)
+	$(call generate_component,cad-geometry,$(X_ITE_VERSION),--compress)
+	$(call generate_component,cube-map-texturing,$(X_ITE_VERSION),--compress)
+	$(call generate_component,dis,$(X_ITE_VERSION),--compress)
+	$(call generate_component,event-utilities,$(X_ITE_VERSION),--compress)
+	$(call generate_component,geometry2d,$(X_ITE_VERSION),--compress)
+	$(call generate_component,geospatial,$(X_ITE_VERSION),--compress)
+	$(call generate_component,h-anim,$(X_ITE_VERSION),--compress)
+	$(call generate_component,key-device-sensor,$(X_ITE_VERSION),--compress)
+	$(call generate_component,layout,$(X_ITE_VERSION),--compress)
+	$(call generate_component,nurbs,$(X_ITE_VERSION),--compress)
+	$(call generate_component,particle-systems,$(X_ITE_VERSION),--compress)
+	$(call generate_component,picking,$(X_ITE_VERSION),--compress)
+	$(call generate_component,projective-texture-mapping,$(X_ITE_VERSION),--compress)
+	$(call generate_component,rigid-body-physics,$(X_ITE_VERSION),--compress)
+	$(call generate_component,scripting,$(X_ITE_VERSION),--compress)
+	$(call generate_component,texturing-3d,$(X_ITE_VERSION),--compress)
+	$(call generate_component,volume-rendering,$(X_ITE_VERSION),--compress)
+	$(call generate_component,x_ite,$(X_ITE_VERSION),--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
@@ -74,8 +76,9 @@ clean:
 
 define generate_component
 	node_modules/requirejs/bin/r.js -o build/components/$(1).build.js
+	perl -pi -e "s|\"X_ITE.X3D\"|\"X_ITE.X3D-"$(2)"\"|" dist/assets/components/$(1).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
+	perl -pi -e "s|define\\s*\\(\\[|define (require .getComponentUrl (\"$(1)\"), [|" dist/assets/components/$(1).js
+	node_modules/terser/bin/terser --mangle $(3) -- dist/assets/components/$(1).js > dist/assets/components/$(1).min.js
 endef

package/build/bin/version-number.pl

@@ -12,7 +12,7 @@ sub check_version {
 	$VERSION =~ /"version":\s*"(.*?)"/;
 	$VERSION = $1;
 
-	say "VERSION »$VERSION«";
+	say $VERSION;
 
 	my $BROWSER = `cat src/x_ite/Browser/VERSION.js`;
 	$BROWSER =~ s/"(.*?a?)"/"$VERSION"/;

package/build/bin/version.pl

@@ -37,10 +37,10 @@ sub publish
 {
 	my $version = shift;
 
-	system "git", "tag", "--delete", "$version";
-	system "git", "push", "--delete", "origin", "$version";
+	system "git", "tag", "--delete", $version;
+	system "git", "push", "--delete", "origin", $version;
 
-	system "git", "tag", "$version";
+	system "git", "tag", $version;
 	system "git", "push", "origin", "--tags";
 }
 

package/build/parts/default.start.frag.js

@@ -4,5 +4,5 @@
 var module = { }, exports, process;
 
 const
-	define  = X3D .define,
-	require = X3D .require;
+	define  = window [Symbol .for ("X_ITE.X3D")] .define,
+	require = window [Symbol .for ("X_ITE.X3D")] .require;

package/build/parts/x_ite.end.frag.js

@@ -13,5 +13,4 @@ function ()
 	};
 });
 
-})
-(typeof module === "object" ? module : undefined, typeof require === "function" ? require : undefined);
+})));

package/build/parts/x_ite.start.frag.js

@@ -1,11 +1,8 @@
-(function (globalModule, globalRequire)
+(function (global, factory)
 {
-
-if (typeof __filename === "undefined")
-{
-	globalModule  = undefined;
-	globalRequire = undefined;
+	typeof module === "object" && typeof require === "function" ? factory (module, require) : factory ();
 }
-
+(this, (function (__global_module__, __global_require__)
+{
 // Undefine global variables.
 var module, exports, process;