Commit Graph

2492 Commits

Author SHA1 Message Date
Jonathas Costa
c320abb1bd Removed unused shaders files. 2018-02-05 15:13:52 -05:00
Jonathas Costa
9667b6eac5 Removed unused uniforms and renamed shader files. 2018-02-05 15:13:34 -05:00
Jonathas Costa
dfdc906c58 Temporarily disabled scaleFactor for meshes. 2018-02-05 14:51:58 -05:00
Emil Axelsson
d569b8235e Fix height mapping bugs in renderable planet 2018-01-16 17:07:45 +01:00
codingInSpace
7efd8dd603 Update sub module ref to the libtorrent fork 2018-01-15 10:55:40 +01:00
Emil Axelsson
001dea3a62 Add resource synchronization percentage to loading screen 2018-01-11 09:41:39 +01:00
Alexander Bock
34eb8dc359 Merge branch 'feature/wms-timeout' 2018-01-10 11:24:53 -05:00
Alexander Bock
7c7bdbbd7e Add 5s timeout to Lua-generated GDAL files 2018-01-10 11:24:18 -05:00
Emil Axelsson
b9d073e505 Thread safety for torrent client 2018-01-10 09:26:32 +01:00
Emil Axelsson
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
Emil Axelsson
1787a44821 Fix bug introduced by setting different blend modes for individual render targets 2018-01-09 10:32:27 +01:00
Emil Axelsson
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
Alexander Bock
237affa80d Enable atmosphere on default
Add try/catch around CacheManager creation to catch potential Exceptions when directories are created
2018-01-04 16:52:37 -05:00
Alexander Bock
3dae071d35 Fix sorting in GuiPropertyComponent 2018-01-01 16:42:47 -05:00
Alexander Bock
389290d657 Update SGCT repository
Set dashboard framerate default to average framerate
Change Spout_output cube resolution to 1536 (1.5k)
2018-01-01 15:02:10 -05:00
Alexander Bock
a6d33162ca Restructure loading of RenderableBillboardsCloud 2018-01-01 10:51:30 -05:00
Alexander Bock
c1f62d69e8 CMake fix for DigitalUniverse 2018-01-01 09:55:46 -05:00
Alexander Bock
a962cc099b Reenable caching for RenderableBillboardscloud 2018-01-01 09:53:02 -05:00
Alexander Bock
ebf99b3d0d Small changes in Imageplane color and AssetLoader 2018-01-01 09:52:44 -05:00
Alexander Bock
51551bc291 Move VRT specification into separate customization asset
Reenable customization scripts
Remove warning from HTTPRequest class
2017-12-31 22:13:55 -05:00
Alexander Bock
cac2f24b40 Only make an internalInitialize in OpenSpaceModule that accepts a ghoul::Dictionary 2017-12-31 17:32:40 -05:00
Alexander Bock
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
Alexander Bock
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
Alexander Bock
5310eff59b Merge branch 'feature/data-management' into feature/absPathglobebrowsing 2017-12-30 11:13:57 -05:00
Alexander Bock
16595db09f Some cleanup of Globe browsing 2017-12-30 11:12:53 -05:00
Alexander Bock
28e9383461 Remove superfluous absPath calls in Globe browsing (closes 384) 2017-12-30 00:03:06 +01:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
cc178d03f3 Remove clang warnings
Update SGCT repository
2017-12-29 19:47:33 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Alexander Bock
c4932bcbae Jenkins compile fix 2017-12-29 00:05:26 +01:00
Alexander Bock
9389e31164 Jenkins compile fix 2017-12-28 20:16:03 +01:00
Alexander Bock
b337c3aa1e Windows compile fix 2017-12-28 14:15:06 -05:00
Alexander Bock
8c7d220335 Some fixes for Jenkins build 2017-12-28 16:58:19 +01:00
Alexander Bock
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
Alexander Bock
fac3780ce9 Remove warnings on MacOS 2017-12-26 23:06:11 +01:00
Alexander Bock
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
Alexander Bock
0d6a94789a Remove todo comment 2017-12-26 19:47:13 +01:00
Alexander Bock
91a32c7b93 Change renderproperties from value checking to changed flag
Make matrix fromLuaConversion functions actually work
2017-12-25 10:32:27 +01:00
Alexander Bock
d749c43a54 Enable multiple directories for image sequence
Set correct maximum text size values for Exoplanets and Starlabels
Fix Rosetta scene and rendering on MacOS
Add Voyager scene
2017-12-25 09:09:19 +01:00
Alexander Bock
c7c4f01f26 Make SyncTask work with globebrowsing scripts
Add additional error information to http request
2017-12-24 01:45:22 +01:00
Alexander Bock
079627e4c1 Merge branch 'feature/data-management' of https://github.com/OpenSpace/OpenSpace into feature/data-management 2017-12-23 23:25:38 +01:00
Alexander Bock
e74801b490 Enable RenderablePlanetProjection to have a selection of possible targets and change and hotload them at runtime
Makke RenderablePlanetProjection work if no base texture is loaded
2017-12-23 20:24:19 +01:00
Emil Axelsson
fd2568fdab Let http synchronizations overwrite files 2017-12-23 17:54:22 +01:00
Alexander Bock
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
Alexander Bock
4b65e20570 Support loading of .asset and .scene files
Fix hardcoded paths to placeholder image add placeholder image to repository
Disable launcher in SyncWidget to keep it compiling until deletion
2017-12-23 08:08:12 +01:00
Jonathas Costa
3ea918b818 Multiples fixes and added max text size for grids. 2017-12-19 17:49:30 -05:00
Jonathas Costa
1c72561bff Fixes introduced. 2017-12-19 12:56:09 -05:00
Emil Axelsson
d40d2abc9a Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-19 12:56:12 +01:00
Emil Axelsson
09182c9274 Cleanup code 2017-12-19 11:48:30 +01:00
Emil Axelsson
f7dc598f60 Small code cleanup 2017-12-19 11:17:56 +01:00