Erik Broberg
23c4a05a96
Merge from globebrowsing
2016-08-17 20:25:58 -04:00
Alexander Bock
c93d882ea6
Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
...
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Kalle Bladin
c01808ce10
Convert tabs to spaces.
2016-08-17 00:30:53 -04:00
Alexander Bock
cf80788067
More cleanup of Gui code
...
Added IswaGroup properties to the iSWA properties list
Enable sorting the performance measurements by total time
2016-06-28 19:22:50 +02:00
Alexander Bock
9fb7814145
Add visibility toggle to Property base class
...
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
Alexander Bock
ad1893fd6f
Cleanup of ScreenSpaceRenderable
...
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Sebastian Piwell
db375d310e
Update kameleonlpane when sliding
2016-06-15 13:42:26 -04:00
Sebastian Piwell
294773b2cb
Updated shaders
2016-06-14 13:53:24 -04:00
Sebastian Piwell
d368ad9054
Correct coordinate transformation
2016-06-14 13:33:55 -04:00
Michael Nilsson
0ce4b50855
updated ghoul reference
2016-06-14 10:08:24 -04:00
Michael Nilsson
b74782a103
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-06-13 16:28:19 -04:00
Michael Nilsson
86bcbfb92c
windows fix
2016-06-13 16:27:59 -04:00
Sebastian Piwell
04a0abf010
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-06-13 16:10:41 -04:00
Sebastian Piwell
c2a64df1c4
Processing speed test
2016-06-13 16:10:31 -04:00
Michael Nilsson
55e1850045
download texture resource ahead of time
2016-06-13 15:44:31 -04:00
Michael Nilsson
db9af4c886
abstracted cygnet properties to DataCygnet
2016-06-10 16:57:55 -04:00
Michael Nilsson
cb484f3ce5
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-06-10 15:48:46 -04:00
Michael Nilsson
1633d9048e
cleanup iswacygnet header, 90 degree rotation fix, small optimization
2016-06-10 15:48:34 -04:00
Sebastian Piwell
39f083c342
Every datacygnet uses own dimensions
2016-06-10 15:19:32 -04:00
Sebastian Piwell
e2e5d39d3f
x data for new offset
2016-06-10 11:51:20 -04:00
Sebastian Piwell
4ae4ecca3c
Auto filter at start
2016-06-03 14:16:15 -04:00
Sebastian Piwell
e3dae7abc3
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-06-03 13:43:01 -04:00
Sebastian Piwell
8e8d949107
Summer school release
2016-06-03 13:42:50 -04:00
Michael Nilsson
dbe9066829
removed shared_ptr from group events.
2016-06-03 12:44:18 -04:00
Michael Nilsson
f9f9e9abd1
cleanup, update ghoul ref
2016-06-03 11:32:09 -04:00
Michael Nilsson
e694be248f
solve merge conflict in kameleonplane
2016-06-03 09:20:27 -04:00
Michael Nilsson
c05b417519
refactor kameleonplane
2016-06-02 18:00:26 -04:00
Sebastian Piwell
e1b042b252
Do not register backgroundValues when autoFilter is true
2016-06-02 17:30:10 -04:00
Sebastian Piwell
a4f9789dd9
Transfer function bug fix
2016-06-02 17:06:41 -04:00
Sebastian Piwell
41299f17f7
Improved multiple transfer functions
2016-06-02 16:56:25 -04:00
Sebastian Piwell
d788e31334
Change resolution and cdf file in KameleonPlane
2016-06-02 16:25:11 -04:00
Michael Nilsson
7401595e93
refactor filloptions in kameleonplane, merge conflict
2016-06-02 09:45:14 -04:00
Sebastian Piwell
a00e29d987
Merge fix
2016-06-01 16:55:20 -04:00
Sebastian Piwell
342b7fa985
Renamed IswaGroup to IswaBaseGroup
2016-06-01 15:25:11 -04:00
Sebastian Piwell
bba419fcf1
IswaKameleonGroup
2016-06-01 15:08:29 -04:00
Sebastian Piwell
27a046d81d
IswaDataGroup
2016-06-01 14:40:00 -04:00
Michael Nilsson
cb601042a6
solve merge conflict
2016-06-01 14:03:39 -04:00
Michael Nilsson
f029362372
refactor datasphere
2016-06-01 13:19:45 -04:00
Sebastian Piwell
876c86ca75
Merge fix
2016-06-01 12:09:58 -04:00
Sebastian Piwell
d33121d07c
New dataprocessor classes works with IswaGroup
2016-06-01 11:50:26 -04:00
Michael Nilsson
a882d7df6c
add class comments to dataplane
2016-05-31 18:00:09 -04:00
Michael Nilsson
e8238859f8
refactor cygnetplane and dataplane
2016-05-31 17:54:39 -04:00
Sebastian Piwell
1f8df7a166
Refactor dataprocessor
2016-05-31 16:52:46 -04:00
Alexander Bock
88db25e868
Windows compile fix
2016-05-31 18:51:57 +02:00
Michael Nilsson
627d31a5b2
refactor textureplane and cygnetplane
2016-05-27 16:50:01 -04:00
Michael Nilsson
8bc665eb04
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
2016-05-27 09:57:27 -04:00
Michael Nilsson
fccf05a026
uncommented important code
2016-05-27 09:57:11 -04:00
Sebastian Piwell
95dd221f84
Fix crash when cygnet has no group
2016-05-26 15:53:44 -04:00
Sebastian Piwell
edfff68491
Memory leak fix
2016-05-26 15:29:45 -04:00
Sebastian Piwell
6f6e016602
No more unique option names
2016-05-26 13:09:08 -04:00