mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,004 Commits 84 Branches 47 Tags
f05672436e0071df003f2d2e34b2ef44bd870307
Commit Graph

69 Commits

Author SHA1 Message Date
Michael Nilsson f05672436e removed iswamanager update function and create cygnet through scripts instead 2016-05-03 15:07:22 -04:00
Michael Nilsson 2f7d2e294f solve merge conflict 2016-05-03 13:37:19 -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 8bde97fdfa ISWAGroup for manipulation of multiple dataplanes 2016-05-02 17:32:25 -04:00
Sebastian Piwell 434f8bfabb Some clean up and small fixes 2016-04-27 14:48:22 -04:00
Sebastian Piwell d3df58ff92 Preparation for ENLIL model 2016-04-25 13:37:27 -04:00
Sebastian Piwell c9bb834ef1 Render KameleonPlane 2016-04-25 10:48:48 -04:00
Sebastian Piwell f13367e717 Kameleon plane 2016-04-25 10:37:06 -04:00
Sebastian Piwell 0246cd482e Solved merge conflict 2016-04-22 20:01:15 -04:00
Sebastian Piwell 3381fe5c59 Update dataplan with cygnet update time 2016-04-21 17:38:06 -04:00
Sebastian Piwell 132d21160f Texture plane updates with cygnet update time 2016-04-21 16:45:24 -04:00
Sebastian Piwell 72e3d85f1c Min and max coordinates in cygnet metadata 2016-04-20 15:27:19 -04:00
Sebastian Piwell 201963a2f2 Solved merge conflict 2016-04-20 14:46:37 -04:00
Sebastian Piwell f6ddce7929 Seperated coordinate scale and spatial scale 2016-04-20 14:38:12 -04:00
Michael Nilsson 2701d483c1 check if node with same name already exist before create cygnet 2016-04-20 13:55:03 -04:00
Michael Nilsson b7dc02d421 solve merge conflict 2016-04-20 13:29:05 -04:00
Michael Nilsson 6aa8536d8c create both textureplane and dataplane through gui easier 2016-04-20 13:21:14 -04:00
Sebastian Piwell cb49805b07 Update ghoul 2016-04-20 10:28:53 -04:00
Michael Nilsson a068ca2030 load cygnets through mod file 2016-04-20 09:47:20 -04:00
Sebastian Piwell 64a9dd8069 Update screenspacerenderables 2016-04-19 18:03:29 -04:00
Sebastian Piwell 3d229fdc3a Update textureplane and delete dataplane 2016-04-19 16:59:40 -04:00
Michael Nilsson c0e3eed9e3 loading image cygnets from localhost 2016-04-19 09:54:18 -04:00
Sebastian Piwell 4d487fc810 Stream data 2016-04-19 09:07:17 -04:00
Sebastian Piwell 02c2ee9ef6 DataPlane reads from server 2016-04-18 15:16:11 -04:00
Sebastian Piwell 86bf771cdd Read data file from server 2016-04-18 13:05:50 -04:00
Sebastian Piwell e292f79697 Get metadata and add new images 2016-04-11 17:45:41 -04:00
Sebastian Piwell 5af317e594 Functions to create iSWAcygnets 2016-04-11 15:15:58 -04:00
Sebastian Piwell 6d74bd3b29 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-11 14:41:38 -04:00
Sebastian Piwell d4ade042c1 Parse json string to Lua table 2016-04-11 14:41:31 -04:00
Michael Nilsson 0d298e7232 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-11 14:27:02 -04:00
Michael Nilsson d5d79e01b3 add and remove iswaCygnets through lua scripts 2016-04-11 14:26:53 -04:00
Sebastian Piwell 6c72494859 Small json parse fix 2016-04-11 14:10:37 -04:00
Sebastian Piwell f64804d043 Add frame from json 2016-04-11 13:57:03 -04:00
Sebastian Piwell a820d0a4dd Parse json to lua table string 2016-04-11 12:11:38 -04:00
Sebastian Piwell 6f582912f6 Update with ISWAManager 2016-04-08 16:10:53 -04:00
Sebastian Piwell a55d5e9e9a Put ISWACygnets in sceneGraph 2016-04-08 15:42:24 -04:00
Sebastian Piwell 6a81065b42 ISWACygnet child of Renderable 2016-04-08 12:27:23 -04:00
Sebastian Piwell 263bc9508e Create ISWACygnets with dictionary 2016-04-08 11:58:46 -04:00
Michael Nilsson 575c580e80 iSWAmanager allow GIF loading, update ref to ghoul 2016-04-06 18:20:10 -04:00
Michael Nilsson 65179d49e2 update ghoul reference and iswamanager remove check for '.jpeg' extension 2016-04-06 15:49:14 -04:00
Michael Nilsson a276b330e1 Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-06 15:35:00 -04:00
Michael Nilsson 5e8df2fd06 add check if cdf file exist before reading 2016-04-06 15:34:50 -04:00
Sebastian Piwell bf61f6f1e4 Load and read textures from memory 2016-04-06 14:17:29 -04:00
Sebastian Piwell fdaeaa7361 Changed function names 2016-04-06 09:39:54 -04:00
Sebastian Piwell bea3a1b89b Correct updateintervall 2016-04-05 17:09:45 -04:00
Michael Nilsson e370e915fc Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-04-05 15:39:09 -04:00