Commit Graph

4887 Commits

Author SHA1 Message Date
Alexander Bock f57feb01d3 Fix meridian shift issue on Pluto
Easier configuration of Pluto image textures from within the scene file
2017-08-21 13:53:05 -04:00
Alexander Bock 222bbe22ab Feature/gb gui (#390)
Implemented new GUI component to handle WMS servers
* Add Lua scripts to support adding GIBS datasets (closes #222)
* Add Lua function to load WMS servers from a predefined file

* Workaround for Visual Studio 15.3 compile fix in Windows headers

* Initial support for parsing GetCapabilities file and automatically add layers

* Add a Trigger property to remove a layer

* Support default servers

* Add default file

* Move WMS server code from GUI component into GlobeBrowsingModule

* Add Lua scripts for loading and removing WMS servers
Automatically load default servers on startup

* Reset tile provider before removing a layer tolimit the crash risk
Add "From focus" button to switch globebrowsing gui to the same node as the focus

* Remove warnings
Remove compile error with nonexisting GDALOpenEx function
2017-08-19 20:23:08 -04:00
Alexander Bock 09a94e6bf5 Workaround for Visual Studio 15.3 compile fix in Windows headers 2017-08-18 15:44:06 -04:00
Emil Axelsson ab22c18714 Add missing parameter to lua library 2017-08-18 13:28:29 +02:00
Emil Axelsson 75fccbefcd Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	modules/globebrowsing/globebrowsingmodule.cpp
2017-08-18 13:26:50 +02:00
Alexander Bock 9d4a69b6e7 Quick fix for mars.mod 2017-08-17 10:17:32 -04:00
Alexander Bock e056ad561f Add MOC WA Mars texture as torrent
Organize mars textures correctly
2017-08-17 10:15:28 -04:00
Alexander Bock 7d3b0d7822 Update new horizons data files (kernels and textures) 2017-08-17 09:36:05 -04:00
Alexander Bock 621dd20f45 Fix include of default applications 2017-08-16 15:08:47 -04:00
Alexander Bock 904ea5b447 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-08-16 09:10:39 -04:00
Alexander Bock 4513c4e1e2 Runtime fix for SpacecraftInstruments module 2017-08-16 09:10:03 -04:00
Kalle Bladin d5fab17df2 Merge pull request #389 from OpenSpace/feature/globe-normal-fix
Small Globe Normal Fix
2017-08-16 15:02:08 +02:00
Kalle Bladin 948507f20e Fix previous error appearing when accurate normals were used without height layers. 2017-08-16 14:35:56 +02:00
Alexander Bock 82fd196ddd Organize WMS minidrivers for Moon, Mars, and Mercury
Add WMS minidrivers from AWS servers
2017-08-15 13:57:34 -04:00
Kalle Bladin 893068733c Merge pull request #380 from OpenSpace/feature/globe-generalization
Feature/globe generalization
2017-08-15 16:43:13 +02:00
Emil Axelsson 1197b702d1 Fix compilation error from merge 2017-08-15 16:34:11 +02:00
Alexander Bock 8fc0eb560a Create additional subdirectory in Jenkinsfile 2017-08-15 10:14:15 -04:00
Alexander Bock 709d7fa63c Use branch name in Jenkinsfile 2017-08-15 10:06:17 -04:00
Alexander Bock 04a90acd23 Update Jenkinsfile to point to shorter workspace directory in Windows 2017-08-15 10:02:43 -04:00
Kalle Bladin 0ac1f96ae8 Add ability to define a color for SolidColor layers at initialization. 2017-08-15 12:09:06 +02:00
Emil Axelsson 5ebd4d5327 Add missing file 2017-08-15 12:03:25 +02:00
Emil Axelsson 2426545a05 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl
2017-08-15 11:43:18 +02:00
Emil Axelsson 6c36fa7bfd Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	include/openspace/util/concurrentjobmanager.h
	include/openspace/util/concurrentjobmanager.inl
	include/openspace/util/concurrentqueue.h
	include/openspace/util/concurrentqueue.inl
	include/openspace/util/threadpool.h
	modules/globebrowsing/tile/tileloadjob.h
	modules/sync/syncmodule.cpp
	src/util/threadpool.cpp
2017-08-15 11:34:54 +02:00
Emil Axelsson eed7041f1c Compile fixes after merge 2017-08-15 11:25:52 +02:00
Kalle Bladin 59694c8213 Merge branch 'feature/globe-generalization' of github.com:OpenSpace/OpenSpace into feature/globe-generalization 2017-08-15 11:03:38 +02:00
Alexander Bock 52b257a62c Support nested module directories (closing #369) 2017-08-14 16:11:36 -04:00
Alexander Bock a016fd96a6 Fix duplicate property name error 2017-08-14 15:24:41 -04:00
Alexander Bock ae06112fdc Fix coding style issues 2017-08-14 13:49:13 -04:00
Alexander Bock dcd1196341 Rename NewHorizons module to SpacecraftInstruments 2017-08-14 13:27:47 -04:00
Alexander Bock c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Emil Axelsson cb7319d5f2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp
2017-08-14 11:17:25 +02:00
Kalle Bladin 1fb5273b85 Add function getGeoPosition and fix bug in getGeo 2017-08-11 15:27:23 +02:00
Kalle Bladin 3adf037073 Clean up 2017-08-08 17:23:19 +02:00
Kalle Bladin afe449c67d Specify no padding for layer 2017-08-08 16:39:58 +02:00
Kalle Bladin 71f811fcd8 Tiles now have the same size even if padding is enabled. 2017-08-08 16:11:16 +02:00
Kalle Bladin 559a8063bc Do not use padding for temporal VIIRS for faster loading 2017-08-08 15:49:27 +02:00
Kalle Bladin 1265de0d50 Only use padding for height layers 2017-08-08 14:02:56 +02:00
Kalle Bladin 2ecfd4d05a Remove debug code 2017-08-07 10:45:36 +02:00
Kalle Bladin fa47fd19fa Woops, accidentally removed chunkedlodglobe.cpp. Now it is back 2017-08-07 10:26:46 +02:00
Kalle Bladin 902af5b321 Solve conflict 2017-08-07 10:24:30 +02:00
Alexander Bock 0b063827b8 Merge pull request #379 from OpenSpace/misc/various-fixes
Misc/various fixes
2017-08-04 16:49:23 -04:00
Alexander Bock e07822e2a9 Fix compile error in documentation unit test 2017-08-04 15:59:45 -04:00
Alexander Bock 8349a3639b Minor fixes 2017-08-04 14:14:41 -04:00
Alexander Bock cedd8adf0d Remove const qualifier from shaders as it causes shaders to not compile on Mac 2017-08-03 12:05:58 -04:00
Alexander Bock 8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -04:00
Alexander Bock eaf0d70a79 Fix JSON error in documentation 2017-07-31 16:57:07 -04:00
Alexander Bock e4ef40ad72 Add functions to recursively parse and add color layers described in .info files 2017-07-31 16:50:21 -04:00
Alexander Bock 3976d2500a Do not output generation time for documentation 2017-07-31 10:09:59 -04:00
Alexander Bock c04b379520 Enable the selection of constellation bounds through the mod file 2017-07-29 01:57:16 -04:00
Alexander Bock ad5ca816a9 Move friction properties into common subowner 2017-07-29 01:33:22 -04:00