diff --git a/src/extensions/core/load3d.ts b/src/extensions/core/load3d.ts index 86ae4e4f4..260c618c8 100644 --- a/src/extensions/core/load3d.ts +++ b/src/extensions/core/load3d.ts @@ -803,6 +803,10 @@ class Load3d { } setViewPosition(position: 'front' | 'top' | 'right' | 'isometric') { + if (!this.currentModel) { + return + } + const box = new THREE.Box3() let center = new THREE.Vector3() let size = new THREE.Vector3() diff --git a/src/locales/en/main.json b/src/locales/en/main.json index 16cc4a9dc..664a6709e 100644 --- a/src/locales/en/main.json +++ b/src/locales/en/main.json @@ -910,6 +910,7 @@ "compositing": "compositing", "samplers": "samplers", "operations": "operations", + "3d": "3d", "model_specific": "model_specific", "model": "model", "cond pair": "cond pair", @@ -942,6 +943,8 @@ "INT": "INT", "LATENT": "LATENT", "LATENT_OPERATION": "LATENT_OPERATION", + "LOAD_3D": "LOAD_3D", + "LOAD_3D_ANIMATION": "LOAD_3D_ANIMATION", "MASK": "MASK", "MODEL": "MODEL", "NOISE": "NOISE", diff --git a/src/locales/en/nodeDefs.json b/src/locales/en/nodeDefs.json index c86bebb10..1b2e9ed3a 100644 --- a/src/locales/en/nodeDefs.json +++ b/src/locales/en/nodeDefs.json @@ -2190,6 +2190,107 @@ } } }, + "Load3D": { + "display_name": "Load 3D", + "inputs": { + "model_file": { + "name": "model_file" + }, + "image": { + "name": "image" + }, + "width": { + "name": "width" + }, + "height": { + "name": "height" + }, + "show_grid": { + "name": "show_grid" + }, + "camera_type": { + "name": "camera_type" + }, + "view": { + "name": "view" + }, + "material": { + "name": "material" + }, + "bg_color": { + "name": "bg_color" + }, + "light_intensity": { + "name": "light_intensity" + }, + "up_direction": { + "name": "up_direction" + } + }, + "outputs": { + "0": { + "name": "image" + }, + "1": { + "name": "mask" + }, + "2": { + "name": "mesh_path" + } + } + }, + "Load3DAnimation": { + "display_name": "Load 3D - Animation", + "inputs": { + "model_file": { + "name": "model_file" + }, + "image": { + "name": "image" + }, + "width": { + "name": "width" + }, + "height": { + "name": "height" + }, + "show_grid": { + "name": "show_grid" + }, + "camera_type": { + "name": "camera_type" + }, + "view": { + "name": "view" + }, + "material": { + "name": "material" + }, + "bg_color": { + "name": "bg_color" + }, + "light_intensity": { + "name": "light_intensity" + }, + "up_direction": { + "name": "up_direction" + }, + "animation_speed": { + "name": "animation_speed" + } + }, + "outputs": { + "0": { + "name": "image" + }, + "1": { + "name": "mask" + }, + "2": { + "name": "mesh_path" + } + } + }, "LoadAudio": { "display_name": "LoadAudio", "inputs": { diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json index daf606257..9fb68fff2 100644 --- a/src/locales/ja/main.json +++ b/src/locales/ja/main.json @@ -27,6 +27,8 @@ "INT": "整数", "LATENT": "潜在", "LATENT_OPERATION": "潜在操作", + "LOAD_3D": "3Dをロード", + "LOAD_3D_ANIMATION": "3Dアニメーションをロード", "MASK": "マスク", "MODEL": "モデル", "NOISE": "ノイズ", @@ -274,6 +276,7 @@ "Zoom Out": "ズームアウト" }, "nodeCategories": { + "3d": "3d", "3d_models": "3Dモデル", "DevTools": "デブツール", "_for_testing": "_テスト用", diff --git a/src/locales/ja/nodeDefs.json b/src/locales/ja/nodeDefs.json index 72e0f0171..27b1f1029 100644 --- a/src/locales/ja/nodeDefs.json +++ b/src/locales/ja/nodeDefs.json @@ -2281,6 +2281,107 @@ } } }, + "Load3D": { + "display_name": "3Dを読み込む", + "inputs": { + "bg_color": { + "name": "背景色" + }, + "camera_type": { + "name": "カメラタイプ" + }, + "height": { + "name": "高さ" + }, + "image": { + "name": "画像" + }, + "light_intensity": { + "name": "光の強度" + }, + "material": { + "name": "素材" + }, + "model_file": { + "name": "モデルファイル" + }, + "show_grid": { + "name": "グリッドを表示" + }, + "up_direction": { + "name": "上方向" + }, + "view": { + "name": "ビュー" + }, + "width": { + "name": "幅" + } + }, + "outputs": { + "0": { + "name": "画像" + }, + "1": { + "name": "マスク" + }, + "2": { + "name": "メッシュパス" + } + } + }, + "Load3DAnimation": { + "display_name": "3Dを読み込む - アニメーション", + "inputs": { + "animation_speed": { + "name": "アニメーション速度" + }, + "bg_color": { + "name": "背景色" + }, + "camera_type": { + "name": "カメラタイプ" + }, + "height": { + "name": "高さ" + }, + "image": { + "name": "画像" + }, + "light_intensity": { + "name": "光の強度" + }, + "material": { + "name": "素材" + }, + "model_file": { + "name": "モデルファイル" + }, + "show_grid": { + "name": "グリッドを表示" + }, + "up_direction": { + "name": "上方向" + }, + "view": { + "name": "ビュー" + }, + "width": { + "name": "幅" + } + }, + "outputs": { + "0": { + "name": "画像" + }, + "1": { + "name": "マスク" + }, + "2": { + "name": "メッシュパス" + } + } + }, "LoadAudio": { "display_name": "音声を読み込む", "inputs": { diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json index 937e78384..072d99ef5 100644 --- a/src/locales/ko/main.json +++ b/src/locales/ko/main.json @@ -27,6 +27,8 @@ "INT": "정수", "LATENT": "잠재", "LATENT_OPERATION": "잠재 연산", + "LOAD_3D": "3D_로드", + "LOAD_3D_ANIMATION": "3D_애니메이션_로드", "MASK": "마스크", "MODEL": "모델", "NOISE": "노이즈", @@ -274,6 +276,7 @@ "Zoom Out": "축소" }, "nodeCategories": { + "3d": "3d", "3d_models": "3D 모델", "DevTools": "개발자 도구", "_for_testing": "_테스트용", diff --git a/src/locales/ko/nodeDefs.json b/src/locales/ko/nodeDefs.json index 4b8710857..b0c7cddc6 100644 --- a/src/locales/ko/nodeDefs.json +++ b/src/locales/ko/nodeDefs.json @@ -2281,6 +2281,107 @@ } } }, + "Load3D": { + "display_name": "3D 로드", + "inputs": { + "bg_color": { + "name": "배경_색" + }, + "camera_type": { + "name": "카메라_유형" + }, + "height": { + "name": "높이" + }, + "image": { + "name": "이미지" + }, + "light_intensity": { + "name": "빛_강도" + }, + "material": { + "name": "재질" + }, + "model_file": { + "name": "모델_파일" + }, + "show_grid": { + "name": "그리드_보기" + }, + "up_direction": { + "name": "위_방향" + }, + "view": { + "name": "보기" + }, + "width": { + "name": "너비" + } + }, + "outputs": { + "0": { + "name": "이미지" + }, + "1": { + "name": "마스크" + }, + "2": { + "name": "메시_경로" + } + } + }, + "Load3DAnimation": { + "display_name": "3D 로드 - 애니메이션", + "inputs": { + "animation_speed": { + "name": "애니메이션_속도" + }, + "bg_color": { + "name": "배경_색" + }, + "camera_type": { + "name": "카메라_유형" + }, + "height": { + "name": "높이" + }, + "image": { + "name": "이미지" + }, + "light_intensity": { + "name": "빛_강도" + }, + "material": { + "name": "재질" + }, + "model_file": { + "name": "모델_파일" + }, + "show_grid": { + "name": "그리드_보기" + }, + "up_direction": { + "name": "위_방향" + }, + "view": { + "name": "보기" + }, + "width": { + "name": "너비" + } + }, + "outputs": { + "0": { + "name": "이미지" + }, + "1": { + "name": "마스크" + }, + "2": { + "name": "메시_경로" + } + } + }, "LoadAudio": { "display_name": "오디오 로드", "inputs": { diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json index 9bb0fb357..7b25a7b7b 100644 --- a/src/locales/ru/main.json +++ b/src/locales/ru/main.json @@ -27,6 +27,8 @@ "INT": "ЦЕЛОЕ", "LATENT": "ЛАТЕНТНЫЙ", "LATENT_OPERATION": "ЛАТЕНТНАЯ ОПЕРАЦИЯ", + "LOAD_3D": "ЗАГРУЗИТЬ_3D", + "LOAD_3D_ANIMATION": "ЗАГРУЗИТЬ_3D_АНИМАЦИЮ", "MASK": "МАСКА", "MODEL": "МОДЕЛЬ", "NOISE": "ШУМ", @@ -274,6 +276,7 @@ "Zoom Out": "Уменьшить" }, "nodeCategories": { + "3d": "3d", "3d_models": "3d_модели", "DevTools": "Инструменты_разработчика", "_for_testing": "_для_тестирования", diff --git a/src/locales/ru/nodeDefs.json b/src/locales/ru/nodeDefs.json index cdf722a34..faf9c81fb 100644 --- a/src/locales/ru/nodeDefs.json +++ b/src/locales/ru/nodeDefs.json @@ -2281,6 +2281,107 @@ } } }, + "Load3D": { + "display_name": "Загрузить 3D", + "inputs": { + "bg_color": { + "name": "цвет_фона" + }, + "camera_type": { + "name": "тип_камеры" + }, + "height": { + "name": "высота" + }, + "image": { + "name": "изображение" + }, + "light_intensity": { + "name": "интенсивность_света" + }, + "material": { + "name": "материал" + }, + "model_file": { + "name": "файл_модели" + }, + "show_grid": { + "name": "показать_сетку" + }, + "up_direction": { + "name": "направление_вверх" + }, + "view": { + "name": "вид" + }, + "width": { + "name": "ширина" + } + }, + "outputs": { + "0": { + "name": "изображение" + }, + "1": { + "name": "маска" + }, + "2": { + "name": "путь_сетки" + } + } + }, + "Load3DAnimation": { + "display_name": "Загрузить 3D - Анимация", + "inputs": { + "animation_speed": { + "name": "скорость_анимации" + }, + "bg_color": { + "name": "цвет_фона" + }, + "camera_type": { + "name": "тип_камеры" + }, + "height": { + "name": "высота" + }, + "image": { + "name": "изображение" + }, + "light_intensity": { + "name": "интенсивность_света" + }, + "material": { + "name": "материал" + }, + "model_file": { + "name": "файл_модели" + }, + "show_grid": { + "name": "показать_сетку" + }, + "up_direction": { + "name": "направление_вверх" + }, + "view": { + "name": "вид" + }, + "width": { + "name": "ширина" + } + }, + "outputs": { + "0": { + "name": "изображение" + }, + "1": { + "name": "маска" + }, + "2": { + "name": "путь_сетки" + } + } + }, "LoadAudio": { "display_name": "Загрузить аудио", "inputs": { diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json index 4b4912358..4ff8b617a 100644 --- a/src/locales/zh/main.json +++ b/src/locales/zh/main.json @@ -27,6 +27,8 @@ "INT": "整数", "LATENT": "潜空间", "LATENT_OPERATION": "潜空间操作", + "LOAD_3D": "加载3D", + "LOAD_3D_ANIMATION": "加载3D动画", "MASK": "遮罩", "MODEL": "模型", "NOISE": "噪声", @@ -274,6 +276,7 @@ "Zoom Out": "缩小" }, "nodeCategories": { + "3d": "3d", "3d_models": "3D模型", "DevTools": "开发工具", "_for_testing": "_用于测试", diff --git a/src/locales/zh/nodeDefs.json b/src/locales/zh/nodeDefs.json index 75a8b8b86..72f44bc85 100644 --- a/src/locales/zh/nodeDefs.json +++ b/src/locales/zh/nodeDefs.json @@ -2281,6 +2281,107 @@ } } }, + "Load3D": { + "display_name": "加载3D", + "inputs": { + "bg_color": { + "name": "背景颜色" + }, + "camera_type": { + "name": "相机类型" + }, + "height": { + "name": "高度" + }, + "image": { + "name": "图像" + }, + "light_intensity": { + "name": "光照强度" + }, + "material": { + "name": "材质" + }, + "model_file": { + "name": "模型文件" + }, + "show_grid": { + "name": "显示网格" + }, + "up_direction": { + "name": "上方向" + }, + "view": { + "name": "视图" + }, + "width": { + "name": "宽度" + } + }, + "outputs": { + "0": { + "name": "图像" + }, + "1": { + "name": "遮罩" + }, + "2": { + "name": "网格路径" + } + } + }, + "Load3DAnimation": { + "display_name": "加载3D - 动画", + "inputs": { + "animation_speed": { + "name": "动画速度" + }, + "bg_color": { + "name": "背景颜色" + }, + "camera_type": { + "name": "相机类型" + }, + "height": { + "name": "高度" + }, + "image": { + "name": "图像" + }, + "light_intensity": { + "name": "光照强度" + }, + "material": { + "name": "材质" + }, + "model_file": { + "name": "模型文件" + }, + "show_grid": { + "name": "显示网格" + }, + "up_direction": { + "name": "上方向" + }, + "view": { + "name": "视图" + }, + "width": { + "name": "宽度" + } + }, + "outputs": { + "0": { + "name": "图像" + }, + "1": { + "name": "遮罩" + }, + "2": { + "name": "网格路径" + } + } + }, "LoadAudio": { "display_name": "加载音频", "inputs": {