Commit Graph

50 Commits

Author SHA1 Message Date
Arne Morten Kvarving
ab4619bf74 fixed: add missing cmath include statements
highlighted by building with gcc6
2017-09-29 18:24:28 +02:00
Bjørnar Grip Fjær
76f55c211f #1031 Fix parallel projection for linked Eclipse and GeoMech cases 2017-04-26 15:18:14 +02:00
Magne Sjaastad
b2e9d3fe11 #1292 Fixed CppCheck Issues in AppFwk viewer/vizExtensions/CommonCode 2017-03-06 19:22:32 +01:00
Magne Sjaastad
cae5c42f68 #279 Bind offscreen frame buffer before reading pixel data 2016-11-01 10:12:11 +01:00
Magne Sjaastad
5f484abc2d #279 Create QImage from offscreen frame buffer object 2016-11-01 09:34:51 +01:00
Jacob Støren
78b29fc3a0 Fixed zoom all bounding box issue related to 1209c908e5
Used explicit mainRendering instead of renderSequence->firstRendering()
2016-09-07 15:54:12 +02:00
Jacob Støren
1209c908e5 Fixed clip plane related assert on linux. Hopefully the final fix of trouble related to : ca6e650a72 and 80985785 and 0128baddff
The fundamental problem was that the quad rendering was included in the boundingbox.
2016-09-07 12:52:40 +02:00
Jacob Støren
fcace2a92b Merge Formation Names coloring work and FlowDiagnostics integration 2016-09-06 14:17:50 +02:00
Magne Sjaastad
f2f6cfd77c #279 Access single quad rendering as member of caf::Viewer 2016-09-05 13:43:10 +02:00
Jacob Støren
ca6e650a72 #279 Fixed paralell projection nearplane bug introduced by 8098578545 2016-09-05 11:53:56 +02:00
Magne Sjaastad
8098578545 #279 Workaround for invalid near plane location detected on Linux 2016-09-01 13:02:33 +02:00
Magne Sjaastad
0128baddff #279 Use frame buffer objects for snapshots when available, otherwise use grabFrameBuffer() 2016-08-31 17:34:31 +02:00
Jacob Støren
c1f5ec5bdf #168 Finalized. Zoom along ray is now updated to cope with parallel projection. The code in the different navigations are cleaned up a bit, and alligned 2016-08-17 10:54:15 +02:00
Jacob Støren
0f3fe3ac1b Linux compile warning 2016-08-17 08:52:22 +02:00
Jacob Støren
d13d0775b4 #168 Fixed zoom along ray problem making the camera end up with the scene behind it. 2016-08-16 13:41:10 +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
a3499152a5 #168 Improved the front and back clipping plane calculation in relation to parallel projection.
Added a margin of 20% to account for inaccuracies. Not new for far-plane, but became missing in the first commit regarding parallel projection.
2016-08-15 16:11:38 +02:00
Jacob Støren
c529e18351 #168 Switch to directional Fixed Function light when in parallel mode 2016-08-15 14:27:46 +02:00
Jacob Støren
79a025e06f #168 Zoom All improved to handle parallel projection 2016-08-15 08:57:22 +02:00
Jacob Støren
5cdf307d4e WIP: Improved support for parallel projection. #168
Near plane negative to show everything
ZoomAlongRay now works for parallel projection (only implemented in
ceetron Plus)
2016-08-15 08:55:28 +02:00
Magne Sjaastad
d5050e96b8 AppFwk : Early exit if no scene is present 2016-07-06 16:59:13 +02:00
Magne Sjaastad
e8cf78c2af (#710) Clamp currentFrameIndex to available frame indices 2015-12-17 14:40:01 +01:00
Jacob Støren
6db74465b6 Removed debug output 2015-12-14 09:53:59 +01:00
Jacob Støren
1d9481f09b (#695) Unintentional picking fixed.
Fixed in viewer, keeping the concept of the navigation policies to not flag the
the events as handled.
Made this clearer by adding an interface to turn event consumption on or off on the
navigation policies.
2015-12-10 09:39:55 +01:00
Jacob Støren
f1574bc774 (#168) Consolidated zoom along ray to prepare for handling ortho view 2015-12-10 09:39:49 +01:00
Jacob Støren
f3eb304d66 Caf: Added constructors/destructors to navigation policies 2015-12-10 09:39:35 +01:00
Jacob Støren
8f92dfd0c0 Caf: WIP: Created a base class with trackball related navigation stuff.
Refactored cad and ceetron plus nav to use the common base
2015-12-10 09:39:28 +01:00
Jacob Støren
afe84ce75e (#168) Parallel walk navigation working. Still things to fix 2015-12-10 09:39:06 +01:00
Jacob Støren
bbb0a5e993 (#168) Wip: Parallel projection. Basics in place 2015-12-10 09:33:58 +01:00
Magne Sjaastad
a2bfc12c57 (#674) Clicking on items in 3D view selects corresponding item in tree view/property panel
Clicking on 3D Info box and legends for cell result, separate fault
result and cell edge selects corresponding items in tree view
2015-12-07 09:59:19 +01:00
Magne Sjaastad
469ffdf920 Fwk : Fixed typo 2015-11-23 13:31:28 +01:00
Jacob Støren
c4aed9c487 (#166) Geomech cross sections in place. Refactor of frame/scene/model usage on top level. 2015-11-23 11:25:47 +01:00
Jacob Støren
4d0c1d17b4 cafViewer: Add static model(s) to mainScene as well. 2015-11-23 11:21:58 +01:00
Magne Sjaastad
98bdb6ea6e (#266) Move far clipping plane further away 2015-11-17 13:19:32 +01:00
Magne Sjaastad
c6454300d8 (#266) Added static model interface 2015-11-17 13:19:15 +01:00
Magne Sjaastad
6e56ee28c2 (#266) Functions to be called from a constructor cannot be virtual
Improved immediate mode to be applied on all renderings
2015-11-17 13:18:30 +01:00
Magne Sjaastad
121ee80295 (#266) Cleaned up access to boundingBox 2015-11-17 13:18:27 +01:00
Magne Sjaastad
fb55b469a0 System : Replaced tab with four spaces in AppFwk 2015-10-23 15:21:45 +02:00
Magne Sjaastad
1f2a5a8c08 (#395) Fixed missing calls to navigationPolicyUpdate 2015-09-03 13:06:10 +02:00
Magne Sjaastad
4730e10319 Created navigationPolicyUpdate to be used from navigation policies 2015-09-01 18:04:35 +02:00
Magne Sjaastad
33d5b9b63b Early exit if no frames are present 2015-09-01 11:31:32 +02:00
Magne Sjaastad
3086ab10bc (#395) Fixed bug in viewer 2015-09-01 11:31:32 +02:00
Magne Sjaastad
854c47500b Clamp frameindex instead of doing nothing 2015-09-01 11:31:31 +02:00
Magne Sjaastad
e5d5543cd9 Ovveride update() and find all linked views to be updated 2015-08-28 21:32:51 +02:00
Magne Sjaastad
58149cbdb9 Copied in RPM/Fwk/AppFwk
Commented out use of stipple line, as VizFwk is not update yet
2015-07-29 14:19:43 +02:00
sigurdp
477792e89d Refactored naming of cvfqt:Utils member functions 2013-12-04 17:04:05 +01:00
sigurdp
fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
2013-10-31 14:57:52 +01:00
Jacob Støren
9c1b676f7f Added an improved Ceetron Navigation 2013-10-20 00:41:25 +02:00
Magne Sjaastad
15eab9b261 Performance: Added Utils::copyFromQImage() in cvfqtUtils. Optimized copy
for QImage::Format_ARGB32, and use this function from the paint event in
cafViewer.
2013-09-30 13:17:05 +02:00
sigurdp
f64d9b7e64 Moved CAF to Fwk/AppFwk and moved/renamed VisualizationModules to Fwk/VizFwk 2013-09-20 16:01:20 +02:00