From b1713b4c8061e69b4e78a2fdf2238f548dd5b824 Mon Sep 17 00:00:00 2001 From: Terry Jia Date: Sun, 2 Mar 2025 10:48:23 -0500 Subject: [PATCH] [3d] add lineart mode (#2800) Co-authored-by: github-actions --- src/components/load3d/Load3D.vue | 1 + src/components/load3d/Load3DAnimation.vue | 1 + src/components/load3d/Load3DControls.vue | 28 +- src/components/load3d/Load3DScene.vue | 23 +- src/components/load3d/LoadingOverlay.vue | 6 +- src/extensions/core/load3d/ModelManager.ts | 351 +++++++++++++++- .../ColoredShadowMaterial.js | 159 ++++++++ .../ConditionalEdgesGeometry.js | 122 ++++++ .../ConditionalEdgesShader.js | 92 +++++ .../Lines2/ConditionalLineMaterial.js | 375 ++++++++++++++++++ .../Lines2/ConditionalLineSegmentsGeometry.js | 39 ++ .../conditional-lines/OutsideEdgesGeometry.js | 44 ++ src/extensions/core/load3d/interfaces.ts | 7 +- src/locales/en/main.json | 3 +- src/locales/fr/main.json | 1 + src/locales/ja/main.json | 1 + src/locales/ko/main.json | 1 + src/locales/ru/main.json | 1 + src/locales/zh/main.json | 1 + 19 files changed, 1234 insertions(+), 22 deletions(-) create mode 100644 src/extensions/core/load3d/conditional-lines/ColoredShadowMaterial.js create mode 100644 src/extensions/core/load3d/conditional-lines/ConditionalEdgesGeometry.js create mode 100644 src/extensions/core/load3d/conditional-lines/ConditionalEdgesShader.js create mode 100644 src/extensions/core/load3d/conditional-lines/Lines2/ConditionalLineMaterial.js create mode 100644 src/extensions/core/load3d/conditional-lines/Lines2/ConditionalLineSegmentsGeometry.js create mode 100644 src/extensions/core/load3d/conditional-lines/OutsideEdgesGeometry.js diff --git a/src/components/load3d/Load3D.vue b/src/components/load3d/Load3D.vue index 75635f1b8..ed3e222c2 100644 --- a/src/components/load3d/Load3D.vue +++ b/src/components/load3d/Load3D.vue @@ -35,6 +35,7 @@ :hasBackgroundImage="hasBackgroundImage" :upDirection="upDirection" :materialMode="materialMode" + :isAnimation="false" @updateBackgroundImage="handleBackgroundImageUpdate" @switchCamera="switchCamera" @toggleGrid="toggleGrid" diff --git a/src/components/load3d/Load3DAnimation.vue b/src/components/load3d/Load3DAnimation.vue index bd3d03af5..9e9e8423d 100644 --- a/src/components/load3d/Load3DAnimation.vue +++ b/src/components/load3d/Load3DAnimation.vue @@ -42,6 +42,7 @@ :hasBackgroundImage="hasBackgroundImage" :upDirection="upDirection" :materialMode="materialMode" + :isAnimation="true" @updateBackgroundImage="handleBackgroundImageUpdate" @switchCamera="switchCamera" @toggleGrid="toggleGrid" diff --git a/src/components/load3d/Load3DControls.vue b/src/components/load3d/Load3DControls.vue index abba85a98..41fdc1d27 100644 --- a/src/components/load3d/Load3DControls.vue +++ b/src/components/load3d/Load3DControls.vue @@ -105,7 +105,7 @@
-
+