|
@@ -63575,7 +63575,7 @@ vec4 getMapColor(vec4 color){
|
|
const vec3 mapAnotherColor = vec3(1.0,1.0,1.0);
|
|
const vec3 mapAnotherColor = vec3(1.0,1.0,1.0);
|
|
//uniform vec4 replaceColor;//新的颜色
|
|
//uniform vec4 replaceColor;//新的颜色
|
|
|
|
|
|
-
|
|
|
|
|
|
+
|
|
if(mapColor.r < beReplacedRed){//要被取代的颜色
|
|
if(mapColor.r < beReplacedRed){//要被取代的颜色
|
|
mapColor = vec4(replaceColor, mapColor.a);
|
|
mapColor = vec4(replaceColor, mapColor.a);
|
|
}/*else if(mapColor.r>mapTextColotR){
|
|
}/*else if(mapColor.r>mapTextColotR){
|
|
@@ -75241,7 +75241,7 @@ void main()
|
|
transparent: o.transparent == void 0 ? true : o.transparent,
|
|
transparent: o.transparent == void 0 ? true : o.transparent,
|
|
side: o.side || 0 /* THREE.DoubleSide */,
|
|
side: o.side || 0 /* THREE.DoubleSide */,
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
this.events = {
|
|
this.events = {
|
|
@@ -75249,7 +75249,8 @@ void main()
|
|
if(!this.useDepth || !e.viewport.camera.isPerspectiveCamera || !e.viewport)return
|
|
if(!this.useDepth || !e.viewport.camera.isPerspectiveCamera || !e.viewport)return
|
|
let viewport = e.viewport;
|
|
let viewport = e.viewport;
|
|
let viewportOffset = viewport.offset || new Vector2();
|
|
let viewportOffset = viewport.offset || new Vector2();
|
|
- this.uniforms.resolution.value.copy(viewport.resolution);
|
|
|
|
|
|
+
|
|
|
|
+ this.uniforms.resolution.value.copy(viewport.resolution);
|
|
this.uniforms.viewportOffset.value.copy(viewportOffset);
|
|
this.uniforms.viewportOffset.value.copy(viewportOffset);
|
|
},
|
|
},
|
|
render:(e)=>{//before render 如果有大于两个viewport的话,不同viewport用不同的depthTex
|
|
render:(e)=>{//before render 如果有大于两个viewport的话,不同viewport用不同的depthTex
|
|
@@ -80269,7 +80270,7 @@ void main()
|
|
this.points = [...this.points.slice(0,index), o.point, ...this.points.slice(index,this.points.length)];
|
|
this.points = [...this.points.slice(0,index), o.point, ...this.points.slice(index,this.points.length)];
|
|
//this.points.push(o.point);
|
|
//this.points.push(o.point);
|
|
|
|
|
|
- if(o.marker){
|
|
|
|
|
|
+ if(o.marker){
|
|
this.add(o.marker);
|
|
this.add(o.marker);
|
|
this.markers = [...this.markers.slice(0,index), o.marker, ...this.markers.slice(index,this.markers.length)];
|
|
this.markers = [...this.markers.slice(0,index), o.marker, ...this.markers.slice(index,this.markers.length)];
|
|
this.updateMarker(o.marker, o.point);
|
|
this.updateMarker(o.marker, o.point);
|
|
@@ -106253,7 +106254,7 @@ ENDSEC
|
|
|
|
|
|
//鼠标静止一段时间它就会消失
|
|
//鼠标静止一段时间它就会消失
|
|
updateVisible(){
|
|
updateVisible(){
|
|
- //Date.now() - this.mouseLastMoveTime > 1500 && !this.hidden && this.hide()
|
|
|
|
|
|
+ Date.now() - this.mouseLastMoveTime > 1500 && !this.hidden && this.hide();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|