diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 09ece7e..d85dee1 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -1,4 +1,4 @@ -var Map_QM, renderFrame = -1, pathCameraState, stats, stateTime, isJUZ = false, hasLine = false, dir = false, iot = false, shopTime, debug = false; //dir--自定义地图大小适应不同版本的地图大小 +var Map_QM, renderFrame = -1, pathCameraState, stats, stateTime, isJUZ = false, hasLine = false, dir = false, iot = true, shopTime, debug = false; //dir--自定义地图大小适应不同版本的地图大小 //basePath 基础路径 graphPath最佳路径 ftPath 扶梯路径 dtPath 电梯路径 var typeObj = [{ ft: 0, type: 0, code: 'ft', name: '扶梯' }, { upft: 1, type: 1, code: 'upft', name: '上扶梯' }, { downft: 2, type: 2, code: 'downft', name: '下扶梯' }, { mys: 3, type: 3, code: 'mys', name: '母婴室' }, { xsj: 4, type: 4, code: 'xsj', name: '洗手间' }, @@ -2798,7 +2798,7 @@ MainMap_QM.prototype = { /** * @api {方法} rotationAngle(angle) 改变水平角度 * @apiGroup 地图显示 - * @apiDescription 改变地图水平角度 angle>-180 && angle<180 + * @apiDescription 改变地图水平角度 angle>-180 && angle<180 逆时针旋转 * @apiVersion 4.0.0 * * @apiParam {int} angle 旋转角度 @@ -2811,9 +2811,8 @@ MainMap_QM.prototype = { * */ rotationAngle: function (angle) { - if(Math.abs(parseInt(angle)+Map_QM.controls.getRotateHorizontal()*180/Math.PI)>5){ - Map_QM.controls.setRotateHorizontal((angle / 180) * Math.PI) - } + Map_QM.controls.setRotateHorizontal(Map_QM.controls.getRotateHorizontal()); + Map_QM.controls.setRotateHorizontal((angle / 180) * Math.PI) }, /** * @api {方法} rotateAngle(angle) 改变垂直角度 @@ -5891,8 +5890,8 @@ FloorMap_QM.prototype = { if (arr.length > 0) { let shape = new THREE.Shape(); shape.moveTo(arr[0][0], -1 * arr[0][1]); - for (let k = 0; k < arr.length; k++) { - shape.lineTo(arr[k][2], -1 * arr[k][3]); + for (let k = 1; k < arr.length; k++) { + shape.lineTo(arr[k][0], -1 * arr[k][1]); } shapeArr.push(shape); let meshMaterial;