Commit Graph

505 Commits

Author SHA1 Message Date
Jonathas Costa 554cbcf32a Added gBuffer filling from Globebrowsing. Changed Earth Radius for ATM calculations. Removed unsused code. 2017-05-24 16:09:28 -04:00
Jonathas Costa d632b41710 Merged master into NewAtmosphere. 2017-05-18 12:33:08 -04:00
Jonathas Costa 87843b57a5 Removed dummy texture units. Fixed empty ATM. 2017-05-17 14:11:26 -04:00
Jonathas Costa 08fa7a9e7e Changing texture units use in ATM. 2017-05-17 10:08:49 -04:00
Jonathas Costa c2e4a94825 Small improvements. 2017-05-16 16:22:55 -04:00
Jonathas Costa 46864ac744 Initial rendering of Mars with ATM (Lots of fixes still needed). 2017-05-16 14:41:01 -04:00
Jonathas Costa d7f541ec3b Changed part of the Atmosphere's shaders to work with Globebrowsing (Precision problems to be fixed). 2017-05-15 17:04:00 -04:00
Jonathas Costa 8d95bf05ce Fixed Mars wrong radius. Added debug messages. 2017-05-12 17:53:48 -04:00
Jonathas Costa 587d5c8d75 Initial merging of ATM with Globebrowsing. Still missing code. 2017-05-12 16:46:12 -04:00
Alexander Bock 0b1c6706dd Remove unused RenderablePath
Add documentations to base module classes
Change RenderableSphere to not use power scaled coordinates
2017-05-12 11:28:10 -04:00
Alexander Bock 1d024dfff3 Use correct variable for Sun transformation 2017-05-10 15:39:42 -04:00
Jonathas Costa 8d6fcf6635 Merged master into NewAtmopshere branch. 2017-05-01 11:33:54 -04:00
Emil Axelsson 28c82341bf Fix malformed mod files 2017-04-25 18:24:30 +02:00
Jonathas Costa dfba5e42a4 Removed intersect code from inside inscattering radiance. Fixed Mars ATM. Preparing to final G-Buffer. 2017-04-23 23:16:42 -04:00
Jonathas Costa 8615860686 Added Deferred Support for Atmosphere. 2017-04-19 13:45:06 -04:00
Emil Axelsson 4b38b33e18 Clean up code for planet radius and bounding sphere calculation (#289)
- Remove some power scaled coordaintes.
- Remove spice dependency from sphere geometry.
- Remove dead code.
2017-04-18 09:58:27 +02:00
Alexander Bock 26e4354c40 Add cache to Moon textures 2017-04-17 18:36:50 -04:00
Alexander Bock d5307faf31 Clean earth.mod
Add Sea Ice concentration
2017-04-17 18:35:37 -04:00
Gene Payne 0a50043753 Merge pull request #285 from OpenSpace/feature/grouping
Feature/grouping
2017-04-13 13:31:07 -06:00
Alexander Bock 76aed0578c Feature/virtualproperty (#286)
* Add virtual property owner to OpenSpaceEngine

* Ability to add and remove virtual properties

* Do not try to render empty PropertyOwner name
Compile fix for iswaComponent
Add example in default.scene

* Delete virtual properties also in the OpenSpaceEngine dtor

* Make RenderablePlanet not crash if the nighttextures are not present

* - Add VirtualPropertyManager to manage ownership of virtual properties
- Only execute regex when it was necessary
-
2017-04-13 14:38:28 -04:00
Gene Payne 4a312c70b8 Merge branch 'master' into feature/grouping 2017-04-13 11:23:15 -06:00
GPayne bef3f2b652 Added tags to solar system planets for grouping functionality, and added scale property to some planets 2017-04-13 11:02:54 -06:00
Kalle Bladin 8a617ee254 Feature/globebrowsing (#281)
* Solve bug related to corrupted texture tiles for certain sizes.

* Regard layer settings when sampling height map.

* Make Tile in to a class instead of a struct.

* Memory aware lru cache. Needs cleanup.

* Clean up and comment.

* Clean up and comment.

* Clean up

* Clean up and comment.

* Fix compilation error on Windows.

* Specify data type explicitly in GDAL xml config files for Utah height maps. Closes #242

* Update the key type for the memory aware lru cache and use a unordered map instead of a map.

* Solve pixel row size bug.

* Solve initialization bug.

* Add cache size as property of the globe browsing module.

* Use memory aware tile cache for text tile provider.

* Log GDAL errors as GHOUL messages

* Add the ability to toggle tile level limiting by available data

* Add ability to toggle GDAL logging

* Add lock guard to memory aware tile cache

* create base class rawtiledatareader that can be extended with different implementations than GDAL.

* Let GdalWrapper take care of global GDAL settings.

* Move iodescription to separate file

* Move some functionality from gdalrawtiledatareader to rawtiledatareader

* Move functionality from gdalrawtiledatareader to rawtiledatareader.

* GDAL is no longer a necessary dependency for the globebrowsing module. However to read tiles, the SimpleRawTileDataReader needs to be implemented. Otherwise GDAL is needed.

* Add ifdef check for GLOBEBROWSING_USE_GDAL

* Implement SimpleRawTileDataReader. Currently can only read pow 2 textures.

* Change ints to unsigned long longs

* Limit number of texture creations per tile provider per frame

* Solve linker error on windows

* Fix Windows build errors

* Fix crash in reading local patches

* Update lodglobe descriptions

* Abstract away overviews in gdal raw tile data reader

* Update Mars and Moon configs.

* Update screenshot script

* Update ghoul version

* Remove use of interaction depth below ellipsoid

* Normalize direction vector

* Use scale for distance swotch

* Go back to use of interaction depth below ellipsoid

* Fix comments on pull request.

* TileProviderByLevel error does not propagate up.

* Comment on mars and moon mod file

* Add model space cut off level as a property

* Update ChunkTile struct

* Minor clean up

* Go back tu constructor for ChunkTile
2017-04-13 10:14:47 +02:00
Alexander Bock 644ba0a3e2 Added a temporal version of the VIIRS_SNPP_DayNightBand_ENCC (closing (#193) 2017-04-08 00:19:48 -04:00
Alexander Bock c3dd7a7c7b Merge branch 'develop' of http://github.com/OpenSpace/OpenSpace into develop 2017-04-04 13:22:09 -04:00
Alexander Bock 5364e2c835 Fix non-temporal VIIRS file
Enable caching on default for all Earth-based datasets
2017-04-04 08:54:41 -04:00
Emil Axelsson a44978b90e Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-04-04 14:26:17 +02:00
Alexander Bock a35609c6dd Add new libCurl that supports SSL for new GIBS datasets
Update WMS specification of GIBS datasets
2017-04-03 15:53:56 -04:00
Jonathas Costa 9001eb0f96 Merged develop branch into NewAtmosphere branch. 2017-03-30 15:59:20 -04:00
Jonathas Costa 79726f70c8 Rewrite atmosphere all shaders. Add documentation and improve code. Fixed bugs. 2017-03-30 12:21:33 -04:00
GPayne 40de0a9624 Added tags to solar system planet .mod files for testing. 2017-03-22 14:25:08 -06:00
GPayne ae2cb222b0 Switched to using propertyowners in grouping, and group/tag name in group syntax 2017-03-21 11:35:09 -06:00
Emil Axelsson 7da999c332 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl
2017-03-07 10:57:50 +01:00
Alexander Bock 437db6c6f6 Rename PlutoProjection to Pluto 2017-03-05 17:27:43 -05:00
Emil Axelsson 686fec4f9d Add Spice kernels for Mercury and Saturn magnetosphere rendering, implement inside volume rendering for kameleon volumes
Conflicts:
	data/scene/mercury/mercury.mod
	data/scene/saturn/saturn/saturn.mod
2017-03-02 18:20:02 +01:00
Alexander Bock 57ba41bb10 Update the leap second kernel 2017-02-27 16:39:58 -05:00
Jonathas Costa 3c4bf23317 Merged develop into NewAtmosphere branch. 2017-02-27 15:02:02 -05:00
Alexander Bock 8665cbe957 Update the Juno trajectory to the new format 2017-02-22 15:53:59 -05:00
Alexander Bock 1ac45a9077 Fix OsirisRex configuration file 2017-02-19 15:55:18 -05:00
Jonathas Costa b179c707e7 Merged develop into NewAtmosphere temporary code. 2017-01-31 14:28:51 -05:00
Emil Axelsson 4751ce36c4 Refactor scene graph: Move scene loading to separate class. 2016-12-30 17:08:50 +01:00
Jonathas Costa 1bbced144e Mutiple updates to Atmosphere debugging and rendering. 2016-12-15 15:30:25 -05:00
Alexander Bock b3be4180de Clean data/scene folder; remove lodesritest and restructure lodglobes folders
Fix various issues in mod files
Remove backslash from file paths in StringProperty
2016-12-09 10:21:17 +01:00
Alexander Bock 2a3b532745 Add display of double precision properties to ImGui
Do not show date text when render information is hidden
Add Utah WMS files
2016-12-09 09:04:53 +01:00
Alexander Bock 189a68dd6d Add Utah MOLA and CTX configurations 2016-12-07 23:23:17 +01:00
Alexander Bock b3db661277 Fix RenderableFoV for all missions (NewHorizons, Rosetta, OsirisRex)
Make the CacheManager not crash when ShadowCylinder shader is created in the same cache directory as RenderablePlanet
Remove excessive logging from TileDataset
2016-12-07 14:51:31 +01:00
Alexander Bock 2cffaa352a Provide Mars WMS servers in the correct order 2016-12-07 08:59:11 +01:00
Alexander Bock 1a48868ae3 Add data file to lodsaturn 2016-12-06 19:03:57 +01:00
Alexander Bock 04c6398d6a Fix case dependent kernels in OsirisRex
Fix stitched trail rendering for RenderableTrailTrajectory
Adapt Lua scheduler helper scripts to new Dictionary layout
Make Spice throw exceptions on default again
Enable caching on default for CTX and MOLA data
Add NOAA rt data (commented out in LodEarth)
2016-12-06 18:47:46 +01:00
Alexander Bock 341bc8b105 Merge branch 'develop' into feature/globebrowsing
# Conflicts:
#	modules/globebrowsing/chunk/chunkrenderer.cpp
#	modules/globebrowsing/globes/renderableglobe.cpp
#	modules/globebrowsing/globes/renderableglobe.h
2016-12-03 01:32:23 +01:00