Commit Graph

316 Commits

Author SHA1 Message Date
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
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
Alexander Bock 758e26789c More coding style conformance 2017-11-11 11:25:49 -05: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 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 e80730e9bf Fix a variety of warnings 2017-10-21 10:10:40 -04:00
Emil Axelsson 6b82df68dd Pr/core threadpool (#401)
Move GlobeBrowsing thread pool to OpenSpace core
2017-09-22 13:22:03 +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
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
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 902af5b321 Solve conflict 2017-08-07 10:24:30 +02:00
Alexander Bock 8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -04:00
Alexander Bock dc79a94142 Remove warnings
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock d95576077b More work on documentation 2017-07-25 18:06:55 -04:00
Alexander Bock e93070504b Some more property documentation 2017-07-25 01:08:20 -04:00
Alexander Bock 46c1fbb902 More work on Property documentation 2017-07-25 00:21:17 -04:00
Alexander Bock 036b271d0d Change capitalization of property names 2017-07-22 18:22:44 -04:00
Alexander Bock 04bac9293b Encapsulate identifier, guiName, and description into a PropertyInfo struct 2017-07-22 17:36:03 -04:00
Alexander Bock b584f0197e Add description to Propertys 2017-07-21 16:31:58 -04:00
Alexander Bock e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Kalle Bladin a14eae32e4 Merge branch 'master' into feature/globe-generalization 2017-07-18 15:12:20 +02:00
Alexander Bock 7737b082d9 Removing more warnings 2017-07-17 18:03:37 -04:00
Alexander Bock 0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock 26682669ff More work on making use of nested namespaces 2017-07-16 01:55:35 -04:00
Alexander Bock 4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -04:00
Alexander Bock 00e684f7dc Merge remote-tracking branch 'origin/master' into misc/cleanup
# Conflicts:
#	data/scene/default.scene
#	modules/globebrowsing/globes/pointglobe.cpp
#	modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
2017-07-15 13:22:46 -04:00
Kalle Bladin a232a1a0a7 Fix compilation warnings. 2017-07-14 22:48:32 +02:00
Alexander Bock 6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Kalle Bladin 0a0942307c Fix y axis flip issue. 2017-07-14 10:58:50 +02:00
Kalle Bladin f2d7c9c754 Update maxChunkLevel function 2017-07-14 00:46:39 +02:00
Kalle Bladin e825d3b736 Correct type reinterpretation 2017-07-14 00:09:44 +02:00
Kalle Bladin 28a6365aa2 Add the ability to have fallback textures 2017-07-13 23:49:39 +02:00
Kalle Bladin c22d1e3df4 SimpleRawTileDataReader can now read all image sizes 2017-07-13 22:14:29 +02:00
Kalle Bladin 5ef2966083 Move getIODescription from GdalRawTileDataReader to RawTileDataReader. 2017-07-13 20:34:56 +02:00
Kalle Bladin 09b3675491 Move readImageData from GdalRawTileDataReader to RawTileDataReader so that it can be used by other RawTileDataReaders 2017-07-13 20:23:57 +02:00
Klas Eskilson 98534bc1ec Normalize ALL the line endings (#361)
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
Kalle Bladin ca90faab75 Include globebrowsing module to avoid linking errors. (#360) 2017-07-13 13:31:27 +02:00
Kalle Bladin 4f903ac030 Feature/globebrowsing (#334)
Layer support for globe browsing:

Add layers using the function openspace.globebrowsing.addLayer
Delete layers using openspace.globebrowsing.deleteLayer
Layer type does not necessarily have to be of tile type. For example solidcolor does not use tiles
Blend modes for layers are Normal, Add, Subtract, Multiply, Color
Layer adjustments to affect layers. The current only active one is chroma key to cut out a color from the layer. Transfer functions or clipping masks are examples of layer adjustments for the future.
Support for adding layer specifications for quickly accessing GIBS layers:
openspace.globebrowsing.createGibsGdalXml
openspace.globebrowsing.createTemporalGibsGdalXml
The arguments for these functions are currently strings. Would it be better to use a lua dictionary?
No data values for height layers are correctly regarded (can be seen on Earth. No longer bumps on the poles)
Other minor things:

Worked a bit on point globe to render globes at large distances. Currently not in use and doesn't have anything to do with the other things.
Concurrent job manager takes a thread pool as argument and not a pointer to one. This is because the concurrent job manager needs to have ownership of the thread pool for correct deinitialization. Will cause breaking change for users of concurrent job manager if merged in to master.


* Add ability to add layers programatically.

* Clean up

* Fix order of deletion in concurrent job manager and clean up

* Can create by level tile provider with empty dictionary.

* Add script to add GIBS datasets.

* Start working with layer adjustment

* Update mod files

* More work on point globe

* Add script to create temporal GIBS datasets.

* Update temporal tile provider to be able to take gdal descriptions without file path.

* Add adjustment property to layers.

* Rename adjustment layer

* Add adjustment code to all layer groups

* Remove caching of gdal datasets due to cluttering of folders

* Document layer support

* Update Mars mod

* Make Mercury great again.

* Cleanup and add blend mode Color

* Enable setting of layeradjustment and blend mode from mod files.

* No more use for grayscale color overlays. Use grayscale layer with color blend mode instead.

* Clean up mod files

* Clean up

* Clean up

* No need for grayscale layers. Reading grayscale in to rgb instead for color layers.

* Remove unused layer groups

* Correctly read to grayscale layers

* Update globe mod files

* Rename ColorOverlays to Overlays.

* Clean up

* Clean up

* Solve compilation error
2017-07-10 20:34:39 +02:00
Alexander Bock 0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00