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.

Sign up for GitHub

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

WebGLUniformsGroups: Support for array of Uniform Buffer Object #701

Merged
merged 5 commits into from
Dec 5, 2023
Merged

WebGLUniformsGroups: Support for array of Uniform Buffer Object #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
76894e2
WebGLUniformsGroups: Support for array of Uniform Buffer Object
Methuselah96 Dec 5, 2023
35d5b5f
Update three.js
Methuselah96 Dec 5, 2023
3fe9c2f
Add examples
Methuselah96 Dec 5, 2023
9fd072d
Update patch
Methuselah96 Dec 5, 2023
9450efd
Delete examples
Methuselah96 Dec 5, 2023
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
63 changes: 62 additions & 1 deletion examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,6 +2117,67 @@ index e296fdc..527b9a7 100644
child.rotation.x += delta * 0.5;
child.rotation.y += delta * 0.3;
}
diff --git a/examples-testing/examples/webgl2_ubo_arrays.ts b/examples-testing/examples/webgl2_ubo_arrays.ts
index 74d9a62..ca43ef5 100644
--- a/examples-testing/examples/webgl2_ubo_arrays.ts
+++ b/examples-testing/examples/webgl2_ubo_arrays.ts
@@ -5,11 +5,15 @@ import Stats from 'three/addons/libs/stats.module.js';
import { OrbitControls } from 'three/addons/controls/OrbitControls.js';
import { GUI } from 'three/addons/libs/lil-gui.module.min.js';

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

-let lightingUniformsGroup, lightCenters;
+let lightingUniformsGroup: THREE.UniformsGroup, lightCenters: { x: number; z: number }[];

-const container = document.getElementById('container');
+const container = document.getElementById('container')!;

const pointLightsMax = 300;

@@ -78,8 +82,8 @@ function init() {
defines: {
POINTLIGHTS_MAX: pointLightsMax,
},
- vertexShader: document.getElementById('vertexShader').textContent,
- fragmentShader: document.getElementById('fragmentShader').textContent,
+ vertexShader: document.getElementById('vertexShader')!.textContent!,
+ fragmentShader: document.getElementById('fragmentShader')!.textContent!,
glslVersion: THREE.GLSL3,
});

@@ -123,7 +127,7 @@ function init() {
// controls

const controls = new OrbitControls(camera, renderer.domElement);
- controls.enabledPan = false;
+ controls.enablePan = false;

// stats

@@ -135,7 +139,7 @@ function init() {
gui.add(api, 'count', 1, pointLightsMax)
.step(1)
.onChange(function () {
- lightingUniformsGroup.uniforms[2].value = api.count;
+ (lightingUniformsGroup.uniforms[2] as THREE.Uniform).value = api.count;
});
}

@@ -155,7 +159,7 @@ function animate() {

const elapsedTime = clock.getElapsedTime();

- const lights = lightingUniformsGroup.uniforms[0];
+ const lights = lightingUniformsGroup.uniforms[0] as THREE.Uniform[];

// Parameters for circular movement
const radius = 5; // Smaller radius for individual circular movements
diff --git a/examples-testing/examples/webgl2_volume_cloud.ts b/examples-testing/examples/webgl2_volume_cloud.ts
index bc54732..7fe4043 100644
--- a/examples-testing/examples/webgl2_volume_cloud.ts
Expand Down Expand Up @@ -6591,7 +6652,7 @@ index b3ca12c..47dca0a 100644
const geometry = new WireframeGeometry2(geo);

diff --git a/examples-testing/examples/webgl_loader_3dm.ts b/examples-testing/examples/webgl_loader_3dm.ts
index c0ff73f..d910753 100644
index 545970a..c90ffcf 100644
--- a/examples-testing/examples/webgl_loader_3dm.ts
+++ b/examples-testing/examples/webgl_loader_3dm.ts
@@ -5,8 +5,8 @@ import { Rhino3dmLoader } from 'three/addons/loaders/3DMLoader.js';
Expand Down
1 change: 1 addition & 0 deletions examples-testing/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ const files = {
// 'webgl2_rendertarget_texture2darray',
'webgl2_texture2darray_compressed',
'webgl2_ubo',
'webgl2_ubo_arrays',
'webgl2_volume_cloud',
'webgl2_volume_instancing',
'webgl2_volume_perlin',
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 34 files
+21 −12 build/three.cjs
+21 −12 build/three.js
+1 −1 build/three.min.js
+21 −12 build/three.module.js
+1 −1 build/three.module.min.js
+1 −1 docs/api/zh/math/Quaternion.html
+5 −5 docs/examples/en/loaders/3DMLoader.html
+1 −1 editor/js/Script.js
+8 −11 editor/js/Sidebar.Material.BooleanProperty.js
+9 −12 editor/js/Sidebar.Material.ColorProperty.js
+8 −11 editor/js/Sidebar.Material.ConstantProperty.js
+12 −10 editor/js/Sidebar.Material.MapProperty.js
+8 −11 editor/js/Sidebar.Material.NumberProperty.js
+7 −10 editor/js/Sidebar.Material.Program.js
+8 −11 editor/js/Sidebar.Material.RangeValueProperty.js
+5 −1 editor/js/Sidebar.Material.js
+4 −2 editor/js/commands/SetMaterialColorCommand.js
+4 −2 editor/js/commands/SetMaterialCommand.js
+4 −2 editor/js/commands/SetMaterialMapCommand.js
+4 −2 editor/js/commands/SetMaterialRangeCommand.js
+4 −2 editor/js/commands/SetMaterialValueCommand.js
+4 −2 editor/js/commands/SetMaterialVectorCommand.js
+1 −0 examples/files.json
+ − examples/screenshots/webgl2_ubo_arrays.jpg
+317 −0 examples/webgl2_ubo_arrays.html
+1 −1 examples/webgl_loader_3dm.html
+17 −9 examples/webgpu_compute_particles_rain.html
+189 −21 package-lock.json
+1 −1 package.json
+1 −1 src/constants.js
+1 −1 src/core/BufferAttribute.js
+1 −1 src/core/InterleavedBuffer.js
+7 −1 src/core/UniformsGroup.js
+70 −66 src/renderers/webgl/WebGLUniformsGroups.js
6 changes: 3 additions & 3 deletions types/three/src/core/UniformsGroup.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ export class UniformsGroup extends EventDispatcher<{ dispose: {} }> {

usage: Usage;

uniforms: Uniform[];
uniforms: Array<Uniform | Uniform[]>;

add(uniform: Uniform): this;
add(uniform: Uniform | Uniform[]): this;

remove(uniform: Uniform): this;
remove(uniform: Uniform | Uniform[]): this;

setName(name: string): this;

Expand Down