Bug/three examples dependencies (#20)

* included imported three examples into the bundle

* sync three examples script

* script bugfix

* added libs build command to PR CI

.github/workflows/pull_request_build.yml

@@ -23,10 +23,22 @@ jobs:
         working-directory: ./packages/ammo
         run: npm run build && npm run test
 
+      - name: Build matter
+        working-directory: ./packages/matter
+        run: npm run build
+
+      - name: Build pixi
+        working-directory: ./packages/pixi
+        run: npm run build
+
       - name: Test rapier2d
         working-directory: ./packages/rapier2d
         run: npm run build && npm run test
 
       - name: Test rapier3d
         working-directory: ./packages/rapier3d
         run: npm run build && npm run test
+
+      - name: Build three
+        working-directory: ./packages/three
+        run: npm run build

packages/three/.npmignore

@@ -1,2 +1,3 @@
 node_modules
+etc
 src

packages/three/etc/sync_three_examples.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+SOURCE_A="./node_modules/three/examples/jsm"
+SOURCE_B="./node_modules/@types/three/examples/jsm"
+TARGET="./src/three-examples"
+
+update_files() {
+  local source_dir=$1
+  find "$TARGET" -type f | while IFS= read -r target_file; do
+    relative_path="${target_file#$TARGET/}"
+    source_file="$source_dir/$relative_path"
+    if [[ -f "$source_file" ]]; then
+      cp "$source_file" "$target_file"
+    fi
+  done
+}
+
+update_files "$SOURCE_A"
+update_files "$SOURCE_B"

packages/three/package.json

@@ -7,9 +7,9 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "prettier-format": "prettier --config ../core/.prettierrc 'src/**/*.ts' --write",
-    "prepublish": "rm -rf ./dist/ && tsc && cp -R ./src/gltf-loader ./dist",
-    "sync-gltf-loader": "cp ./node_modules/three/examples/jsm/loaders/GLTFLoader.js ./src/gltf-loader && cp ./node_modules/@types/three/examples/jsm/loaders/GLTFLoader.d.ts ./src/gltf-loader && cp ./node_modules/three/examples/jsm/utils/BufferGeometryUtils.js ./src/gltf-loader && cp ./node_modules/@types/three/examples/jsm/utils/BufferGeometryUtils.d.ts ./src/gltf-loader",
-    "build": "tsc && cp -R ./src/gltf-loader ./dist"
+    "prepublish": "rm -rf ./dist/ && tsc && cp -R ./src/three-examples ./dist",
+    "sync-three-examples": "sh ./etc/sync_three_examples.sh && npm run prettier-format",
+    "build": "tsc && cp -R ./src/three-examples ./dist"
   },
   "repository": {
     "type": "git",

packages/three/src/components/three-composer-renderer.component.ts

@@ -3,9 +3,9 @@ import { WebGLRendererParameters } from 'three';
 import { ThreeSceneComponent } from './three-scene.component';
 import { ThreeCameraComponent } from './three-camera.component';
 import { ThreeVisualTypeDocRepo } from '../types';
-import { EffectComposer } from 'three/examples/jsm/postprocessing/EffectComposer';
+import { EffectComposer } from 'three-examples/postprocessing/EffectComposer';
 import { ThreeRendererComponent } from './three-renderer.component';
-import { RenderPass } from 'three/examples/jsm/postprocessing/RenderPass';
+import { RenderPass } from 'three-examples/postprocessing/RenderPass';
 
 export class ThreeComposerRendererComponent extends ThreeRendererComponent {
   public readonly nativeComposer: EffectComposer;

packages/three/src/index.ts

@@ -1,4 +1,3 @@
-export * from './gltf-loader/GLTFLoader';
 export * from './components/three-display-object.component';
 export * from './components/three-scene.component';
 export * from './components/three-renderer.component';
@@ -7,3 +6,12 @@ export * from './components/three-camera.component';
 export * from './three-factory';
 export * from './three-loader';
 export * from './types';
+
+export * from './three-examples/loaders/GLTFLoader';
+export * from './three-examples/postprocessing/EffectComposer';
+export * from './three-examples/postprocessing/MaskPass';
+export * from './three-examples/postprocessing/Pass';
+export * from './three-examples/postprocessing/RenderPass';
+export * from './three-examples/postprocessing/ShaderPass';
+export * from './three-examples/shaders/CopyShader';
+export * from './three-examples/utils/BufferGeometryUtils';

packages/three/src/gltf-loader/GLTFLoader.js → packages/three/src/three-examples/loaders/GLTFLoader.js

@@ -65,7 +65,7 @@ import {
 	SRGBColorSpace,
 	InstancedBufferAttribute
 } from 'three';
-import { toTrianglesDrawMode } from './BufferGeometryUtils';
+import { toTrianglesDrawMode } from '../utils/BufferGeometryUtils.js';
 
 class GLTFLoader extends Loader {
 
@@ -544,8 +544,8 @@ class GLTFLightsExtension {
 			const nodeDef = nodeDefs[ nodeIndex ];
 
 			if ( nodeDef.extensions
-				&& nodeDef.extensions[ this.name ]
-				&& nodeDef.extensions[ this.name ].light !== undefined ) {
+					&& nodeDef.extensions[ this.name ]
+					&& nodeDef.extensions[ this.name ].light !== undefined ) {
 
 				parser._addNodeRef( this.cache, nodeDef.extensions[ this.name ].light );
 
@@ -1723,9 +1723,9 @@ class GLTFMeshGpuInstancing {
 		for ( const primitive of meshDef.primitives ) {
 
 			if ( primitive.mode !== WEBGL_CONSTANTS.TRIANGLES &&
-				primitive.mode !== WEBGL_CONSTANTS.TRIANGLE_STRIP &&
-				primitive.mode !== WEBGL_CONSTANTS.TRIANGLE_FAN &&
-				primitive.mode !== undefined ) {
+				 primitive.mode !== WEBGL_CONSTANTS.TRIANGLE_STRIP &&
+				 primitive.mode !== WEBGL_CONSTANTS.TRIANGLE_FAN &&
+				 primitive.mode !== undefined ) {
 
 				return null;
 
@@ -1810,8 +1810,8 @@ class GLTFMeshGpuInstancing {
 						instancedMesh.instanceColor = new InstancedBufferAttribute( attr.array, attr.itemSize, attr.normalized );
 
 					} else if ( attributeName !== 'TRANSLATION' &&
-						attributeName !== 'ROTATION' &&
-						attributeName !== 'SCALE' ) {
+						 attributeName !== 'ROTATION' &&
+						 attributeName !== 'SCALE' ) {
 
 						mesh.geometry.setAttribute( attributeName, attributes[ attributeName ] );
 
@@ -2252,7 +2252,7 @@ const PATH_PROPERTIES = {
 
 const INTERPOLATION = {
 	CUBICSPLINE: undefined, // We use a custom interpolant (GLTFCubicSplineInterpolation) for CUBICSPLINE tracks. Each
-	// keyframe track will be initialized with a default interpolation type, then modified.
+		                        // keyframe track will be initialized with a default interpolation type, then modified.
 	LINEAR: InterpolateLinear,
 	STEP: InterpolateDiscrete
 };
@@ -2466,8 +2466,8 @@ function createPrimitiveKey( primitiveDef ) {
 	if ( dracoExtension ) {
 
 		geometryKey = 'draco:' + dracoExtension.bufferView
-			+ ':' + dracoExtension.indices
-			+ ':' + createAttributesKey( dracoExtension.attributes );
+				+ ':' + dracoExtension.indices
+				+ ':' + createAttributesKey( dracoExtension.attributes );
 
 	} else {
 
@@ -3790,9 +3790,9 @@ class GLTFParser {
 				const material = materials[ i ];
 
 				if ( primitive.mode === WEBGL_CONSTANTS.TRIANGLES ||
-					primitive.mode === WEBGL_CONSTANTS.TRIANGLE_STRIP ||
-					primitive.mode === WEBGL_CONSTANTS.TRIANGLE_FAN ||
-					primitive.mode === undefined ) {
+						primitive.mode === WEBGL_CONSTANTS.TRIANGLE_STRIP ||
+						primitive.mode === WEBGL_CONSTANTS.TRIANGLE_FAN ||
+						primitive.mode === undefined ) {
 
 					// .isSkinnedMesh isn't in glTF spec. See ._markDefs()
 					mesh = meshDef.isSkinnedMesh === true

packages/three/src/three-examples/postprocessing/EffectComposer.d.ts

@@ -0,0 +1,31 @@
+import { Clock, WebGLRenderer, WebGLRenderTarget } from 'three';
+
+import { FullScreenQuad, Pass } from './Pass.js';
+import { ShaderPass } from './ShaderPass.js';
+
+export { FullScreenQuad } from './Pass.js';
+export { Pass };
+
+export class EffectComposer {
+  constructor(renderer: WebGLRenderer, renderTarget?: WebGLRenderTarget);
+  renderer: WebGLRenderer;
+  renderTarget1: WebGLRenderTarget;
+  renderTarget2: WebGLRenderTarget;
+  writeBuffer: WebGLRenderTarget;
+  readBuffer: WebGLRenderTarget;
+  passes: Pass[];
+  copyPass: ShaderPass;
+  clock: Clock;
+  renderToScreen: boolean;
+
+  swapBuffers(): void;
+  addPass(pass: Pass): void;
+  insertPass(pass: Pass, index: number): void;
+  removePass(pass: Pass): void;
+  isLastEnabledPass(passIndex: number): boolean;
+  render(deltaTime?: number): void;
+  reset(renderTarget?: WebGLRenderTarget): void;
+  setSize(width: number, height: number): void;
+  setPixelRatio(pixelRatio: number): void;
+  dispose(): void;
+}