|
|
@@ -12,6 +12,9 @@ window.waterMap = {}
|
|
|
window.sdkInstance = null;
|
|
|
window.uwbInstance = null;
|
|
|
window.getsqlData = getsqlData;
|
|
|
+window.modeChangeInterval = null;
|
|
|
+window.benchListInterval = null;
|
|
|
+window.otherInterval = null;
|
|
|
var fbxLoader1Loaded = false;
|
|
|
var fbxLoader2Loaded = false;
|
|
|
|
|
|
@@ -24,7 +27,7 @@ window.benchMeshMap = {};
|
|
|
window.benchMeshWaterMap = {};
|
|
|
window.benchDBList = null
|
|
|
|
|
|
-function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
+function getsqlData(sdkInstance, uwbInstance, bAddModel) {
|
|
|
let g_PosArrayResult = null;
|
|
|
if (g_PosArrayResult == null) {
|
|
|
var sqlstr = "SELECT * FROM dat_bench_extend order by bench_id asc";
|
|
|
@@ -131,10 +134,11 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
let show_remote_button = item.show_remote_button;
|
|
|
// 添加水滴
|
|
|
let benchList = window.store ? window.store.getters['benchList/getBenchList'] : [];
|
|
|
+ let benchIdList = window.store.getters['benchList/getBenchList'].map(m => m.id);
|
|
|
let currentBench = benchList.find(b => b.id == bench_id);
|
|
|
let texture = null;
|
|
|
if (currentBench) {
|
|
|
- switch(currentBench.status) {
|
|
|
+ switch (currentBench.status) {
|
|
|
case "ready":
|
|
|
texture = textureReady;
|
|
|
break;
|
|
|
@@ -151,7 +155,7 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
} else {
|
|
|
texture = textureOffline;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (window.waterMap[bench_id]) {
|
|
|
sdkInstance.sceneRenderer.scene.remove(window.waterMap[bench_id]);
|
|
|
}
|
|
|
@@ -162,9 +166,9 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
map: texture
|
|
|
});
|
|
|
let uniformsA = {
|
|
|
- amplitude: {value: 1.0},
|
|
|
- color: {value: new THREE.Color(0xff2200)},
|
|
|
- texture: {value: texture }
|
|
|
+ amplitude: { value: 1.0 },
|
|
|
+ color: { value: new THREE.Color(0xff2200) },
|
|
|
+ texture: { value: texture }
|
|
|
};
|
|
|
// 创建着色器材质
|
|
|
const shaderMaterial = new THREE.ShaderMaterial({
|
|
|
@@ -185,7 +189,7 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
transparent: true
|
|
|
})
|
|
|
let sprite = new THREE.Sprite(spriteMaterial);
|
|
|
-
|
|
|
+
|
|
|
const mesh = new THREE.Mesh(geometry, shaderMaterial);
|
|
|
var customData = {
|
|
|
benchId: bench_id,
|
|
|
@@ -198,18 +202,19 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
mesh.position.set(x, y + 10, z);
|
|
|
mesh.rotation.set(-Math.PI / 2, 0, 0);
|
|
|
window.waterMap[bench_id] = mesh;
|
|
|
- console.log('添加模型和水滴1111')
|
|
|
+ console.log('添加模型和水滴1111',benchIdList)
|
|
|
if (sdkInstance) {
|
|
|
-
|
|
|
- if(bAddModel && window.benchMeshWaterMap[bench_id])
|
|
|
- {
|
|
|
- window.benchMeshWaterMap[bench_id] = mesh;
|
|
|
- sdkInstance.sceneRenderer.scene.add(mesh)
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- window.benchMeshWaterMap[bench_id] = mesh;
|
|
|
+ if (benchIdList.indexOf(Number(bench_id)) > 0) {
|
|
|
+ if (bAddModel && window.benchMeshWaterMap[bench_id]) {
|
|
|
+ window.benchMeshWaterMap[bench_id] = mesh;
|
|
|
+ console.log('添加benchid', bench_id)
|
|
|
+ sdkInstance.sceneRenderer.scene.add(mesh)
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ window.benchMeshWaterMap[bench_id] = mesh;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
};
|
|
|
}
|
|
|
@@ -222,6 +227,7 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
if (!fbxLoader1Loaded) {
|
|
|
fbxLoader1.load("../models/meshDraco.gltf", function (fbx) {
|
|
|
console.log('loadzmg')
|
|
|
+ let benchIdList = window.store.getters['benchList/getBenchList'].map(m => m.id);
|
|
|
//fbxLoader1Loaded = true;
|
|
|
let result = g_PosArrayResult;
|
|
|
for (var item of result) {
|
|
|
@@ -243,20 +249,20 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
}
|
|
|
else {
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
var distance = 10000.0;
|
|
|
-
|
|
|
+
|
|
|
var xSubTmp = x;
|
|
|
var ySubTmp = y;
|
|
|
var zSubTmp = z;
|
|
|
var ang_xSubTmp = ang_x;
|
|
|
var ang_ySubTmp = ang_y;
|
|
|
var ang_zSubTmp = ang_z;
|
|
|
-
|
|
|
+
|
|
|
if (g_PosArrayResult) {
|
|
|
var iCount = 0;
|
|
|
for (var itemSub of g_PosArrayResult) {
|
|
|
-
|
|
|
+
|
|
|
iCount++;
|
|
|
var xSub = itemSub.x;
|
|
|
var ySub = itemSub.y;
|
|
|
@@ -282,8 +288,8 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
x = xSubTmp;
|
|
|
y = ySubTmp;
|
|
|
z = zSubTmp;
|
|
|
@@ -296,7 +302,7 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
ang_x = JSON.parse(JSON.stringify(ang_xSubTmp));
|
|
|
ang_y = JSON.parse(JSON.stringify(ang_ySubTmp));
|
|
|
ang_z = JSON.parse(JSON.stringify(ang_zSubTmp));
|
|
|
-
|
|
|
+
|
|
|
let card_id = item.card_id;
|
|
|
let bench_id = item.bench_id;
|
|
|
let bench_img = item.bench_img;
|
|
|
@@ -321,24 +327,25 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
benchImg: bench_img,
|
|
|
};
|
|
|
childMeshTmp.userData = customData;
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
console.log('添加模型和水滴1111')
|
|
|
- if(bAddModel && window.benchMeshMap[bench_id])
|
|
|
- {
|
|
|
- window.benchMeshMap[bench_id] = childMeshTmp;
|
|
|
- sdkInstance.sceneRenderer.scene.add(childMeshTmp)
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- window.benchMeshMap[bench_id] = childMeshTmp;
|
|
|
+ if (benchIdList.indexOf(Number(bench_id)) > 0) {
|
|
|
+ if (bAddModel && window.benchMeshMap[bench_id]) {
|
|
|
+ window.benchMeshMap[bench_id] = childMeshTmp;
|
|
|
+ sdkInstance.sceneRenderer.scene.add(childMeshTmp)
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ window.benchMeshMap[bench_id] = childMeshTmp;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
};
|
|
|
})
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
var fbxLoader2 = new THREE.GLTFLoader();
|
|
|
fbxLoader2.setDRACOLoader(dracoLoader);
|
|
|
@@ -365,20 +372,20 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
}
|
|
|
else {
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
var distance = 10000.0;
|
|
|
-
|
|
|
+
|
|
|
var xSubTmp = x;
|
|
|
var ySubTmp = y;
|
|
|
var zSubTmp = z;
|
|
|
var ang_xSubTmp = ang_x;
|
|
|
var ang_ySubTmp = ang_y;
|
|
|
var ang_zSubTmp = ang_z;
|
|
|
-
|
|
|
+
|
|
|
if (g_PosArrayResult) {
|
|
|
var iCount = 0;
|
|
|
for (var itemSub of g_PosArrayResult) {
|
|
|
-
|
|
|
+
|
|
|
iCount++;
|
|
|
var xSub = itemSub.x;
|
|
|
var ySub = itemSub.y;
|
|
|
@@ -404,8 +411,8 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
x = xSubTmp;
|
|
|
y = ySubTmp;
|
|
|
z = zSubTmp;
|
|
|
@@ -418,12 +425,12 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
ang_x = JSON.parse(JSON.stringify(ang_xSubTmp));
|
|
|
ang_y = JSON.parse(JSON.stringify(ang_ySubTmp));
|
|
|
ang_z = JSON.parse(JSON.stringify(ang_zSubTmp));
|
|
|
-
|
|
|
+
|
|
|
let card_id = item.card_id;
|
|
|
let bench_id = item.bench_id;
|
|
|
let show_remote_button = item.show_remote_button;
|
|
|
let bench_img = item.bench_img;
|
|
|
-
|
|
|
+
|
|
|
if (benchType == 2) {
|
|
|
console.log("控制台查看加载gltf文件返回的对象结构", fbx);
|
|
|
var childMesh = fbx.scene.children[0];
|
|
|
@@ -445,38 +452,38 @@ function getsqlData(sdkInstance, uwbInstance,bAddModel) {
|
|
|
};
|
|
|
childMeshTmp.userData = customData;
|
|
|
|
|
|
- if(bAddModel && window.benchMeshMap[bench_id])
|
|
|
- {
|
|
|
+ if (bAddModel && window.benchMeshMap[bench_id]) {
|
|
|
window.benchMeshMap[bench_id] = childMeshTmp;
|
|
|
sdkInstance.sceneRenderer.scene.add(childMeshTmp)
|
|
|
}
|
|
|
- else
|
|
|
- {
|
|
|
+ else {
|
|
|
window.benchMeshMap[bench_id] = childMeshTmp;
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
if (!sessionStorage.getItem('3dMode') || sessionStorage.getItem('3dMode') == 0) {
|
|
|
- setTimeout(() => {
|
|
|
- var benchPosList = [];
|
|
|
- for (var item of result) {
|
|
|
- var localPosition = new THREE.Vector3(item.fix_pos_x, item.fix_pos_y, item.fix_pos_z);
|
|
|
- var worldPosition = uwbInstance.convertLocalToWorld(localPosition);
|
|
|
- var pos = sdkInstance.getScreenPosition(worldPosition);
|
|
|
- benchPosList.push(
|
|
|
- {
|
|
|
- x: pos.x,
|
|
|
- y: pos.y,
|
|
|
- benchType: item.bench_type,
|
|
|
- benchId: item.bench_id,
|
|
|
- benchImg: item.bench_img,
|
|
|
- }
|
|
|
- )
|
|
|
+ otherInterval = setInterval(() => {
|
|
|
+ if (uwbInstance) {
|
|
|
+ clearInterval(otherInterval)
|
|
|
+ var benchPosList = [];
|
|
|
+ for (var item of result) {
|
|
|
+ var localPosition = new THREE.Vector3(item.fix_pos_x, item.fix_pos_y, item.fix_pos_z);
|
|
|
+ var worldPosition = uwbInstance.convertLocalToWorld(localPosition);
|
|
|
+ var pos = sdkInstance.getScreenPosition(worldPosition);
|
|
|
+ benchPosList.push(
|
|
|
+ {
|
|
|
+ x: pos.x,
|
|
|
+ y: pos.y,
|
|
|
+ benchType: item.bench_type,
|
|
|
+ benchId: item.bench_id,
|
|
|
+ benchImg: item.bench_img,
|
|
|
+ }
|
|
|
+ )
|
|
|
+ }
|
|
|
+ window.showBenchPos(benchPosList);
|
|
|
+ setInterval(() => { getsqlDataRealTime(); }, 5 * 60 * 1000)
|
|
|
}
|
|
|
- window.showBenchPos(benchPosList);
|
|
|
- setInterval(()=>{getsqlDataRealTime();},5*60*1000)
|
|
|
- }, 2000
|
|
|
- )
|
|
|
+ }, 2000)
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
@@ -523,8 +530,8 @@ function getsqlDataRealTime() {
|
|
|
var xSubTmp = x;
|
|
|
var ySubTmp = y;
|
|
|
var zSubTmp = z;
|
|
|
- x = x-14.7;
|
|
|
- z = y-14
|
|
|
+ x = x - 14.7;
|
|
|
+ z = y - 14
|
|
|
var ang_xSubTmp = ang_x;
|
|
|
var ang_ySubTmp = ang_y;
|
|
|
var ang_zSubTmp = ang_z;
|
|
|
@@ -562,21 +569,20 @@ function getsqlDataRealTime() {
|
|
|
ang_x = ang_xSubTmp;
|
|
|
ang_y = ang_ySubTmp;
|
|
|
ang_z = ang_zSubTmp;
|
|
|
-
|
|
|
+
|
|
|
x = JSON.parse(JSON.stringify(xSubTmp));
|
|
|
y = JSON.parse(JSON.stringify(ySubTmp));
|
|
|
z = JSON.parse(JSON.stringify(zSubTmp));
|
|
|
ang_x = JSON.parse(JSON.stringify(ang_xSubTmp));
|
|
|
ang_y = JSON.parse(JSON.stringify(ang_ySubTmp));
|
|
|
ang_z = JSON.parse(JSON.stringify(ang_zSubTmp));
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
window.benchMeshMap[item.bench_id].position.set(x, y, z);
|
|
|
- window.benchMeshWaterMap[item.bench_id].position.set(x, y+10, z);
|
|
|
- if(item.use_fix_pos == 0)
|
|
|
- {
|
|
|
- window.benchMeshMap[item.bench_id].position.set(x-14.7, JSON.parse(JSON.stringify(item.fix_pos_y)), y-14);
|
|
|
- window.benchMeshWaterMap[item.bench_id].position.set(x-14.7, JSON.parse(JSON.stringify(item.fix_pos_y))+10, y-14);
|
|
|
+ window.benchMeshWaterMap[item.bench_id].position.set(x, y + 10, z);
|
|
|
+ if (item.use_fix_pos == 0) {
|
|
|
+ window.benchMeshMap[item.bench_id].position.set(x - 14.7, JSON.parse(JSON.stringify(item.fix_pos_y)), y - 14);
|
|
|
+ window.benchMeshWaterMap[item.bench_id].position.set(x - 14.7, JSON.parse(JSON.stringify(item.fix_pos_y)) + 10, y - 14);
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -654,13 +660,16 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
|
|
|
element.style.marginTop = ((height - (height * ratio)) / 2) + 'px';
|
|
|
let playersmall = document.getElementById('playersmall')
|
|
|
playersmall.appendChild(element)
|
|
|
- setTimeout(() => {
|
|
|
- window.sdkInstance.changeMode('floorplan');
|
|
|
- sdkInstance.player.cameras.floorplan.position.setY(10)
|
|
|
- }, 3000)
|
|
|
+ modeChangeInterval = setInterval(() => {
|
|
|
+ if (window.sdkInstance.player.controls) {
|
|
|
+ clearInterval(modeChangeInterval);
|
|
|
+ window.sdkInstance.changeMode('floorplan');
|
|
|
+ sdkInstance.player.cameras.floorplan.position.setY(10)
|
|
|
+ }
|
|
|
+ }, 500)
|
|
|
}, 1500)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
sdkInstance.on("endLoading", (mode) => {
|
|
|
console.log(mode, '-----+++++-----')
|
|
|
vrBgContainer.style.display = "none";
|
|
|
@@ -719,10 +728,13 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
|
|
|
// 500
|
|
|
// );
|
|
|
// }
|
|
|
- getsqlData(sdkInstance, uwbInstance,false)
|
|
|
- // var timerId = setInterval(function () {
|
|
|
- // getsqlData(sdkInstance, uwbInstance)
|
|
|
- // }, 1500);
|
|
|
+ benchListInterval = setInterval(() => {
|
|
|
+ let benchIdList = window.store.getters['benchList/getBenchList'].map(m => m.id);
|
|
|
+ if (benchIdList.length > 0) {
|
|
|
+ clearInterval(benchListInterval)
|
|
|
+ getsqlData(sdkInstance, uwbInstance, false)
|
|
|
+ }
|
|
|
+ }, 500);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -749,38 +761,39 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
|
|
|
intersects.forEach(m => {
|
|
|
console.log('点击水滴', event, m && m.object && m.object.geometry && m.object.geometry.type, m.object)
|
|
|
if (m.object.geometry.type != "PlaneBufferGeometry") {
|
|
|
- console.log('onmousedown', 111)
|
|
|
- if (m.object.userData && m.object.userData.benchFlag == true) {
|
|
|
- if (!bool) {
|
|
|
- bool = true;
|
|
|
- //m.object.material = window.shader1;
|
|
|
- ////m.object.scale.set(10, 10, 10)
|
|
|
- //m.object.scale.set(5, 5, 5)
|
|
|
- //outlineObj(m.object)
|
|
|
- // let player = document.getElementById(domId)
|
|
|
- // player.style.display = "none
|
|
|
- if (box) {
|
|
|
- sdkInstance.sceneRenderer.scene.remove(box);
|
|
|
- }
|
|
|
- window.handleBenchClick(m.object.userData.benchId, m.object.userData.bShowRemoteButton)
|
|
|
- box = new THREE.BoxHelper(m.object, '#ff0000'); //object 模型
|
|
|
- sdkInstance.sceneRenderer.scene.add(box)
|
|
|
- //let ambientLight = new THREE.AmbientLight(0xffffff); //设置环境光
|
|
|
- //sdkInstance.sceneRenderer.scene.add(ambientLight); //将环境光添加到场景中
|
|
|
- //let pointLight = new THREE.PointLight(0xffffff, 1, 0);
|
|
|
- //pointLight.position.set(200, 200, 200); //设置点光源位置
|
|
|
- //sdkInstance.sceneRenderer.scene.add(pointLight); //将点光源添加至场景
|
|
|
- }
|
|
|
- //outlineObj(m.object
|
|
|
- //m.object.material = FXAAShader
|
|
|
-
|
|
|
- }
|
|
|
+ console.log('onmousedown', 111)
|
|
|
+ if (m.object.userData && m.object.userData.benchFlag == true) {
|
|
|
+ if (!bool) {
|
|
|
+ bool = true;
|
|
|
+ //m.object.material = window.shader1;
|
|
|
+ ////m.object.scale.set(10, 10, 10)
|
|
|
+ //m.object.scale.set(5, 5, 5)
|
|
|
+ //outlineObj(m.object)
|
|
|
+ // let player = document.getElementById(domId)
|
|
|
+ // player.style.display = "none
|
|
|
+ if (box) {
|
|
|
+ sdkInstance.sceneRenderer.scene.remove(box);
|
|
|
+ }
|
|
|
+ window.handleBenchClick(m.object.userData.benchId, m.object.userData.bShowRemoteButton)
|
|
|
+ box = new THREE.BoxHelper(m.object, '#ff0000'); //object 模型
|
|
|
+ sdkInstance.sceneRenderer.scene.add(box)
|
|
|
+ //let ambientLight = new THREE.AmbientLight(0xffffff); //设置环境光
|
|
|
+ //sdkInstance.sceneRenderer.scene.add(ambientLight); //将环境光添加到场景中
|
|
|
+ //let pointLight = new THREE.PointLight(0xffffff, 1, 0);
|
|
|
+ //pointLight.position.set(200, 200, 200); //设置点光源位置
|
|
|
+ //sdkInstance.sceneRenderer.scene.add(pointLight); //将点光源添加至场景
|
|
|
+ }
|
|
|
+ //outlineObj(m.object
|
|
|
+ //m.object.material = FXAAShader
|
|
|
+
|
|
|
+ }
|
|
|
} else if (m.object.geometry.type == "PlaneBufferGeometry") {
|
|
|
console.log('onmousedown', 222)
|
|
|
if (m.object.userData && m.object.userData.benchFlag == true) {
|
|
|
window.handleListClick(m.object.userData.benchId)
|
|
|
}
|
|
|
- }})
|
|
|
+ }
|
|
|
+ })
|
|
|
bool = false;
|
|
|
bool1 = false;
|
|
|
}
|
|
|
@@ -801,12 +814,12 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
|
|
|
marginLeft = (width - (width * 1.8)) / 2;
|
|
|
marginTop = (height - (height * 1.8)) / 2;
|
|
|
|
|
|
- mouse.x = ((event.clientX + Math.abs(marginLeft)) / parseFloat(housePlayer.style.width)) * 2 - 1;
|
|
|
+ mouse.x = ((event.clientX + Math.abs(marginLeft)) / parseFloat(housePlayer.style.width)) * 2 - 1;
|
|
|
mouse.y = -((event.clientY + Math.abs(marginTop)) / parseFloat(housePlayer.style.height)) * 2 + 1;
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
console.log('======鼠标坐标=====', mouse)
|
|
|
|
|
|
raycaster.setFromCamera(mouse, sdkInstance.player.cameras.floorplan);
|
