mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-29 07:19:28 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,049 Commits 85 Branches 48 Tags
df030b4529b329dfebe209a81e7db22ad484d993
Commit Graph

413 Commits

Author SHA1 Message Date
Michael Nilsson df030b4529 warnings if download to memory failed for some reason 2016-05-05 10:53:50 -04:00
Sebastian Piwell 12baec3827 Small typo 2016-05-05 10:11:59 -04:00
Sebastian Piwell 8f730987df Use frameTransformationMatrix from SpiceManager 2016-05-04 17:38:21 -04:00
Sebastian Piwell 930cd8e0b4 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-04 15:00:45 -04:00
Sebastian Piwell 99a3ebf8da Coordinate transformation with kameleon 2016-05-04 15:00:38 -04:00
Michael Nilsson bf9a819617 windows fix, add base module as dependency to iswa 2016-05-04 12:43:59 -04:00
Michael Nilsson 3a80405c30 solve merge conflict 2016-05-04 12:10:49 -04:00
Sebastian Piwell 4056b36ba5 Add GuiISWAComponent 2016-05-04 12:06:29 -04:00
Michael Nilsson 05cc0850b7 if screenspacecygnet already downloading image, dont send another request 2016-05-04 12:04:08 -04:00
Sebastian Piwell 8fc89d8762 Can't add different cygnet type to a group 2016-05-04 09:37:20 -04:00
Sebastian Piwell 355e70ca0a Remove cygnet groups 2016-05-03 17:13:28 -04:00
Michael Nilsson 0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Michael Nilsson e4a8683aba fixed path to fboPass shaders in renderablePlanetProjection 2016-05-03 16:30:04 -04:00
Sebastian Piwell a0efc00408 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-03 15:35:38 -04:00
Sebastian Piwell 1e4e8919c3 Set attributes of screenspacerenderable through dictionary 2016-05-03 15:35:33 -04:00
Michael Nilsson 57cd5c0bf7 solve merge conflict 2016-05-03 15:14:31 -04:00
Michael Nilsson f05672436e removed iswamanager update function and create cygnet through scripts instead 2016-05-03 15:07:22 -04:00
Sebastian Piwell 5e5e9244f5 Created dataSphere 2016-05-03 14:32:04 -04:00
Sebastian Piwell ddb3345af8 Replace strings with enum 2016-05-03 14:00:51 -04:00
Sebastian Piwell 810bcbb4e1 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-03 13:46:18 -04:00
Sebastian Piwell 7eae57b02f Removed iswacontainer 2016-05-03 13:46:02 -04:00
Michael Nilsson 2f7d2e294f solve merge conflict 2016-05-03 13:37:19 -04:00
Michael Nilsson c34fa48c73 add script to remove screenspacerenderables from renderengine 2016-05-03 13:30:22 -04:00
Sebastian Piwell dfd1968f0b Lua script to add cygnet 2016-05-03 13:24:17 -04:00
Sebastian Piwell c17bfbba02 Chose ISWAGroup in GUI 2016-05-03 11:06:17 -04:00
Michael Nilsson d6b5976298 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-03 10:39:41 -04:00
Michael Nilsson 4d61694f75 ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory 2016-05-03 10:39:32 -04:00
Sebastian Piwell c57a9b7be1 Replaced string with enum 2016-05-03 10:06:47 -04:00
Sebastian Piwell f5ab620398 Merge fix 2016-05-02 17:34:10 -04:00
Sebastian Piwell 8bde97fdfa ISWAGroup for manipulation of multiple dataplanes 2016-05-02 17:32:25 -04:00
Michael Nilsson 40cd7e98ec Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-02 13:42:14 -04:00
Michael Nilsson 7245807a1a changed function parameters to processData, update ghoul ref 2016-05-02 13:42:10 -04:00
Sebastian Piwell 14c0eb8b99 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-05-02 11:35:04 -04:00
Sebastian Piwell 3977a8cdb5 Change transfer functions at runtime 2016-05-02 11:34:13 -04:00
Michael Nilsson 080459d229 sove merge conflict 2016-05-02 10:13:03 -04:00
Michael Nilsson aa40e3a8b3 fix bug where screenspace cygnets crash program if moved to fast 2016-05-02 10:03:07 -04:00
Alexander Bock 3f9cd92767 Use correct shader in RenderablePlanet 2016-05-01 13:39:09 +02:00
Alexander Bock eb4904fc17 Moving pscstandard shader into base 2016-05-01 13:21:57 +02:00
Alexander Bock cfb895e2e9 Move fboPass shader into NewHorizons module 2016-05-01 13:14:36 +02:00
Alexander Bock 6daf8cb6a0 Move nighttexture shader into base module 2016-05-01 13:08:30 +02:00
Sebastian Piwell 6ec125abc0 Changed name on property 2016-04-29 10:07:36 -04:00
Sebastian Piwell 45721dae4b Clean up and multiple transferfunction 2016-04-29 09:56:02 -04:00
Sebastian Piwell 200a3d4dd6 Filter out background values 2016-04-28 17:40:04 -04:00
Sebastian Piwell 233b01c641 Multiple textures and transferfunctions 2016-04-28 15:56:06 -04:00
Michael Nilsson b2725000e8 Added some benchmarking code 2016-04-28 15:08:24 -04:00
Sebastian Piwell 191e4e4d75 Set up for multipletextures in dataplane 2016-04-27 18:06:41 -04:00
Sebastian Piwell 38a5e83f50 Texture and tranferfunction to vectors 2016-04-27 17:44:36 -04:00
Sebastian Piwell ba1f3ad8df Option to log values in data files 2016-04-27 15:40:48 -04:00
Sebastian Piwell 7332ba6446 Merge fix 2016-04-27 14:56:19 -04:00
Sebastian Piwell 5e52910dc6 remove files and merge fix 2016-04-27 14:53:57 -04:00