diff --git a/js/scripts/JSRootGeoPainter.js b/js/scripts/JSRootGeoPainter.js index 532bdfe5822a27b8fb607a67653524ba6e5bd1a7..55648cc97b40100b83e4149ad28978093a93464a 100644 --- a/js/scripts/JSRootGeoPainter.js +++ b/js/scripts/JSRootGeoPainter.js @@ -1927,8 +1927,11 @@ this._outlinePass.edgeThickness = 1.0; this._outlinePass.usePatternTexture = false; this._outlinePass.downSampleRatio = 2; - this._outlinePass.visibleEdgeColor.set('#dd1111'); - this._outlinePass.hiddenEdgeColor.set('#1111dd'); + + const sh = THREE.OutlinePass.selection_enum["select"]; // doesnt stand for spherical harmonics :P + THREE.OutlinePass.selection_atts[sh].visibleEdgeColor.set('#dd1111'); + THREE.OutlinePass.selection_atts[sh].hiddenEdgeColor.set('#1111dd'); + this._effectComposer.addPass( this._outlinePass ); this._effectFXAA = new THREE.ShaderPass( THREE.FXAAShader ); diff --git a/ui5/eve7/lib/OutlinePass.js b/ui5/eve7/lib/OutlinePass.js index 432993bed23533af2e9db02063f42c15cea50d0a..3094e1a27f755b8236d1cea8a5b03fe623b0dc78 100644 --- a/ui5/eve7/lib/OutlinePass.js +++ b/ui5/eve7/lib/OutlinePass.js @@ -8,17 +8,20 @@ THREE.OutlinePass = function ( resolution, scene, camera ) { this.renderScene = scene; this.renderCamera = camera; + // R: Primitives this.selectedObjects = []; + // [fElementId][elementId] -> { "sel_type": THREE.OutlinePass.selection_enum, "sec_sel": boolean, "geom": Primitive<> } this.id2obj_map = {}; + // [C]: Selection Types - [R]: Primitives + this.sel = []; + // [C]: Attributes(color, size, etc...) - [C]: Primitives + this.groups = []; - this.visibleEdgeColor = new THREE.Color( 1, 1, 1 ); - this.hiddenEdgeColor = new THREE.Color( 0.1, 0.04, 0.02 ); this.edgeGlow = 0.0; this.usePatternTexture = false; this.edgeThickness = 1.0; this.edgeStrength = 3.0; this.downSampleRatio = 2; - this.pulsePeriod = 0; THREE.Pass.call( this ); @@ -805,8 +808,6 @@ THREE.OutlinePass.selection_atts = [ // usePatternTexture: false, // edgeThickness: 1.0, // edgeStrength: 3.0, - // downSampleRatio: 2, - // pulsePeriod: 0 }, { visibleEdgeColor: new THREE.Color( 0, 0, 1 ), @@ -815,7 +816,5 @@ THREE.OutlinePass.selection_atts = [ // usePatternTexture: false, // edgeThickness: 1.0, // edgeStrength: 3.0, - // downSampleRatio: 2, - // pulsePeriod: 0 } ];