02bb5e68b6
Add global timeout of 3 seconds to GDAL request
...
Remove duplicate opening of GDAL datasets on failure (closes #478 )
2018-02-06 11:03:35 -05:00
34eb8dc359
Merge branch 'feature/wms-timeout'
2018-01-10 11:24:53 -05:00
7c7bdbbd7e
Add 5s timeout to Lua-generated GDAL files
2018-01-10 11:24:18 -05:00
2758b35dec
Feature/mipmapping ( #454 )
...
* Enable mipmapping for textures where it was previously disabled
* Fix mipmapping for renderable projections
2018-01-09 17:52:34 +01:00
4c2f72226f
Performance Optimizations ( #450 )
...
* Make derived transform classes less involved in simulation state
* Add performance measurements in openspaceengine
* Avoid redundant transformation lookups
* Fix bug causing redundant calls to GPULayerManager::bind
* Move water reflectance to alpha component of normal buffer. Remove otherData buffer.
2018-01-08 09:43:41 +01:00
51551bc291
Move VRT specification into separate customization asset
...
Reenable customization scripts
Remove warning from HTTPRequest class
2017-12-31 22:13:55 -05:00
cac2f24b40
Only make an internalInitialize in OpenSpaceModule that accepts a ghoul::Dictionary
2017-12-31 17:32:40 -05:00
47233b8e6f
Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases
2017-12-31 17:31:10 -05:00
6089449bba
Fix crash with MSAA buffer generation when compiling in Debug on Windows
...
Cleanup of logging behavior
2017-12-30 20:24:05 -05:00
5310eff59b
Merge branch 'feature/data-management' into feature/absPathglobebrowsing
2017-12-30 11:13:57 -05:00
16595db09f
Some cleanup of Globe browsing
2017-12-30 11:12:53 -05:00
28e9383461
Remove superfluous absPath calls in Globe browsing (closes 384)
2017-12-30 00:03:06 +01:00
dcfef3557f
Update copyright header
2017-12-29 20:11:22 +01:00
cc178d03f3
Remove clang warnings
...
Update SGCT repository
2017-12-29 19:47:33 +01:00
c9a3c68f19
Fix style guide issues
...
Update Ghoul repository
2017-12-29 19:18:06 +01:00
1ddde4b6e1
Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management
...
# Conflicts:
# data/scene/default.scene
# data/scene/digitaluniverse/abell/abell.mod
# data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
# data/scene/digitaluniverse/constellations/constellations.mod
# data/scene/digitaluniverse/grids/grids.mod
# data/scene/digitaluniverse/quasars/quasars.mod
# data/scene/digitaluniverse/sloandss/sloandss.mod
# data/scene/digitaluniverse/tully/tully.data
# data/scene/digitaluniverse/tully/tully.mod
# data/scene/earth/earth.mod
# data/scene/grids/grids.mod
# data/scene/mars/mars.mod
# data/scene/milkyway/digitaluniverse/digitaluniverse.mod
# data/scene/moon/moon.mod
# data/scene/satellites/tle/geo.txt
# data/scene/satellites/tle/gps-ops.txt
# data/scene/satellites/tle/stations.txt
# modules/imgui/src/renderproperties.cpp
# modules/sync/ext/libtorrent
# openspace.cfg
# src/rendering/renderengine.cpp
2017-12-27 19:39:40 +01:00
fac3780ce9
Remove warnings on MacOS
2017-12-26 23:06:11 +01:00
59916bc0c1
Renaming path tokens
...
- ${BASE_PATH} -> ${BASE}
- ${OPENSPACE_DATA} -> ${DATA}
- Make use of new token ${WEB}
Enable Phobos and Deimos on default
Remove unused cdflist file
2017-12-26 20:49:17 +01:00
a8ea93da17
Make regular settings default in RenderableGlobe and GDALWrapper
...
Fix spelling error in Asset
Wrap initializeGL in try/catch block to catch error
2017-12-23 16:31:17 +01:00
d40d2abc9a
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-19 12:56:12 +01:00
db668b5342
Some changes to PR #432
2017-12-18 16:25:02 -05:00
a3185a0cfa
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
2017-12-18 14:49:08 -05:00
966df322cf
Added additional absPath where necessary
2017-12-18 14:47:58 -05:00
d4278f9adc
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-17 18:30:00 +01:00
eead4b7f25
Merged master into NewAtmosphere.
2017-12-14 15:55:27 -05:00
23a446cb2c
Update Ghoul repository
...
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
952f8e8e13
Merged master into NewAtmosphere.
2017-12-12 13:43:40 -05:00
a08c678bb0
Remove erraneous enabled OpenGL checking code
...
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
a631b7e0a3
Making most logger categories constexpr
2017-12-11 23:46:34 -05:00
56854012a5
Fixed bug in local normals.
2017-12-06 12:40:33 -05:00
f698a3de09
Merged master into NewAtmosphere.
2017-12-04 12:19:40 -05:00
fb675dfeab
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-04 10:52:12 +01:00
ae9da60356
Improve Earth's night side.
2017-11-30 12:38:50 -05:00
38338725b9
Strict coding style adherence
2017-11-26 14:57:26 -05:00
6363fc0bb2
Added missing include and merged master into NewAtmosphere.
2017-11-25 22:39:18 -05:00
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
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
0264a3026c
Merged master into NewAtmosphere.
2017-11-15 18:12:58 -05:00
3a7f221793
Remove GCC warnings
2017-11-13 16:22:07 -05:00
62c5506250
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-13 11:18:00 +01:00
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
19812af629
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-11 19:10:42 +01:00
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
cb07af4a2b
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-10 16:07:58 +01:00
7e4bb0b2c6
Merge branch 'master' into feature/loadingscreen-refactor
2017-11-09 22:49:07 -06:00
afa1d6d33e
Add strict test for whitespace at end of line
...
More work on coding style
2017-11-09 23:47:51 -05:00
7b12a241ed
Remove BOMs
...
Fix coding style and script
2017-11-09 19:10:32 -05:00
929bd9ae05
Merged.
2017-11-09 15:46:46 -05:00
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
88cf7926ae
Merge branch 'master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/galaxy/rendering/renderablegalaxy.cpp
2017-11-09 10:51:56 -05:00
Alexander Bock