Commit Graph

236 Commits

Author SHA1 Message Date
Sebastian Piwell
8e996f5bab Remove screenspacerenderables and iSWACygnets 2016-04-04 15:30:54 -04: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
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
f925a35aee Fixed merge conflict 2016-03-30 17:46:21 -04:00
Sebastian Piwell
232bd6d94c Add cygnetPlane class 2016-03-30 17:42:45 -04:00
Michael Nilsson
0feb7fb771 fix for windows. removed thread for updating texture. 2016-03-30 17:26:05 -04:00
Michael Nilsson
378766b55a add loggercat to dataplane 2016-03-30 16:13:52 -04:00
Michael Nilsson
e2e1ae9829 change function and variable names from datasurface to iswacygnet in ISWAManager 2016-03-30 15:59:08 -04:00
Michael Nilsson
c30e215c3f check path file extension to decide what cygnet to create 2016-03-30 15:50:23 -04:00
Sebastian Piwell
c935ce6fe0 renamed module dataplane to iswa 2016-03-30 15:27:31 -04:00
Sebastian Piwell
7f096155ba Merge branch 'feature/dataplane' of github.com:OpenSpace/OpenSpace-Development into feature/dataplane 2016-03-30 14:25:54 -04:00
Sebastian Piwell
4444bb00f1 Abstracted variables for dataSurface 2016-03-30 14:25:31 -04:00
Michael Nilsson
dcbc10e792 Merge branch 'feature/dataplane' of github.com:OpenSpace/OpenSpace-Development into feature/dataplane 2016-03-30 10:27:58 -04:00
Sebastian Piwell
5999369ef1 Update texture based on OpenSpace time 2016-03-30 10:25:45 -04:00
Michael Nilsson
030a051e19 Merge branch 'feature/dataplane' of github.com:OpenSpace/OpenSpace-Development into feature/dataplane 2016-03-30 10:04:03 -04:00
Michael Nilsson
d7509ddc52 add loggerCat 2016-03-30 10:03:05 -04:00
Sebastian Piwell
7cce96b315 Support for multiple TexturePlanes 2016-03-30 09:56:56 -04:00
Michael Nilsson
d390a70fb6 solve merge conflict 2016-03-30 09:51:34 -04:00
Sebastian Piwell
efc2fc5d72 Remove downloaded file for texturePlane 2016-03-30 09:49:40 -04:00
Sebastian Piwell
57afa8fe9f TexturePlane scales after texture ratio 2016-03-30 09:42:46 -04:00
Sebastian Piwell
0bcdb88874 Properies for dataSurface 2016-03-30 09:36:41 -04:00
Michael Nilsson
3e7249157c add some documentation 2016-03-30 09:17:49 -04:00
Michael Nilsson
7df90f2f2e Merge branch 'feature/dataplane' of github.com:OpenSpace/OpenSpace-Development into feature/dataplane 2016-03-29 10:09:48 -04:00
Sebastian Piwell
ea8c126202 Create iSWA url 2016-03-28 15:19:27 -04:00
Michael Nilsson
6034f7ee7e Merge branch 'feature/dataplane' of github.com:OpenSpace/OpenSpace-Development into feature/dataplane 2016-03-28 11:26:56 -04:00
Michael Nilsson
2ca5d52fa3 fix for linux 2016-03-28 11:25:04 -04:00
Sebastian Piwell
4e419eb944 Better angle code to look at sun 2016-03-25 11:36:04 -04:00