Examples: Merge geometry demos. (#31253)

examples/files.json

@@ -22,7 +22,6 @@
 		"webgl_effects_stereo",
 		"webgl_framebuffer_texture",
 		"webgl_geometries",
-		"webgl_geometries_parametric",
 		"webgl_geometry_colors",
 		"webgl_geometry_colors_lookuptable",
 		"webgl_geometry_convex",

examples/tags.json

@@ -21,7 +21,6 @@
 	"webgl_depth_texture": [ "renderTarget" ],
 	"webgl_framebuffer_texture": [ "renderTarget" ],
 	"webgl_geometries": [ "geometry" ],
-	"webgl_geometries_parametric": [ "geometry" ],
 	"webgl_geometry_colors_lookuptable": [ "vertex" ],
 	"webgl_geometry_csg": [ "external", "csg", "bvh", "constructive", "solid", "geometry", "games", "level" ],
 	"webgl_geometry_nurbs": [ "curve", "surface" ],

examples/webgl_geometries.html

@@ -25,6 +25,9 @@
 
 			import Stats from 'three/addons/libs/stats.module.js';
 
+			import { ParametricGeometry } from 'three/addons/geometries/ParametricGeometry.js';
+			import { plane, klein, mobius } from 'three/addons/geometries/ParametricFunctions.js';
+
 			let camera, scene, renderer, stats;
 
 			init();
@@ -32,11 +35,11 @@
 			function init() {
 
 				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 );
-				camera.position.y = 400;
+				camera.position.y = 500;
 
 				scene = new THREE.Scene();
 
-				let object;
+				let object, geometry;
 
 				const ambientLight = new THREE.AmbientLight( 0xcccccc, 1.5 );
 				scene.add( ambientLight );
@@ -55,43 +58,43 @@
 				//
 
 				object = new THREE.Mesh( new THREE.SphereGeometry( 75, 20, 10 ), material );
-				object.position.set( - 300, 0, 200 );
+				object.position.set( - 300, 0, 300 );
 				scene.add( object );
 
-				object = new THREE.Mesh( new THREE.IcosahedronGeometry( 75, 1 ), material );
-				object.position.set( - 100, 0, 200 );
+				object = new THREE.Mesh( new THREE.IcosahedronGeometry( 75 ), material );
+				object.position.set( - 100, 0, 300 );
 				scene.add( object );
 
-				object = new THREE.Mesh( new THREE.OctahedronGeometry( 75, 2 ), material );
-				object.position.set( 100, 0, 200 );
+				object = new THREE.Mesh( new THREE.OctahedronGeometry( 75 ), material );
+				object.position.set( 100, 0, 300 );
 				scene.add( object );
 
-				object = new THREE.Mesh( new THREE.TetrahedronGeometry( 75, 0 ), material );
-				object.position.set( 300, 0, 200 );
+				object = new THREE.Mesh( new THREE.TetrahedronGeometry( 75 ), material );
+				object.position.set( 300, 0, 300 );
 				scene.add( object );
 
 				//
 
 				object = new THREE.Mesh( new THREE.PlaneGeometry( 100, 100, 4, 4 ), material );
-				object.position.set( - 300, 0, 0 );
+				object.position.set( - 300, 0, 100 );
 				scene.add( object );
 
 				object = new THREE.Mesh( new THREE.BoxGeometry( 100, 100, 100, 4, 4, 4 ), material );
-				object.position.set( - 100, 0, 0 );
+				object.position.set( - 100, 0, 100 );
 				scene.add( object );
 
 				object = new THREE.Mesh( new THREE.CircleGeometry( 50, 20, 0, Math.PI * 2 ), material );
-				object.position.set( 100, 0, 0 );
+				object.position.set( 100, 0, 100 );
 				scene.add( object );
 
 				object = new THREE.Mesh( new THREE.RingGeometry( 10, 50, 20, 5, 0, Math.PI * 2 ), material );
-				object.position.set( 300, 0, 0 );
+				object.position.set( 300, 0, 100 );
 				scene.add( object );
 
 				//
 
 				object = new THREE.Mesh( new THREE.CylinderGeometry( 25, 75, 100, 40, 5 ), material );
-				object.position.set( - 300, 0, - 200 );
+				object.position.set( - 300, 0, - 100 );
 				scene.add( object );
 
 				const points = [];
@@ -103,15 +106,40 @@
 				}
 
 				object = new THREE.Mesh( new THREE.LatheGeometry( points, 20 ), material );
-				object.position.set( - 100, 0, - 200 );
+				object.position.set( - 100, 0, - 100 );
 				scene.add( object );
 
 				object = new THREE.Mesh( new THREE.TorusGeometry( 50, 20, 20, 20 ), material );
-				object.position.set( 100, 0, - 200 );
+				object.position.set( 100, 0, - 100 );
 				scene.add( object );
 
 				object = new THREE.Mesh( new THREE.TorusKnotGeometry( 50, 10, 50, 20 ), material );
