Commit Graph

35 Commits

Author SHA1 Message Date
Michael Nilsson aa40e3a8b3 fix bug where screenspace cygnets crash program if moved to fast 2016-05-02 10:03:07 -04:00
Sebastian Piwell 434f8bfabb Some clean up and small fixes 2016-04-27 14:48:22 -04:00
Sebastian Piwell 6878975192 Colormaps and read image format from string 2016-04-27 14:44:07 -04:00
Sebastian Piwell 3fc25492f2 Read texture from memory with bare pointer 2016-04-25 11:26:15 -04:00
Sebastian Piwell 0246cd482e Solved merge conflict 2016-04-22 20:01:15 -04:00
Sebastian Piwell f6bbce8b4c Add extension to futurefile 2016-04-22 17:39:45 -04:00
Sebastian Piwell 9786628d6d Log and standard score normalization 2016-04-21 17:24:45 -04:00
Sebastian Piwell 132d21160f Texture plane updates with cygnet update time 2016-04-21 16:45:24 -04:00
Michael Nilsson c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Sebastian Piwell 64a9dd8069 Update screenspacerenderables 2016-04-19 18:03:29 -04:00
Sebastian Piwell 5af317e594 Functions to create iSWAcygnets 2016-04-11 15:15:58 -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
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 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 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
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 8e996f5bab Remove screenspacerenderables and iSWACygnets 2016-04-04 15:30:54 -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 b160f3b9af isReady check before render of iSWACygnets 2016-04-01 10:46:41 -04:00
Sebastian Piwell 7423d2f1c3 Change cygnet in screenspacecygnet 2016-03-31 17:14:52 -04:00
Michael Nilsson 3967e513d2 call ISWAManagers downloadImage in screenspacecygnet 2016-03-31 12:21:42 -04:00
Michael Nilsson 2bfe0129e4 add screenspacecygnets 2016-03-31 12:17:32 -04:00