Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update examples #716

Merged
merged 4 commits into from
Dec 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 49 additions & 8 deletions examples-testing/changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1876,6 +1876,47 @@ index a77b973..d24a458 100644

renderer.render(scene, camera);
}
diff --git a/examples-testing/examples/webgl2_clipculldistance.ts b/examples-testing/examples/webgl2_clipculldistance.ts
index bfa572c..fa75879 100644
--- a/examples-testing/examples/webgl2_clipculldistance.ts
+++ b/examples-testing/examples/webgl2_clipculldistance.ts
@@ -2,9 +2,14 @@ import * as THREE from 'three';
import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
import Stats from 'three/addons/libs/stats.module.js';

-let camera, controls, clock, scene, renderer, stats;
+let camera: THREE.PerspectiveCamera,
+ controls: OrbitControls,
+ clock: THREE.Clock,
+ scene: THREE.Scene,
+ renderer: THREE.WebGLRenderer,
+ stats: Stats;

-let material;
+let material: THREE.ShaderMaterial;

init();
animate();
@@ -25,7 +30,7 @@ function init() {
document.body.appendChild(renderer.domElement);

if (renderer.extensions.has('WEBGL_clip_cull_distance') === false) {
- document.getElementById('notSupported').style.display = '';
+ document.getElementById('notSupported')!.style.display = '';
return;
}

@@ -69,8 +74,8 @@ function init() {
uniforms: {
time: { value: 1.0 },
},
- vertexShader: document.getElementById('vertexShader').textContent,
- fragmentShader: document.getElementById('fragmentShader').textContent,
+ vertexShader: document.getElementById('vertexShader')!.textContent!,
+ fragmentShader: document.getElementById('fragmentShader')!.textContent!,
side: THREE.DoubleSide,
transparent: true,
vertexColors: true,
diff --git a/examples-testing/examples/webgl2_materials_texture3d.ts b/examples-testing/examples/webgl2_materials_texture3d.ts
index b746daf..581c97a 100644
--- a/examples-testing/examples/webgl2_materials_texture3d.ts
Expand Down Expand Up @@ -9596,22 +9637,22 @@ index e8253d2..5c1b3e1 100644
const radius = 600;
let theta = 0;
diff --git a/examples-testing/examples/webgl_morphtargets_sphere.ts b/examples-testing/examples/webgl_morphtargets_sphere.ts
index dd73f97..aa2cfc5 100644
index 305889a..2885ad1 100644
--- a/examples-testing/examples/webgl_morphtargets_sphere.ts
+++ b/examples-testing/examples/webgl_morphtargets_sphere.ts
@@ -3,9 +3,9 @@ import * as THREE from 'three';
import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
@@ -4,9 +4,9 @@ import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
import { GLTFLoader } from 'three/addons/loaders/GLTFLoader.js';
import { Timer } from 'three/addons/misc/Timer.js';

-let camera, scene, renderer, clock;
+let camera: THREE.PerspectiveCamera, scene: THREE.Scene, renderer: THREE.WebGLRenderer, clock: THREE.Clock;
-let camera, scene, renderer, timer;
+let camera: THREE.PerspectiveCamera, scene: THREE.Scene, renderer: THREE.WebGLRenderer, timer: Timer;

-let mesh;
+let mesh: THREE.Mesh;

let sign = 1;
const speed = 0.5;
@@ -14,7 +14,7 @@ init();
@@ -15,7 +15,7 @@ init();
animate();

function init() {
Expand All @@ -9620,7 +9661,7 @@ index dd73f97..aa2cfc5 100644

camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 0.2, 100);
camera.position.set(0, 5, 5);
@@ -35,7 +35,7 @@ function init() {
@@ -36,7 +36,7 @@ function init() {

const loader = new GLTFLoader();
loader.load('models/gltf/AnimatedMorphSphere/glTF/AnimatedMorphSphere.gltf', function (gltf) {
Expand All @@ -9629,7 +9670,7 @@ index dd73f97..aa2cfc5 100644
mesh.rotation.z = Math.PI / 2;
scene.add(mesh);

@@ -103,9 +103,9 @@ function render() {
@@ -95,9 +95,9 @@ function render() {

mesh.rotation.y += step;

Expand Down
2 changes: 2 additions & 0 deletions examples-testing/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ const files = {
webgl2: [
'webgl2_buffergeometry_attributes_integer',
'webgl2_buffergeometry_attributes_none',
'webgl2_clipculldistance',
// 'webgl2_materials_texture2darray',
'webgl2_materials_texture3d',
'webgl2_materials_texture3d_partialupdate',
Expand Down Expand Up @@ -354,6 +355,7 @@ const files = {
'webgpu_morphtargets_face',
// 'webgpu_occlusion',
// 'webgpu_particles',
// 'webgpu_portal',
// 'webgpu_rtt',
// 'webgpu_sandbox',
// 'webgpu_shadertoy',
Expand Down
2 changes: 1 addition & 1 deletion three.js
Submodule three.js updated 62 files
+1 −1 .github/workflows/ci.yml
+3 −3 .github/workflows/codeql-code-scanning.yml
+1 −1 .github/workflows/read-size.yml
+113 −91 build/three.cjs
+113 −91 build/three.js
+1 −1 build/three.min.js
+113 −91 build/three.module.js
+1 −1 build/three.module.min.js
+2 −2 docs/api/ar/materials/ShaderMaterial.html
+3 −0 docs/api/ar/math/Sphere.html
+2 −2 docs/api/en/materials/ShaderMaterial.html
+3 −0 docs/api/en/math/Sphere.html
+2 −1 docs/api/fr/materials/ShaderMaterial.html
+2 −1 docs/api/it/materials/ShaderMaterial.html
+5 −0 docs/api/it/math/Sphere.html
+2 −1 docs/api/zh/materials/ShaderMaterial.html
+5 −0 docs/api/zh/math/Sphere.html
+124 −0 docs/examples/en/misc/Timer.html
+4 −0 docs/list.json
+2 −0 examples/files.json
+12 −7 examples/jsm/controls/OrbitControls.js
+23 −8 examples/jsm/exporters/USDZExporter.js
+144 −0 examples/jsm/misc/Timer.js
+2 −0 examples/jsm/nodes/Nodes.js
+7 −2 examples/jsm/nodes/accessors/CubeTextureNode.js
+22 −15 examples/jsm/nodes/accessors/TextureNode.js
+6 −0 examples/jsm/nodes/core/AttributeNode.js
+4 −1 examples/jsm/nodes/core/CacheNode.js
+3 −3 examples/jsm/nodes/core/NodeBuilder.js
+2 −2 examples/jsm/nodes/display/ColorAdjustmentNode.js
+165 −0 examples/jsm/nodes/display/GaussianBlurNode.js
+182 −0 examples/jsm/nodes/display/PassNode.js
+2 −2 examples/jsm/nodes/utils/RemapNode.js
+60 −0 examples/jsm/objects/QuadMesh.js
+8 −10 examples/jsm/renderers/common/Background.js
+25 −0 examples/jsm/renderers/common/PostProcessing.js
+6 −0 examples/jsm/renderers/common/RenderObject.js
+9 −8 examples/jsm/renderers/webgl/WebGLBackend.js
+1 −1 examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js
+1 −1 examples/jsm/renderers/webgpu/nodes/WGSLNodeBuilder.js
+ examples/screenshots/webgl2_clipculldistance.jpg
+ examples/screenshots/webgpu_depth_texture.jpg
+ examples/screenshots/webgpu_instance_uniform.jpg
+ examples/screenshots/webgpu_portal.jpg
+ examples/screenshots/webgpu_skinning_instancing.jpg
+189 −0 examples/webgl2_clipculldistance.html
+5 −19 examples/webgl_morphtargets_sphere.html
+7 −4 examples/webgpu_compute_particles_rain.html
+5 −11 examples/webgpu_depth_texture.html
+0 −1 examples/webgpu_instance_uniform.html
+5 −10 examples/webgpu_multiple_rendertargets.html
+196 −0 examples/webgpu_portal.html
+5 −9 examples/webgpu_rtt.html
+41 −8 examples/webgpu_skinning_instancing.html
+80 −80 package-lock.json
+2 −1 src/materials/ShaderMaterial.js
+2 −0 src/math/Sphere.js
+1 −0 src/renderers/webgl/WebGLExtensions.js
+14 −0 src/renderers/webgl/WebGLProgram.js
+1 −0 src/renderers/webgl/WebGLPrograms.js
+2 −1 test/e2e/puppeteer.js
+10 −0 test/unit/src/math/Sphere.tests.js