Commit Graph

323 Commits

Author SHA1 Message Date
Kalle Bladin 4ac19f21b7 Solve merge conflict. 2016-05-19 12:10:14 -04:00
Kalle Bladin 0215c63bab Camera class compiles but missing implementation of two functions. 2016-05-19 11:29:31 -04:00
Sebastian Piwell ff39239b0f Auto filter of 'background' 2016-05-17 16:11:57 -04:00
Michael Nilsson ae131f88c5 changed the naming of min and max value in histogram class 2016-05-17 14:02:40 -04:00
Michael Nilsson 7549beb5f2 solve merge conflict 2016-05-17 12:53:29 -04:00
Michael Nilsson d2e913b70e moved histogram class to core 2016-05-17 12:49:16 -04:00
Erik Broberg afd8ba5e9b Added copy constructor for Camera 2016-05-11 18:36:19 -04:00
Sebastian Piwell e51b104ce8 Transformation Manager 2016-05-10 11:18:09 -04:00
Michael Nilsson c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Kalle Bladin aaa099d542 Solve conflict and fixed old code that did not run on OSX due to use of depricated shader functionality. 2016-04-18 23:05:19 -04:00
Kalle Bladin ada97704f8 Solve compilation problems for OSX. 2016-04-18 22:44:20 -04:00
Erik Broberg 4073f4e6cb Merged in branch develop to feature/globebrowsing 2016-04-18 20:02:42 -04:00
Alexander Bock 906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock 4936a4a084 Remove sgct.h inclusion from LuaConsole
Untabify more files
2016-04-18 11:12:12 +02:00
Alexander Bock 46b207b379 Removing some cppcheck warnings 2016-04-14 22:49:03 -04:00
Alexander Bock b43a454e9f Fix GCC compiler warnings 2016-04-14 22:40:25 -04:00
Erik Broberg 3ec7badcf0 Camera: added convenience method for getting viewRotation and added inner class SyncData 2016-04-14 17:33:52 -04:00
Erik Broberg 299cd27f2c Fixed bug Camera (view rot matrix had translation components) and structured Camera code 2016-04-14 12:47:12 -04:00
Alexander Bock 352e7283d6 Enable the usage of modifiers in bindKey calls (closing #158) 2016-04-08 18:03:09 +02:00
Karl Bladin ff74f0794c Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-04 12:12:19 -04:00
Erik Broberg 9d45463e93 Created class DistanceSwitch and added length() in double precision to PowerScaledCoordinate 2016-03-30 19:34:42 -04:00
Emil Axelsson ebe10a29b5 Volume rendering compatible with abuffer and framebuffer renderers 2016-03-21 16:40:24 +01:00
Alexander Bock d0f4ab6f60 Removing Jenkins warnings 2016-02-05 23:28:45 +01:00
Alexander Bock 877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Emil Axelsson a6a9537b6c Merge with antialiased abuffer 2016-02-03 17:47:29 +01:00
Emil Axelsson d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock cdf228975a Started cleanup of Time class 2015-12-23 17:44:05 -05:00
Alexander Bock 52971caef5 Cleaning the ScreenLog 2015-12-23 17:18:59 -05:00
Alexander Bock 0735d0fc2d More cleanup of FactoryManager 2015-12-14 17:55:24 -08:00
Alexander Bock 177571195c Completely remove references to constants.h 2015-12-14 17:36:15 -08:00
Alexander Bock c92fc923f9 Remove constants.h file
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
Alexander Bock adfc7d244c Cleanup of WindowWrapper classes 2015-12-14 15:55:28 -08:00
Alexander Bock 6eca5c0f68 More module cleanup 2015-12-14 11:46:44 -08:00
Alexander Bock 2fce471743 Started cleanup of module structure 2015-12-14 10:50:38 -08:00
Alexander Bock cd3a819541 Updating Ghoul version
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
Alexander Bock 3806318b0d Applied Ghoul cleanups 2015-11-22 21:26:02 -05:00
Alexander Bock 2cc1a91fad Rename SpiceKernelException to SpiceException 2015-11-21 23:15:48 -05:00
Alexander Bock a087fe47e3 Add fromString methods for enums 2015-11-21 10:39:26 -05:00
Alexander Bock 443963a151 Finished cleanup of SpiceManager 2015-11-20 18:36:03 -05:00
Alexander Bock 2c84368b0b More cleaning of SpiceManager 2015-11-20 00:54:19 -05:00
Alexander Bock 12fdb23684 More cleanup in SpiceManager 2015-11-19 19:47:50 -05:00
Alexander Bock 16897bb8d4 Make the aberration correction specification for targetPosition in SpiceManager explicit by including a seprate class for it 2015-11-19 15:33:57 -05:00
Alexander Bock 11fec9387b More changes on the documentation and Exception handling in SpiceManager
Change some interfaces on SpiceManager
Removed target position return in powerscaled coordinates and only use glm::dvec4 instead as the Spice library does not have higher accuracy anyway
2015-11-19 13:40:44 -05:00
Alexander Bock fad2c642f8 Cleanup of SpiceManager by introducing exceptions
Catch exceptions in RenderableShadowCylinder and LabelParser
Catch exceptions in RenderableFov and Hongkangparser
2015-11-18 21:55:25 -05:00
Alexander Bock d1ca5bd941 More cleanup of SpiceManager 2015-11-18 01:15:58 -05:00
Alexander Bock f7f5f2e262 Started cleanup of SpiceManager
Clean boost message output
Update to new Ghoul with cppformat library
2015-11-17 23:54:54 -05:00
Alexander Bock bbb622f555 Initial work on integrating fontrendering into ghoul 2015-11-02 21:40:45 -05:00
Alexander Bock 327e2560be Remove X11 preprocessor defines for mouse buttons 2015-10-27 14:48:19 -05:00
Alexander Bock d84edc4090 More work on transitioning to windowwrapper for keyboard and mouse interaction 2015-10-25 17:34:03 -05:00
Joakim Kilby b53efe4f0e changed how time keyframes are used 2015-07-05 16:41:38 +02:00