From d7fd261c07eecb286c8c00b81bd4d32b8a624a2d Mon Sep 17 00:00:00 2001 From: sunzhenyu Date: Wed, 1 Apr 2020 16:03:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E7=BB=B4?= =?UTF-8?q?=E5=AE=A2=E6=B5=81=E8=A7=86=E5=9B=BE=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jlmap3d/edit/neweditmodel/SectionList.js | 2 +- src/jlmap3d/edit/neweditmodel/StationStandList.js | 2 +- src/jlmap3d/jl3ddevice/config.js | 4 ++-- src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js | 2 +- src/jlmap3d/jl3dpassflow/jl3dpassflow.js | 11 +++++++---- .../jl3dsimulation/connect/Jlmap3dSubscribeNew.js | 2 +- src/jlmap3d/main/loaders/DriverLoadNew.js | 2 +- src/views/jlmap3d/passflow/jl3dpassflow.vue | 6 ++++-- 8 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/jlmap3d/edit/neweditmodel/SectionList.js b/src/jlmap3d/edit/neweditmodel/SectionList.js index a0c37bdfc..9a0cd6036 100644 --- a/src/jlmap3d/edit/neweditmodel/SectionList.js +++ b/src/jlmap3d/edit/neweditmodel/SectionList.js @@ -902,7 +902,7 @@ export function SectionList() { // console.log(sectiondata[i]); // console.log(testmesh2); - console.log(newsection); + // console.log(newsection); testmesh2.geometry = newrail; testmesh2.geometry.attributes.position.needsUpdate = true; testmesh2.geometry.attributes.uv.needsUpdate = true; diff --git a/src/jlmap3d/edit/neweditmodel/StationStandList.js b/src/jlmap3d/edit/neweditmodel/StationStandList.js index c0e66f96e..a2f9e59e3 100644 --- a/src/jlmap3d/edit/neweditmodel/StationStandList.js +++ b/src/jlmap3d/edit/neweditmodel/StationStandList.js @@ -181,6 +181,7 @@ export function StationStandList() { if(jlmapstanddata[j].inside == true){ newstationmesh = assetloader.modellist[num].mesh.clone(true); }else{ + console.log(jlmapstanddata[j]); newstationmesh = assetloader.modellist[num2].mesh.clone(true); } // console.log(jlmapstanddata[j]); @@ -190,7 +191,6 @@ export function StationStandList() { newstationstand.direction1.name = standsdata[i].direction1.name; newstationstand.direction2.code = standsdata[i].direction2.code; newstationstand.direction2.name = standsdata[i].direction2.name; - console.log(standsdata[i]); // console.log(standsdata[i]); newstationmesh.position.x = standsdata[i].position.x; newstationmesh.position.y = standsdata[i].position.y; diff --git a/src/jlmap3d/jl3ddevice/config.js b/src/jlmap3d/jl3ddevice/config.js index 35b00f777..456fbc8e3 100644 --- a/src/jlmap3d/jl3ddevice/config.js +++ b/src/jlmap3d/jl3ddevice/config.js @@ -5,7 +5,7 @@ var Staticmodel = { deviceType: "Switch", type: "fuzhou", picUrl: "", - assetUrl: "https://joylink.club/oss/wx/switch/switch.FBX" + assetUrl: "./../static/model/device/switch.FBX" },//"https://joylink.club/oss/wx/switch/switch.FBX" //../../static/model/device/switch.FBX Signal: { @@ -14,7 +14,7 @@ var Staticmodel = { deviceType: "Signal", type: "low", picUrl: "", - assetUrl: "https://joylink.club/oss/wx/signal/signal.FBX" + assetUrl: "../../static/model/device/signal.FBX" }, stationstand: { id: "3", diff --git a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js index 0b6e8544a..6da7c43d6 100644 --- a/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js +++ b/src/jlmap3d/jl3ddrive/moveupdate/DrivingConnectNew.js @@ -102,7 +102,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta return; } if(data.type == "Train_Hmi_3D"){ - console.log(data.body); + // console.log(data.body); trainhmi(data.body); return; } diff --git a/src/jlmap3d/jl3dpassflow/jl3dpassflow.js b/src/jlmap3d/jl3dpassflow/jl3dpassflow.js index 75ae71fea..4e4620731 100644 --- a/src/jlmap3d/jl3dpassflow/jl3dpassflow.js +++ b/src/jlmap3d/jl3dpassflow/jl3dpassflow.js @@ -90,7 +90,7 @@ var views = [ width: 0.5, height: 0.5, background: new THREE.Color( 0.5, 0.5, 0.7 ), - eye: [ 3.7, 17, 26 ], + eye: [ 3.7, 16, 26 ], up: [3.7, 10 ,16 ], fov: 30 }, @@ -100,7 +100,7 @@ var views = [ width: 0.5, height: 0.5, background: new THREE.Color( 0.5, 0.5, 0.7 ), - eye: [ 3.7,30,-4 ], + eye: [ 3.7,17,-4 ], up: [ 3.7, 10 ,16], fov: 30 }, @@ -120,8 +120,8 @@ var views = [ width: 0.5, height: 0.5, background: new THREE.Color( 0.5, 0.7, 0.7 ), - eye: [ -1,12,0], - up: [-1, 11, 8], + eye: [ -7,17,2], + up: [-7, 10, 8], fov: 60 } ]; @@ -229,6 +229,9 @@ export function Jl3dpassflow(dom) { originhuman1.remove(originhuman1.children[2]); scene.add(rungroup); loadingInstance.close(); + + scope.switchrender(false); + animate(); }) diff --git a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js index b63ae5581..637f3393e 100644 --- a/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js +++ b/src/jlmap3d/jl3dsimulation/connect/Jlmap3dSubscribeNew.js @@ -77,7 +77,7 @@ export function Jlmap3dSubscribeNew(jlmap3d,routegroup,jsonwebwork) { // } if (event.data.type== 'SIGNAL' && signallist) { signalupdate(event.data); - console.log(event.data); + // console.log(event.data); return; } diff --git a/src/jlmap3d/main/loaders/DriverLoadNew.js b/src/jlmap3d/main/loaders/DriverLoadNew.js index 16caa2504..1bc47b86d 100644 --- a/src/jlmap3d/main/loaders/DriverLoadNew.js +++ b/src/jlmap3d/main/loaders/DriverLoadNew.js @@ -125,7 +125,7 @@ export function DriverLoadNew(data,scope,netdata,mapdata,sectionlist,signallist, backdata.loaderdata(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails); scope.Subscribe.updatamap(sectionlist,linklist,signallist,stationstandlist,trainlisttest,realsectionlist,rails,scope.materiallist,scope.actions,scope.sceneload); scope.webwork.postMessage("on"); - // console.log(stationstandlist); + console.log(scene); // updatemenulist(stationstandlist.list,trainlisttest.list); loadingInstance.close(); }); diff --git a/src/views/jlmap3d/passflow/jl3dpassflow.vue b/src/views/jlmap3d/passflow/jl3dpassflow.vue index 44a89f03e..f9c414f5e 100644 --- a/src/views/jlmap3d/passflow/jl3dpassflow.vue +++ b/src/views/jlmap3d/passflow/jl3dpassflow.vue @@ -3,11 +3,11 @@
-