odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trp:修复隧道编辑模式下不能hover和设备编辑情况

Browse Source
This commit is contained in:
trp
2025-02-25 20:55:24 +08:00
parent c9ed05b975
commit 3b538ee6d2
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/content/tunnelScene/TunnelScene.vue
View File

@@ -109,6 +109,7 @@ async function handleMounted() {
demo = new ThreeDScene(three, content.value); demo = new ThreeDScene(three, content.value);
//看是不是预览模式，然后继续相关的操作(会在demo中的初始化中进行) //看是不是预览模式，然后继续相关的操作(会在demo中的初始化中进行)
demo.isedit = params.isedit; demo.isedit = params.isedit;
demo.enableLeftBtn = true;
// "../../../../public/tunnelModel/chanel-have-wall-now-use.gltf" // "../../../../public/tunnelModel/chanel-have-wall-now-use.gltf"
const loaded = await demo.loadModel( const loaded = await demo.loadModel(
GLTFLoader, GLTFLoader,
@@ -209,6 +210,7 @@ let pointNum = ref(0);
let targetP = ref({}); let targetP = ref({});
// 右键点击附着点后调函数 // 右键点击附着点后调函数
function rClickCallback(demo) { function rClickCallback(demo) {
function editDev(targetPoint = null) { function editDev(targetPoint = null) {
hasDevice.value = targetPoint.hasDevice; hasDevice.value = targetPoint.hasDevice;
targetP.value = targetPoint; targetP.value = targetPoint;

3
src/components/content/tunnelScene/sceneClass/demo.js
View File

@@ -261,7 +261,7 @@ export default class Demo {
const intersects = raycaster.intersectObjects(hoverModels); const intersects = raycaster.intersectObjects(hoverModels);
if (intersects.length > 0) { if (intersects.length > 0) {
if(Object.keys(intersects[0].object).includes('enableHover') && !intersects[0].object.enableHover)return; if(Object.keys(intersects[0].object).includes('enableHover') && !intersects[0].object.enableHover && !isedit)return;
if (!this.preHover) { if (!this.preHover) {
this.preHover = intersects[0].object; this.preHover = intersects[0].object;
} else { } else {
@@ -353,6 +353,7 @@ export default class Demo {
if (e.button === 0) { if (e.button === 0) {
this._handleLClick(intersects[0].object); this._handleLClick(intersects[0].object);
} else if (e.button === 2) { } else if (e.button === 2) {
return; //==========》暂时不处理右键事件
this._handleRClick(intersects[0].object); this._handleRClick(intersects[0].object);
} }
}, 400); }, 400);