Commit Graph

354 Commits

Author SHA1 Message Date
Alexander Bock
317ecad9ac Potential fix for High-DPI and manual framebuffer sizes by using SGCT window scaling 2016-10-23 22:55:26 +02:00
Alexander Bock
febf8c9a1b High-DPI fixes for ImGUI 2016-10-19 15:54:19 +02:00
Alexander Bock
542f92e768 Add a fix to the window resolution for Retina displays
Add a new setting to the ConfigurationManager that can specify whether to scale the onscreen text by window size or resolution
2016-10-18 18:52:30 +02:00
Emil Axelsson
b448b0ec5e Move all network namespace members into the openspace namespace 2016-09-30 14:13:36 +02:00
Emil Axelsson
0230acb005 Merge branch 'feature/parallelconnection' into develop
Conflicts:
	src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
Emil Axelsson
15e83394c3 improve look and feel of the html documentation 2016-09-27 14:45:26 +02:00
Alexander Bock
77db054959 Make fontrenderer, gui, and console depend on the window resolution rather than the framebuffer resolution (closing #140) 2016-09-26 19:26:41 +02:00
Alexander Bock
26f4975b17 Clear up MissionManager
Consolidate core class registrations
2016-09-26 18:46:20 +02:00
Alexander Bock
7ddccd8172 Rename Ephemeris files to Translation 2016-09-26 13:49:17 +02:00
Alexander Bock
a688a1eee9 Rename Ephemeris to Translation 2016-09-26 13:34:22 +02:00
Alexander Bock
616a115536 Adding a Lua function to manually enable/disable the frame synchronization 2016-09-24 14:55:20 +02:00
Alexander Bock
8cf39cdd29 Only enable syncing after the first frame due to high initialization load 2016-09-24 09:07:15 +02:00
Emil Axelsson
cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Emil Axelsson
112fe7fc54 synchronize time over parallel connection 2016-09-22 18:42:19 +02:00
Alexander Bock
a85356dcff Add a commandline argument to override the cache directory 2016-09-21 22:10:59 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
Alexander Bock
d3f7139f5e Merge branch 'feature/globebrowsing' into syncing
Conflicts:
	modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
2016-09-20 14:48:28 +02:00
Emil Axelsson
fa8eee5386 sync camera movement over parallel connection 2016-09-19 14:49:57 +02:00
Alexander Bock
8867b3439f Add central location for the core to register documentations
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
2016-09-19 14:03:42 +02:00
Alexander Bock
85492405bd Make use of referenced verifier for Renderables
Adapt HTML documentation generation
2016-09-19 11:24:37 +02:00
Alexander Bock
0a13d5430f Make DocumentationEngine into a singleton object
Add documentation to DocumentationEngine
Add unique identifier to Documentation class (and enforce in DocumentationEngine)
2016-09-19 09:31:34 +02:00
Erik Broberg
7f393a3270 Inject SyncBuffer into SyncEngine. Add Doxygen comments for SyncEngine and SyncData 2016-09-16 20:32:29 -04:00
Erik Broberg
dd304fee31 Make ScriptEngine implement Syncable interface 2016-09-16 15:40:29 -04:00
Erik Broberg
0cd40512dd Generalize Syncable interface and use mutex locks for SyncData 2016-09-16 12:21:19 -04:00
Alexander Bock
a25a9b4a2d Add the ability to the FactoryManager to write documentation about all registered classes
Enable this feature on default in openspace.cfg
Move all generated documentations into a documentation folder
Adapt gitignore accordingly
2016-09-16 17:37:02 +02:00
Emil Axelsson
13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Erik Broberg
9e59cd3b8d Use SyncEngine for synchronizing all synced state in RenderEngine 2016-09-15 17:52:22 -04:00
Erik Broberg
ee0cc6d165 Remove explicit syncing in Time and Camera and let SyncEngine do the work 2016-09-15 17:03:46 -04:00
Alexander Bock
f22f01ce95 More work on DocumentationEngine 2016-09-15 18:02:56 +02:00
Alexander Bock
408280a533 Rearrange and rename constants in ConfigurationManager
Make use of constants in ConfigurationManager documentation
2016-09-15 17:58:31 +02:00
Alexander Bock
a354f13ef3 Adding DocumentationEngine 2016-09-15 13:48:28 +02:00
Erik Broberg
87815ac179 Clean up ScriptScheduler and add doxygen comments 2016-09-13 17:35:45 -04:00
Erik Broberg
d287b08c51 Enable toggling use of doublebuffering for camera and time 2016-09-13 11:52:54 -04:00
Erik Broberg
9c5deaba82 Use double buffering for time and camera syncing 2016-09-07 21:39:29 -04:00
Erik Broberg
c20cd80eaa Merge globebrowsing, resolve conflicts
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04:00
Erik Broberg
0856be9d99 Remove InteractionHandler serialize and deserialize calls from openspace engine 2016-09-07 13:14:39 -04:00
Erik Broberg
aada13a656 Add debug functionalities: Busy wait for decode() and Log SGCT out-of-order errors 2016-09-06 12:44:03 -04:00
Erik Broberg
c837edae5b Testing new syncing scheme 2016-09-04 03:44:50 -04:00
Erik Broberg
2116f5c987 Rename preSync and postSync in InteractionHandler to more descriptive names 2016-09-03 22:14:10 -04:00
Erik Broberg
5e3c4cb0db Replace preSync and postSync in RenderEngine with a set of more descriptive methods 2016-09-03 21:46:58 -04:00
Erik Broberg
60441c4fa1 Remove non-descriptive methods preSync and postSync from class Time 2016-09-03 21:06:09 -04:00
Erik Broberg
3a887fef02 Remove non-descriptive preSync and postSync methods from Camera class 2016-09-03 21:02:30 -04:00
Erik Broberg
9196ec2f50 Remove local, shared, synced versions of Time. Keep one source of true 2016-09-03 19:45:58 -04:00
Erik Broberg
2bb3379d66 Log isUsingSwapGroups and isSwapGroupMaster after initialization and before deinitialization 2016-09-01 15:30:07 -04:00
Erik Broberg
6b1369f58c Log at info level when scheduled scripts are executed 2016-08-30 13:16:10 -04:00
Erik Broberg
b74b01d294 Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua 2016-08-29 16:16:11 -04:00
Erik Broberg
6875e8c1c7 Re-fix, after doing git submodule update 2016-08-22 15:55:42 -04:00
Erik Broberg
fd76e8063e Fix compilation error after git pull 2016-08-22 15:26:19 -04:00
Kalle Bladin
d042f6c4be Merge branch 'develop' into feature/osirisrex 2016-08-19 12:33:49 -04:00
Alexander Bock
adf02bd5f6 Updated Ghoul
- Adapted to CommandlineParser changes
2016-08-19 16:42:19 +02:00