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

THREE.TextGeometry: .height -> .depth #874

Merged
merged 3 commits into from
Mar 23, 2024
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
24 changes: 12 additions & 12 deletions examples-testing/changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3056,7 +3056,7 @@ index d78fbec..6b84a2c 100644
case 79 /*O*/:
activeCamera = cameraOrtho;
diff --git a/examples-testing/examples/webgl_camera_logarithmicdepthbuffer.ts b/examples-testing/examples/webgl_camera_logarithmicdepthbuffer.ts
index a80cc19..4d1f2c8 100644
index f1d4400..7f149db 100644
--- a/examples-testing/examples/webgl_camera_logarithmicdepthbuffer.ts
+++ b/examples-testing/examples/webgl_camera_logarithmicdepthbuffer.ts
@@ -1,6 +1,6 @@
Expand Down Expand Up @@ -3458,7 +3458,7 @@ index 648e097..98d024c 100644

stats = new Stats();
diff --git a/examples-testing/examples/webgl_custom_attributes_lines.ts b/examples-testing/examples/webgl_custom_attributes_lines.ts
index 29b8a06..9217e11 100644
index 5f18f65..c6c7dd0 100644
--- a/examples-testing/examples/webgl_custom_attributes_lines.ts
+++ b/examples-testing/examples/webgl_custom_attributes_lines.ts
@@ -1,13 +1,18 @@
Expand Down Expand Up @@ -4734,7 +4734,7 @@ index 4e9a7d3..86071e3 100644
helper.position.copy(intersects[0].point);
}
diff --git a/examples-testing/examples/webgl_geometry_text.ts b/examples-testing/examples/webgl_geometry_text.ts
index 51a639b..90087e4 100644
index c6000e0..e0b49b6 100644
--- a/examples-testing/examples/webgl_geometry_text.ts
+++ b/examples-testing/examples/webgl_geometry_text.ts
@@ -1,23 +1,23 @@
Expand Down Expand Up @@ -4808,7 +4808,7 @@ index 51a639b..90087e4 100644
+ font: font!,

