mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-28 15:09:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,520 Commits 82 Branches 46 Tags
32632f2df0e18d760ffbae991e91589f549eb55d
Commit Graph

921 Commits

Author SHA1 Message Date
Alexander Bock
db7ae7e384 Issue/453 (#556) 
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
 2018-03-16 09:21:29 -04:00
Alexander Bock
5b6ae62bab Add Override parameter for URLSynchronization 
Add PerformShading asset parameter for RenderablePlanet
Disable shading on default for Earth
 2018-03-09 11:42:32 -05:00
Alexander Bock
5a3ef0fda2 Apply coding styles 2018-03-08 05:32:46 -05:00
Alexander Bock
a3c849843f Feature/new formatting (#547) 
* Change to new logging format (closes #542)
 * Adds a screenshots folder that uses the application startup time
 * Creating focus nodes for VRT files if the info files contain location information
 * Fix issue with removing virtual properties
 * Add a method for returning the cartesian coordinates for a geolocation on a planet
 2018-03-07 18:10:32 -05:00
Alexander Bock
9a00f38e09 Feature/jenkins warnings (#538) 
* Remove warnings from Jenkins
 * Improve Jenkins behavior
 2018-02-28 08:41:55 -05:00
Alexander Bock
6d76080370 Simplify script precondition argument checks 2018-02-15 17:56:12 -05:00
Alexander Bock
92b88fe5b6 Merge pull request #499 from OpenSpace/feature/fix-torrent-bug 
Fix asset bugs
 2018-02-12 09:39:51 -05:00
Alexander Bock
2cd16e54b1 Replace initialize list of LuaLibrary with explicit instantiation (closes #477) 2018-02-09 13:15:21 -05:00
Emil Axelsson
a85eddff4e Clean up lua stack and weak pointers 2018-02-09 16:44:34 +01:00
Alexander Bock
4a9142cef7 Change "Now" to "Today" in TemporalTileProvider (closes #495) 2018-02-07 15:52:08 -05:00
Alexander Bock
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
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
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
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
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
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
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
Emil Axelsson
d40d2abc9a Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-19 12:56:12 +01:00
Alexander Bock
db668b5342 Some changes to PR #432 2017-12-18 16:25:02 -05:00
Alexander Bock
a3185a0cfa Merge branch 'master' into feature/NewAtmosphere 
# Conflicts:
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
 2017-12-18 14:49:08 -05:00
Alexander Bock
966df322cf Added additional absPath where necessary 2017-12-18 14:47:58 -05:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Jonathas Costa
eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00
Alexander Bock
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
Jonathas Costa
952f8e8e13 Merged master into NewAtmosphere. 2017-12-12 13:43:40 -05:00
Alexander Bock
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
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
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
Emil Axelsson
fb675dfeab Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-04 10:52:12 +01: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
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
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
Emil Axelsson
62c5506250 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-13 11:18:00 +01:00