Skip to content

Refactor ParametricGeometries to ParametricFunctions #1569

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

Merged
merged 7 commits into from
Mar 15, 2025
Merged

Refactor ParametricGeometries to ParametricFunctions #1569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
47c7ed3
Update three.js
Methuselah96 Mar 15, 2025
079f200
Add examples
Methuselah96 Mar 15, 2025
da90676
Update three.js
Methuselah96 Mar 15, 2025
f8c26ce
Refactor ParametricGeometries
Methuselah96 Mar 15, 2025
7289e32
Add examples
Methuselah96 Mar 15, 2025
f84be82
Update patch and delete examples
Methuselah96 Mar 15, 2025
6976eed
Fix
Methuselah96 Mar 15, 2025
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
8 changes: 4 additions & 4 deletions examples-testing/changes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3710,12 +3710,12 @@ index 2b2d0261..d5820b37 100644
object.rotation.y = timer * 2.5;
}
diff --git a/examples-testing/examples/webgl_geometries_parametric.ts b/examples-testing/examples/webgl_geometries_parametric.ts
index 29bf7ae2..30a6930c 100644
index b9a0f520..fe7792cf 100644
--- a/examples-testing/examples/webgl_geometries_parametric.ts
+++ b/examples-testing/examples/webgl_geometries_parametric.ts
@@ -6,12 +6,12 @@ import * as Curves from 'three/addons/curves/CurveExtras.js';
@@ -5,12 +5,12 @@ import Stats from 'three/addons/libs/stats.module.js';
import { ParametricGeometry } from 'three/addons/geometries/ParametricGeometry.js';
import { ParametricGeometries } from 'three/addons/geometries/ParametricGeometries.js';
import { plane, klein, mobius } from 'three/addons/geometries/ParametricFunctions.js';

-let camera, scene, renderer, stats;
+let camera: THREE.PerspectiveCamera, scene: THREE.Scene, renderer: THREE.WebGLRenderer, stats: Stats;
Expand All @@ -3728,7 +3728,7 @@ index 29bf7ae2..30a6930c 100644

camera = new THREE.PerspectiveCamera(45, window.innerWidth / window.innerHeight, 1, 2000);
camera.position.y = 400;
@@ -114,7 +114,7 @@ function render() {
@@ -93,7 +93,7 @@ function render() {
camera.lookAt(scene.position);

scene.traverse(function (object) {
Expand Down
2 changes: 1 addition & 1 deletion three.js
Open in desktop
Submodule three.js updated 50 files
+1 −1 docs/examples/en/geometries/ParametricGeometry.html
+1 −1 docs/examples/zh/geometries/ParametricGeometry.html
+1 −1 examples/jsm/Addons.js
+30 −0 examples/jsm/effects/AnaglyphEffect.js
+46 −9 examples/jsm/effects/AsciiEffect.js
+59 −111 examples/jsm/effects/OutlineEffect.js
+28 −0 examples/jsm/effects/ParallaxBarrierEffect.js
+21 −2 examples/jsm/effects/PeppersGhostEffect.js
+29 −0 examples/jsm/effects/StereoEffect.js
+53 −13 examples/jsm/exporters/DRACOExporter.js
+37 −8 examples/jsm/exporters/EXRExporter.js
+146 −6 examples/jsm/exporters/GLTFExporter.js
+20 −0 examples/jsm/exporters/KTX2Exporter.js
+18 −0 examples/jsm/exporters/OBJExporter.js
+39 −9 examples/jsm/exporters/PLYExporter.js
+25 −5 examples/jsm/exporters/STLExporter.js
+67 −0 examples/jsm/exporters/USDZExporter.js
+22 −0 examples/jsm/geometries/BoxLineGeometry.js
+18 −0 examples/jsm/geometries/ConvexGeometry.js
+20 −9 examples/jsm/geometries/DecalGeometry.js
+97 −0 examples/jsm/geometries/ParametricFunctions.js
+0 −255 examples/jsm/geometries/ParametricGeometries.js
+37 −5 examples/jsm/geometries/ParametricGeometry.js
+21 −0 examples/jsm/geometries/RoundedBoxGeometry.js
+22 −38 examples/jsm/geometries/TeapotGeometry.js
+44 −16 examples/jsm/geometries/TextGeometry.js
+35 −0 examples/jsm/helpers/LightProbeHelper.js
+36 −0 examples/jsm/helpers/LightProbeHelperGPU.js
+35 −0 examples/jsm/helpers/OctreeHelper.js
+59 −0 examples/jsm/helpers/PositionalAudioHelper.js
+35 −3 examples/jsm/helpers/RectAreaLightHelper.js
+27 −0 examples/jsm/helpers/TextureHelper.js
+28 −0 examples/jsm/helpers/TextureHelperGPU.js
+58 −2 examples/jsm/helpers/VertexNormalsHelper.js
+46 −2 examples/jsm/helpers/VertexTangentsHelper.js
+73 −0 examples/jsm/helpers/ViewHelper.js
+25 −0 examples/jsm/interactive/HTMLMesh.js
+65 −5 examples/jsm/interactive/InteractiveGroup.js
+74 −9 examples/jsm/interactive/SelectionBox.js
+71 −29 examples/jsm/interactive/SelectionHelper.js
+23 −0 examples/jsm/lighting/TiledLighting.js
+26 −1 examples/jsm/lights/LightProbeGenerator.js
+48 −13 examples/jsm/lights/RectAreaLightTexturesLib.js
+15 −0 examples/jsm/lights/RectAreaLightUniformsLib.js
+12 −0 examples/jsm/textures/FlakesTexture.js
+ − examples/screenshots/webgl_geometries_parametric.jpg
+8 −29 examples/webgl_geometries_parametric.html
+22 −17 src/extras/PMREMGenerator.js
+6 −0 src/renderers/common/extras/PMREMGenerator.js
+11 −1 utils/docs/jsdoc.config.json
2 changes: 1 addition & 1 deletion types/three/examples/jsm/Addons.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export * from "./exporters/USDZExporter.js";
export * from "./geometries/BoxLineGeometry.js";
export * from "./geometries/ConvexGeometry.js";
export * from "./geometries/DecalGeometry.js";
export * from "./geometries/ParametricGeometries.js";
export * from "./geometries/ParametricFunctions.js";
export * from "./geometries/ParametricGeometry.js";
export * from "./geometries/RoundedBoxGeometry.js";
export * from "./geometries/TeapotGeometry.js";
Expand Down
8 changes: 8 additions & 0 deletions types/three/examples/jsm/geometries/ParametricFunctions.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Vector3 } from "three";

declare function klein(v: number, u: number, target: Vector3): void;
declare function plane(u: number, v: number, target: Vector3): void;
declare function mobius(u: number, t: number, target: Vector3): void;
declare function mobius3d(u: number, t: number, target: Vector3): void;

export { klein, mobius, mobius3d, plane };
40 changes: 0 additions & 40 deletions types/three/examples/jsm/geometries/ParametricGeometries.d.ts
View file
Open in desktop

This file was deleted.

Loading