Commit cda846bd authored by 单奇雲's avatar 单奇雲

闪烁

parent f639f934
...@@ -60,6 +60,7 @@ class PointsPool extends Component { ...@@ -60,6 +60,7 @@ class PointsPool extends Component {
onMarkersCreated = (type, { markersCache }) => { onMarkersCreated = (type, { markersCache }) => {
this.markerList[type] = markersCache; this.markerList[type] = markersCache;
let stagePilot = this.props.stagePilot; let stagePilot = this.props.stagePilot;
debugger;
// if(markersCache&&stagePilot) { // if(markersCache&&stagePilot) {
// // console.log(this.markerList) // // console.log(this.markerList)
// console.log(markersCache) // console.log(markersCache)
......
...@@ -1362,6 +1362,7 @@ class View3D extends Component { ...@@ -1362,6 +1362,7 @@ class View3D extends Component {
...desigerConf, ...desigerConf,
enableAnimator: true, enableAnimator: true,
enableOutline: true, enableOutline: true,
enableObjOutline: true,
enableCSS2D: true, enableCSS2D: true,
onCreated: this.onGraphCreated, onCreated: this.onGraphCreated,
afterRender: this.afterRender afterRender: this.afterRender
......
...@@ -76,7 +76,6 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -76,7 +76,6 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
} }
}, },
mouseout: (marker) => { mouseout: (marker) => {
console.log('2222')
if(marker.object2DPipe){ if(marker.object2DPipe){
marker.object2DPipe.pipeNode.visible = false; marker.object2DPipe.pipeNode.visible = false;
marker.object2DPipe.pipeNode.elementVisible = false; marker.object2DPipe.pipeNode.elementVisible = false;
...@@ -140,11 +139,26 @@ export default function marker3DFactory(WrappedComponent = 'div', options){ ...@@ -140,11 +139,26 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
markerCreated = ({ markersCache }) => { markerCreated = ({ markersCache }) => {
this.markersCache = markersCache; this.markersCache = markersCache;
markersCache.eachValue(item=>{ this.stagePilot = this.props.stagePilot;
const obj = item.node; this.outlineHelper = this.stagePilot ? this.stagePilot.outlineHelper : undefined;
const boh = new BaseObjHelper({ obj }); markersCache.eachValue(obj=>{
obj.baseObjHelper = boh; this.setTopCardConf(obj, obj.extData);
this.setTopCardConf(obj, item.extData); if(obj.extData.type === "riskSource"){
this.setTwinkleConf(obj);
}
});
}
setTwinkleConf = ( obj ) => {
const { twinkle,frequency } = obj.extData;
let pulsePeriod = (twinkle && frequency != 0 ? 1 / frequency : null)
let color = twinkle && frequency != 0 ? '#FF0000': null;
if (!obj.baseObjHelper.outlineHelper){
obj.baseObjHelper.setOutlineHelper(this.outlineHelper);
}
obj.baseObjHelper.style.outlineColor = color;
pulsePeriod && obj.baseObjHelper.outlineHelper.setConfig({
pulsePeriod: pulsePeriod.toFixed(2)
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment