Commit Graph

685 Commits

Author SHA1 Message Date
Erik Broberg dc410c213e Remove old files chunkindex.* and rename ChunkIndexTileProvider 2016-10-05 22:16:05 +02:00
Erik Broberg cdf954d2aa Rename: ChunkIndex -> TileIndex 2016-10-05 21:06:03 +02:00
kalbl da947cab7e Add the settings properties gamma and multiplier to RenderableGlobe textures. 2016-10-04 00:52:18 +02:00
kalbl bacd189d8c Add per layer settings for shading. Includes opacity. 2016-10-03 12:29:50 +02:00
kalbl 423c55ba38 Update structure of properties for renderable globes. 2016-10-02 21:30:26 +02:00
kalbl c2603e5712 Update initial values 2016-09-30 01:54:28 +02:00
kalbl 619048e3b9 Add texture category GrayScaleTexture for textures with one channel. 2016-09-30 01:39:43 +02:00
kalbl fae89a12a0 Clean up and enable shading without night texture. 2016-09-30 00:58:11 +02:00
kalbl cf331dd523 Solve mac OSX errors. 2016-09-22 14:49:56 +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 d3f7139f5e Merge branch 'feature/globebrowsing' into syncing
Conflicts:
	modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
2016-09-20 14:48:28 +02:00
Alexander Bock b6a13fa097 Compile fix 2016-09-20 14:10:11 +02:00
Alexander Bock 1b4b0f49b6 Update SGCT 2016-09-20 10:11:59 +02:00
Alexander Bock 6637ae2849 Update Ghoul 2016-09-19 22:45:45 +02:00
Kalle Bladin 80a9dfd431 Document LayeredTextureShaderProvider 2016-09-15 15:22:39 -04:00
Kalle Bladin f9e88fb40c Fix bug that caused black screen when unable to load gdal dataset. 2016-09-15 12:49:34 -04:00
Erik Broberg a11f16a0b3 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-09-14 21:17:19 -04:00
Kalle Bladin 2c5c29ce9c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-09-14 20:08:46 -04:00
Kalle Bladin 7a22763143 Remove texture cateory HeightMapOverlays 2016-09-14 20:08:33 -04:00
Erik Broberg c08299ea58 Add Doxygen comments for TextTileProviders 2016-09-14 19:35:55 -04:00
Erik Broberg 5e801f04f0 Replace start and end time in TemporalTileProvider with TimeRange 2016-09-14 19:26:45 -04:00
Erik Broberg 775088dc4d Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing 2016-09-14 18:57:59 -04:00
Erik Broberg f7567839ad Clean up and add Doxygen documentation for TemporalTileProvider 2016-09-14 18:57:46 -04:00
Kalle Bladin db18bc0c1a Update error message in TileProvider::createFromDictionary. 2016-09-14 14:01:42 -04:00
Kalle Bladin 54fafd3bae Document and clean up trienglesoup. 2016-09-14 13:55:46 -04:00
Kalle Bladin 5583ad5a7a Add doxygen for grid and cleanup. 2016-09-14 13:46:47 -04:00
Kalle Bladin 42ef18447f Clean up in tile providers 2016-09-14 12:11:10 -04:00
Erik Broberg 9a34761e25 Clean up and add some doxygen comments for CachingTileProvider 2016-09-13 22:02:13 -04:00
Erik Broberg bb9bebf558 Add doxygen comments for struct Tile 2016-09-13 21:12:11 -04:00
Erik Broberg 2fe3ecf72d Add Doxygen documentation for TileProvider 2016-09-13 20:24:13 -04:00
Erik Broberg 2a9cc928b8 Add Doxyfile to the globebrowsing module 2016-09-13 20:23:01 -04:00
Alexander Bock 0376300732 Update Ghoul
Change TriangleSoup and StatsCollector to use new Boolean class
2016-09-11 19:37:15 +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
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
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 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