Commit Graph

2124 Commits

Author SHA1 Message Date
Sebastian Piwell
ff39239b0f Auto filter of 'background' 2016-05-17 16:11:57 -04:00
Sebastian Piwell
08f0204a66 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-17 14:10:44 -04:00
Michael Nilsson
ae131f88c5 changed the naming of min and max value in histogram class 2016-05-17 14:02:40 -04:00
Sebastian Piwell
be17e8851e Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-17 13:26:02 -04:00
Sebastian Piwell
6c37ab289a Group name instead of id 2016-05-17 13:25:57 -04:00
Michael Nilsson
b9ae534a4c updated histogram include path in dataprocessor 2016-05-17 13:04:56 -04:00
Michael Nilsson
5ff67104de Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-17 13:04:11 -04:00
Michael Nilsson
7549beb5f2 solve merge conflict 2016-05-17 12:53:29 -04:00
Michael Nilsson
d2e913b70e moved histogram class to core 2016-05-17 12:49:16 -04:00
Sebastian Piwell
068643d38f Removed a function 2016-05-17 10:19:05 -04:00
Sebastian Piwell
562a986a43 Real Radius on Ionosphere 2016-05-16 17:31:12 -04:00
Michael Nilsson
53eb17bb66 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-16 17:21:14 -04:00
Michael Nilsson
ac635df66b change parsing of metadata 2016-05-16 17:21:01 -04:00
Sebastian Piwell
6afb91eab3 Search for coordnate variables in dataprocessor 2016-05-16 17:18:22 -04:00
Sebastian Piwell
9efc40eadb More Cygnets 2016-05-16 17:00:51 -04:00
Sebastian Piwell
4f9c969e4e Merge fix 2016-05-16 15:26:43 -04:00
Sebastian Piwell
1184240b2b Transfer function and texture fix 2016-05-16 15:21:25 -04:00
Michael Nilsson
b3164d6a8b removed commented code 2016-05-16 14:34:10 -04:00
Michael Nilsson
ace6a91301 fetch ionosphere date from localhost - solve merge conflict 2016-05-16 14:27:17 -04:00
Sebastian Piwell
24d7832c40 Removed couts 2016-05-16 13:55:42 -04:00
Michael Nilsson
b4dc8494cd create data sphere from new metadata 2016-05-16 13:52:51 -04:00
Sebastian Piwell
8cd0a5d50a Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-16 13:36:37 -04:00
Sebastian Piwell
2a236bca77 Read ionosphere data from json file 2016-05-16 13:36:25 -04:00
Alexander Bock
31e6b0e2b3 Add debugging module with RenderableDebugPlane, closing #56 2016-05-16 14:50:48 +02:00
Alexander Bock
ecc6c8d63f Reintroduce powerscaled coordinates to modelgeometry to fix scaling issue
Correctly set magnification property in RenderableModelProjection
2016-05-16 14:44:55 +02:00
Alexander Bock
ffdaeeedcc Renamed default_nh.scene to newhorizons.scene
Remove all 'projection' suffices from newhorizons classes
2016-05-16 09:30:27 +02:00
Alexander Bock
9fd0e02cb7 Flip placeholder texture 2016-05-16 09:16:33 +02:00
Michael Nilsson
13b5d5b205 changed to log-modulus transformation in dataprocessing 2016-05-13 17:01:34 -04:00
Michael Nilsson
f41bf3e424 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-13 15:32:51 -04:00
Michael Nilsson
ece7519b8f solve merge conflict 2016-05-13 15:32:30 -04:00
Sebastian Piwell
88dca0d6c0 Ionosphere test data 2016-05-13 15:22:50 -04:00
Michael Nilsson
d37de2e582 moved histogram stuff to Histogram class, fixed miscalculated standard deviation 2016-05-13 15:16:43 -04:00
Sebastian Piwell
fec15357e8 Moved function body 2016-05-13 14:29:25 -04:00
Sebastian Piwell
1eb0d47fad DataProcessor class 2016-05-13 14:17:42 -04:00
Sebastian Piwell
c81078682d Solved iSWA name problem 2016-05-13 11:00:50 -04:00
Sebastian Piwell
05fa58c39b Delete ScreenSpaceCygnet with lua script 2016-05-13 10:39:26 -04:00
Sebastian Piwell
489b7bbcd2 Clean up 2016-05-13 10:20:51 -04:00
Sebastian Piwell
929fe810df Set scale and position for ScreenSpaceCygnets at start up 2016-05-13 09:45:37 -04:00
Sebastian Piwell
581002175c IswaManager loads cygnet info 2016-05-12 18:49:16 -04:00
Sebastian Piwell
03de689de3 Use update time for ScreenSpaceCygnet from json 2016-05-12 17:40:15 -04:00
Sebastian Piwell
9da4f36ad0 Read cygnet options from json 2016-05-12 15:39:14 -04:00
Sebastian Piwell
a28abd7774 iSWA Screen Space Options 2016-05-12 15:10:17 -04:00
Sebastian Piwell
c2443a9ee2 Merge branch 'develop' into feature/iSWA 2016-05-11 13:30:59 -04:00
Sebastian Piwell
e51b104ce8 Transformation Manager 2016-05-10 11:18:09 -04:00
Sebastian Piwell
18c83a3bd7 Clamp valu in dataplane shader 2016-05-09 15:33:07 -04:00
Sebastian Piwell
c5fa1891b6 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-09 13:10:06 -04:00
Sebastian Piwell
39ff2415bb Name changes 2016-05-09 13:09:47 -04:00
Michael Nilsson
2b541127fa Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-09 11:24:33 -04:00
Michael Nilsson
279d85f0c2 windows fix 2016-05-09 11:24:05 -04:00
Michael Nilsson
819b227976 bugfix, reset dataBuffer in DataPlane before append new data 2016-05-09 09:09:47 -04:00