Commit Graph

158 Commits

Author SHA1 Message Date
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
Magne Sjaastad
decb0a756e Initialize cell scalar value 2013-12-17 12:19:29 +01:00
Magne Sjaastad
40a4e0d0ab Added combined transmissibility to faults 2013-12-17 11:52:50 +01:00
Magne Sjaastad
a8497bec85 Created static method for update of texture coordinates 2013-12-17 11:52:48 +01:00
Magne Sjaastad
3cf1a0f32a Use helper function to get transmissibility scalar results 2013-12-17 11:52:44 +01:00
Magne Sjaastad
c32cf208f2 Removed redundant call 2013-12-17 11:52:42 +01:00
JacobStoren
880ab554f9 Linux compile fixes. Had to pull out the unused NNC search map. 2013-12-16 13:48:51 +01:00
Jacob Støren
b6437d370c NNC: Fixed crash and made colorupdate work 2013-12-16 11:31:06 +01:00
Jacob Støren
56616097d3 NNC: Added preliminary Gui control 2013-12-16 11:29:48 +01:00
Jacob Støren
925d5b5dd6 NNC: Added NNC parts to the FaultPartMgr 2013-12-14 09:48:13 +01:00
Jacob Støren
1e65a9db11 NNC: Added NNCGeometryGenerator 2013-12-14 09:48:06 +01:00
JacobStoren
d4f5dd6803 Fix of linux Compile warnings 2013-12-14 09:38:55 +01:00
Jacob Støren
bf6fba191e Moved Faluts to MainGrid. New fault calculation
Now finding the uncovered geometrical faults and adds them to a separate
generated fault.
2013-12-12 22:18:20 +01:00
Jacob Støren
1be9f1996f Moved GeometryTools w tests to ReservoirDataModel 2013-12-12 22:18:06 +01:00
Jacob Støren
df411efe3f Geometry tools: Made edgeIntersectStorage optional 2013-12-12 22:17:57 +01:00
Magne Sjaastad
e3135e8d08 Use back face culling on faults to avoid z-fighting issues 2013-12-10 11:31:10 +01:00
Magne Sjaastad
48d63495e5 Renamed to RivFaultPartMgr 2013-12-10 07:56:58 +01:00