|
@@ -55546,17 +55546,9 @@
|
|
|
|
|
|
if(once){
|
|
if(once){
|
|
this.removeEventListener(type,listener);
|
|
this.removeEventListener(type,listener);
|
|
- }
|
|
|
|
-
|
|
|
|
- if(type == 'allLoaded'){
|
|
|
|
- console.log('dispatchEvent ', type, listener);
|
|
|
|
- }
|
|
|
|
|
|
+ }
|
|
let result = listener.call(this, event); //add stopContinue
|
|
let result = listener.call(this, event); //add stopContinue
|
|
-
|
|
|
|
-
|
|
|
|
- if(type == 'allLoaded'){
|
|
|
|
- console.log('dispatchEvent2 ',type, result);
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
if(result && result.stopContinue){
|
|
if(result && result.stopContinue){
|
|
break
|
|
break
|
|
}
|
|
}
|
|
@@ -63542,7 +63534,12 @@ uniform float opacity;
|
|
uniform vec3 baseColor;
|
|
uniform vec3 baseColor;
|
|
|
|
|
|
#if defined use_map
|
|
#if defined use_map
|
|
- uniform sampler2D map;
|
|
|
|
|
|
+ uniform sampler2D map;
|
|
|
|
+ #if defined mapColorReplace
|
|
|
|
+ uniform vec3 replaceColor;
|
|
|
|
+ uniform float beReplacedRed;
|
|
|
|
+
|
|
|
|
+ #endif
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#if defined(GL_EXT_frag_depth) && defined(useDepth)
|
|
#if defined(GL_EXT_frag_depth) && defined(useDepth)
|
|
@@ -63566,6 +63563,36 @@ uniform vec3 baseColor;
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
+
|
|
|
|
+vec4 getMapColor(vec4 color){
|
|
|
|
+ #if defined use_map
|
|
|
|
+
|
|
|
|
+ vec4 mapColor = texture2D(map, vUv);
|
|
|
|
+
|
|
|
|
+ #if defined mapColorReplace
|
|
|
|
+ //主要为了测量线marker。 假设此图中仅有两种颜色,另一种是白色
|
|
|
|
+
|
|
|
|
+ const vec3 mapAnotherColor = vec3(1.0,1.0,1.0);
|
|
|
|
+ //uniform vec4 replaceColor;//新的颜色
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ if(mapColor.r < beReplacedRed){//要被取代的颜色
|
|
|
|
+ mapColor = vec4(replaceColor, mapColor.a);
|
|
|
|
+ }/*else if(mapColor.r>mapTextColotR){
|
|
|
|
+ mapColor = vec4(textColor, mapColor.a);
|
|
|
|
+ }*/else{//抗锯齿 过渡
|
|
|
|
+ float replaceRatio = (mapColor.r - mapAnotherColor.r) / (beReplacedRed - mapAnotherColor.r);
|
|
|
|
+ mapColor = vec4( mix(mapAnotherColor, replaceColor, replaceRatio), mapColor.a);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ #endif
|
|
|
|
+
|
|
|
|
+ color *= mapColor;
|
|
|
|
+ #endif
|
|
|
|
+ return color;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+
|
|
void main() {
|
|
void main() {
|
|
|
|
|
|
|
|
|
|
@@ -63612,20 +63639,14 @@ void main() {
|
|
{
|
|
{
|
|
discard;
|
|
discard;
|
|
}else{
|
|
}else{
|
|
-
|
|
|
|
- #if defined use_map
|
|
|
|
- color = texture2D(map, vUv) * color;
|
|
|
|
- #endif
|
|
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ color = getMapColor(color);
|
|
|
|
|
|
color = vec4(mix(color.rgb, backColor, mixFactor), color.a * (1.0 - clipFactor));
|
|
color = vec4(mix(color.rgb, backColor, mixFactor), color.a * (1.0 - clipFactor));
|
|
}
|
|
}
|
|
|
|
|
|
#else
|
|
#else
|
|
- #if defined use_map
|
|
|
|
- color = texture2D(map, vUv) * color;
|
|
|
|
- #endif
|
|
|
|
|
|
+ color = getMapColor(color);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
gl_FragColor = color;
|
|
gl_FragColor = color;
|
|
@@ -72481,9 +72502,8 @@ void main()
|
|
|
|
|
|
{
|
|
{
|
|
|
|
|
|
- var cloudPath = //`${Potree.settings.urls.prefix1}/${dataset.webBin}` //webBin添加原因:每次裁剪之类的操作会换路径,因为oss文件缓存太严重,更新慢
|
|
|
|
- `${Potree.settings.urls.prefix1}/webcloud/cloud.js`;
|
|
|
|
-
|
|
|
|
|
|
+ var cloudPath = //`${Potree.settings.urls.prefix1}/webcloud/cloud.js`
|
|
|
|
+ `${Potree.settings.urls.prefix1}/floor_0_webcloud/cloud.js`;
|
|
|
|
|
|
var timeStamp = 0; //var timeStamp = dataset.updateTime ? dataset.updateTime.replace(/[^0-9]/ig,'') : ''; //每重算一次后缀随updateTime更新一次
|
|
var timeStamp = 0; //var timeStamp = dataset.updateTime ? dataset.updateTime.replace(/[^0-9]/ig,'') : ''; //每重算一次后缀随updateTime更新一次
|
|
|
|
|
|
@@ -75207,8 +75227,10 @@ void main()
|
|
occlusionDistance : { type: 'f', value: o.occlusionDistance || 1 }, //变为backColor距离
|
|
occlusionDistance : { type: 'f', value: o.occlusionDistance || 1 }, //变为backColor距离
|
|
maxClipFactor : { type: 'f', value: o.maxClipFactor || 1 }, //0-1
|
|
maxClipFactor : { type: 'f', value: o.maxClipFactor || 1 }, //0-1
|
|
maxOcclusionFactor : { type: 'f', value: o.maxOcclusionFactor || 1 }, //0-1
|
|
maxOcclusionFactor : { type: 'f', value: o.maxOcclusionFactor || 1 }, //0-1
|
|
-
|
|
|
|
- };
|
|
|
|
|
|
+ //-------add:-----
|
|
|
|
+ replaceColor : {type:'v3', value: o.replaceColor ? new Color(o.replaceColor) : null},
|
|
|
|
+ beReplacedRed : {type:'f', value: o.beReplacedRed},
|
|
|
|
+ };
|
|
|
|
|
|
super({
|
|
super({
|
|
uniforms,
|
|
uniforms,
|
|
@@ -75241,7 +75263,9 @@ void main()
|
|
}
|
|
}
|
|
|
|
|
|
};
|
|
};
|
|
-
|
|
|
|
|
|
+ if(o.mapColorReplace){
|
|
|
|
+ this.defines.mapColorReplace = '';
|
|
|
|
+ }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -75571,8 +75595,13 @@ void main()
|
|
}
|
|
}
|
|
|
|
|
|
applyMatrix(e){
|
|
applyMatrix(e){
|
|
- if(!e)e = {viewport:viewer.mainViewport};//随便写一个viewport
|
|
|
|
|
|
+
|
|
|
|
+ if(!e)e = {viewport:viewer.mainViewport};//随便写一个viewport
|
|
if(e.viewport.name == 'magnifier')return
|
|
if(e.viewport.name == 'magnifier')return
|
|
|
|
+ /* if(this.name == 'measure_point'){
|
|
|
|
+ console.log(1)
|
|
|
|
+ } */
|
|
|
|
+
|
|
if(this.viewports && !this.viewports.includes(e.viewport) )return
|
|
if(this.viewports && !this.viewports.includes(e.viewport) )return
|
|
if( !this.root || !this.realVisible() )return
|
|
if( !this.root || !this.realVisible() )return
|
|
|
|
|
|
@@ -75581,6 +75610,7 @@ void main()
|
|
if(!matrix){
|
|
if(!matrix){
|
|
this.update(e);
|
|
this.update(e);
|
|
matrix = this.matrixMap.get(e.viewport);
|
|
matrix = this.matrixMap.get(e.viewport);
|
|
|
|
+ if(!matrix)return
|
|
}
|
|
}
|
|
|
|
|
|
if(e.viewport == this.useViewport){
|
|
if(e.viewport == this.useViewport){
|
|
@@ -80202,21 +80232,21 @@ void main()
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- if(Potree.settings.editType != 'merge'){
|
|
|
|
|
|
+ /* if(Potree.settings.editType != 'merge'){
|
|
if(this.datasetId != void 0){//初始化位置
|
|
if(this.datasetId != void 0){//初始化位置
|
|
if(this.dataset_points){
|
|
if(this.dataset_points){
|
|
this.dataset_points = this.dataset_points.map(e=>{
|
|
this.dataset_points = this.dataset_points.map(e=>{
|
|
- return e && new Vector3().copy(e)
|
|
|
|
- });
|
|
|
|
- this.transformByPointcloud(); //根据dataset_points生成points
|
|
|
|
|
|
+ return e && new THREE.Vector3().copy(e)
|
|
|
|
+ })
|
|
|
|
+ this.transformByPointcloud() //根据dataset_points生成points
|
|
}
|
|
}
|
|
- }else {
|
|
|
|
|
|
+ }else{
|
|
if(prop.dataset_points && prop.dataset_points.some(e=>e != void 0)){
|
|
if(prop.dataset_points && prop.dataset_points.some(e=>e != void 0)){
|
|
- console.error('存在测量线的datasetId为空而dataset_points有值,请检查并删除:'+this.sid);//存在过的bug,原因未知,可能是后台处理dataset时替换的错误:http://192.168.0.21/index.php?m=bug&f=view&bugID=23601
|
|
|
|
- console.log(this);
|
|
|
|
|
|
+ console.error('存在测量线的datasetId为空而dataset_points有值,请检查并删除:'+this.sid)//存在过的bug,原因未知,可能是后台处理dataset时替换的错误:http://192.168.0.21/index.php?m=bug&f=view&bugID=23601
|
|
|
|
+ console.log(this)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ } */
|
|
|
|
|
|
this.getFacePlane();
|
|
this.getFacePlane();
|
|
this.getPoint2dInfo(this.points);
|
|
this.getPoint2dInfo(this.points);
|
|
@@ -80885,8 +80915,8 @@ void main()
|
|
|
|
|
|
let color = new Color(config$1.measure.color);
|
|
let color = new Color(config$1.measure.color);
|
|
let textColor = new Color(config$1.measure.textColor);
|
|
let textColor = new Color(config$1.measure.textColor);
|
|
- var markerMats;
|
|
|
|
- var lineMats;
|
|
|
|
|
|
+ var markerMats = {};
|
|
|
|
+ var lineMats ;
|
|
var planeMats;
|
|
var planeMats;
|
|
|
|
|
|
const lineDepthInfo = {
|
|
const lineDepthInfo = {
|
|
@@ -80938,8 +80968,8 @@ void main()
|
|
|
|
|
|
|
|
|
|
this.name = this.measureType + this.constructor.counter; //'Measure_' + this.constructor.counter;
|
|
this.name = this.measureType + this.constructor.counter; //'Measure_' + this.constructor.counter;
|
|
-
|
|
|
|
-
|
|
|
|
|
|
+ this.color = '#FF4399';
|
|
|
|
+ this.color = new Color(this.color);
|
|
|
|
|
|
this.markerLabels = [];
|
|
this.markerLabels = [];
|
|
this.edgeLabels = [];
|
|
this.edgeLabels = [];
|
|
@@ -80977,10 +81007,10 @@ void main()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
- this.addEventListener('marker_dropped',(e)=>{
|
|
|
|
- this.updateDatasetBelong(e.index);
|
|
|
|
- });
|
|
|
|
|
|
+ //这版应该没多数据集,不需要更新这个:
|
|
|
|
+ /* this.addEventListener('marker_dropped',(e)=>{
|
|
|
|
+ this.updateDatasetBelong(e.index)
|
|
|
|
+ }) */
|
|
|
|
|
|
|
|
|
|
this.addEventListener('isVisible', ()=>{
|
|
this.addEventListener('isVisible', ()=>{
|
|
@@ -81540,7 +81570,12 @@ void main()
|
|
|
|
|
|
createEdgeLabel(name, hasHoverEvent){
|
|
createEdgeLabel(name, hasHoverEvent){
|
|
const edgeLabel = new TextSprite$2(
|
|
const edgeLabel = new TextSprite$2(
|
|
- $.extend(hasHoverEvent ? mainLabelProp : subLabelProp,{sizeInfo: labelSizeInfo, name:name||'edgeLabel'})
|
|
|
|
|
|
+ $.extend(hasHoverEvent ? mainLabelProp : subLabelProp,{
|
|
|
|
+ sizeInfo: labelSizeInfo, name:name||'edgeLabel',
|
|
|
|
+
|
|
|
|
+ backgroundColor: {r: this.color.r*255, g: this.color.g*255, b: this.color.b*255, a:config$1.measure.default.opacity},
|
|
|
|
+
|
|
|
|
+ })
|
|
);
|
|
);
|
|
if(hasHoverEvent){
|
|
if(hasHoverEvent){
|
|
edgeLabel.addEventListener('mouseover',()=>{
|
|
edgeLabel.addEventListener('mouseover',()=>{
|
|
@@ -81595,26 +81630,30 @@ void main()
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
- getMarkerMaterial(type) {
|
|
|
|
- if(!markerMats){
|
|
|
|
- markerMats = {
|
|
|
|
- default: new DepthBasicMaterial($.extend({},lineDepthInfo,{
|
|
|
|
- transparent: !0,
|
|
|
|
- opacity: 1,
|
|
|
|
- map: texLoader$2.load(Potree.resourcePath+'/textures/pic_point_s32.png' ),
|
|
|
|
- useDepth:true
|
|
|
|
- })),
|
|
|
|
- select: new MeshBasicMaterial({
|
|
|
|
- transparent: !0,
|
|
|
|
- opacity: 1,
|
|
|
|
- depthTest:false,
|
|
|
|
- map: texLoader$2.load(Potree.resourcePath+'/textures/pic_point32.png'/* , null, null, { antialias: false } */),
|
|
|
|
-
|
|
|
|
- }),
|
|
|
|
- };
|
|
|
|
- Measure$1.markerMats = markerMats;
|
|
|
|
- }
|
|
|
|
- return markerMats[type]
|
|
|
|
|
|
+ getMarkerMaterial(type){
|
|
|
|
+ let color = this.color.getHexString();
|
|
|
|
+ if(!markerMats[type + color]){
|
|
|
|
+
|
|
|
|
+ markerMats['default' + color] = new DepthBasicMaterial($.extend({},lineDepthInfo,{
|
|
|
|
+ transparent: !0,
|
|
|
|
+ opacity: 1,
|
|
|
|
+ map: texLoader$2.load(Potree.resourcePath+'/textures/pic_point_s32.png' ),
|
|
|
|
+ useDepth:true,
|
|
|
|
+ replaceColor:this.color,
|
|
|
|
+ beReplacedRed: 0.184, //0.18431372
|
|
|
|
+ mapColorReplace:true,
|
|
|
|
+ })),
|
|
|
|
+ markerMats['select' + color] = new DepthBasicMaterial($.extend({},lineDepthInfo,{
|
|
|
|
+ transparent: !0,
|
|
|
|
+ opacity: 1,
|
|
|
|
+ map: texLoader$2.load(Potree.resourcePath+'/textures/pic_point32.png' ),
|
|
|
|
+ useDepth:true ,
|
|
|
|
+ replaceColor:this.color,
|
|
|
|
+ beReplacedRed: 0.184, //0.18431372
|
|
|
|
+ mapColorReplace:true
|
|
|
|
+ }));
|
|
|
|
+ }
|
|
|
|
+ return markerMats[type + color]
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -81622,39 +81661,51 @@ void main()
|
|
|
|
|
|
|
|
|
|
getLineMat(type) {
|
|
getLineMat(type) {
|
|
- if(!Measure$1.lineMats){
|
|
|
|
- Measure$1.lineMats = {
|
|
|
|
- edgeDefault: LineDraw.createFatLineMat({
|
|
|
|
- color: config$1.measure.default.color,
|
|
|
|
- lineWidth: config$1.measure.lineWidth,
|
|
|
|
- useDepth :true,
|
|
|
|
- dashWithDepth :true, // 只在被遮住的部分显示虚线,因为实线容易挡住label
|
|
|
|
- dashed :true,
|
|
|
|
- dashSize : 0.04,
|
|
|
|
- gapSize: 0.04,
|
|
|
|
- transparent: true,
|
|
|
|
- opacity: config$1.measure.default.opacity,
|
|
|
|
- depthTestWhenPick:true,
|
|
|
|
- }),
|
|
|
|
- edgeSelect: LineDraw.createFatLineMat({
|
|
|
|
- color: config$1.measure.highlight.color,//'#f0ff00',
|
|
|
|
- dashSize: 0.5,
|
|
|
|
- gapSize: 0.2,
|
|
|
|
- lineWidth: config$1.measure.lineWidth ,
|
|
|
|
- transparent: true,
|
|
|
|
- opacity: config$1.measure.highlight.opacity
|
|
|
|
- }),
|
|
|
|
- guide: LineDraw.createFatLineMat({
|
|
|
|
- color:config$1.measure.guide.color,
|
|
|
|
- dashSize: 0.1,
|
|
|
|
- gapSize: 0.02,
|
|
|
|
- dashed: true,
|
|
|
|
- lineWidth: config$1.measure.lineWidth
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
- };
|
|
|
|
|
|
+
|
|
|
|
+ if(!lineMats) Measure$1.lineMats = lineMats = {
|
|
|
|
+ guide: LineDraw.createFatLineMat({
|
|
|
|
+ color:config$1.measure.guide.color,
|
|
|
|
+ dashSize: 0.1,
|
|
|
|
+ gapSize: 0.02,
|
|
|
|
+ dashed: true,
|
|
|
|
+ lineWidth: config$1.measure.lineWidth
|
|
|
|
+ })
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ let color = this.color.getHexString();
|
|
|
|
+ if(!lineMats['edgeDefault'+color]){
|
|
|
|
+ lineMats['edgeDefault'+color] = LineDraw.createFatLineMat({
|
|
|
|
+ color: this.color,
|
|
|
|
+ lineWidth: config$1.measure.lineWidth,
|
|
|
|
+ useDepth :true,
|
|
|
|
+ dashWithDepth :true, // 只在被遮住的部分显示虚线,因为实线容易挡住label
|
|
|
|
+ dashed :true,
|
|
|
|
+ dashSize : 0.04,
|
|
|
|
+ gapSize: 0.04,
|
|
|
|
+ transparent: true,
|
|
|
|
+ opacity: config$1.measure.default.opacity,
|
|
|
|
+ depthTestWhenPick:true,
|
|
|
|
+ });
|
|
|
|
+ lineMats['edgeSelect'+color] = LineDraw.createFatLineMat({
|
|
|
|
+ color: this.color,//'#f0ff00',
|
|
|
|
+ dashSize: 0.5,
|
|
|
|
+ gapSize: 0.2,
|
|
|
|
+ lineWidth: config$1.measure.lineWidth ,
|
|
|
|
+ transparent: true,
|
|
|
|
+ opacity: config$1.measure.highlight.opacity
|
|
|
|
+ });
|
|
}
|
|
}
|
|
- return Measure$1.lineMats[type]
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ if(type != 'guide'){
|
|
|
|
+ return Measure$1.lineMats['edgeSelect'+color]
|
|
|
|
+ }else return Measure$1.lineMats[type]
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -81926,17 +81977,31 @@ void main()
|
|
|
|
|
|
|
|
|
|
function setLabelHightState(label, state){
|
|
function setLabelHightState(label, state){
|
|
- if(state){
|
|
|
|
- label.backgroundColor = {r: highlightColor.r*255, g: highlightColor.g*255, b: highlightColor.b*255, a:config$1.measure.highlight.opacity},
|
|
|
|
|
|
+ /* if(state){
|
|
|
|
+ label.backgroundColor = {r: highlightColor.r*255, g: highlightColor.g*255, b: highlightColor.b*255, a:config.measure.highlight.opacity},
|
|
|
|
+ label.backgroundColor.a = config.measure.highlight.opacity
|
|
|
|
+ label.sprite.material.useDepth = false;
|
|
|
|
+
|
|
|
|
+ }else{
|
|
|
|
+ label.backgroundColor = mainLabelProp.backgroundColor
|
|
|
|
+ label.backgroundColor.a = config.measure.default.opacity
|
|
|
|
+ label.sprite.material.useDepth = true
|
|
|
|
+
|
|
|
|
+ } */
|
|
|
|
+
|
|
|
|
+ if(state){
|
|
|
|
+ //label.backgroundColor = {r: this.color[0]*255, g: this.color[1]*255, b: this.color[2]*255, a:config.measure.highlight.opacity},
|
|
label.backgroundColor.a = config$1.measure.highlight.opacity;
|
|
label.backgroundColor.a = config$1.measure.highlight.opacity;
|
|
label.sprite.material.useDepth = false;
|
|
label.sprite.material.useDepth = false;
|
|
|
|
|
|
}else {
|
|
}else {
|
|
- label.backgroundColor = mainLabelProp.backgroundColor;
|
|
|
|
|
|
+ //label.backgroundColor = {r: this.color[0]*255, g: this.color[1]*255, b: this.color[2]*255
|
|
label.backgroundColor.a = config$1.measure.default.opacity;
|
|
label.backgroundColor.a = config$1.measure.default.opacity;
|
|
label.sprite.material.useDepth = true;
|
|
label.sprite.material.useDepth = true;
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
label.updateTexture();
|
|
label.updateTexture();
|
|
//label.sprite.material.needsUpdate = true
|
|
//label.sprite.material.needsUpdate = true
|
|
}
|
|
}
|
|
@@ -82102,7 +82167,7 @@ void main()
|
|
return line;
|
|
return line;
|
|
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ Measure$1.markerMats = markerMats;
|
|
/* function createAzimuth(){
|
|
/* function createAzimuth(){
|
|
|
|
|
|
const azimuth = {
|
|
const azimuth = {
|
|
@@ -95787,7 +95852,7 @@ ENDSEC
|
|
this.originPosition = new Vector3().copy(o.pose.translation);
|
|
this.originPosition = new Vector3().copy(o.pose.translation);
|
|
this.originFloorPosition = new Vector3().copy(o.puck);
|
|
this.originFloorPosition = new Vector3().copy(o.puck);
|
|
|
|
|
|
- this.originID = parseInt(o.id);// uuid "file_id":"00022"对应是原本的4dkk的id --来自vision.txt
|
|
|
|
|
|
+ this.originID = parseInt(o.uuid);//id uuid "file_id":"00022"对应是原本的4dkk的id --来自vision.txt
|
|
|
|
|
|
this.pointcloud = viewer.scene.pointclouds[0];
|
|
this.pointcloud = viewer.scene.pointclouds[0];
|
|
this.pointcloud.panos.push(this);
|
|
this.pointcloud.panos.push(this);
|
|
@@ -106186,7 +106251,7 @@ ENDSEC
|
|
|
|
|
|
//鼠标静止一段时间它就会消失
|
|
//鼠标静止一段时间它就会消失
|
|
updateVisible(){
|
|
updateVisible(){
|
|
- Date.now() - this.mouseLastMoveTime > 1500 && !this.hidden && this.hide();
|
|
|
|
|
|
+ //Date.now() - this.mouseLastMoveTime > 1500 && !this.hidden && this.hide()
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -141312,7 +141377,7 @@ ENDSEC
|
|
if(Potree.fileServer){
|
|
if(Potree.fileServer){
|
|
path = '/vision.json';
|
|
path = '/vision.json';
|
|
}else {
|
|
}else {
|
|
- path = `${Potree.settings.urls.prefix1}/vision.json`;
|
|
|
|
|
|
+ path = '/floor_0_webcloud/floor_0_vision.txt'; //`${Potree.settings.urls.prefix1}/vision.json`
|
|
}
|
|
}
|
|
return Potree.getRealUrl(path, (path)=>{
|
|
return Potree.getRealUrl(path, (path)=>{
|
|
loadFile(path, { }, callback, );
|
|
loadFile(path, { }, callback, );
|