Commit Graph

204 Commits

Author SHA1 Message Date
Alexander Bock 9afae5c2f9 Remove extra includes 2016-09-15 09:19:46 +02:00
Alexander Bock 5192f312fb Enable LabelParser to load different file extensions by querying the TextureReader supported extensions (closing #89) 2016-09-12 20:39:14 +02:00
Alexander Bock 9135f6141a Fix crash with parser getting being destroyed prematurely 2016-09-12 20:38:48 +02:00
Alexander Bock 32ca42ebaa Some work on the Decoder and ImageParser to make the ownership of data more clear 2016-09-12 19:50:59 +02:00
Alexander Bock 965f3eded0 Clang compile fixes 2016-09-08 13:22:34 +02:00
Alexander Bock 95b1a2a1ad Make the RenderableModelProjection shader work without a depth map 2016-09-07 17:21:08 +02:00
Alexander Bock 69f72718c0 Enable the change of projection texture size in ProjectionComponent (closing #105)
Make the Shadowmapping in RenderableModelProjection optional by setting a value in the mod file
2016-09-07 14:16:16 +02:00
Alexander Bock 3785d30ff6 Ability to enable and disable the ShadowMapping 2016-09-07 10:35:05 +02:00
Alexander Bock 574e6db29d Remove the false image flipping in the renderableplanetprojection shader 2016-09-01 11:07:18 +02:00
Alexander Bock fa904ef1df Merge remote-tracking branch 'origin/feature/rosetta-shadowmapping' into feature/rosetta 2016-09-01 11:01:09 +02:00
Alexander Bock d9016f9a98 Fix projection fading in renderable model 2016-09-01 10:42:19 +02:00
Alexander Bock 0060e4782a Adding a configuration value to ProjectionComponent that determines the aspect ratio of the projection texture (default = 1.0) 2016-09-01 09:54:49 +02:00
Emil Axelsson 86a0661aef perform bias matrix operation in shader instead of on cpu, for renderableplanetprojection 2016-08-30 13:36:57 +02:00
Alexander Bock 6884eca40e Merge remote-tracking branch 'origin/feature/rosetta-shadowmapping' into feature/rosetta
Conflicts:
	modules/newhorizons/rendering/renderablemodelprojection.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	modules/newhorizons/util/projectioncomponent.cpp
2016-08-29 18:34:18 +02:00
Kalle Bladin 5551da922d Update renderables to higher precision rendering by calculating M and V matrix in double precision. 2016-08-24 16:16:31 -04:00
Kalle Bladin 22d60779c6 Update renderable planet projection to render in high precision 2016-08-24 11:42:44 -04:00
Emil Axelsson 3d000a5bb1 flip texture access to correct projection error 2016-08-24 11:38:32 +02:00
Erik Broberg 25705962cd Before accessing current mission, check if available 2016-08-23 19:53:53 -04:00
Erik Broberg 6952b526cc Unable to load mission file is an error 2016-08-23 18:47:28 -04:00
Erik Broberg 3291bb5ac0 Render nested mission phases 2016-08-22 19:18:34 -04:00
Erik Broberg 81f72e0e92 Move TimeRange to OpenSpaceLib 2016-08-22 15:27:16 -04:00
Erik Broberg 37bb16baa8 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-22 15:03:39 -04:00
Erik Broberg f1c705fa19 Add mission description 2016-08-22 15:03:30 -04:00
Erik Broberg b6429183d6 Move parsing of time range to TimeRange class 2016-08-22 13:13:57 -04:00
Erik Broberg 46f005fa58 Add Mission related classes. Add basic mission phase viz. Move TimeRange to separate file 2016-08-22 11:53:59 -04:00
Kalle Bladin 6d9d2b5127 Update RenderableFov to inherit transform in model matrix 2016-08-19 21:12:12 -04:00
Kalle Bladin d042f6c4be Merge branch 'develop' into feature/osirisrex 2016-08-19 12:33:49 -04:00
Emil Axelsson 6d56b1d38a implement shadow mapping for image projections on non-convex bodies 2016-08-19 16:56:57 +02:00
Erik Broberg 559ba76edd Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-18 21:38:04 -04:00
Kalle Bladin cd0fd8fb5c Update Rosetta scene to render correctly with new scene graph structure. 2016-08-18 20:47:05 -04:00
Erik Broberg b1bcc5741f Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-18 18:37:11 -04:00
Erik Broberg 8f8114fabf Image has a TimeRange instead of two doubles 2016-08-18 18:23:52 -04:00
Erik Broberg ae25a171a6 Use proper default values- and clearify interface of TimeRange 2016-08-18 17:55:31 -04:00
Kalle Bladin 628f8b479f Update updatestructures to have transform with translation, rotation and scale. 2016-08-18 16:59:51 -04:00
Alexander Bock 2ae7095d9b Fix image dilation (closing #108)
- Using pixel(=texel) coordinates and integer offsets
 - Using a single channel stencil texture instead of a 4-channel one
2016-08-18 16:29:00 +02:00
Alexander Bock 72e1e9231a Add an update method to the ProjectionComponent that takes care of Shader rebuildin 2016-08-18 16:27:44 +02:00
Alexander Bock 010b8739f1 Use the correct output in the renderablemodelprojection shader 2016-08-18 15:45:07 +02:00
Alexander Bock 788ec99575 Merge branch 'develop' into feature/projectiontexturemap
Conflicts:
	support/cmake/support_macros.cmake
2016-08-18 13:23:55 +02:00
Alexander Bock e284543434 Make use of a secondary stencil buffer for masking the dilation areas 2016-08-18 11:43:51 +02:00
Emil Axelsson c4c9396441 add rosetta image of the day crawler 2016-08-18 11:12:28 +02:00
Erik Broberg 23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Kalle Bladin 93ceb176fa New model hierarchy for osiris rex and add try catch in determineTarget in renderablefov 2016-08-17 14:08:48 -04:00
Alexander Bock c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Alexander Bock 4f1fe0dd49 Add optional image dilation to the ProjectionComponent 2016-08-17 11:25:29 +02:00
Kalle Bladin c55872d5f4 Increase precision in renderable plane projection. 2016-08-16 00:49:41 -04:00
Kalle Bladin fb7104fbed Add renderable fov to OSIRIS-REx polycam and increse precision in rendering of view frustum (fov) 2016-08-15 20:20:36 -04:00
Alexander Bock dd9eeeb092 Remove the use of PowerScaledCoordinates in the RenderableModel as it caused an interpolation issue (closing #107) 2016-08-15 20:06:04 +02:00
Erik Broberg 7fc31151ea Clean up: Remove targetBody from Renderable 2016-08-12 16:42:33 -04:00
Erik Broberg bc9befc970 Clean up ghoul dict parsing in InstrumentTimesParser construcor 2016-08-11 15:40:09 -04:00
Erik Broberg 88ab0147bf Fix bug causing the instrument times parser to only work in Debug mode
OBS: ghoul asserts are removed in Release mode. So don't put crucial
statements that will have side effects in a ghoul assert. This is what
caused the bug which is fixed in this commit.
2016-08-11 13:03:55 -04:00