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
Kalle Bladin
d128e09691
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-08 17:20:45 -04:00
Kalle Bladin
d91dd3dbb7
Implement ability to update camera in two steps. still using old method.
2016-08-04 19:16:36 -04:00
Erik Broberg
d6aa4216cc
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-02 19:25:39 -04:00
Kalle Bladin
4e0bbe2da0
Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision
2016-08-02 19:14:52 -04:00
Erik Broberg
244c18fdc7
Solve merge conflicts: develop --> globebrowsing
2016-08-02 18:50:10 -04:00
Alexander Bock
50dd45fbb1
Add an indirection layer to the PerformanceManager to support multiple shared memory blocks in cases of multiple windows per node
2016-08-01 16:20:23 +02:00
Alexander Bock
81c18b2b62
Updated URLs in code or comments
2016-08-01 11:05:50 +02:00
Alexander Bock
6bd0ef7102
Make OpenSpaceModule a properties::PropertyOwner so that it can own properties
...
Add properties owned by OpenSpaceModule to the global settings engine (closing #104 )
2016-07-31 19:26:55 +02:00
Alexander Bock
635ce1713b
Add initial implementation of rings for Saturn
2016-07-29 07:54:16 +02:00
Alexander Bock
0c3b2c55d9
Removing more CppCheck warnings
2016-07-28 20:31:53 +02:00
Matthew Territo
fdb90f74ac
Added scene selector in the SettingsEngine, in the GUI under Global Properties.
...
Has placeholder functionality for what's coming in the next commit.
2016-07-27 16:45:43 -06:00
Matthew Territo
f53c4b6193
OptionProperty: ability to get the string description by passing a value
...
string getDescriptionByValue(int)
2016-07-27 09:25:28 -06:00
Matthew Territo
2abd1951fa
Add display option to OptionProperty
...
For displaying as Radio or Dropdown
2016-07-22 19:07:32 -06:00
Matthew Territo
8f40020fcb
Add ability to append multiple Options to an OptionProperty
...
via addOptions(vector<int>, vector<string>)
2016-07-22 12:39:09 -06:00
Erik Broberg
b44e761eba
Merge branch 'develop' into feature/globebrowsing
2016-07-21 13:29:33 -04:00
Matthew Territo
a2c96f5a36
Added ability to cycle through average frametime, FPS and average FPS
...
"t" and "Shift+t" are Lua bindings in common.lua
Maybe needs to be part of SettingsEngine instead, but the display code was already in RenderEngine, so it'll do for now on this branch
2016-07-20 16:33:37 -06:00
Alexander Bock
65ddeba70c
Add SGCT as submodule
...
Fix compile errors in ParallelConnection using __WIN32__ macro instead of WIN32
2016-07-20 14:31:30 +02:00
Alexander Bock
bc137ab377
Updated Spice library. Compile fix for Syncbuffer and Unittestson Linux
2016-07-20 10:41:06 +02:00
Kalle Bladin
541fbba322
Merge with develop and solve conflicts.
2016-07-18 17:26:30 -04:00
Alexander Bock
a244defdbc
Add additional Lua functions that make use of regular expressions to match against fully qualified property identifiers
...
- Making the GUI use the new function setPropertyValueSingle to not incur the overhead of compiling the regex
- The default setPropertyValue Lua function uses a wildcard, which replaces a * with the correct regex (.*) for ease of use
- The setPropertyValueRegex Lua function allows a full regular expression to be used
Closing #108
2016-07-18 20:12:24 +02:00
Alexander Bock
a2db1bed99
Include fixes for performance measurements
2016-07-18 16:25:55 +02:00
Alexander Bock
9df88a6a79
Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117 )
2016-07-18 14:54:36 +02:00
Alexander Bock
1b7ede6d5c
Add Lua functions to load and unload SpiceKernels
2016-07-18 14:41:27 +02:00
Alexander Bock
f7f8f279de
Move the LuaLibrary definition into its own file
2016-07-18 12:40:29 +02:00
Alexander Bock
6d8a16f19e
Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119 )
...
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120 )
- ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
- The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
Alexander Bock
dc32dfe075
Added functionality to print all keybindings to file when a scene is loaded
2016-07-14 00:28:09 -04:00
Alexander Bock
94a46813fe
Add to_string methods to Key, KeyModifier, and KeyWithModifier
2016-07-14 00:27:03 -04:00
Kalle
8fcaaf2799
Merge remote-tracking branch 'origin/develop' into feature/globebrowsing
2016-07-13 12:09:02 -04:00
Kalle
7e7a1cb720
Change friction to bool properties
2016-07-13 11:29:29 -04:00
Kalle
916916f82b
Fix bug that caused change in camera direction when switching between interaction mode.
2016-07-12 14:52:00 -04:00
Alexander Bock
e3a1b775fd
Correctly rollback the previous rollback
2016-07-07 13:49:57 +02:00
Matthew Territo
da203364ba
Rollback pointer changes to _synchronizationBuffer.
...
Was causing segfault on mutex locks during launch.
2016-07-06 12:02:01 -06:00
Alexander Bock
c9ac04d3cd
Remove sgct inclusion from SyncBuffer header and move to the source file
...
Fix serialization of MatrixProperty
2016-07-06 17:52:16 +02:00
Kalle
dd7abd355a
GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels
2016-07-01 17:42:49 -04:00
Kalle
fc53905131
Store interaction modes in interaction handler in a std::map
2016-07-01 13:13:31 -04:00
Kalle
3c7d1e22fc
Globe browsing interaction mode follows the rotation of the globe.
2016-07-01 12:46:16 -04:00
Kalle
031461307c
Solve problem with unsynched world position between interaction handler and renderer.
2016-06-30 22:43:27 -04:00
kbladin
a89f474502
Solve merge conflict and add properties for friction and interaction parameters.
2016-06-30 14:07:51 -04:00
