Commit Graph

970 Commits

Author SHA1 Message Date
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
Erik Broberg
6024070745 Add new classes SyncEngine and SyncData to encapsulate SGCT synchronization 2016-09-15 17:02:00 -04:00
Erik Broberg
d287b08c51 Enable toggling use of doublebuffering for camera and time 2016-09-13 11:52:54 -04:00
Erik Broberg
5cb6d2cb05 Move camera and time serialization and deserialization to cpp-files 2016-09-12 14:05:26 -04:00
Erik Broberg
9c5deaba82 Use double buffering for time and camera syncing 2016-09-07 21:39:29 -04:00
Erik Broberg
047e754369 Remove serialize() and deserialize() from InteractionHandler and InteractionMode 2016-09-06 13:53:31 -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
649d8d2f67 Remove shared and synced versions of data members in MouseStates 2016-09-03 22:54:02 -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
796f80e511 Remove local, shared, synced Camera members, and keep one source of truth 2016-09-03 20:54:21 -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
d59156e81b Enable render global frame number and add as global property 2016-09-02 18:23:44 -04:00
Erik Broberg
9bdbf95961 --amend 2016-09-01 15:25:56 -04:00
Erik Broberg
cc2c26a3e7 Enable OpenSpace checking isUsingSwapGroups and isSwapGroupMaster 2016-09-01 15:19:25 -04:00
Erik Broberg
5e31638b92 Enable the global Lua state when loading scheduled scripts from file 2016-08-30 14:01:42 -04:00
Erik Broberg
0ee638f447 Enable clearing scheduled scripts 2016-08-30 12:26:10 -04:00
Erik Broberg
6206b47ef9 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-29 16:16:21 -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
Kalle Bladin
84834f230d Merge branch 'develop' into feature/osirisrex 2016-08-29 13:01:28 -04:00
Alexander Bock
193e2bdc64 Fix linking error when OpenSpace is compiled without the globebrowsing module 2016-08-29 10:45:59 +02:00
Alexander Bock
6d20c8301f Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 01:07:27 +02:00
Alexander Bock
be67131c33 Remove Globebrowsing restrictions from InteractionHandler header file 2016-08-29 00:56:28 +02:00
Kalle Bladin
a82ad66374 Add scale as a property of every scenegraph node. 2016-08-26 20:32:08 -04:00
Erik Broberg
337cc64ab1 Add forgotten file 2016-08-22 15:35:27 -04:00
Erik Broberg
b92b5260ff Render dummy Mission phases 2016-08-19 10:58:03 -04:00
Kalle Bladin
628f8b479f Update updatestructures to have transform with translation, rotation and scale. 2016-08-18 16:59:51 -04:00
Kalle Bladin
ae1f8e457b Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation. 2016-08-18 14:21:20 -04:00
Erik Broberg
23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Erik Broberg
d4f635513d Merge branch 'develop' into feature/globebrowsing 2016-08-17 19:53:28 -04:00
Alexander Bock
6c43d8404a Added missing files 2016-08-17 16:27:13 +02:00
Alexander Bock
c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files)
Updating SGCT and Ghoul references
2016-08-17 16:26:14 +02:00
Kalle Bladin
a9b8bec7b4 Remove parts of bounding sphere definition in SceneGraphNode. 2016-08-17 00:38:18 -04:00
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Kalle Bladin
64ba3d2717 Add new files supposed to be in previous commit. 2016-08-17 00:30:03 -04:00
Kalle Bladin
542b9e11e6 Update SceneGraphNode to have a full transformation defined in terms of translation, scale and rotation. 2016-08-17 00:19:25 -04:00
Kalle Bladin
9d04fd5593 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-15 13:08:50 -04:00
Kalle Bladin
2f05c8a5f0 Enable scene graph nodes to have transforms relative to parent node. 2016-08-15 13:08:30 -04:00
Erik Broberg
656426dbe5 Merge 2016-08-12 17:05:44 -04:00
Erik Broberg
7fc31151ea Clean up: Remove targetBody from Renderable 2016-08-12 16:42:33 -04:00
Kalle Bladin
fd5355b00f Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex 2016-08-12 12:29:29 -04:00
Kalle Bladin
bd867ec402 Update SceneGraphNode to contain rotation information and remove rotation definition from renderable model. 2016-08-12 12:28:56 -04:00
Erik Broberg
0f21217f38 Merge branch 'feature/globebrowsing' into feature/osirisrex 2016-08-12 11:06:03 -04:00
Matthew Territo
08c9862c32 Merge branch 'develop' into feature/globebrowsing 2016-08-11 21:59:38 -06:00
Matthew Territo
cc0dfdf5d1 Add simple ability to cycle through FPS (instead of Frametime) with t / Shift+t 2016-08-11 20:56:18 -06:00
Matthew Territo
c3ae58afba Add access to deltaTime/getDt in SGCT/WindowWrapper 2016-08-11 19:19:07 -06:00
Erik Broberg
1dd569a3e1 Solve merge conflicts and fix bug in LayeredTextureUniformProvider 2016-08-11 17:05:14 -04:00