Commit Graph

174 Commits

Author SHA1 Message Date
Jacob Støren
537a6ef7af Fixed bug/assert introduced after merge 2014-08-14 10:55:45 +02:00
Jacob Støren
34d62964d6 FaultCelledge : Extracted a method from some duplicate code. 2014-08-14 10:55:43 +02:00
Jacob Støren
066a2c5749 First step in refactoring result texture handling
In order to support more derived reults properties
more consistently across cell/fault/nnc and celledgevisualizations
2014-08-14 10:55:43 +02:00
Jacob Støren
fc1c7c0b0f Wip - reactoring result texture handling 2014-08-14 10:55:42 +02:00
Jacob Støren
710395bb85 Created StructGrid...ToCellFaceMapper
Done to start refactoring to pave way for many new combined result
properties
2014-08-14 10:55:42 +02:00
Jacob Støren
c96169c62e Fixed crash in loading Statistics RegTest manually 2014-07-02 14:11:56 +02:00
Jacob Støren
2a61073b26 Fixed missing Well cell transparency on faults 2014-07-01 14:28:06 +02:00
Jacob Støren
076601e0e5 Fault Results: Fix of crash with None as selected result
Discovered during regtest
2014-06-30 11:20:27 +02:00
Jacob Støren
7846bb1ac6 Fixed bug in Combined Trans result.
Wrong neighbour was used, so the results was actually completely wrong
in any sence for the negative faces.
2014-06-20 12:41:16 +02:00
Magne Sjaastad
a29a388df2 Fixed issue when combining static and dynamic filters
Time step index was set to 0 for static results. This was also done for
all other filters, which caused dynamic filters to always evaluate time
step 0
2014-06-12 08:00:28 +02:00
Magne Sjaastad
071abb2c97 Ternary: Improved positioning of SOIL text and range 2014-05-09 07:32:18 +02:00
Magne Sjaastad
bed902d005 Show ternary range on overlay item 2014-05-06 23:29:41 +02:00
Magne Sjaastad
625a6b5f0e Cleaned up includes 2014-05-06 22:51:17 +02:00
Magne Sjaastad
7c6ff0c533 Added ternary legend config
Included user defined ranges for SOIL, SGAS, SWAT
2014-05-06 22:39:53 +02:00
Magne Sjaastad
3b651d7578 Show ternary saturation data on faults 2014-04-29 10:13:19 +02:00
Magne Sjaastad
83a5a34c4b Ternary: Compute color based on local/global min/max values 2014-04-25 16:32:41 +02:00
Magne Sjaastad
03ab3d0a34 Ternary: Use shader based per vertex coloring effect 2014-04-22 11:22:18 +02:00
Magne Sjaastad
b158c0da9d Use polygon offsett to avoid flickering with mesh lines 2014-04-22 11:22:17 +02:00
Magne Sjaastad
0e92bc5d3f Added ternary saturation overlay item 2014-04-22 11:22:16 +02:00
Magne Sjaastad
d10177494e Added ternary saturation visualization
Ternary saturation available on top of dynamic results
Created visualization for ternary based on SOIL, SGAS and SWAT
2014-04-22 11:22:15 +02:00
Magne Sjaastad
6aa586f9f5 NNC: Improved visual effects
Removed use of depth buffer manipulation as this caused invalid result
color mapping for NNC when combined with other fault geometry.
Use polygon offset on NNC geometry to make sure NNC always wins
2014-01-22 13:17:05 +01:00
Magne Sjaastad
658a513c7f Fault: Show both fault faces in in grid mode to make geometry watertight 2014-01-08 10:47:41 +01:00
Magne Sjaastad
271eb755eb Faults: Fixed update of fault colors (missing files from previous commit) 2014-01-08 08:25:46 +01:00
Magne Sjaastad
f477d7ade6 Faults: Fixed update of fault colors 2014-01-08 08:23:56 +01:00
Magne Sjaastad
7276c2ad31 Faults: Improved forced visibility control of faults. Renaming. 2014-01-07 14:27:43 +01:00
Magne Sjaastad
4391a4ff65 Show fault result mapping in 3D info. Fixed display model update. 2014-01-06 14:02:08 +01:00
Magne Sjaastad
38aca20b84 Faults: Renaming 2014-01-06 13:03:57 +01:00
Magne Sjaastad
c569b9fac1 Faults: Show faults when filters are active 2014-01-06 12:06:36 +01:00
Magne Sjaastad
49a43a036e Pick info and result info: Added face type 2014-01-03 14:59:52 +01:00
Jacob Støren
9aa70640a3 Faults: Use "Cell behind" when showing grid cells
When any grid cell visualization we need to set the Faults face mode to
the cell behind, to match the needs of the normal grid cell
visualization.
The face culling option is grayed out, but is not altered yet.
2014-01-03 08:50:15 +01:00
Magne Sjaastad
34ed2d7e9f Option: Renamed to Fault results 2014-01-02 15:24:07 +01:00
Magne Sjaastad
088df79245 Option: Renamed to Show result on faults 2014-01-02 15:20:08 +01:00
Magne Sjaastad
508334fcb0 Faults: Always show fault color option 2014-01-02 11:21:35 +01:00
Magne Sjaastad
1c80a9dbe8 NNC: Prioritize NNC parts when picking in 3D scene 2013-12-20 10:57:53 +01:00
Magne Sjaastad
c3cd245ffa Hide fault labels when fault collection is disabled 2013-12-19 10:37:16 +01:00
Magne Sjaastad
75225b7519 NNC: Picking and result mapping
Show NNC info in Result Info
Show NNC result mapping for combined transmissibility
2013-12-19 09:24:35 +01:00
Magne Sjaastad
01e0bf4999 Added source info to communicate both cell indices and face indices 2013-12-19 09:16:30 +01:00
Magne Sjaastad
f492f0eda2 Renaming 2013-12-19 09:16:29 +01:00
Jacob Støren
b7f305b142 Faults: Face culling handles flipaxis 2013-12-19 08:48:36 +01:00
Jacob Støren
2171b1bde4 Faults: First shot on getting the face culling right
Still needs to handle flipaxis
2013-12-18 15:49:03 +01:00
Jacob Støren
a6ef98772a Faults: Override backface culling from Grid mode
When in grid mode, backface culling must always be off, when we do not
have results.
2013-12-18 13:36:29 +01:00
Magne Sjaastad
bc4ef17409 Create only one label per fault
Use a separate code path for fault labels to avoid multiple labels on
different sub parts of a fault
2013-12-18 12:49:41 +01:00
Magne Sjaastad
ae4175dd15 Always connect label line to native fault 2013-12-18 12:49:41 +01:00
sigurdp
0100038db0 Experimental support for offsetting NNCs when drawing
Utilize polygon offset in conjunction with disabling of depth writes to
layer drawing of NNs on top of other fault drawing.
2013-12-18 12:13:44 +01:00
Jacob Støren
6d1db22cd8 NNC: Made nnc's folllow cell filters 2013-12-18 10:16:14 +01:00
Magne Sjaastad
55fe73c3b2 Control face culling when mapping results 2013-12-18 09:31:45 +01:00
Magne Sjaastad
d826c79a73 Added face culling in fault part color mode 2013-12-18 09:31:44 +01:00
Magne Sjaastad
a617c4a430 Added more control of face culling 2013-12-18 09:31:43 +01:00
Jacob Støren
473a49f83d Faults: Always show faults when showing Grid
Always show the faults parts when showing the grid in the "normal" way.
If we do not, there will be holes in the model.
2013-12-18 09:26:06 +01:00
sigurdp
28d0fbc476 Added support for multi-level polygon offset
Allow effect generator to tak multiple levels of polygon offsetting.
2013-12-17 13:11:46 +01:00