Commit Graph

295 Commits

Author SHA1 Message Date
Magne Sjaastad
d7a69bdae8 Merged intersection box interactive manipulation 2016-09-30 10:01:17 +02:00
Magne Sjaastad
593d72d63b (#884) Refactor and cleanup 2016-09-30 09:34:45 +02:00
Magne Sjaastad
de11836e03 AppFwk : Added DisplayCoordTransform 2016-09-30 09:34:45 +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
ca71b03d80 Linux complie fix 2016-09-29 14:55:56 +02:00
Jacob Støren
8f6744adcb #896 Made the resolution of the slider better 2016-09-29 12:01:25 +02:00
Jacob Støren
c2eff1b733 Linux compile fixes 2016-09-28 15:07:19 +02:00
Jacob Støren
cbb626aa31 Merged intersection-box into dev 2016-09-28 14:27:17 +02:00
Jacob Støren
c84b7ab6d9 Proposed fix for some progressbar related crashes 2016-09-28 12:14:41 +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
120cc8b6dc #887 Category Legend: Limit legend height when having few categories 2016-09-22 15:31:21 +02:00
Jacob Støren
8f501d96ea #815 Reentered Whitespace 2016-09-21 15:05:59 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Magne Sjaastad
59afd14339 AppFwk : Added descendantsIncludingThisOfType 2016-09-21 13:03:55 +02:00
Magne Sjaastad
b524abc48d #815 Moved common geometry code to HexGridIntersectionTools 2016-09-20 15:57:06 +02:00
Magne Sjaastad
8e79a781c9 #827 Fixed issue causing some categories to use uninitialized region of texture 2016-09-14 08:23:50 +02:00
Jacob Støren
e2d200de88 #829 Fixed crash due to color interpolation assert 2016-09-12 14:04:53 +02:00
Jacob Støren
8486889b39 Linux compile fix 2016-09-09 12:31:01 +02:00
Jacob Støren
39d82a28f4 #829 Use interpolated colors in category legend by default 2016-09-09 11:17:08 +02:00
Jacob Støren
ed93db724a #829 Fixed strange category colors in odb intersections 2016-09-09 09:59:35 +02: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
Magne Sjaastad
3e40db6ef0 #827 Refactored CategoryMapper function names and added comments 2016-09-07 08:52:32 +02:00
Jacob Støren
fcace2a92b Merge Formation Names coloring work and FlowDiagnostics integration 2016-09-06 14:17:50 +02:00
Magne Sjaastad
f01e762ef1 #827 Added support for text labels in category legend 2016-09-06 11:15:21 +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
Magne Sjaastad
457c3c732b #569 Added font sizes 12, 24, and 32 2016-08-29 14:25:50 +02:00
Jacob Støren
1a3d8a13af Made uiCapability and xmlCapability const 2016-08-24 15:16:34 +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
fbcf9fca11 #168 Merged in parallel projection 2016-08-16 23:20:33 +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
853e92723b #168 Added hacklish control over Fixed Function default light. 2016-08-15 14:26:44 +02:00
Jacob Støren
20e7e9ec6e Removed compiler warning 2016-08-15 14:25:12 +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
32ded3e05d Added scrollTo() to make sure the expanded item is expanded to root and visibile 2016-08-11 09:15:43 +02:00
Magne Sjaastad
17d37c70d3 #569 Added font with point sizes 8, 12, 16, 24, 32 2016-08-09 13:43:13 +02:00
Magne Sjaastad
5088ae90d9 #805 Linux fixes 2016-08-05 17:53:02 +02:00
Magne Sjaastad
1101db5787 (#805) Added category legend and mapper 2016-08-05 17:23:50 +02:00
Magne Sjaastad
2b588fa35f AppFwk : Function rename 2016-08-05 17:19:47 +02:00
Magne Sjaastad
975f52a78d VizFwk : Added guard for one level only scalar values 2016-08-05 17:19:47 +02:00
Magne Sjaastad
e031f89dcc Merged from maintenance branch 2016-08-05 12:13:13 +02:00
Magne Sjaastad
c5d4519eb1 #282 Added category list if category values are present 2016-08-05 10:26:47 +02:00