Commit Graph

5357 Commits

Author SHA1 Message Date
Alexander Bock ebf99b3d0d Small changes in Imageplane color and AssetLoader 2018-01-01 09:52:44 -05:00
Alexander Bock edc250deb8 Cleanup core script extensions
Cleanup default scripts
2017-12-31 23:26:38 -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 f5662b3fe4 Add function to asset Lua namespace that can check whether another asset exists 2017-12-31 19:41:56 -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 53cfc7dd91 Cleanup GPUData and remove confusing UniformLocation class 2017-12-31 17:31:41 -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 8ea5837f00 Various updates and fixes to scene and assets 2017-12-31 17:26:46 -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 96e065ef08 Set default number of antialiasing samples to 4 2017-12-30 16:15:53 -05:00
Alexander Bock 79be10360a Update Ghoul 2017-12-30 16:12:52 -05:00
Alexander Bock 7ab26b3015 Fix TaskRunner 2017-12-30 15:56:24 -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 e4875dd8d6 Remove scene folder 2017-12-30 00:15:51 +01:00
Alexander Bock 28e9383461 Remove superfluous absPath calls in Globe browsing (closes 384) 2017-12-30 00:03:06 +01:00
Alexander Bock 2d2bd4518f Update default values for some DU assets 2017-12-29 20:25:12 +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 023b654c16 Add simplified GUI button to the Touchbar on MacOS 2017-12-29 11:35:00 +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
Jonathas Costa a9661f681e Merge pull request #432 from OpenSpace/feature/NewAtmosphere
Feature/new atmosphere
2017-12-27 09:40:19 -05:00
Alexander Bock 03c7cf0108 Remove resetting the current working directory as it is no longer needed when OpenSpace is a bundle 2017-12-27 15:00:48 +01:00
Alexander Bock 3201bab8d6 Add icons to Sync and TaskRunner applications 2017-12-26 23:38:51 +01:00
Alexander Bock 7520241387 Make OpenSpace an AppBundle on MacOS
Add icon to AppBundle
2017-12-26 23:06:31 +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 339c45a7f6 Add specialized TaskRunner application "Sync" that only synchronizes all scenes in the asset folder
Replace TaskRoot in openspace.cfg with ${TASK} in Taskrunner
Remove Launcher
2017-12-26 20:13:23 +01:00
Alexander Bock 0d6a94789a Remove todo comment 2017-12-26 19:47:13 +01:00
Alexander Bock fb8114f5fc Cleanup of Earth, Moon, and Mars WMS configuration files 2017-12-26 19:45:33 +01:00
Alexander Bock ee730b79a0 Fix touchbar GUI script 2017-12-26 18:55:49 +01:00
Alexander Bock 5fc297cdcf Add Phobos and Deimos 2017-12-26 18:19:15 +01:00
Alexander Bock dd689b6ac1 Fix size of the logo on the loading screen
Reduce the font size on the loading screen
Add moons to Neptune and Uranus
Fix specification of Mercury
2017-12-26 17:20:06 +01:00
Alexander Bock 28750b3926 Add Saturn minor moons 2017-12-26 12:16:09 +01:00
Alexander Bock fef18e549d Exchange old jup260 kernel for updated jup310 and 341
Add asset files for Jupiter's minor moons
2017-12-26 10:53:15 +01:00
Alexander Bock 376135a748 Add color specification for synchronization phase to the loading screen
Increase the buffer size in the SpiceManager to prepare for larger jupiter kernels
2017-12-26 10:52:02 +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 08ba7fada5 Fix Gui paths for Voyager 1 and Voyager 2 2017-12-25 10:29:18 +01:00
Alexander Bock fad87fc4e9 Add old Pluto image to the selection of textures
Have newhorizons.asset require all child assets to ensure initialization
2017-12-25 09:31:25 +01:00
Alexander Bock 1079d67c9a Have the documentation print out more information if an error occurs
Add other scene files (commented out) to the openspace.cfg
2017-12-25 09:10:22 +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 7920c97767 Fix the map configurations for Mars
Include hotfix for limiting the number of concurrent downloads
2017-12-24 18:23:18 +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 4c92b9ccbb First steps towards making OpenSpaceEngine resilient against SGCT configuration errors 2017-12-23 20:39:23 +01:00