mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 12:40:01 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,434 Commits 83 Branches 46 Tags
cb77e2839cd68d3367ec8263cd481c2104f55c13
Commit Graph

263 Commits

Author SHA1 Message Date
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
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
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
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
Emil Axelsson
ab52504ec8 Restructure asset files 2017-12-18 18:55:12 +01: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
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Jonathas Costa
eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00
Alexander Bock
7e2d6bf3ab Coding style adherence 2017-12-12 17:08:24 -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
2152c3ee88 Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere 
# Conflicts:
#	modules/imgui/src/renderproperties.cpp
 2017-12-11 09:12:13 -05:00
Alexander Bock
c9aedb084b Add Lua functions to query keyboard bindings and remove individual keybinds 
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
 2017-12-08 14:58:18 -05:00
Jonathas Costa
b031245a19 Changed behaviou of max billboard sizes. 2017-12-08 13:03:36 -05:00
Jonathas Costa
28fc1d08a7 Disabled OpenGL logging. 2017-12-05 11:02:12 -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
a797c2b6db Merged master into NewAtmosphere 2017-12-01 17:13:04 -05:00
Alexander Bock
8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue) 
Add Dashboard for on-screen information (#closes 201)
 2017-11-26 14:46:54 -05:00
Jonathas Costa
cd1c695944 Improved RendedrablePlanesCloud rendering times. 2017-11-22 11:55:37 -05:00
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa
67033c4583 Tentative fix for billbords alingment problems. 2017-11-15 17:35:00 -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
Jonathas Costa
9885c00beb Performance improved atmosphere. 2017-11-07 15:57:25 -05:00
Alexander Bock
bc4e0e4af0 Refactor item overlap and add standoff distance 2017-11-06 11:02:58 -06:00
Emil Axelsson
1f33359697 Cleanup and better configuration of resource syncs 2017-11-05 23:17:51 +01:00
Alexander Bock
dc9831b6a6 Add progress bar to the loading screen 
Add configuration options to customize the loading screen
 2017-11-05 14:49:46 -05:00
Jonathas Costa
089cfe727f Improved ATM perfomance (still working on it). Debugging billboards alingment (in progress). 2017-11-03 17:10:03 -04:00
Alexander Bock
735d6378d9 More work on loading screen 
Multithreaded SceneGraphNode initialization
 2017-11-03 14:06:51 -04:00
Emil Axelsson
157d91d631 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-26 13:43:49 +02:00
Alexander Bock
50fd9309ba Merge branch 'master' into feature/NewAtmosphere 
# Conflicts:
#	src/rendering/renderengine.cpp
 2017-10-24 15:30:22 -04:00
Alexander Bock
eaca6c7487 Add SceneLicense information to the Scene 
Add documentation generator to SceneLicense
 2017-10-23 18:11:09 -07:00
Jonathas Costa
637e74a9dc Merged master into NewAtmosphere. 2017-10-19 14:23:06 -04:00
Emil Axelsson
97f78a09df Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-19 10:27:34 +02:00
Alexander Bock
7377d63794 Clean up digitaluniverse data folder 
Add mod files
Add Moon WAC wms file
 2017-10-17 21:36:54 -04:00
Jonathas Costa
d36e32e560 Merged master into NewAtmosphere. 2017-10-17 20:14:41 -04:00
Alexander Bock
d628c1a667 Merge branch 'master' into feature/DU 
# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct
 2017-10-17 17:09:37 -04:00
Alexander Bock
a303bf3aa8 Fix for mission visualization 
Change default monospaced font
 2017-10-16 16:27:32 -04:00
Emil Axelsson
2623912ec9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-16 11:07:24 +02:00
Jonathas Costa
0ed72d6652 Merge branch 'master' into feature/DU 2017-10-04 09:36:37 -04:00
Jonathas Costa
600536e7f8 Added colormap range defined. Added VectorListVerifier. Added Text rendering. Added other datavar types for Tully. Added transformantion matrix. 2017-10-04 09:23:49 -04:00
Jonathas Costa
74f0da9033 Added new data, new RenderableBillboardsCloud renderable, added and fixed multiple shaders. 2017-09-22 08:12:45 -04:00
Emil Axelsson
ea5382c028 Volume conversion and rendering (#350) 
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
 2017-09-22 12:03:23 +02:00
Emil Axelsson
f4901fa4cf Work on asset management 2017-09-18 18:13:20 +02:00
Emil Axelsson
aaed6ab6d7 Work on asset loader and assets 2017-09-15 14:05:43 +02:00
Jonathas Costa
2d0da72a50 Merged master into atm. 2017-08-16 12:00:28 -04:00
Jonathas Costa
f95411b1cc Removed atmosphereerath scene, mod and data files. 2017-08-16 09:39:29 -04:00
Emil Axelsson
cb7319d5f2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp
 2017-08-14 11:17:25 +02:00
Alexander Bock
5ca44d4aa1 Allow RenderableGlobe to have a single radius 
Make GlobeBrowsing scene the new default scene
 2017-07-27 17:24:22 -04:00