mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-14 17:40:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,360 Commits 82 Branches 46 Tags
a6d33162ca48d0b5b74f530c8dd95e163eedccfb
Commit Graph

2477 Commits

Author SHA1 Message Date
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
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
Jonathas Costa
5ad7fa94f3 Merge branch 'master' into feature/NewAtmosphere 2017-12-18 12:21:08 -05:00
Alexander Bock
0b0ad54028 Reenable digital universe on default 
Fix refresh rate setting in configuration_helper
 2017-12-18 11:58:22 -05:00
Emil Axelsson
8230e8d1e5 Add preprocessor flag 2017-12-18 17:50:07 +01:00
Emil Axelsson
ef2633980b Allow sync module to be compiled without libtorrent 2017-12-18 17:36:52 +01:00
Jonathas Costa
c7a784f01e Updated absPath in shaders compilation. 2017-12-18 10:26:26 -05:00
Emil Axelsson
90243cf388 Improve loading screen 2017-12-18 15:00:57 +01:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Emil Axelsson
df259f6d02 Multithreaded scene initialization 2017-12-17 17:34:46 +01:00
Emil Axelsson
7cc05ba2e0 More code cleanup 2017-12-16 15:37:46 +01:00
Emil Axelsson
84dfbe7b80 Clean up asset related code 2017-12-16 12:51:46 +01:00
Jonathas Costa
61b2c82b92 Improved code. 2017-12-15 13:21:14 -05:00
Emil Axelsson
603078af53 Add sync task 2017-12-15 13:28:24 +01:00