Commit Graph

1469 Commits

Author SHA1 Message Date
Alexander Bock e6720103fd Updated ImGUI version to 1.49 2016-10-19 15:42:45 +02:00
Emil Axelsson 5e2ea10bcd Add http proxy support for GDAL 2016-10-07 20:42:32 +02:00
Emil Axelsson 0a47931b4b Rename shader files to lower case 2016-10-04 12:09:36 +02:00
Emil Axelsson 74dd1873f0 Clean up toy volume module 2016-10-04 12:04:06 +02:00
Emil Axelsson 3f3083b419 update toyvolume to new volume raycasting interface 2016-10-04 09:48:31 +02:00
Emil Axelsson 0230acb005 Merge branch 'feature/parallelconnection' into develop
Conflicts:
	src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
Emil Axelsson 15e83394c3 improve look and feel of the html documentation 2016-09-27 14:45:26 +02:00
Alexander Bock a0da1514c9 Making Galaxy, iSWA, and multiresvolume modules compile again 2016-09-26 13:50:08 +02:00
Alexander Bock 7ddccd8172 Rename Ephemeris files to Translation 2016-09-26 13:49:17 +02:00
Alexander Bock a688a1eee9 Rename Ephemeris to Translation 2016-09-26 13:34:22 +02:00
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
Emil Axelsson cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Alexander Bock 57389755e7 Fix imaging for osiris rex 2016-09-20 20:02:47 +02:00
Alexander Bock 428f488bb6 Add documentation to Ephemeris classes
Remove unused "Reference" specification from mod files
Add osirisrex files to gitgnore
Make Ephemeris values into properties
2016-09-20 19:24:14 +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
Alexander Bock 8867b3439f Add central location for the core to register documentations
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
2016-09-19 14:03:42 +02:00
Alexander Bock 29c989ab82 Add documentation to the documentation and verifier classes
Add static const member variable to the DocumentationEntry class for Wildcards
2016-09-18 20:47:41 +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
Emil Axelsson 13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +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
Alexander Bock 6a2eda393c Make StaticScale be creatable without a Dictionary 2016-09-15 18:02:29 +02:00
Alexander Bock a354f13ef3 Adding DocumentationEngine 2016-09-15 13:48:28 +02:00
Alexander Bock 746a76e436 Adding documentation to StaticScale 2016-09-15 13:47:52 +02:00
Alexander Bock 9afae5c2f9 Remove extra includes 2016-09-15 09:19:46 +02: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 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 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