|
@@ -26657,7 +26657,8 @@
|
|
|
var rot90 = new Quaternion().setFromAxisAngle(new Vector3(0, 0, 1), Math.PI / 2); //使用的是刚好适合全景图的,给cube贴图需要转90°
|
|
|
//var rot90 = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(1,0,0), -Math.PI/2 ); //4dkk->navvis
|
|
|
//var rot901 = new THREE.Quaternion().setFromAxisAngle(new THREE.Vector3(0,1,0), -Math.PI/2 ); //整张球幕图要旋转下
|
|
|
- //rot90 = new THREE.Quaternion().multiplyQuaternions( rot901, rot90)
|
|
|
+ //rot90 = new THREE.Quaternion().multiplyQuaternions( rot901, rot90)
|
|
|
+ var rotQua2 = new Quaternion().setFromAxisAngle(new Vector3(0, 0, 1), Math.PI);
|
|
|
var old = null;
|
|
|
/*
|
|
|
转成四维看看的axis:
|
|
@@ -26719,9 +26720,9 @@
|
|
|
this.dataQuaternion = new Quaternion().copy(o.pose.rotation);
|
|
|
this.dataRotation = new Euler().setFromQuaternion(this.dataQuaternion);
|
|
|
|
|
|
- //因为位置朝向随着点云位置改变,所以直接运用到点云上,这里清零
|
|
|
- this.originPosition = new Vector3(); //{x: 0, y: 0, z: 0}
|
|
|
- this.quaternion = new Quaternion(); //{w: 0, x: 0, y: 0, z: 1}
|
|
|
+ //因为位置朝向随着点云位置改变,所以直接改变点云,这里清零
|
|
|
+ this.originPosition = new Vector3();
|
|
|
+ this.quaternion = new Quaternion().copy(rotQua2);
|
|
|
this.quaternion4dkk = math.convertVisionQuaternion(this.quaternion); //4dkk内使用的quaternion
|
|
|
|
|
|
this.quaternion2 = this.quaternion.clone();
|
|
@@ -35262,7 +35263,9 @@
|
|
|
renderer.clearDepth(); //防止地图遮挡其他物体
|
|
|
|
|
|
//绘制其他物体
|
|
|
- Potree.Utils.setCameraLayers(this.camera, ['mapObjects', 'bothMapAndScene', 'light']);
|
|
|
+ var layers = ['mapObjects', 'bothMapAndScene', 'light'];
|
|
|
+ Potree.settings.showObjectsOnMap && layers.push('model');
|
|
|
+ Potree.Utils.setCameraLayers(this.camera, layers);
|
|
|
viewer.dispatchEvent({
|
|
|
type: "render.begin",
|
|
|
viewer: this,
|
|
@@ -71870,6 +71873,8 @@
|
|
|
var texLoader$c = new TextureLoader();
|
|
|
texLoader$c.crossOrigin = "anonymous";
|
|
|
var rotQua = new Quaternion().setFromAxisAngle(new Vector3(0, 0, 1), Math.PI / 2 /* Math.PI */);
|
|
|
+ //为什么我算的是-90度,结果是90度才对
|
|
|
+
|
|
|
var lineMats$3 = {};
|
|
|
var circleMats = {};
|
|
|
var renderOrders$1 = {
|
|
@@ -72119,7 +72124,8 @@
|
|
|
Potree.Utils.updateVisible(this.panoMeshs, 'entered', true);
|
|
|
Potree.Utils.updateVisible(this.lineMeshes, 'entered', true);
|
|
|
Potree.settings.unableNavigate = true;
|
|
|
- this.switchView('top');
|
|
|
+
|
|
|
+ //this.switchView('top')
|
|
|
|
|
|
//过后恢复
|
|
|
/* {//默认选择一个楼层
|
|
@@ -83325,7 +83331,7 @@
|
|
|
MergeEditor.changeOpacity(e.tileContent, master.opacity);
|
|
|
if (master.panos) viewer.images360.judgeModelMat(e.tileContent);
|
|
|
//set Layers ?
|
|
|
- Potree.Utils.setObjectLayers(e.tileContent, Potree.settings.showObjectsOnMap ? 'bothMapAndScene' : 'model');
|
|
|
+ Potree.Utils.setObjectLayers(e.tileContent, 'model');
|
|
|
});
|
|
|
{
|
|
|
var vi = true;
|