50fd9309ba
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -04:00
008896bdd7
Only add color layers and height layers through info files if they exist
2017-10-20 17:01:44 -04:00
a925d0646a
Added lunar eclipses back.
2017-10-19 11:41:36 -04:00
d36e32e560
Merged master into NewAtmosphere.
2017-10-17 20:14:41 -04:00
16a865337e
Fix compile error in GlobeBrowsing module without GDAL ( closes #396 )
2017-09-30 15:47:11 -06:00
6b82df68dd
Pr/core threadpool ( #401 )
...
Move GlobeBrowsing thread pool to OpenSpace core
2017-09-22 13:22:03 +02:00
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
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
1c6aba6b7b
Merge branch 'master' into feature/NewAtmosphere
2017-08-21 13:35:42 -04:00
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
d4cf4a5f22
Important comments for development.
2017-08-16 15:27:05 -04:00
2d0da72a50
Merged master into atm.
2017-08-16 12:00:28 -04:00
948507f20e
Fix previous error appearing when accurate normals were used without height layers.
2017-08-16 14:35:56 +02:00
758ee8bd6d
Pull request changes.
2017-08-15 18:15:56 -04:00
0ac1f96ae8
Add ability to define a color for SolidColor layers at initialization.
2017-08-15 12:09:06 +02:00
59694c8213
Merge branch 'feature/globe-generalization' of github.com:OpenSpace/OpenSpace into feature/globe-generalization
2017-08-15 11:03:38 +02:00
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
1fb5273b85
Add function getGeoPosition and fix bug in getGeo
2017-08-11 15:27:23 +02:00
293cc3e063
Make use of accurate normals for globe atmosphere rendering
2017-08-10 10:49:14 +02:00
3adf037073
Clean up
2017-08-08 17:23:19 +02:00
71f811fcd8
Tiles now have the same size even if padding is enabled.
2017-08-08 16:11:16 +02:00
559a8063bc
Do not use padding for temporal VIIRS for faster loading
2017-08-08 15:49:27 +02:00
1265de0d50
Only use padding for height layers
2017-08-08 14:02:56 +02:00
2ecfd4d05a
Remove debug code
2017-08-07 10:45:36 +02:00
fa47fd19fa
Woops, accidentally removed chunkedlodglobe.cpp. Now it is back
2017-08-07 10:26:46 +02:00
902af5b321
Solve conflict
2017-08-07 10:24:30 +02:00
cedd8adf0d
Remove const qualifier from shaders as it causes shaders to not compile on Mac
2017-08-03 12:05:58 -04:00
8a62e6e791
Add description to PropertyOwner
2017-08-01 17:05:52 -04:00
eaf0d70a79
Fix JSON error in documentation
2017-07-31 16:57:07 -04:00
e4ef40ad72
Add functions to recursively parse and add color layers described in .info files
2017-07-31 16:50:21 -04:00
31377466ba
Remove return values from initialize and deinitialize functions
2017-07-28 17:51:25 -04:00
b9f0d60d85
Hide layergroups in RenderableGlobe that do not contain any layers
...
Update Ghoul repository
2017-07-28 14:49:08 -04:00
5ca44d4aa1
Allow RenderableGlobe to have a single radius
...
Make GlobeBrowsing scene the new default scene
2017-07-27 17:24:22 -04:00
a55110e286
Merged master info NewAtmosphere.
2017-07-27 17:13:42 -04:00
19f8e30813
Change RenderableModel "Rotation.ModelTransform" to "ModelTransform"
...
Add Property descriptions to the documentation file
Remove update method from StaticTranslation
Remove spelling error in RenderableGlobe
Remove rotation from renderablemodel projection
Fix setting the Origin through the GUI
Reorder Optional and documentation arguments for DocumentationEntry, and making Optional a non-optional argument
2017-07-27 00:22:17 -04:00
dc79a94142
Remove warnings
...
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
d95576077b
More work on documentation
2017-07-25 18:06:55 -04:00
2d33b63383
Ignore uniform not located in globebrowsing. (It is needed when the Night layer is disabled and the perform shading is also disable - the lightDirectionCameraSpace vector is not found).
2017-07-25 16:02:41 -04:00
9812abb487
Added an option to have the sun following the camera when using an ATM. Removed unused code. Added missing comments.
2017-07-25 15:55:52 -04:00
e93070504b
Some more property documentation
2017-07-25 01:08:20 -04:00
46c1fbb902
More work on Property documentation
2017-07-25 00:21:17 -04:00
7096aeb9dd
Atmosphere is now a separated node in OS. Removed ATM code from renderableglobe and renderableplanet.
2017-07-24 17:05:30 -04:00
eb87fa4390
Fixed accurate normals in globebrowsing after problematic merging.
2017-07-24 13:39:32 -04:00
1a475ef570
Started documenting properties
...
Cleanup of Nagivationhandler properties
2017-07-24 00:15:45 -04:00
036b271d0d
Change capitalization of property names
2017-07-22 18:22:44 -04:00
04bac9293b
Encapsulate identifier, guiName, and description into a PropertyInfo struct
2017-07-22 17:36:03 -04:00
b584f0197e
Add description to Propertys
2017-07-21 16:31:58 -04:00
20003d5b32
Merged master into NewAtmosphere.
2017-07-21 15:02:24 -04:00
e661324002
Remove style guide errors
...
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock