 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
|
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
|
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 |
|
|
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
|
78b827d9d6
|
Histogram with standard score normalization
|
2016-06-15 10:32:59 -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
|
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 |
|
|
Sebastian Piwell
|
65bacf3119
|
Merge with develop
|
2016-06-13 13:30:26 -04:00 |
|
|
Sebastian Piwell
|
3e034b73bb
|
Solved merge conflict
|
2016-06-13 13:25:03 -04:00 |
|
|
Sebastian Piwell
|
661dd00129
|
Faster processing in DataProcessorText
|
2016-06-13 13:20:00 -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
|
a48b46e921
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-06 10:21:01 -04:00 |
|
|
Sebastian Piwell
|
9e7c420719
|
KameleonTransformationMatrix() in Transformation manager
|
2016-06-06 10:20:53 -04:00 |
|
|
Alexander Bock
|
4409003524
|
Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop
Conflicts:
data/scene/default.scene
|
2016-06-04 19:06:54 +02:00 |
|
|
Michael Nilsson
|
79bbd6b01b
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-03 16:27:00 -04:00 |
|
|
Michael Nilsson
|
11245c9ead
|
fix for new ionosphere data
|
2016-06-03 16:26:51 -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
|
8c7986bee4
|
Clean up in DataProcessor
|
2016-06-02 17:14:51 -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 |
|