From d1c6a4460355766d3ae67fc7330785a1cc748f9e Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 20 十一月 2024 17:01:29 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
public/static/modelView/js/main.js | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/public/static/modelView/js/main.js b/public/static/modelView/js/main.js
index 6e50cc4..03e0d1b 100644
--- a/public/static/modelView/js/main.js
+++ b/public/static/modelView/js/main.js
@@ -262,6 +262,7 @@
const dataS = getUrlParams();
// const str = dataS.domain + '/file/api/ApiDownload?md5=' + dataS.md5
let str = "";
+ let exd = dataS.exd;
if (dataS.token != null || dataS.token != undefined) {
str =
dataS.domain +
@@ -276,7 +277,12 @@
},
];
var sceneInfo = modelList[index]; //index from array of sample models in html select options
- loader = new THREE.FBXLoader(manager);
+ if (exd == "obj") {
+ loader = new THREE.OBJLoader(manager);
+ }
+ if (exd == "fbx" || !exd) {
+ loader = new THREE.FBXLoader(manager);
+ }
var url = sceneInfo.url;
//progress/loading bar
--
Gitblit v1.9.1