Jonathas Costa
56854012a5
Fixed bug in local normals.
2017-12-06 12:40:33 -05:00
Jonathas Costa
f698a3de09
Merged master into NewAtmosphere.
2017-12-04 12:19:40 -05:00
Jonathas Costa
ae9da60356
Improve Earth's night side.
2017-11-30 12:38:50 -05:00
Alexander Bock
38338725b9
Strict coding style adherence
2017-11-26 14:57:26 -05:00
Jonathas Costa
6363fc0bb2
Added missing include and merged master into NewAtmosphere.
2017-11-25 22:39:18 -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
Jonathas Costa
0264a3026c
Merged master into NewAtmosphere.
2017-11-15 18:12:58 -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
7b12a241ed
Remove BOMs
...
Fix coding style and script
2017-11-09 19:10:32 -05:00
Jonathas Costa
929bd9ae05
Merged.
2017-11-09 15:46:46 -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
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
50fd9309ba
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
Alexander Bock
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -04:00
Jonathas Costa
a925d0646a
Added lunar eclipses back.
2017-10-19 11:41:36 -04:00
Jonathas Costa
d36e32e560
Merged master into NewAtmosphere.
2017-10-17 20:14:41 -04: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
Jonathas Costa
1c6aba6b7b
Merge branch 'master' into feature/NewAtmosphere
2017-08-21 13:35:42 -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
Jonathas Costa
2d0da72a50
Merged master into atm.
2017-08-16 12:00:28 -04:00
Kalle Bladin
948507f20e
Fix previous error appearing when accurate normals were used without height layers.
2017-08-16 14:35:56 +02:00
Kalle Bladin
0ac1f96ae8
Add ability to define a color for SolidColor layers at initialization.
2017-08-15 12:09:06 +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
Kalle Bladin
293cc3e063
Make use of accurate normals for globe atmosphere rendering
2017-08-10 10:49:14 +02:00
Kalle Bladin
3adf037073
Clean up
2017-08-08 17:23:19 +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
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
b9f0d60d85
Hide layergroups in RenderableGlobe that do not contain any layers
...
Update Ghoul repository
2017-07-28 14:49:08 -04:00
Jonathas Costa
a55110e286
Merged master info NewAtmosphere.
2017-07-27 17:13:42 -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
Jonathas Costa
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
Alexander Bock
46c1fbb902
More work on Property documentation
2017-07-25 00:21:17 -04:00
Jonathas Costa
eb87fa4390
Fixed accurate normals in globebrowsing after problematic merging.
2017-07-24 13:39:32 -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
Jonathas Costa
20003d5b32
Merged master into NewAtmosphere.
2017-07-21 15:02:24 -04:00
Alexander Bock
e661324002
Remove style guide errors
...
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock
77b15724b5
More shader cleanup
...
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Kalle Bladin
a14eae32e4
Merge branch 'master' into feature/globe-generalization
2017-07-18 15:12:20 +02:00
