joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2020-07-03 18:14:49 +08:00
commit 9bef909f27
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jlmap3d/jl3dmaintainer/Jl3dfaultdevice.js
View File

@ -200,6 +200,7 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
if (data.type == "room") { if (data.type == "room") {
scope.resetmodel(); scope.resetmodel();
scope.showmodel = scope.modelmanager.roommodel.mesh; scope.showmodel = scope.modelmanager.roommodel.mesh;
scope.showmodel.code = data.code;
scope.scene.add(scope.showmodel); scope.scene.add(scope.showmodel);
scope.camera.position.set(5, 7, -9); scope.camera.position.set(5, 7, -9);
scope.controls.target = new THREE.Vector3(4, 6, -8); scope.controls.target = new THREE.Vector3(4, 6, -8);
@ -366,11 +367,12 @@ export function Jl3dfaultdevice(dom,group,token,skinCode) {
}; };
this.resetmodel = function(){ this.resetmodel = function(){
if(scope.nowobject.animacode){ if(scope.nowobject){
scope.animastats = false; if(scope.nowobject.animacode){
moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"fuwei"],true); scope.animastats = false;
moveanima.setplaylist(moveanima.animatelist[scope.nowobject.animacode+"fuwei"],true);
}
} }
}; };
this.animationmsgshowon = function(nowobject){ this.animationmsgshowon = function(nowobject){