mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-04 09:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,822 Commits 83 Branches 48 Tags
fd9fbb540c222ef5ff211bfa5687612d597421a0
Commit Graph

1822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Piwell fd9fbb540c Solved merge conficts 2016-04-05 13:21:34 -04:00
Sebastian Piwell ca9adfeb44 Some cleanup 2016-04-05 12:13:30 -04:00
Michael Nilsson e25d30f2fb Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-05 12:11:27 -04:00
Michael Nilsson 0810376b03 fix for windows 2016-04-05 12:11:06 -04:00
Michael Nilsson 49d8319938 merge with develop 2016-04-05 12:02:25 -04:00
Michael Nilsson a3266dfcc5 small addition to solving conflict 2016-04-05 11:57:55 -04:00
Michael Nilsson e59ea07b24 solved merge conflict 2016-04-05 11:57:17 -04:00
Sebastian Piwell b1a009e1b0 Create ISWACygnets with metadata struct 2016-04-05 11:44:49 -04:00
Michael Nilsson 0d0f761d6e downloadmanager return shared_ptr to FileFutures instead of bare pointers 2016-04-05 11:33:58 -04:00
Michael Nilsson 7263b251ca iswa module ready for api change in downloadmanager 2016-04-05 11:03:55 -04:00
Michael Nilsson 4da6d72985 merge solved, fixed broken for loop in iswacontainer 2016-04-04 17:55:46 -04:00
Sebastian Piwell 7e4aecbd90 Add ISWACygnets at runtime 2016-04-04 16:42:01 -04:00
Michael Nilsson b62ff11c75 example creation of screenspacecygnet 2016-04-04 16:38:18 -04:00
Michael Nilsson aa10012386 solve merge 2016-04-04 16:21:51 -04:00
Michael Nilsson cf2403c93d screenspacecygnet gets image path in constructor 2016-04-04 16:15:21 -04:00
Michael Nilsson bf6a8e249a solve merge conflict 2016-04-04 16:02:27 -04:00
Sebastian Piwell 6f1b9a9fab Merge with screenspaceimage 2016-04-04 15:51:30 -04:00
Michael Nilsson 6e8d8a9576 getting extension moved to iswa container 2016-04-04 15:46:20 -04:00
Sebastian Piwell 453fbe300e Remove screenspacerenderables in any order 2016-04-04 15:40:45 -04:00
Sebastian Piwell 8e996f5bab Remove screenspacerenderables and iSWACygnets 2016-04-04 15:30:54 -04:00
Alexander Bock e23a1f3e3c Fix compilatioon of renderablefieldlines 2016-04-04 20:26:27 +02:00
Alexander Bock 019092e98e Correctly set child nodes for SceneGraphNode%s 2016-04-04 20:26:10 +02:00
Sebastian Piwell 3fbfb9bb33 Remove screenspacerenderables 2016-04-04 13:49:21 -04:00
Sebastian Piwell 7eb312d10b Delete cygnets 2016-04-04 11:58:42 -04:00
Michael Nilsson 66a9aeb008 solve merge conflict 2016-04-01 16:39:35 -04:00
Michael Nilsson f4964b1628 request file extension 2016-04-01 16:32:18 -04:00
Emil Axelsson 90f3193236 Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop 2016-04-01 17:48:45 +02:00
Emil Axelsson 568a6a3416 fix bug when numberOfSamples is 0 2016-04-01 17:47:00 +02:00
Sebastian Piwell f7643769d9 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-01 11:24:32 -04:00
Sebastian Piwell d3fc17fc4d Real time updateinterval 2016-04-01 11:24:23 -04:00
Michael Nilsson 00c16cf21b Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-01 10:47:00 -04:00
Michael Nilsson b160f3b9af isReady check before render of iSWACygnets 2016-04-01 10:46:41 -04:00
Sebastian Piwell a1cce7d41a BATSRUS model pointing at sun 2016-04-01 10:13:17 -04:00
Michael Nilsson e184f1fad9 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-01 09:09:08 -04:00
Michael Nilsson a583856a52 remove thread and called update texture in textureplane constructor 2016-04-01 09:08:54 -04:00
Sebastian Piwell 9c3d72f57d Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-03-31 17:15:03 -04:00
Sebastian Piwell 7423d2f1c3 Change cygnet in screenspacecygnet 2016-03-31 17:14:52 -04:00
Michael Nilsson df1f79bc62 two test cases for iswamanager 2016-03-31 16:45:32 -04:00
Sebastian Piwell e729723b06 Merge with feature/screenspacerenderable 2016-03-31 15:58:54 -04:00
Sebastian Piwell d610171441 for simple testing 2016-03-31 15:54:29 -04:00
Sebastian Piwell 79979fe8dd Clean up 2016-03-31 14:53:42 -04:00
Michael Nilsson 3967e513d2 call ISWAManagers downloadImage in screenspacecygnet 2016-03-31 12:21:42 -04:00
Michael Nilsson fd281f05b5 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-03-31 12:17:57 -04:00
Michael Nilsson 2bfe0129e4 add screenspacecygnets 2016-03-31 12:17:32 -04:00
Sebastian Piwell 91db544b07 Removed path property 2016-03-31 12:07:20 -04:00
Sebastian Piwell b893c60d53 Download image in ISWAManager 2016-03-31 11:18:22 -04:00
Sebastian Piwell 100f1b75dd Seperated iSWAManager and iSWAContainer 2016-03-31 10:53:03 -04:00
Michael Nilsson ba57bd4cf8 solve merge conflict 2016-03-31 09:50:50 -04:00
Sebastian Piwell a2fb30b432 Depth working again 2016-03-31 09:39:05 -04:00
Sebastian Piwell 687b8551d2 Merge branch 'develop' into feature/screenspaceimage 2016-03-31 09:13:57 -04:00