Michael Nilsson
|
4486fd9a80
|
fix for duplicate dataoptions dropdown in gui
|
2016-06-23 10:31:45 -04:00 |
|
Michael Nilsson
|
cd7ce765a9
|
made member variables private in dataprocessor
|
2016-06-22 14:41:28 -04:00 |
|
Michael Nilsson
|
22d03a3bcd
|
get dimensions from metadata differently, documentation, change dataprocessor method args to const
|
2016-06-22 14:17:59 -04:00 |
|
Michael Nilsson
|
db4b241485
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-22 09:56:00 -04:00 |
|
Michael Nilsson
|
7cbd558dda
|
change from http to http for heroku server
|
2016-06-21 13:16:05 -04:00 |
|
Michael Nilsson
|
8ea1259c58
|
removed includes
|
2016-06-21 11:31:06 -04:00 |
|
Michael Nilsson
|
122f44384b
|
windows fix
|
2016-06-21 11:21:37 -04:00 |
|
Michael Nilsson
|
8f0c8e422b
|
get initial group properties, cleanup of includes
|
2016-06-21 10:53:08 -04:00 |
|
Michael Nilsson
|
1110abc02c
|
correct filter span without histogram
|
2016-06-20 15:26:20 -04:00 |
|
Michael Nilsson
|
294a29d99a
|
merge conflict + update ghoul ref
|
2016-06-20 13:46:38 -04:00 |
|
Sebastian Piwell
|
c285f4b156
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-20 12:01:31 -04:00 |
|
Sebastian Piwell
|
16bdc88633
|
Correctly unnormalize standardscroe normalization
|
2016-06-20 12:01:21 -04:00 |
|
Michael Nilsson
|
2d47eb7a6d
|
fix for crash when plain format file downloaded to screenspacecygnet and texturecygnet
|
2016-06-17 16:22:21 -04:00 |
|
Sebastian Piwell
|
8468742d6b
|
Better auto contrast
|
2016-06-17 14:20:06 -04:00 |
|
Michael Nilsson
|
c5b1a5e53a
|
fix bug crash if load screenspaceimage from disk + catch textureloading exception texturecygnet
|
2016-06-17 14:03:23 -04:00 |
|
Michael Nilsson
|
f9411385d6
|
remove unnecessary includes from dataprocessor
|
2016-06-16 16:56:30 -04:00 |
|
Michael Nilsson
|
35c3d3ce8b
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-16 14:40:39 -04:00 |
|
Michael Nilsson
|
268ca0ea75
|
change method for adding data values in dataprocessortext
|
2016-06-16 14:40:26 -04:00 |
|
Alexander Bock
|
78f3b42c3b
|
Started cleanup of ScreenSpaceImage
|
2016-06-16 01:22:30 +02:00 |
|
Alexander Bock
|
77c8ecf6df
|
Rename screnspace* to screenspace shaders
|
2016-06-16 01:02:13 +02:00 |
|
Alexander Bock
|
ad1893fd6f
|
Cleanup of ScreenSpaceRenderable
Add missing includes to other files
|
2016-06-16 01:00:10 +02:00 |
|
Alexander Bock
|
4fc838cbaf
|
Compile fix for missing Boost
|
2016-06-16 00:58:31 +02:00 |
|
Alexander Bock
|
5cc278c97f
|
Add ModelMatrix retrieval to WindowWrapper
|
2016-06-16 00:57:31 +02:00 |
|
Alexander Bock
|
f38b8856c1
|
Updated Ghoul version
|
2016-06-16 00:32:47 +02:00 |
|
Alexander Bock
|
7548b5654b
|
Make iSWA module dependent on Kameleon
|
2016-06-16 00:24:03 +02:00 |
|
Alexander Bock
|
d03d484f40
|
Actually spell textureplane correctly
|
2016-06-16 00:12:22 +02:00 |
|
Alexander Bock
|
1fb0b40563
|
Rename cygnetplane to textureplane in CMakeLists
|
2016-06-16 00:08:47 +02:00 |
|
Alexander Bock
|
9c83dc1135
|
Make TransformationManager work without Kameleon module
|
2016-06-15 22:59:16 +02:00 |
|
Sebastian Piwell
|
db375d310e
|
Update kameleonlpane when sliding
|
2016-06-15 13:42:26 -04:00 |
|
Sebastian Piwell
|
389d094b8e
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-15 11:49:50 -04:00 |
|
Sebastian Piwell
|
1ef3c035e3
|
Renormalize values in the histogram correctly
|
2016-06-15 11:49:36 -04:00 |
|
Michael Nilsson
|
4401a21677
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-15 11:07:30 -04:00 |
|
Michael Nilsson
|
6573a6dfce
|
add heroku baseurl and key bindings
|
2016-06-15 11:07:20 -04:00 |
|
Sebastian Piwell
|
fe28c9b0aa
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-15 10:33:08 -04:00 |
|
Sebastian Piwell
|
78b827d9d6
|
Histogram with standard score normalization
|
2016-06-15 10:32:59 -04:00 |
|
Michael Nilsson
|
573ebd34a7
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-14 14:02:05 -04:00 |
|
Michael Nilsson
|
b3f1f12a40
|
add scene orientation to screenspacerenderables
|
2016-06-14 13:54:21 -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
|
448492c655
|
update ghoul ref
|
2016-06-14 10:45:01 -04:00 |
|
Michael Nilsson
|
0ce4b50855
|
updated ghoul reference
|
2016-06-14 10:08:24 -04:00 |
|
Michael Nilsson
|
fd026dae53
|
only get selected datavalues from file
|
2016-06-13 17:59:36 -04:00 |
|
Michael Nilsson
|
546b1a9d92
|
another windows fix + disable update when enable equals false
|
2016-06-13 17:14:20 -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
|
cdbe0ae1e0
|
solve merge conflict
|
2016-06-13 15:45:28 -04:00 |
|
Michael Nilsson
|
55e1850045
|
download texture resource ahead of time
|
2016-06-13 15:44:31 -04:00 |
|
Sebastian Piwell
|
afb54ea8d1
|
Do not process x,y,z variables in DataProcessorText
|
2016-06-13 14:17:34 -04:00 |
|