Commit Graph

70 Commits

Author SHA1 Message Date
Kalle Bladin 1db9f2f60c Clean up camera class. 2016-05-19 23:21:48 -04:00
Alexander Bock 54fa1c8cbc Merge branch 'feature/rosetta' into develop 2016-05-19 13:24:26 +02:00
Alexander Bock dba650c80d Create separate key bindings for rosetta mission
Prolong rosetta trail
2016-05-18 21:37:27 +02:00
Alexander Bock 7d32dba5cb Enable SingleSphereGeometry to have more segments
Another fix for RenderablePlanetProjection heightmap offset
2016-05-18 20:19:47 +02:00
Alexander Bock 0ab3f0c026 Some fixes on heightmap displacement for RenderablePlanet
Some fixes on heightmap displacement for RenderablePlanetProjection
Enable optional normal map on RenderablePlanetProjection
2016-05-18 19:03:03 +02:00
Alexander Bock 74c7413115 Adding functionality to clear projections on RenderableModelProjection (closing #22) 2016-05-18 00:36:11 +02:00
Alexander Bock bd90a0c44c Fix the image flipping on RenderableModelProjection 2016-05-17 19:25:59 +02:00
Alexander Bock ecc6c8d63f Reintroduce powerscaled coordinates to modelgeometry to fix scaling issue
Correctly set magnification property in RenderableModelProjection
2016-05-16 14:44:55 +02:00
Alexander Bock 9fd0e02cb7 Flip placeholder texture 2016-05-16 09:16:33 +02:00
Alexander Bock 02674cb1c5 Cleanup in projection classes 2016-05-08 16:20:51 +02:00
Michael Nilsson e4a8683aba fixed path to fboPass shaders in renderablePlanetProjection 2016-05-03 16:30:04 -04:00
Alexander Bock 472d35b7c4 Use correct orientation for renderableplaneprojection 2016-04-23 04:07:51 +02:00
Alexander Bock def64f7c24 Correctly clear imageprojections in case the base texture is not RGB 2016-04-20 23:15:34 +02:00
Alexander Bock 4b4a7805c2 Fix the image orientation in the FBO passing for planetprojection 2016-04-20 15:44:06 +02:00
Alexander Bock c14aa7b11b Fix inverted texture problem
- Change texture indices of PowerScaledSphere
- Change texture generation in FBOBass for projections
- Updated NewHorizons to download unflipped texture
- Use new Ghoul version
2016-04-20 14:28:11 +02:00
Alexander Bock ea91d50b87 Start correcting fixes for wrong image origin 2016-04-20 13:07:01 +02:00
Alexander Bock acc6095ba3 Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes 2016-04-20 13:06:40 +02:00
Alexander Bock 906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock c8da825098 Rename ImageSequencer2 to ImageSequencer 2016-04-18 15:14:59 +02:00
Alexander Bock 6b5681626b Removing clang-analyze warnings 2016-04-13 11:46:07 -04:00
Alexander Bock 7c750ff2a2 Merge branch 'develop' into feature/newhorizons 2016-04-08 13:54:23 +02:00
Alexander Bock 2acb2cbd92 Updated ghoul repository
Make use of automatic conversion and swizzling of textures
2016-04-07 19:07:18 +02:00
Emil Axelsson 80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00
Alexander Bock 8031a8c2d4 Fixed RenderableModelProject problem with degrees v radians
Added 67P coordinate system to onscreen gui
2016-03-18 23:00:37 +01:00
Alexander Bock c3aa8fecc2 Update ghoul to account for removed boost dependency 2016-03-15 23:59:57 +01:00
Emil Axelsson ebbbbb2dfd Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/renderengine.cpp
2016-02-08 15:07:38 +01:00
Emil Axelsson 781ca62742 fix bugs in fisheye rendering 2016-02-08 14:33:19 +01:00
Alexander Bock dd98cef974 Enable the RenderableShadowCylinder's color to be set via properties 2016-02-07 20:37:11 +01:00
Alexander Bock 794bbcedda Fix more GLM degrees->radians changes 2016-02-05 22:48:49 +01:00
Alexander Bock f266f0bcee Updated copyright header 2016-02-05 22:47:37 +01:00
Alexander Bock 7e3024959a Remove the disabling of the blend function after an image projection that caused flickering
Set the window resolution in the framebuffer renderer
Fix spelling errors in CK kernel error messages
Reference new leap second kernel
2016-02-05 20:48:35 +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 f1437c7183 Remove superfluous LINFO in RenderablePlanetProjection 2016-01-31 13:59:18 +01:00
Alexander Bock cee66b9c5e Fix image projection error that occurred due to degrees v radians glm functions
Don't crash if a shader recompile fails, but log an error
Use correct file extension for binary Spice kernels
2016-01-31 13:56:46 +01:00
Alexander Bock 50228d9296 Updated Ghoul repository
GCC compile fix
2016-01-18 17:42:51 +01: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 e26f1d41a4 Updated Ghoul version
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock cd3a819541 Updating Ghoul version
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
Alexander Bock 383c7028a8 Applied changes in texture reading io classes to OpenSpace 2015-11-24 18:15:23 -05:00
Alexander Bock 2cc1a91fad Rename SpiceKernelException to SpiceException 2015-11-21 23:15:48 -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 390f5be4a8 Removing includes of sgct.h 2015-10-26 16:14:38 -05:00