Commit Graph

429 Commits

Author SHA1 Message Date
Magne Sjaastad
7659f58fd6 #884 Intersection collection is responsible for adding box manipulator geometry to model used in 3D viewer 2016-10-03 14:26:46 +02:00
Magne Sjaastad
d7a69bdae8 Merged intersection box interactive manipulation 2016-09-30 10:01:17 +02:00
Magne Sjaastad
d4bdbcb7c8 (#884) Added prototype of event handler for interaction with box 2016-09-30 09:34:39 +02:00
Jacob Støren
865d1e1d9c #898 Include inactive cells in box intersections 2016-09-29 14:57:27 +02:00
Jacob Støren
c2eff1b733 Linux compile fixes 2016-09-28 15:07:19 +02:00
Jacob Støren
3bca03a722 Fix of missing changes from previous merge commits. Missing rename of anchestor to ancestor 2016-09-28 14:35:57 +02:00
Jacob Støren
cbb626aa31 Merged intersection-box into dev 2016-09-28 14:27:17 +02:00
Jacob Støren
0d4e4508dc #892 Fixed problem with one element only gray colors 2016-09-28 09:27:28 +02:00
Jacob Støren
3ca53b6103 Fixed some missing update guards on intersections/intersection box 2016-09-28 09:04:21 +02:00
Jacob Støren
db57bc5b28 #817 Single plane visualization (Avoid creating the other planes) 2016-09-27 11:28:39 +02:00
Jacob Støren
4c98ea2283 #815 First working interpolation scheme, so values are not insane 2016-09-27 10:16:16 +02:00
Magne Sjaastad
6b1dd89b2e #888 Intersection Box: Enable picking on intersection box geometry 2016-09-26 10:35:59 +02:00
Jacob Støren
d9f71ad054 #815 Box is now working with correct clipping. Values are not correct on edges of the box. 2016-09-23 11:13:42 +02:00
Magne Sjaastad
3d83d32055 #815 Fixed issue for use of setFromPointAndNormal 2016-09-22 10:09:03 +02:00
Magne Sjaastad
e3cec5bfec #815 Wired up infrastructure for intersection box from view to geometry generators 2016-09-22 10:09:03 +02:00
Jacob Støren
8f501d96ea #815 Reentered Whitespace 2016-09-21 15:05:59 +02:00
Magne Sjaastad
e789694780 #815 : Intersection Box : Added PartManager and SourceInfo 2016-09-21 14:47:02 +02:00
Jacob Støren
33296e4424 #815 Preliminary box calculations lacking some clipping 2016-09-21 14:21:45 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Jacob Støren
08baa5ccc9 #815 Renamed RimCrossSection -> RimIntersection 2016-09-21 10:48:25 +02:00
Jacob Støren
e5cf69a3fe #815 More Rename CrossSection -> Intersection 2016-09-21 10:40:08 +02:00
Jacob Støren
16ab7fcb72 #815 More renaming CrossSection -> Intersection 2016-09-21 10:36:11 +02:00
Jacob Støren
0083fb068f #815 More renaming CrossSection -> Intersection 2016-09-21 10:32:29 +02:00
Jacob Støren
1c612030ef #815 Renamed CrossSection -> Intersection 2016-09-21 10:15:38 +02:00
Magne Sjaastad
c08dce7167 #815 Prototype of interface for RivIntersectionBoxGeometryGenerator 2016-09-21 08:50:55 +02:00
Magne Sjaastad
bb906cdbe2 #815 Moved code to RivHexGridIntersectionTools 2016-09-21 07:57:39 +02:00
Magne Sjaastad
935d49dfdb #815 Moved files to Intersections folder 2016-09-20 16:09:27 +02:00
Magne Sjaastad
b524abc48d #815 Moved common geometry code to HexGridIntersectionTools 2016-09-20 15:57:06 +02:00
Magne Sjaastad
91476b43c8 #837 Rename 2016-09-13 14:07:45 +02:00
Magne Sjaastad
b3f036fb0e #837 GeoMech: Added formation property filter. Moved some functionality to RimCellFilter 2016-09-13 13:43:27 +02:00
Magne Sjaastad
191788643c #719 Extended Grid Box axis to make sure a label coord is present both above max coord and below min coord 2016-09-02 14:04:17 +02:00
Jacob Støren
fbcf9fca11 #168 Merged in parallel projection 2016-08-16 23:20:33 +02:00
Jacob Støren
0eace5579a #168 Fixed shader based light in parallel projection
Added the light position as a uniform in the standard light model shader snippet in the effect generator.
Set the uniform default value on the shader program where ever it is used.
Added an override global uniform set on the viewer to control the light position, and to set it far behind camera when in parallel projection.
2016-08-16 10:58:07 +02:00
Jacob Støren
742ee46f78 #168 Grid box side visibility now handles parallel projection 2016-08-15 08:57:20 +02:00
Magne Sjaastad
cea77a4299 Merged in changes from maintenace branch 2016-08-12 14:53:04 +02:00
Magne Sjaastad
623c07a2f0 Fixed more compiler warnings for variables declared outside an OpenMP loop 2016-08-12 14:48:13 +02:00
Magne Sjaastad
541c770b80 Fixed compiler warnings for variables declared outside an OpenMP loop 2016-08-11 15:30:55 +02:00
Magne Sjaastad
cb4aa45cd3 Merged in changes from maintenance branch 2016-08-11 10:29:14 +02:00
Magne Sjaastad
58047a6509 #569 Added custom font for labels in 3D scene and added font size to preferences 2016-08-09 13:43:13 +02:00
Magne Sjaastad
7890705ccd Renamed function name 2016-08-06 08:47:55 +02:00
Magne Sjaastad
23bd3c9b0c (#805) Cleaned up includes and generalized access to overlayItemLegend 2016-08-05 17:19:49 +02:00
Magne Sjaastad
eae6012b77 #282 Use value selection to filter cells 2016-08-05 10:27:19 +02:00
Magne Sjaastad
5090eddf44 #254 Show fault colors in combination with cell edge colors 2016-08-01 17:16:55 +02:00
Magne Sjaastad
0aababbb12 Linux : Changed order of includes 2016-07-16 18:35:15 +02:00
Magne Sjaastad
686aef821e Cleaned up includes 2016-07-16 16:31:55 +02:00
Magne Sjaastad
68c0d906fb #590 Fault labels are not shown outside filters when faults are 2016-07-16 16:09:03 +02:00
Jacob Støren
2a98f5b116 (#707) Renamed to make the use of resultWellIndex more clear 2015-12-11 17:45:09 +01:00
Jacob Støren
856054666d Fixed error introduced in 28a0e1107c 2015-12-10 10:40:15 +01:00
Magne Sjaastad
5e6fc505d0 (#694) Fixed missing assigment 2015-12-09 12:26:32 +01:00
Magne Sjaastad
28a0e1107c Improved result accessor factory
Moved clamping of time step to zero for static results into factory
2015-12-09 11:33:08 +01:00