mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 85 Branches 47 Tags
396ecbe5d5730fd2e0876fdfa4e0a76f2eac9708
Commit Graph

266 Commits

Author SHA1 Message Date
Alexander Bock 49308c658c Moved Missions from NewHorizons module into core 2016-09-24 19:32:42 +02:00
Alexander Bock 616a115536 Adding a Lua function to manually enable/disable the frame synchronization 2016-09-24 14:55:20 +02:00
Alexander Bock 57389755e7 Fix imaging for osiris rex 2016-09-20 20:02:47 +02:00
Alexander Bock 329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Alexander Bock 6637ae2849 Update Ghoul 2016-09-19 22:45:45 +02:00
Alexander Bock a25a9b4a2d Add the ability to the FactoryManager to write documentation about all registered classes 
Enable this feature on default in openspace.cfg
Move all generated documentations into a documentation folder
Adapt gitignore accordingly
 2016-09-16 17:37:02 +02:00
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
Erik Broberg 9196ec2f50 Remove local, shared, synced versions of Time. Keep one source of true 2016-09-03 19:45:58 -04: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
Kalle Bladin 64be557abf Use alpha from projection texture in RenderableModelProjection. 2016-08-30 14:17:00 -04: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 e3780f2fc6 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-26 17:54:43 -04:00
Kalle Bladin 547807a8d1 Fix problem with projection texture getting overwritten upon image projection. 2016-08-26 17:54:15 -04:00
Erik Broberg 475d4c9ec6 Break and proceed with next file if instrument times file parsing fails 2016-08-26 17:33:13 -04:00
Kalle Bladin 64187aca5d fix but in InstrumentTimesParser that caused sequence time to be overwritten. 2016-08-25 20:17:17 -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 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