Commit Graph

1622 Commits

Author SHA1 Message Date
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 0376300732 Update Ghoul
Change TriangleSoup and StatsCollector to use new Boolean class
2016-09-11 19:37:15 +02:00
Alexander Bock 965f3eded0 Clang compile fixes 2016-09-08 13:22:34 +02:00
Erik Broberg c20cd80eaa Merge globebrowsing, resolve conflicts
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04: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
Kalle Bladin 7416d7ca69 Update mod files for osirisrex 2016-09-06 22:57:29 -04:00
Kalle Bladin 82618bfd99 Improve temporary atmosphere rendering 2016-09-06 20:32:49 -04:00
Erik Broberg 9196ec2f50 Remove local, shared, synced versions of Time. Keep one source of true 2016-09-03 19:45:58 -04:00
Erik Broberg 1195ff9619 Remove excessive debug logging in TileDataset 2016-09-03 18:28:47 -04:00
Erik Broberg 5cf1a4fbe1 Enable per frame toggling of RenderableGlobes for multi node sync debugging 2016-09-01 15:31:38 -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
Erik Broberg b8fb3dcbe6 SizeReferenceTileProvider hashes based on tile sizes instead of chunk indices 2016-08-31 16:42:48 -04:00
Erik Broberg c201957001 SizeReferenceTileProvider renders referred distance next to its text 2016-08-31 14:38:05 -04:00
Erik Broberg b064c5606f Add new TileProvider implementation SizeReferenceTileProvider and add to lodMars 2016-08-31 13:27:36 -04:00
Erik Broberg 4a5dd1dacb Add longitudal distance and great circle distance to class Ellipsoid 2016-08-31 13:25:33 -04:00
Erik Broberg 41194d33d4 Add Ellipsoid radii accessor and return const refs instead of copies 2016-08-31 11:08:16 -04:00
Erik Broberg 8d17ad7e34 Remove TileProviderFactory and instantiate TileProviders using FactoryManager instead 2016-08-30 23:52:53 -04:00
Erik Broberg b56eeade88 Fix misspelling of SingleImageProvider 2016-08-30 20:05:16 -04:00
Erik Broberg bf1dddf103 Separate Tile and TileProvider. Remove necessary includes 2016-08-30 19:26:22 -04:00
Erik Broberg 87e3b81b68 Merge branch 'develop' into feature/globebrowsing 2016-08-30 18:58:23 -04:00
Erik Broberg 1be37a9333 Add a simple abstract class for providing Tiles with text. Refactor ChunkIndexTileProvider 2016-08-30 18:15:00 -04: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 705f7b43aa Make SpiceEphemeris check for the kernel existence before trying to load 2016-08-30 10:48:26 +02:00
Alexander Bock e4bc8385fb Fix the StaticScale to correctly request only a single double 2016-08-30 01:27:11 +02:00
Alexander Bock d7ea0f8ead Enable the use of a separate model transform in RenderableModel 2016-08-30 01:26:43 +02:00
Kalle Bladin e55cbaff8c Normalize surface normal in for Rednerable globe shader and enable water mask and night texture for LodEarth in osirisrex. 2016-08-29 13:48:05 -04:00
Kalle Bladin 84834f230d Merge branch 'develop' into feature/osirisrex 2016-08-29 13:01:28 -04: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
Kalle Bladin a82ad66374 Add scale as a property of every scenegraph node. 2016-08-26 20:32:08 -04: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
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
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
Emil Axelsson b6be6da974 add support for additive blending in renderable plane 2016-08-25 20:44:00 +02:00
Kalle Bladin 14aad40e6c Fix bug that caused crash when switching on and off night textures and water masks for RenderableGlobe 2016-08-25 13:50:46 -04:00
Emil Axelsson bc58623467 add render bins to improve rendering of transparent objects using framebuffer renderer 2016-08-25 18:26:59 +02:00