|
@@ -63788,7 +63788,7 @@ void main() {
|
|
|
|
|
|
let modelType, modelEditing, MergeEditor = viewer.modules.MergeEditor;
|
|
|
Potree.addModel = function(prop, done, onProgress, onError){ //加载模型
|
|
|
- let isFirstLoad = !prop.position; //在编辑时用户添加的
|
|
|
+ let isFirstLoad = prop.bottom == void 0;//在编辑时用户添加的
|
|
|
|
|
|
let loadDone = (model)=>{
|
|
|
|
|
@@ -85972,7 +85972,7 @@ void main() {
|
|
|
//add for测量线,在检测到sphere时优先选中sphere而非线
|
|
|
intersections = intersections.sort(function(a,b){return b.object.renderOrder-a.object.renderOrder}); // 降序
|
|
|
|
|
|
- console.log('getHoveredElement ', intersections);
|
|
|
+ //console.log('getHoveredElement ', intersections)
|
|
|
return intersections;
|
|
|
}
|
|
|
|
|
@@ -115074,7 +115074,7 @@ ENDSEC
|
|
|
//再加两条线否则在正侧边看不到
|
|
|
let line1 = LineDraw.createLine([new Vector3(-10000, 0, 0),new Vector3(10000, 0, 0) ], {color:'#666', dontAlwaysSeen:true});
|
|
|
let line2 = LineDraw.createLine([new Vector3(0, -10000, 0),new Vector3(0, 10000, 0) ], {color:'#666', dontAlwaysSeen:true});
|
|
|
- ground.renderOrder = line1.renderOrder + 1;
|
|
|
+ ground.renderOrder = line1.renderOrder + 1; //要比模型低,否则模型透明时效果不对
|
|
|
ground.add(line1);
|
|
|
ground.add(line2);
|
|
|
}
|
|
@@ -127367,6 +127367,7 @@ ENDSEC
|
|
|
|
|
|
object.traverse( ( child )=>{
|
|
|
if ( child instanceof Mesh ) {
|
|
|
+ child.renderOrder = 10;
|
|
|
if(Potree.settings.boundAddObjs){
|
|
|
child.geometry.computeBoundingBox();
|
|
|
//console.log(child.matrixWorld.clone())
|
|
@@ -128239,13 +128240,14 @@ ENDSEC
|
|
|
|
|
|
//add:
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
async function loadFile(path, callback, onError){
|
|
|
if(Potree.fileServer){
|
|
|
Potree.fileServer.get(path).then(data=>{
|
|
|
callback && callback(data);
|
|
|
- }).fail(onError);
|
|
|
+ }).catch(onError);
|
|
|
}else {
|
|
|
try{
|
|
|
let response = await fetch(path);
|