Emil Axelsson
fb675dfeab
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-04 10:52:12 +01:00
Alexander Bock
38338725b9
Strict coding style adherence
2017-11-26 14:57:26 -05:00
Alexander Bock
026f51735b
Show distance from current focus object
...
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
Alexander Bock
719130b6b7
Jenkinswarnings ( #419 )
...
* Remove more warnings
* Removing more warnings
* More warning fixes
* More warnings
* More warnings
* Update ghoul
2017-11-16 21:19:28 -05:00
Alexander Bock
3a7f221793
Remove GCC warnings
2017-11-13 16:22:07 -05:00
Emil Axelsson
62c5506250
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-13 11:18:00 +01:00
Alexander Bock
f227767492
Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -05:00
Emil Axelsson
19812af629
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-11 19:10:42 +01:00
Alexander Bock
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
Emil Axelsson
cb07af4a2b
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-10 16:07:58 +01:00
Alexander Bock
7e4bb0b2c6
Merge branch 'master' into feature/loadingscreen-refactor
2017-11-09 22:49:07 -06:00
Alexander Bock
afa1d6d33e
Add strict test for whitespace at end of line
...
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock
7b12a241ed
Remove BOMs
...
Fix coding style and script
2017-11-09 19:10:32 -05:00
Alexander Bock
5f391de33c
Fix crash when adding layers through globebrowsing interface due to missing initialization
...
Fix crash that would happen if the resetting of the tile layer would throw an exception
2017-11-09 12:01:35 -05:00
Alexander Bock
88cf7926ae
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/galaxy/rendering/renderablegalaxy.cpp
2017-11-09 10:51:56 -05:00
Alexander Bock
ca7053d8f2
Fix bug with layer support for height maps
2017-11-09 10:20:33 -05:00
Alexander Bock
acdfefe46d
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/base/rendering/renderabletrailorbit.h
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# modules/digitaluniverse/rendering/renderablepoints.cpp
# modules/galaxy/rendering/renderablegalaxy.cpp
# modules/galaxy/rendering/renderablegalaxy.h
# modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
# modules/kameleonvolume/rendering/renderablekameleonvolume.h
# modules/spacecraftinstruments/rendering/renderablefov.h
# modules/spacecraftinstruments/rendering/renderableplaneprojection.h
# modules/toyvolume/rendering/renderabletoyvolume.cpp
# modules/toyvolume/rendering/renderabletoyvolume.h
# modules/volume/rendering/renderabletimevaryingvolume.cpp
# modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Alexander Bock
b886925616
Move OpenGL in globebrowsing from constructors into initialization functions
...
Place entire scene loading into separate thread
2017-11-03 16:25:06 -04:00
Alexander Bock
78e3320cde
Separate Renderable::initialize into initialize and initializeGL functions
...
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
Emil Axelsson
157d91d631
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-26 13:43:49 +02:00
Alexander Bock
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -04:00
Alexander Bock
008896bdd7
Only add color layers and height layers through info files if they exist
2017-10-20 17:01:44 -04:00
Emil Axelsson
2623912ec9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-16 11:07:24 +02:00
Alexander Bock
16a865337e
Fix compile error in GlobeBrowsing module without GDAL ( closes #396 )
2017-09-30 15:47:11 -06:00
Emil Axelsson
6b82df68dd
Pr/core threadpool ( #401 )
...
Move GlobeBrowsing thread pool to OpenSpace core
2017-09-22 13:22:03 +02:00
Emil Axelsson
ea5382c028
Volume conversion and rendering ( #350 )
...
Add volume rendering features
- Improve task runner
- Improve reading from CDF files
- Basic time varying volume rendering
- Fix scaling bug in RenderableToyVolume
2017-09-22 12:03:23 +02:00
Emil Axelsson
af8bec1441
Prepare for data sync
2017-09-14 20:16:51 +02:00
Emil Axelsson
4cdae984e9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-09-11 11:52:31 +02:00
Kalle Bladin
7aceb54bec
Globe browsing: fix implicit conversion errors and remove warnings ( #393 )
...
* Fix implicit conversion errors and remove warnings.
2017-09-01 12:03:31 -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
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
Kalle Bladin
948507f20e
Fix previous error appearing when accurate normals were used without height layers.
2017-08-16 14:35:56 +02:00
Emil Axelsson
1197b702d1
Fix compilation error from merge
2017-08-15 16:34:11 +02: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
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
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
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
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
cedd8adf0d
Remove const qualifier from shaders as it causes shaders to not compile on Mac
2017-08-03 12:05:58 -04:00
