super-three 0.147.1 → 0.152.0

package/examples/jsm/physics/{OimoPhysics.js → RapierPhysics.js}

@@ -1,14 +1,17 @@
-import * as OIMO from '../libs/OimoPhysics/index.js';
+async function RapierPhysics() {
 
-async function OimoPhysics() {
+	const RAPIER = await import( 'https://cdn.skypack.dev/@dimforge/rapier3d-compat@0.11.2' );
+	
+	await RAPIER.init();
 
 	const frameRate = 60;
 
-	const world = new OIMO.World( 2, new OIMO.Vec3( 0, - 9.8, 0 ) );
+	// Docs: https://rapier.rs/docs/api/javascript/JavaScript3D/	
 
-	//
+	const gravity = { x: 0.0, y: - 9.81, z: 0.0 };
+	const world = new RAPIER.World( gravity );
 
-	function getShape( geometry ) {
+	function getCollider( geometry ) {
 
 		const parameters = geometry.parameters;
 
@@ -20,13 +23,13 @@ async function OimoPhysics() {
 			const sy = parameters.height !== undefined ? parameters.height / 2 : 0.5;
 			const sz = parameters.depth !== undefined ? parameters.depth / 2 : 0.5;
 
-			return new OIMO.OBoxGeometry( new OIMO.Vec3( sx, sy, sz ) );
+			return RAPIER.ColliderDesc.cuboid( sx, sy, sz );
 
 		} else if ( geometry.type === 'SphereGeometry' || geometry.type === 'IcosahedronGeometry' ) {
 
 			const radius = parameters.radius !== undefined ? parameters.radius : 1;
 
-			return new OIMO.OSphereGeometry( radius );
+			return RAPIER.ColliderDesc.ball( radius );
 
 		}
 
@@ -37,12 +40,15 @@ async function OimoPhysics() {
 	const meshes = [];
 	const meshMap = new WeakMap();
 
-	function addMesh( mesh, mass = 0 ) {
+	function addMesh( mesh, mass = 0, restitution = 0 ) {
 
-		const shape = getShape( mesh.geometry );
+		const shape = getCollider( mesh.geometry );
 
 		if ( shape !== null ) {
 
+			shape.setMass( mass );
+			shape.setRestitution( restitution );
+	
 			if ( mesh.isInstancedMesh ) {
 
 				handleInstancedMesh( mesh, mass, shape );
@@ -59,16 +65,15 @@ async function OimoPhysics() {
 
 	function handleMesh( mesh, mass, shape ) {
 
-		const shapeConfig = new OIMO.ShapeConfig();
-		shapeConfig.geometry = shape;
+		const position = mesh.position;
+		const quaternion = mesh.quaternion;
 
-		const bodyConfig = new OIMO.RigidBodyConfig();
-		bodyConfig.type = mass === 0 ? OIMO.RigidBodyType.STATIC : OIMO.RigidBodyType.DYNAMIC;
-		bodyConfig.position = new OIMO.Vec3( mesh.position.x, mesh.position.y, mesh.position.z );
+		const desc = mass > 0 ? RAPIER.RigidBodyDesc.dynamic() : RAPIER.RigidBodyDesc.fixed();
+		desc.setTranslation( position.x, position.y, position.z );
+		desc.setRotation( quaternion );
 
-		const body = new OIMO.RigidBody( bodyConfig );
-		body.addShape( new OIMO.Shape( shapeConfig ) );
-		world.addRigidBody( body );
+		const body = world.createRigidBody( desc );
+		world.createCollider( shape, body );
 
 		if ( mass > 0 ) {
 
@@ -89,16 +94,11 @@ async function OimoPhysics() {
 
 			const index = i * 16;
 
-			const shapeConfig = new OIMO.ShapeConfig();
-			shapeConfig.geometry = shape;
-
-			const bodyConfig = new OIMO.RigidBodyConfig();
-			bodyConfig.type = mass === 0 ? OIMO.RigidBodyType.STATIC : OIMO.RigidBodyType.DYNAMIC;
-			bodyConfig.position = new OIMO.Vec3( array[ index + 12 ], array[ index + 13 ], array[ index + 14 ] );
+			const desc = mass > 0 ? RAPIER.RigidBodyDesc.dynamic() : RAPIER.RigidBodyDesc.fixed();
+			desc.setTranslation( array[ index + 12 ], array[ index + 13 ], array[ index + 14 ] );
 
-			const body = new OIMO.RigidBody( bodyConfig );
-			body.addShape( new OIMO.Shape( shapeConfig ) );
-			world.addRigidBody( body );
+			const body = world.createRigidBody( desc );
+			world.createCollider( shape, body );
 
 			bodies.push( body );
 
@@ -113,7 +113,7 @@ async function OimoPhysics() {
 
 	}
 
-	//
+	const vector = { x: 0, y: 0, z: 0 };
 
 	function setMeshPosition( mesh, position, index = 0 ) {
 
@@ -122,13 +122,17 @@ async function OimoPhysics() {
 			const bodies = meshMap.get( mesh );
 			const body = bodies[ index ];
 
-			body.setPosition( new OIMO.Vec3( position.x, position.y, position.z ) );
+			body.setAngvel( vector );
+			body.setLinvel( vector );
+			body.setTranslation( position );
 
 		} else if ( mesh.isMesh ) {
 
 			const body = meshMap.get( mesh );
 
-			body.setPosition( new OIMO.Vec3( position.x, position.y, position.z ) );
+			body.setAngvel( vector );
+			body.setLinvel( vector );
+			body.setTranslation( position );
 
 		}
 
@@ -144,46 +148,51 @@ async function OimoPhysics() {
 
 		if ( lastTime > 0 ) {
 
-			// console.time( 'world.step' );
-			world.step( 1 / frameRate );
-			// console.timeEnd( 'world.step' );
+			const delta = ( time - lastTime ) / 1000;
 
-		}
+			world.timestep = delta;
+			world.step();
 
-		lastTime = time;
+			//
 
-		//
+			for ( let i = 0, l = meshes.length; i < l; i ++ ) {
 
-		for ( let i = 0, l = meshes.length; i < l; i ++ ) {
+				const mesh = meshes[ i ];
 
-			const mesh = meshes[ i ];
+				if ( mesh.isInstancedMesh ) {
 
-			if ( mesh.isInstancedMesh ) {
+					const array = mesh.instanceMatrix.array;
+					const bodies = meshMap.get( mesh );
 
-				const array = mesh.instanceMatrix.array;
-				const bodies = meshMap.get( mesh );
+					for ( let j = 0; j < bodies.length; j ++ ) {
 
-				for ( let j = 0; j < bodies.length; j ++ ) {
+						const body = bodies[ j ];
 
-					const body = bodies[ j ];
+						const position = body.translation();
+						const quaternion = body.rotation();
 
-					compose( body.getPosition(), body.getOrientation(), array, j * 16 );
+						compose( position, quaternion, array, j * 16 );
 
-				}
+					}
 
-				mesh.instanceMatrix.needsUpdate = true;
+					mesh.instanceMatrix.needsUpdate = true;
+					mesh.computeBoundingSphere();
 
-			} else if ( mesh.isMesh ) {
+				} else if ( mesh.isMesh ) {
+
+					const body = meshMap.get( mesh );
 
-				const body = meshMap.get( mesh );
+					mesh.position.copy( body.translation() );
+					mesh.quaternion.copy( body.rotation() );
 
-				mesh.position.copy( body.getPosition() );
-				mesh.quaternion.copy( body.getOrientation() );
+				}
 
 			}
 
 		}
 
+		lastTime = time;
+
 	}
 
 	// animate
@@ -193,7 +202,6 @@ async function OimoPhysics() {
 	return {
 		addMesh: addMesh,
 		setMeshPosition: setMeshPosition
-		// addCompoundMesh
 	};
 
 }
@@ -228,4 +236,4 @@ function compose( position, quaternion, array, index ) {
 
 }
 
-export { OimoPhysics };
+export { RapierPhysics };

package/examples/jsm/postprocessing/AdaptiveToneMappingPass.js

@@ -33,8 +33,6 @@ class AdaptiveToneMappingPass extends Pass {
 		this.previousLuminanceRT = null;
 		this.currentLuminanceRT = null;
 
-		if ( CopyShader === undefined ) console.error( 'THREE.AdaptiveToneMappingPass relies on CopyShader' );
-
 		const copyShader = CopyShader;
 
 		this.copyUniforms = UniformsUtils.clone( copyShader.uniforms );
@@ -49,9 +47,6 @@ class AdaptiveToneMappingPass extends Pass {
 
 		} );
 
-		if ( LuminosityShader === undefined )
-			console.error( 'THREE.AdaptiveToneMappingPass relies on LuminosityShader' );
-
 		this.materialLuminance = new ShaderMaterial( {
 
 			uniforms: UniformsUtils.clone( LuminosityShader.uniforms ),
@@ -119,9 +114,6 @@ class AdaptiveToneMappingPass extends Pass {
 			blending: NoBlending
 		} );
 
-		if ( ToneMapShader === undefined )
-			console.error( 'THREE.AdaptiveToneMappingPass relies on ToneMapShader' );
-
 		this.materialToneMap = new ShaderMaterial( {
 
 			uniforms: UniformsUtils.clone( ToneMapShader.uniforms ),

package/examples/jsm/postprocessing/AfterimagePass.js

@@ -14,8 +14,6 @@ class AfterimagePass extends Pass {
 
 		super();
 
-		if ( AfterimageShader === undefined ) console.error( 'THREE.AfterimagePass relies on AfterimageShader' );
-
 		this.shader = AfterimageShader;
 
 		this.uniforms = UniformsUtils.clone( this.shader.uniforms );

package/examples/jsm/postprocessing/BloomPass.js

@@ -39,8 +39,6 @@ class BloomPass extends Pass {
 
 		// convolution material
 
-		if ( ConvolutionShader === undefined ) console.error( 'THREE.BloomPass relies on ConvolutionShader' );
-
 		const convolutionShader = ConvolutionShader;
 
 		this.convolutionUniforms = UniformsUtils.clone( convolutionShader.uniforms );

package/examples/jsm/postprocessing/BokehPass.js

@@ -46,12 +46,6 @@ class BokehPass extends Pass {
 
 		// bokeh material
 
-		if ( BokehShader === undefined ) {
-
-			console.error( 'THREE.BokehPass relies on BokehShader' );
-
-		}
-
 		const bokehShader = BokehShader;
 		const bokehUniforms = UniformsUtils.clone( bokehShader.uniforms );
 

package/examples/jsm/postprocessing/DotScreenPass.js

@@ -11,8 +11,6 @@ class DotScreenPass extends Pass {
 
 		super();
 
-		if ( DotScreenShader === undefined ) console.error( 'THREE.DotScreenPass relies on DotScreenShader' );
-
 		const shader = DotScreenShader;
 
 		this.uniforms = UniformsUtils.clone( shader.uniforms );

package/examples/jsm/postprocessing/EffectComposer.js

@@ -1,9 +1,5 @@
 import {
-	BufferGeometry,
 	Clock,
-	Float32BufferAttribute,
-	Mesh,
-	OrthographicCamera,
 	Vector2,
 	WebGLRenderTarget
 } from 'three';
@@ -18,10 +14,11 @@ class EffectComposer {
 
 		this.renderer = renderer;
 
+		this._pixelRatio = renderer.getPixelRatio();
+
 		if ( renderTarget === undefined ) {
 
 			const size = renderer.getSize( new Vector2() );
-			this._pixelRatio = renderer.getPixelRatio();
 			this._width = size.width;
 			this._height = size.height;
 
@@ -30,7 +27,6 @@ class EffectComposer {
 
 		} else {
 
-			this._pixelRatio = 1;
 			this._width = renderTarget.width;
 			this._height = renderTarget.height;
 
@@ -47,20 +43,6 @@ class EffectComposer {
 
 		this.passes = [];
 
-		// dependencies
-
-		if ( CopyShader === undefined ) {
-
-			console.error( 'THREE.EffectComposer relies on CopyShader' );
-
-		}
-
-		if ( ShaderPass === undefined ) {
-
-			console.error( 'THREE.EffectComposer relies on ShaderPass' );
-
-		}
-
 		this.copyPass = new ShaderPass( CopyShader );
 
 		this.clock = new Clock();
@@ -243,77 +225,4 @@ class EffectComposer {
 
 }
 
-
-class Pass {
-
-	constructor() {
-
-		// if set to true, the pass is processed by the composer
-		this.enabled = true;
-
-		// if set to true, the pass indicates to swap read and write buffer after rendering
-		this.needsSwap = true;
-
-		// if set to true, the pass clears its buffer before rendering
-		this.clear = false;
-
-		// if set to true, the result of the pass is rendered to screen. This is set automatically by EffectComposer.
-		this.renderToScreen = false;
-
-	}
-
-	setSize( /* width, height */ ) {}
-
-	render( /* renderer, writeBuffer, readBuffer, deltaTime, maskActive */ ) {
-
-		console.error( 'THREE.Pass: .render() must be implemented in derived pass.' );
-
-	}
-
-}
-
-// Helper for passes that need to fill the viewport with a single quad.
-
-const _camera = new OrthographicCamera( - 1, 1, 1, - 1, 0, 1 );
-
-// https://github.com/mrdoob/three.js/pull/21358
-
-const _geometry = new BufferGeometry();
-_geometry.setAttribute( 'position', new Float32BufferAttribute( [ - 1, 3, 0, - 1, - 1, 0, 3, - 1, 0 ], 3 ) );
-_geometry.setAttribute( 'uv', new Float32BufferAttribute( [ 0, 2, 0, 0, 2, 0 ], 2 ) );
-
-class FullScreenQuad {
-
-	constructor( material ) {
-
-		this._mesh = new Mesh( _geometry, material );
-
-	}
-
-	dispose() {
-
-		this._mesh.geometry.dispose();
-
-	}
-
-	render( renderer ) {
-
-		renderer.render( this._mesh, _camera );
-
-	}
-
-	get material() {
-
-		return this._mesh.material;
-
-	}
-
-	set material( value ) {
-
-		this._mesh.material = value;
-
-	}
-
-}
-
-export { EffectComposer, Pass, FullScreenQuad };
+export { EffectComposer };

package/examples/jsm/postprocessing/FilmPass.js

@@ -11,8 +11,6 @@ class FilmPass extends Pass {
 
 		super();
 
-		if ( FilmShader === undefined ) console.error( 'THREE.FilmPass relies on FilmShader' );
-
 		const shader = FilmShader;
 
 		this.uniforms = UniformsUtils.clone( shader.uniforms );

package/examples/jsm/postprocessing/GlitchPass.js

@@ -16,8 +16,6 @@ class GlitchPass extends Pass {
 
 		super();
 
-		if ( DigitalGlitch === undefined ) console.error( 'THREE.GlitchPass relies on DigitalGlitch' );
-
 		const shader = DigitalGlitch;
 
 		this.uniforms = UniformsUtils.clone( shader.uniforms );

package/examples/jsm/postprocessing/HalftonePass.js

@@ -15,12 +15,6 @@ class HalftonePass extends Pass {
 
 		super();
 
-	 	if ( HalftoneShader === undefined ) {
-
-	 		console.error( 'THREE.HalftonePass requires HalftoneShader' );
-
-	 	}
-
 	 	this.uniforms = UniformsUtils.clone( HalftoneShader.uniforms );
 	 	this.material = new ShaderMaterial( {
 	 		uniforms: this.uniforms,

package/examples/jsm/postprocessing/OutlinePass.js

@@ -91,7 +91,6 @@ class OutlinePass extends Pass {
 		this.overlayMaterial = this.getOverlayMaterial();
 
 		// copy material
-		if ( CopyShader === undefined ) console.error( 'THREE.OutlinePass relies on CopyShader' );
 
 		const copyShader = CopyShader;
 

package/examples/jsm/postprocessing/Pass.js

@@ -9,6 +9,8 @@ class Pass {
 
 	constructor() {
 
+		this.isPass = true;
+
 		// if set to true, the pass is processed by the composer
 		this.enabled = true;
 

package/examples/jsm/postprocessing/SAOPass.js

@@ -91,12 +91,6 @@ class SAOPass extends Pass {
 		this.normalMaterial = new MeshNormalMaterial();
 		this.normalMaterial.blending = NoBlending;
 
-		if ( SAOShader === undefined ) {
-
-			console.error( 'THREE.SAOPass relies on SAOShader' );
-
-		}
-
 		this.saoMaterial = new ShaderMaterial( {
 			defines: Object.assign( {}, SAOShader.defines ),
 			fragmentShader: SAOShader.fragmentShader,
@@ -114,12 +108,6 @@ class SAOPass extends Pass {
 		this.saoMaterial.uniforms[ 'cameraProjectionMatrix' ].value = this.camera.projectionMatrix;
 		this.saoMaterial.blending = NoBlending;
 
-		if ( DepthLimitedBlurShader === undefined ) {
-
-			console.error( 'THREE.SAOPass relies on DepthLimitedBlurShader' );
-
-		}
-
 		this.vBlurMaterial = new ShaderMaterial( {
 			uniforms: UniformsUtils.clone( DepthLimitedBlurShader.uniforms ),
 			defines: Object.assign( {}, DepthLimitedBlurShader.defines ),
@@ -146,12 +134,6 @@ class SAOPass extends Pass {
 		this.hBlurMaterial.uniforms[ 'size' ].value.set( this.resolution.x, this.resolution.y );
 		this.hBlurMaterial.blending = NoBlending;
 
-		if ( CopyShader === undefined ) {
-
-			console.error( 'THREE.SAOPass relies on CopyShader' );
-
-		}
-
 		this.materialCopy = new ShaderMaterial( {
 			uniforms: UniformsUtils.clone( CopyShader.uniforms ),
 			vertexShader: CopyShader.vertexShader,
@@ -169,12 +151,6 @@ class SAOPass extends Pass {
 		this.materialCopy.blendDstAlpha = ZeroFactor;
 		this.materialCopy.blendEquationAlpha = AddEquation;
 
-		if ( UnpackDepthRGBAShader === undefined ) {
-
-			console.error( 'THREE.SAOPass relies on UnpackDepthRGBAShader' );
-
-		}
-
 		this.depthCopy = new ShaderMaterial( {
 			uniforms: UniformsUtils.clone( UnpackDepthRGBAShader.uniforms ),
 			vertexShader: UnpackDepthRGBAShader.vertexShader,

package/examples/jsm/postprocessing/SMAAPass.js

@@ -67,12 +67,6 @@ class SMAAPass extends Pass {
 
 		// materials - pass 1
 
-		if ( SMAAEdgesShader === undefined ) {
-
-			console.error( 'THREE.SMAAPass relies on SMAAShader' );
-
-		}
-
 		this.uniformsEdges = UniformsUtils.clone( SMAAEdgesShader.uniforms );
 
 		this.uniformsEdges[ 'resolution' ].value.set( 1 / width, 1 / height );

package/examples/jsm/postprocessing/SSAARenderPass.js

@@ -1,5 +1,8 @@
 import {
-	AdditiveBlending,
+	CustomBlending,
+	OneFactor,
+	AddEquation,
+	SrcAlphaFactor,
 	Color,
 	ShaderMaterial,
 	UniformsUtils,
@@ -35,8 +38,6 @@ class SSAARenderPass extends Pass {
 		this.clearAlpha = ( clearAlpha !== undefined ) ? clearAlpha : 0;
 		this._oldClearColor = new Color();
 
-		if ( CopyShader === undefined ) console.error( 'THREE.SSAARenderPass relies on CopyShader' );
-
 		const copyShader = CopyShader;
 		this.copyUniforms = UniformsUtils.clone( copyShader.uniforms );
 
@@ -45,9 +46,16 @@ class SSAARenderPass extends Pass {
 			vertexShader: copyShader.vertexShader,
 			fragmentShader: copyShader.fragmentShader,
 			transparent: true,
-			blending: AdditiveBlending,
 			depthTest: false,
-			depthWrite: false
+			depthWrite: false,
+
+			// do not use AdditiveBlending because it mixes the alpha channel instead of adding
+			blending: CustomBlending,
+			blendEquation: AddEquation,
+			blendDst: OneFactor,
+			blendDstAlpha: OneFactor,
+			blendSrc: SrcAlphaFactor,
+			blendSrcAlpha: OneFactor
 		} );
 
 		this.fsQuad = new FullScreenQuad( this.copyMaterial );

package/examples/jsm/postprocessing/SSAOPass.js

@@ -83,12 +83,6 @@ class SSAOPass extends Pass {
 
 		// ssao material
 
-		if ( SSAOShader === undefined ) {
-
-			console.error( 'THREE.SSAOPass: The pass relies on SSAOShader.' );
-
-		}
-
 		this.ssaoMaterial = new ShaderMaterial( {
 			defines: Object.assign( {}, SSAOShader.defines ),
 			uniforms: UniformsUtils.clone( SSAOShader.uniforms ),
@@ -377,12 +371,6 @@ class SSAOPass extends Pass {
 
 		const width = 4, height = 4;
 
-		if ( SimplexNoise === undefined ) {
-
-			console.error( 'THREE.SSAOPass: The pass relies on SimplexNoise.' );
-
-		}
-
 		const simplex = new SimplexNoise();
 
 		const size = width * height;

package/examples/jsm/postprocessing/SSRPass.js

@@ -202,12 +202,6 @@ class SSRPass extends Pass {
 
 		// ssr material
 
-		if ( SSRShader === undefined ) {
-
-			console.error( 'THREE.SSRPass: The pass relies on SSRShader.' );
-
-		}
-
 		this.ssrMaterial = new ShaderMaterial( {
 			defines: Object.assign( {}, SSRShader.defines, {
 				MAX_STEP: Math.sqrt( this.width * this.width + this.height * this.height )

package/examples/jsm/postprocessing/SavePass.js

@@ -12,8 +12,6 @@ class SavePass extends Pass {
 
 		super();
 
-		if ( CopyShader === undefined ) console.error( 'THREE.SavePass relies on CopyShader' );
-
 		const shader = CopyShader;
 
 		this.textureID = 'tDiffuse';

package/examples/jsm/postprocessing/TexturePass.js

@@ -11,8 +11,6 @@ class TexturePass extends Pass {
 
 		super();
 
-		if ( CopyShader === undefined ) console.error( 'THREE.TexturePass relies on CopyShader' );
-
 		const shader = CopyShader;
 
 		this.map = map;

package/examples/jsm/postprocessing/UnrealBloomPass.js

@@ -70,9 +70,6 @@ class UnrealBloomPass extends Pass {
 
 		// luminosity high pass material
 
-		if ( LuminosityHighPassShader === undefined )
-			console.error( 'THREE.UnrealBloomPass relies on LuminosityHighPassShader' );
-
 		const highPassShader = LuminosityHighPassShader;
 		this.highPassUniforms = UniformsUtils.clone( highPassShader.uniforms );
 
@@ -121,11 +118,6 @@ class UnrealBloomPass extends Pass {
 		this.compositeMaterial.uniforms[ 'bloomTintColors' ].value = this.bloomTintColors;
 
 		// copy material
-		if ( CopyShader === undefined ) {
-
-			console.error( 'THREE.UnrealBloomPass relies on CopyShader' );
-
-		}
 
 		const copyShader = CopyShader;