size: size,
height: height,
depth: depth,
@@ -239,7 +239,7 @@ function createText() {

textGeo.computeBoundingBox();
Expand Down Expand Up @@ -7638,7 +7638,7 @@ index 2a583c2..8e3e976 100644
init();

diff --git a/examples-testing/examples/webgl_loader_ttf.ts b/examples-testing/examples/webgl_loader_ttf.ts
index 0dd7f41..4d6cd14 100644
index bda80db..e0f5ca8 100644
--- a/examples-testing/examples/webgl_loader_ttf.ts
+++ b/examples-testing/examples/webgl_loader_ttf.ts
@@ -4,9 +4,9 @@ import { TTFLoader } from 'three/addons/loaders/TTFLoader.js';
Expand All @@ -7654,7 +7654,7 @@ index 0dd7f41..4d6cd14 100644
let firstLetter = true;

let text = 'three.js';
@@ -17,7 +17,7 @@ const height = 20,
@@ -17,7 +17,7 @@ const depth = 20,
bevelThickness = 2,
bevelSize = 1.5;

Expand Down Expand Up @@ -7689,7 +7689,7 @@ index 0dd7f41..4d6cd14 100644
+ font: font!,

size: size,
height: height,
depth: depth,
@@ -159,7 +159,7 @@ function createText() {
textGeo.computeBoundingBox();
textGeo.computeVertexNormals();
Expand Down Expand Up @@ -9080,7 +9080,7 @@ index 2666d09..b284d9f 100644
if (texture.matrixAutoUpdate === true) {
texture.offset.set(API.offsetX, API.offsetY);
diff --git a/examples-testing/examples/webgl_materials_toon.ts b/examples-testing/examples/webgl_materials_toon.ts
index ea9b0b7..54fb0b4 100644
index d1b39e8..9657dbf 100644
--- a/examples-testing/examples/webgl_materials_toon.ts
+++ b/examples-testing/examples/webgl_materials_toon.ts
@@ -4,13 +4,13 @@ import Stats from 'three/addons/libs/stats.module.js';
Expand Down Expand Up @@ -9552,7 +9552,7 @@ index e6ea453..f55a658 100644
simplified.material.flatShading = true;
const count = Math.floor(simplified.geometry.attributes.position.count * 0.875); // number of vertices to remove
diff --git a/examples-testing/examples/webgl_modifier_tessellation.ts b/examples-testing/examples/webgl_modifier_tessellation.ts
index ad9ed59..cd8f4e0 100644
index 23628ef..0a988b9 100644
--- a/examples-testing/examples/webgl_modifier_tessellation.ts
+++ b/examples-testing/examples/webgl_modifier_tessellation.ts
@@ -4,14 +4,14 @@ import Stats from 'three/addons/libs/stats.module.js';
Expand Down Expand Up @@ -12468,7 +12468,7 @@ index 157b8da..63b7a3f 100644

// blur horizontally and draw in the renderTargetBlur
diff --git a/examples-testing/examples/webgl_shadowmap.ts b/examples-testing/examples/webgl_shadowmap.ts
index 122fa84..e539bef 100644
index 069d29f..4f12084 100644
--- a/examples-testing/examples/webgl_shadowmap.ts
+++ b/examples-testing/examples/webgl_shadowmap.ts
@@ -15,18 +15,18 @@ let SCREEN_WIDTH = window.innerWidth;
Expand Down Expand Up @@ -12661,7 +12661,7 @@ index 91ba360..230059a 100644

THREE.ShaderChunk.shadowmap_pars_fragment = shader;
diff --git a/examples-testing/examples/webgl_shadowmap_performance.ts b/examples-testing/examples/webgl_shadowmap_performance.ts
index c3f0207..c211b8a 100644
index 1d37c1d..82dae11 100644
--- a/examples-testing/examples/webgl_shadowmap_performance.ts
+++ b/examples-testing/examples/webgl_shadowmap_performance.ts
@@ -16,16 +16,16 @@ const FLOOR = -250;
Expand Down Expand Up @@ -13622,7 +13622,7 @@ index 5561ada..74fed79 100644
});
}
diff --git a/examples-testing/examples/webgpu_camera_logarithmicdepthbuffer.ts b/examples-testing/examples/webgpu_camera_logarithmicdepthbuffer.ts
index 2e0d37c..deac7ad 100644
index 87da20c..1503bf8 100644
--- a/examples-testing/examples/webgpu_camera_logarithmicdepthbuffer.ts
+++ b/examples-testing/examples/webgpu_camera_logarithmicdepthbuffer.ts
@@ -1,6 +1,6 @@
Expand Down
2 changes: 1 addition & 1 deletion three.js
Submodule three.js updated 44 files
+28 −6 build/three.cjs
+28 −6 build/three.module.js
+1 −1 build/three.module.min.js
+1 −1 docs/api/en/objects/InstancedMesh.html
+6 −0 docs/api/en/scenes/Scene.html
+2 −2 docs/examples/en/geometries/TextGeometry.html
+2 −2 docs/examples/zh/geometries/TextGeometry.html
+3 −3 editor/js/Menubar.Edit.js
+1 −1 editor/js/Sidebar.Geometry.js
+1 −1 editor/js/Sidebar.Material.js
+1 −1 editor/js/Sidebar.Object.js
+18 −2 examples/jsm/exporters/GLTFExporter.js
+15 −0 examples/jsm/exporters/USDZExporter.js
+10 −2 examples/jsm/geometries/TextGeometry.js
+0 −15 examples/jsm/loaders/LUT3dlLoader.js
+0 −14 examples/jsm/loaders/LUTCubeLoader.js
+0 −14 examples/jsm/loaders/LUTImageLoader.js
+4 −4 examples/jsm/nodes/materials/NodeMaterial.js
+5 −71 examples/jsm/postprocessing/LUTPass.js
+4 −3 examples/jsm/renderers/common/Renderer.js
+18 −1 examples/jsm/renderers/webgl/WebGLBackend.js
+42 −0 examples/jsm/renderers/webgl/WebGLBufferRenderer.js
+1 −1 examples/webgl_camera_logarithmicdepthbuffer.html
+1 −1 examples/webgl_custom_attributes_lines.html
+3 −3 examples/webgl_geometry_text.html
+3 −3 examples/webgl_loader_ttf.html
+1 −1 examples/webgl_materials_toon.html
+1 −1 examples/webgl_modifier_curve.html
+1 −1 examples/webgl_modifier_curve_instanced.html
+1 −1 examples/webgl_modifier_tessellation.html
+2 −3 examples/webgl_postprocessing_3dlut.html
+1 −1 examples/webgl_shadowmap.html
+1 −1 examples/webgl_shadowmap_performance.html
+1 −1 examples/webgpu_camera_logarithmicdepthbuffer.html
+1 −1 manual/en/primitives.html
+1 −1 manual/examples/primitives-text.html
+1 −1 manual/examples/primitives.html
+1 −1 manual/fr/primitives.html
+1 −1 manual/ja/primitives.html
+4 −4 manual/resources/threejs-primitives.js
+2 −0 src/loaders/ObjectLoader.js
+6 −0 src/renderers/WebGLRenderer.js
+2 −3 src/renderers/webgl/WebGLMaterials.js
+7 −1 src/scenes/Scene.js
8 changes: 8 additions & 0 deletions types/three/examples/jsm/geometries/TextGeometry.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,17 @@ export interface TextGeometryParameters extends ExtrudeGeometryOptions {
* Thickness to extrude text.
* Expects a `Float`.
* @defaultValue `50`
* @deprecated THREE.TextGeometry: .height is now depreciated. Please use .depth instead
*/
height?: number | undefined;

/**
* Thickness to extrude text.
* Expects a `Float`.
* @defaultValue `50`
*/
depth?: number | undefined;

/**
* @override
* @defaultValue `12`
Expand Down
Loading