|
@@ -26,14 +26,8 @@ const lineDepthInfo = {
|
|
clipDistance : 4,//消失距离
|
|
clipDistance : 4,//消失距离
|
|
occlusionDistance: 1,//变为backColor距离
|
|
occlusionDistance: 1,//变为backColor距离
|
|
}
|
|
}
|
|
-const LabelDepthInfo = {
|
|
|
|
- clipDistance : 6,//消失距离
|
|
|
|
- occlusionDistance: 2,//变为backColor距离
|
|
|
|
-}
|
|
|
|
-/* const LabelDepthInfo = {
|
|
|
|
- clipDistance : 0.1,//消失距离
|
|
|
|
- occlusionDistance: 0.1,//变为backColor距离
|
|
|
|
-} */
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
|
|
const markerSizeInfo = {
|
|
const markerSizeInfo = {
|
|
minSize : 25 , maxSize : 65, nearBound : 0.2, farBound : 4,
|
|
minSize : 25 , maxSize : 65, nearBound : 0.2, farBound : 4,
|
|
@@ -45,6 +39,12 @@ const mainLabelProp = {
|
|
fontsize:16,
|
|
fontsize:16,
|
|
useDepth : true ,
|
|
useDepth : true ,
|
|
renderOrder : 5, pickOrder:5,
|
|
renderOrder : 5, pickOrder:5,
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ clipDistance : 20,//消失距离
|
|
|
|
+ occlusionDistance: 5,//变为backColor距离
|
|
|
|
+ maxOcclusionFactor:0.7,
|
|
|
|
+
|
|
}
|
|
}
|
|
const subLabelProp = {
|
|
const subLabelProp = {
|
|
backgroundColor: {r: 255, g: 255, b: 255, a:1},
|
|
backgroundColor: {r: 255, g: 255, b: 255, a:1},
|
|
@@ -733,7 +733,7 @@ export class Measure extends ctrlPolygon{
|
|
getLineMat(type) {
|
|
getLineMat(type) {
|
|
if(!Measure.lineMats){
|
|
if(!Measure.lineMats){
|
|
Measure.lineMats = {
|
|
Measure.lineMats = {
|
|
- edgeDefault: LineDraw.createFatLineMat({
|
|
|
|
|
|
+ edgeDefault: LineDraw.createFatLineMat($.extend({},lineDepthInfo,{
|
|
color: config.measure.default.color,
|
|
color: config.measure.default.color,
|
|
lineWidth: config.measure.lineWidth,
|
|
lineWidth: config.measure.lineWidth,
|
|
useDepth :true,
|
|
useDepth :true,
|
|
@@ -744,22 +744,22 @@ export class Measure extends ctrlPolygon{
|
|
transparent: true,
|
|
transparent: true,
|
|
opacity: config.measure.default.opacity,
|
|
opacity: config.measure.default.opacity,
|
|
depthTestWhenPick:true,
|
|
depthTestWhenPick:true,
|
|
- }),
|
|
|
|
- edgeSelect: LineDraw.createFatLineMat({
|
|
|
|
|
|
+ })),
|
|
|
|
+ edgeSelect: LineDraw.createFatLineMat($.extend({},lineDepthInfo,{
|
|
color: config.measure.highlight.color,//'#f0ff00',
|
|
color: config.measure.highlight.color,//'#f0ff00',
|
|
dashSize: 0.5,
|
|
dashSize: 0.5,
|
|
gapSize: 0.2,
|
|
gapSize: 0.2,
|
|
lineWidth: config.measure.lineWidth ,
|
|
lineWidth: config.measure.lineWidth ,
|
|
transparent: true,
|
|
transparent: true,
|
|
opacity: config.measure.highlight.opacity
|
|
opacity: config.measure.highlight.opacity
|
|
- }),
|
|
|
|
- guide: LineDraw.createFatLineMat({
|
|
|
|
|
|
+ })),
|
|
|
|
+ guide: LineDraw.createFatLineMat($.extend({},lineDepthInfo,{
|
|
color:config.measure.guide.color,
|
|
color:config.measure.guide.color,
|
|
dashSize: 0.1,
|
|
dashSize: 0.1,
|
|
gapSize: 0.02,
|
|
gapSize: 0.02,
|
|
dashed: true,
|
|
dashed: true,
|
|
lineWidth: config.measure.lineWidth
|
|
lineWidth: config.measure.lineWidth
|
|
- })
|
|
|
|
|
|
+ }))
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -770,7 +770,7 @@ export class Measure extends ctrlPolygon{
|
|
|
|
|
|
createAreaPlane(){
|
|
createAreaPlane(){
|
|
planeMats || (planeMats = {
|
|
planeMats || (planeMats = {
|
|
- default: new DepthBasicMaterial( $.extend({},LabelDepthInfo,{
|
|
|
|
|
|
+ default: new DepthBasicMaterial( $.extend({},lineDepthInfo,{
|
|
color:color,
|
|
color:color,
|
|
side:THREE.DoubleSide,
|
|
side:THREE.DoubleSide,
|
|
opacity:0.2,
|
|
opacity:0.2,
|