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

Jump to bottom

Addons: Refactored InteractiveGroup. #834

Merged
merged 5 commits into from
Feb 22, 2024
Merged

Addons: Refactored InteractiveGroup. #834

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
8a31219
Addons: Refactored InteractiveGroup.
Methuselah96 Feb 22, 2024
31057a1
Update three.js
Methuselah96 Feb 22, 2024
a2e0f55
Add examples
Methuselah96 Feb 22, 2024
cf7e44a
Update patch
Methuselah96 Feb 22, 2024
030c31e
Delete examples
Methuselah96 Feb 22, 2024
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
6 changes: 3 additions & 3 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14522,7 +14522,7 @@ index b659652..06e3224 100644
//

diff --git a/examples-testing/examples/webxr_vr_sandbox.ts b/examples-testing/examples/webxr_vr_sandbox.ts
index aa80cf7..e929206 100644
index 6ffadcf..b3b80e3 100644
--- a/examples-testing/examples/webxr_vr_sandbox.ts
+++ b/examples-testing/examples/webxr_vr_sandbox.ts
@@ -12,9 +12,9 @@ import { XRControllerModelFactory } from 'three/addons/webxr/XRControllerModelFa
Expand All @@ -14538,7 +14538,7 @@ index aa80cf7..e929206 100644

const parameters = {
radius: 0.6,
@@ -197,7 +197,7 @@ function animate() {
@@ -199,7 +199,7 @@ function animate() {

function render() {
const time = performance.now() * 0.0002;
Expand All @@ -14547,7 +14547,7 @@ index aa80cf7..e929206 100644
torus.rotation.x = time * 0.4;
torus.rotation.y = time;

@@ -205,5 +205,9 @@ function render() {
@@ -207,5 +207,9 @@ function render() {
stats.update();

// Canvas elements doesn't trigger DOM updates, so we have to update the texture
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 20 files
+6 −8 docs/api/en/core/BufferGeometry.html
+6 −7 docs/api/en/objects/InstancedMesh.html
+6 −10 docs/api/en/objects/SkinnedMesh.html
+30 −1 docs/manual/en/introduction/How-to-update-things.html
+125 −44 editor/js/EditorControls.js
+1 −18 editor/js/Menubar.Edit.js
+0 −106 editor/js/Menubar.File.js
+33 −0 editor/js/Sidebar.Geometry.js
+31 −0 editor/js/Sidebar.Material.js
+29 −0 editor/js/Sidebar.Object.js
+3 −3 editor/js/Sidebar.Project.Video.js
+17 −4 editor/js/Sidebar.Settings.History.js
+14 −14 editor/js/Strings.js
+23 −3 editor/js/libs/ui.three.js
+16 −0 examples/jsm/controls/OrbitControls.js
+10 −8 examples/jsm/interactive/InteractiveGroup.js
+2 −0 examples/jsm/renderers/webgl/utils/WebGLAttributeUtils.js
+2 −1 examples/webxr_vr_layers.html
+3 −1 examples/webxr_vr_sandbox.html
+2 −0 src/core/Object3D.js
4 changes: 3 additions & 1 deletion types/three/examples/jsm/interactive/InteractiveGroup.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@ export interface InteractiveObject3DEventMap extends Object3DEventMap {
export class InteractiveObject3D extends Object3D<InteractiveObject3DEventMap> {}

export class InteractiveGroup extends Group {
constructor(renderer: WebGLRenderer, camera: Camera);
listenToPointerEvents(renderer: WebGLRenderer, camera: Camera): void;

listenToXRControllerEvents(renderer: WebGLRenderer): void;
}
Loading