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
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
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
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
0e96632586
Add ability to OptionProperty to return the currently selected Option
2017-12-23 20:23:36 +01:00
Emil Axelsson
fd2568fdab
Let http synchronizations overwrite files
2017-12-23 17:54:22 +01:00
Emil Axelsson
624167744d
Report failure for http requests with response code different from 200
2017-12-23 17:37:55 +01:00
Alexander Bock
0149162fbe
Move deinitialization of Assets from OpenSpaceEngine::destroy into OpenSpaceEngine::deinitialize as some of its components might be needed in the asset's deinitialization (like MissionManager)
...
Add function to unload Mission file
2017-12-23 17:32:28 +01:00
Emil Axelsson
2baa0cbb6d
Fix bug with assets changing state prematurely, while loading
2017-12-22 00:15:23 +01:00
Jonathas Costa
73354e87d8
Removed pointer from renderer.
2017-12-21 11:11:50 -05:00
Emil Axelsson
c763b7c30c
Fix state inconsistency bug in asset system
2017-12-20 12:13:18 +01:00
Jonathas Costa
3ea918b818
Multiples fixes and added max text size for grids.
2017-12-19 17:49:30 -05: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
Emil Axelsson
90243cf388
Improve loading screen
2017-12-18 15:00:57 +01:00
Emil Axelsson
ff317d4b2f
Show loading screen when loading assets
2017-12-18 11:55:14 +01:00
Emil Axelsson
fd550fc372
Fix compilation issues and bugs on windows
2017-12-18 10:22:42 +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
814de72bc2
Fix bugs in asset management
2017-12-15 18:51:22 +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
167222c814
Feature/dashboard ( #431 )
...
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable
* Add Onscreen Dashboard
* Add Dashboard class
* Add DashboardItem classes and subclasses
* Added font and fontsize customization to dashboarditems
* Add default dashboard specifications to all scenes
* Add tests.scene to test dashboard items
* Add configuration options to DashboardItemDistance
* Fix distance conversion to correctly use singular or plural values
* Make DashboardItems unique when adding them to a dashboard
* Correctly position test with different font sizes
* Add Dashboard Item that enables spacing between other items
* Add performance measurement to dashboard rendering
* Add method to DashboardItemDistance that computes distance to surface
* Add DashboardItemAngle that computes and prints the angle between three objects
* Add DashboardItemInstruments that shows the instruments on New Horizons
* Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
* Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00
Alexander Bock
7e2d6bf3ab
Coding style adherence
2017-12-12 17:08:24 -05:00
Emil Axelsson
a774b7b5b2
Start implementing support for removing assets
2017-12-12 17:48:33 +01:00
Emil Axelsson
d1305bee6b
Cleanup
2017-12-12 15:21:17 +01:00
Emil Axelsson
1417db5ed7
Let assets control their own lifecycle
2017-12-12 14:55:30 +01: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
Emil Axelsson
e0504980ad
Initialize requested assets when they are ready
2017-12-11 11:12:39 +01: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
Emil Axelsson
0396832ae5
Change notification mechanisms for assets
2017-12-08 17:36:45 +01:00
Emil Axelsson
f3dfade201
Start adding support for removing assets
2017-12-08 16:02:45 +01:00
Emil Axelsson
3968961434
Show resource sync progress in gui
2017-12-08 14:37:34 +01:00
Alexander Bock
0af3233f53
Move Space/Time component into simple menu version
...
Move regular menu to F3
Move easy menu to F2
Remove extra text
2017-12-07 17:06:55 -05:00
Emil Axelsson
4a43ca44f2
Render asset tree in gui
2017-12-07 18:44:08 +01:00
Jonathas Costa
5eb11cfc49
Merged master into NewAtmosphere.
2017-12-07 11:31:51 -05:00
Emil Axelsson
f33b24d551
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-07 11:44:14 +01:00
Emil Axelsson
9630e735db
An asset can only be considered synchronized when all required assets are synchronized
2017-12-07 11:07:15 +01:00
Alexander Bock
a406aaf039
Merge branch 'feature/guisorting'
...
# Conflicts:
# modules/imgui/include/guipropertycomponent.h
# modules/imgui/src/guipropertycomponent.cpp
2017-12-07 01:15:52 -05:00
Alexander Bock
20bdb7b2b4
Use the 4K milkyway texture on default for better performance
...
Make featured properties and space/time widget easy to disable
Add setting for setting the bounds of the delta time slider
Add exponent to all numerical properties and use where appropriate
Add properties to Guicomponents that collapse the title bar
Add new F2 key to only display the main property window
2017-12-07 01:05:03 -05:00
Alexander Bock
be98c3d784
Add TemplateProperty<std::vector<std::string>> as StringListProperty
...
Add default gui sorting to all scenes
2017-12-06 17:04:10 -05:00
Alexander Bock
6be6149e02
Remove deprecation warning from camera functions
...
Fix compile warning
2017-12-06 17:00:50 -05:00
Emil Axelsson
175d21de9a
Remove experimental code
2017-12-06 15:16:52 +01:00
