三维编辑器加载模型修改

src/jlmap3d/edit/Jlmap3dnewdata.js

@@ -124,7 +124,7 @@ export function Jlmap3ddata(mapid,scope){
       assetloader.assetpromise(scene)
       .then(function(data){
 
-        return jlmap3ddata.stationstandlist.loadpromise(jlmap3ddata,standsdata,scene,assetloader);
+        return jlmap3ddata.stationstandlist.loadpromise(jlmap3ddata,standsdata,mapdata.stationStandList,scene,assetloader);
       })
       .then(function(data){
         //console.log(data);

src/jlmap3d/edit/neweditmodel/SectionList.js

@@ -313,10 +313,15 @@ export function SectionList() {
       }
       let stations = jlmap3ddata.stationstandlist.list;
       let num;
+      let num2;
       for(let j=0;j<assetloader.modellist.length;j++){
         if(assetloader.modellist[j].deviceType == "stand"){
           num = j;
         }
+        if(assetloader.modellist[j].deviceType == "standwaice"){
+          num2 = j;
+          assetloader.modellist[num2].mesh.rotation.x = 0;
+        }
       }
 
       for(let j=0,lenj=stations.length;j<lenj;j++){
@@ -324,8 +329,13 @@ export function SectionList() {
         // console.log(scope.sections.datalist[stations[j].direction1.section]);
         let x = scope.sections.datalist[stations[j].direction1.section].mesh.position.x;
         let z = (scope.sections.datalist[stations[j].direction1.section].mesh.position.z+scope.sections.datalist[stations[j].direction2.section].mesh.position.z)/2;
+        let mesh;
+        if(stations[j].direction1.inside == true){
+          mesh = assetloader.modellist[num].mesh.clone(true);
+        }else{
+          mesh = assetloader.modellist[num2].mesh.clone(true);
+        }
 
-        var mesh = assetloader.modellist[num].mesh.clone(true);
         jlmap3ddata.stationstandlist.list[j].modelid = assetloader.modellist[num].modelid;
         jlmap3ddata.stationstandlist.list[j].mesh = mesh;
         // console.log(x);

src/jlmap3d/edit/neweditmodel/StationStandList.js

@@ -52,6 +52,7 @@ export function StationStandList() {
                   newstationstand.direction1.name = stationstanddata[j].name;
                   newstationstand.direction1.screenDoorOpenStatus = "01";
                   newstationstand.direction1.section = stationstanddata[j].standTrackCode;
+                  newstationstand.direction1.inside = stationstanddata[j].inside;
                   // console.log(stationstanddata[j].standTrackCode);
                 }
                 //向左下行
@@ -61,6 +62,7 @@ export function StationStandList() {
                   newstationstand.direction2.name = stationstanddata[j].name;
                   newstationstand.direction2.screenDoorOpenStatus = "01";
                   newstationstand.direction2.section = stationstanddata[j].standTrackCode;
+                  newstationstand.direction2.inside = stationstanddata[j].inside;
                   // console.log(stationstanddata[j].standTrackCode);
                 }
               }
@@ -162,37 +164,56 @@ export function StationStandList() {
       resolve("loadedstation");
     });
   }
-  this.loadpromise = function(jlmap3ddata,standsdata,scene,assetloader){
+  this.loadpromise = function(jlmap3ddata,standsdata,jlmapstanddata,scene,assetloader){
     return new Promise(function(resolve, reject){
-      console.log(standsdata);
+
       let stations = jlmap3ddata.stationstandlist.list;
       let num;
+      let num2;
       for(let j=0;j<assetloader.modellist.length;j++){
         if(assetloader.modellist[j].deviceType == "stand"){
           num = j;
         }
+        if(assetloader.modellist[j].deviceType == "standwaice"){
+          num2 = j;
+          // assetloader.modellist[num2].mesh.rotation.y = Math.PI/2;
+        }
       }
-
+      console.log("+++++++++++++");
+      console.log(jlmapstanddata);
+      console.log(standsdata);
       for(let i=0;i<standsdata.length;i++){
         let newstationstand = new StationStandModel(standsdata[i]);
+        let newstationmesh;
+        for(let j=0;j<jlmapstanddata.length;j++){
+          if(jlmapstanddata[j].code == standsdata[i].direction1.code){
+            if(jlmapstanddata[j].inside == true){
+              newstationmesh = assetloader.modellist[num].mesh.clone(true);
+            }else{
+              newstationmesh = assetloader.modellist[num2].mesh.clone(true);
+            }
+            console.log(jlmapstanddata[j]);
+            newstationstand.code = standsdata[i].code;
+            newstationstand.name = standsdata[i].name;
+            newstationstand.direction1.code = standsdata[i].direction1.code;
+            newstationstand.direction1.name = standsdata[i].direction1.name;
+            newstationstand.direction2.code = standsdata[i].direction2.code;
+            newstationstand.direction2.name = standsdata[i].direction2.name;
 
-        newstationstand.code = standsdata[i].code;
+            console.log(standsdata[i]);
-        newstationstand.name = standsdata[i].name;
+            newstationmesh.position.x = standsdata[i].position.x;
-        newstationstand.direction1.code = standsdata[i].direction1.code;
+            newstationmesh.position.y = standsdata[i].position.y;
-        newstationstand.direction1.name = standsdata[i].direction1.name;
+            newstationmesh.position.z = standsdata[i].position.z;
-        newstationstand.direction2.code = standsdata[i].direction2.code;
+            // newstationmesh.rotation.x = standsdata[i].rotation._x;
-        newstationstand.direction2.name = standsdata[i].direction2.name;
+            // newstationmesh.rotation.y = standsdata[i].rotation._y;
+            // newstationmesh.rotation.z = standsdata[i].rotation._z;
+            newstationstand.mesh = newstationmesh;
+            scope.group.add(newstationmesh);
+            scope.list.push(newstationstand);
+            j = jlmapstanddata.length;
+          }
+        }
 
-        let newstationmesh = assetloader.modellist[num].mesh.clone(true);
-        newstationmesh.position.x = standsdata[i].position.x;
-        newstationmesh.position.y = standsdata[i].position.y;
-        newstationmesh.position.z = standsdata[i].position.z;
-        newstationmesh.rotation.x = standsdata[i].rotation._x;
-        newstationmesh.rotation.y = standsdata[i].rotation._y;
-        newstationmesh.rotation.z = standsdata[i].rotation._z;
-        newstationstand.mesh = newstationmesh;
-        scope.group.add(newstationmesh);
-        scope.list.push(newstationstand);
       }
       scene.add(scope.group);
       resolve("loadedstation");

src/jlmap3d/main/loaders/AssetLoader.js

@@ -32,13 +32,20 @@ let defaulttrain = {
 
 let defaultstation = {
   id:"8",
-  name:"福州车站",
+  name:"内侧车站",
   deviceType:"stand",
   type:"num4",
   picUrl:"",
   assetUrl:"../../static/model/station/fuzhou.FBX"
 }//modelurl+"/models/station/fuzhou/fuzhou.FBX"
-
+let waicestation = {
+  id:"10",
+  name:"外侧车站",
+  deviceType:"standwaice",
+  type:"num4",
+  picUrl:"",
+  assetUrl:"../../static/model/station/waicestation.FBX"
+}
 let defaulttopstation = {
   id:"104",
   name:"福州车站1",
@@ -163,6 +170,8 @@ export function AssetLoader(){
     let station = new AssetModel(defaultstation);
     scope.modellist.push(station);
 
+    let wstation = new AssetModel(waicestation);
+    scope.modellist.push(wstation);
     // let topstation = new AssetModel(defaulttopstation);
     // scope.modellist.push(topstation);
 
@@ -237,6 +246,8 @@ export function AssetLoader(){
       let station = new AssetModel(defaultstation);
       scope.modellist.push(station);
 
+      let wstation = new AssetModel(waicestation);
+      scope.modellist.push(wstation);
       // let topstation = new AssetModel(defaulttopstation);
       // scope.modellist.push(topstation);
 

src/utils/baseUrl.js

@@ -3,7 +3,7 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 张赛