Commit Graph

1384 Commits

Author SHA1 Message Date
Alexander Bock d7ea0f8ead Enable the use of a separate model transform in RenderableModel 2016-08-30 01:26:43 +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
Alexander Bock ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
2016-08-29 15:53:59 +02:00
Alexander Bock 46686d55eb Set default magnification value to 1 2016-08-29 11:56:26 +02:00
Alexander Bock 04f206da76 Compile fix in globebrowsing 2016-08-29 10:00:45 +02:00
Alexander Bock d5063b116c Compile fixes 2016-08-29 02:33:50 +02:00
Alexander Bock dfa0709b11 More work into removing gdal dependency to libOpenspace 2016-08-29 02:12:33 +02:00
Alexander Bock a798a7aae7 Remove gdal include from TileDataset header 2016-08-29 01:32:21 +02:00
Alexander Bock cb92b85081 Remove gdal include from TileProvider
Add stack include to RenderEngine
2016-08-29 01:19:57 +02:00
Alexander Bock 460da3893e Add ability to define external libraries which will cause DLLs to be copied to application directories automatically
Add gdal.dll as external library to the globebrowsing module
2016-08-26 23:47:08 +02:00
Emil Axelsson b6be6da974 add support for additive blending in renderable plane 2016-08-25 20:44:00 +02:00
Emil Axelsson bc58623467 add render bins to improve rendering of transparent objects using framebuffer renderer 2016-08-25 18:26:59 +02:00
Emil Axelsson d0ec7ac735 render trails with additive blending 2016-08-25 16:32:27 +02:00
Kalle Bladin 850ccb6d3c Update rendering of shadow texture and water mask in RenderableGlobe. 2016-08-25 00:00:22 -04: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 ed98107214 Small comment in renderabletrailnew 2016-08-24 11:43:09 -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 737018089c Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-23 18:52:36 -04:00
Erik Broberg 6952b526cc Unable to load mission file is an error 2016-08-23 18:47:28 -04:00
Kalle Bladin de7a60df9e Update comments about new renderable trail. 2016-08-23 17:58:59 -04:00
Kalle Bladin 3ec224061d Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-23 17:30:02 -04:00
Kalle Bladin 57d47cd856 Implement class RenderableTrailNew and use it for osiris rex. Higher precision than the old one. 2016-08-23 17:29:51 -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
Kalle Bladin ae1f8e457b Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation. 2016-08-18 14:21:20 -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
Erik Broberg d4f635513d Merge branch 'develop' into feature/globebrowsing 2016-08-17 19:53:28 -04:00
Erik Broberg 09ad585be5 Rebase to feature/globebrowsing 2016-08-17 19:16:01 -04:00
Erik Broberg 1199acc7b9 Re-add and revert back to old ThreadPool. See ticket #128 2016-08-17 18:22:27 -04:00