mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-26 05:58:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,782 Commits 85 Branches 47 Tags
df1f79bc6284e0fb35b1c99da7ee2dfc7d528781
Commit Graph

219 Commits

Author SHA1 Message Date
Michael Nilsson df1f79bc62 two test cases for iswamanager 2016-03-31 16:45:32 -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
Sebastian Piwell 252789ef6e BATSRUS model pointing at sun 2016-03-24 17:01:16 -04:00
Sebastian Piwell c10dda95d8 Towards more general model scale and position 2016-03-24 16:38:56 -04:00
Michael Nilsson 900afdfc32 add _loggerCat to textureplane 2016-03-24 10:11:16 -04:00
Michael Nilsson 73545c721e merge conflict, added textureplane 2016-03-24 09:25:47 -04:00
Michael Nilsson 5911149273 downloadmanager load to string. update texture function to renderabletextureplane 2016-03-23 16:57:25 -04:00
Sebastian Piwell 1c1db1991c Correect rotation on dataplane with GSM spice kernel 2016-03-23 16:46:08 -04:00
Sebastian Piwell 4b4bea32bf Create dataplane through dataSurfaceContainer moudle 2016-03-23 13:41:28 -04:00
Sebastian Piwell 27666200db Created renderabledataplane through own module in scenegraph 2016-03-23 09:44:19 -04:00
Michael Nilsson 6b19a785e1 changed initital max value in getUniformSliceValues, removed couts 2016-03-23 09:16:54 -04:00
Emil Axelsson 80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00
Emil Axelsson c5aba19d52 Merge branch 'master' of github.com:OpenSpace/OpenSpace-Development into develop 2016-03-23 13:33:42 +01:00
Emil Axelsson 0b3cbaa961 fix bug in multimodelgeometry loading, initializing w to 0 for all vertices 2016-03-23 11:52:29 +01:00
Sebastian Piwell 7712dd0190 Right scale and read from cdf file 2016-03-22 16:15:46 -04:00
Michael Nilsson 1a47008694 solved merge conflict 2016-03-22 09:34:23 -04:00
Sebastian Piwell d269eedf77 Correct size and position 2016-03-22 09:31:17 -04:00
Michael Nilsson ea3d50561d removed cout 2016-03-21 18:04:35 -04:00
Michael Nilsson 2c255cb204 small fix, accidently removed used variable 2016-03-21 17:55:13 -04:00