-				object.position.set( 300, 0, - 200 );
+				object.position.set( 300, 0, - 100 );
+				scene.add( object );
+
+				//
+
+				object = new THREE.Mesh( new THREE.CapsuleGeometry( 20, 50 ), material );
+				object.position.set( - 300, 0, - 300 );
+				scene.add( object );
+
+				geometry = new ParametricGeometry( plane, 10, 10 );
+				geometry.scale( 100, 100, 100 );
+				geometry.center();
+				object = new THREE.Mesh( geometry, material );
+				object.position.set( - 100, 0, - 300 );
+				scene.add( object );
+
+				geometry = new ParametricGeometry( klein, 20, 20 );
+				object = new THREE.Mesh( geometry, material );
+				object.position.set( 100, 0, - 300 );
+				object.scale.multiplyScalar( 5 );
+				scene.add( object );
+
+				geometry = new ParametricGeometry( mobius, 20, 20 );
+				object = new THREE.Mesh( geometry, material );
+				object.position.set( 300, 0, - 300 );
+				object.scale.multiplyScalar( 30 );
 				scene.add( object );
 
 				//

examples/webgl_geometries_parametric.html

@@ -1,144 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<title>three.js webgl - parametric geometries</title>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
-		<link type="text/css" rel="stylesheet" href="main.css">
-	</head>
-	<body>
-
-		<div id="container"></div>
-		<div id="info"><a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> webgl - parametric geometries</div>
-
-		<script type="importmap">
-			{
-				"imports": {
-					"three": "../build/three.module.js",
-					"three/addons/": "./jsm/"
-				}
-			}
-		</script>
-
-		<script type="module">
-
-			import * as THREE from 'three';
-
-			import Stats from 'three/addons/libs/stats.module.js';
-
-			import { ParametricGeometry } from 'three/addons/geometries/ParametricGeometry.js';
-			import { plane, klein, mobius } from 'three/addons/geometries/ParametricFunctions.js';
-
-			let camera, scene, renderer, stats;
-
-			init();
-
-			function init() {
-
-				const container = document.getElementById( 'container' );
-
-				camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 );
-				camera.position.y = 400;
-
-				scene = new THREE.Scene();
-
-				//
-
-				const ambientLight = new THREE.AmbientLight( 0xcccccc, 1.5 );
-				scene.add( ambientLight );
-
-				const pointLight = new THREE.PointLight( 0xffffff, 2.5, 0, 0 );
-				camera.add( pointLight );
-				scene.add( camera );
-
-				//
-
-				const map = new THREE.TextureLoader().load( 'textures/uv_grid_opengl.jpg' );
-				map.wrapS = map.wrapT = THREE.RepeatWrapping;
-				map.anisotropy = 16;
-				map.colorSpace = THREE.SRGBColorSpace;
-
-				const material = new THREE.MeshPhongMaterial( { map: map, side: THREE.DoubleSide } );
-
-				//
-
-				let geometry, object;
-
-				geometry = new ParametricGeometry( plane, 10, 10 );
-				geometry.scale( 100, 100, 100 );
-				geometry.center();
-				object = new THREE.Mesh( geometry, material );
-				object.position.set( - 200, 0, 0 );
-				scene.add( object );
-
-				geometry = new ParametricGeometry( klein, 20, 20 );
-				object = new THREE.Mesh( geometry, material );
-				object.position.set( 0, 0, 0 );
-				object.scale.multiplyScalar( 5 );
-				scene.add( object );
-
-				geometry = new ParametricGeometry( mobius, 20, 20 );
-				object = new THREE.Mesh( geometry, material );
-				object.position.set( 200, 0, 0 );
-				object.scale.multiplyScalar( 30 );
-				scene.add( object );
-
-				//
-
-				renderer = new THREE.WebGLRenderer( { antialias: true } );
-				renderer.setPixelRatio( window.devicePixelRatio );
-				renderer.setSize( window.innerWidth, window.innerHeight );
-				renderer.setAnimationLoop( animate );
-				container.appendChild( renderer.domElement );
-
-				stats = new Stats();
-				container.appendChild( stats.dom );
-
-				window.addEventListener( 'resize', onWindowResize );
-
-			}
-
-			function onWindowResize() {
-
-				camera.aspect = window.innerWidth / window.innerHeight;
-				camera.updateProjectionMatrix();
-
-				renderer.setSize( window.innerWidth, window.innerHeight );
-
-			}
-
-			function animate() {
-
-				render();
-				stats.update();
-
-			}
-
-			function render() {
-
-				const timer = Date.now() * 0.0001;
-
-				camera.position.x = Math.cos( timer ) * 800;
-				camera.position.z = Math.sin( timer ) * 800;
-
-				camera.lookAt( scene.position );
-
-				scene.traverse( function ( object ) {
-
-					if ( object.isMesh === true ) {
-
-						object.rotation.x = timer * 5;
-						object.rotation.y = timer * 2.5;
-
-					}
-
-				} );
-
-				renderer.render( scene, camera );
-
-			}
-
-		</script>
-
-	</body>
-</html>