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
|
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 |
|
Erik Broberg
|
b44e761eba
|
Merge branch 'develop' into feature/globebrowsing
|
2016-07-21 13:29:33 -04: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
|
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
|
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 |
|
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 |
|
kbladin
|
a89f474502
|
Solve merge conflict and add properties for friction and interaction parameters.
|
2016-06-30 14:07:51 -04:00 |
|
Kalle Bladin
|
35a095c448
|
Change camera dictionary state representation to consider position, rotation and focus node.
|
2016-06-29 15:23:37 -04:00 |
|
Kalle Bladin
|
5807919ac7
|
Start changing camera write and restore functions.
|
2016-06-29 10:45:26 -04:00 |
|
Alexander Bock
|
a56ce8d3f5
|
Clang compile fixes
|
2016-06-29 16:40:20 +02:00 |
|
Kalle Bladin
|
e5ccf185cd
|
Remove rotation state variables from interaction mode and enable more freely local rotation.
|
2016-06-28 22:28:56 -04:00 |
|
Alexander Bock
|
824da2199f
|
Include file cleanup
|
2016-06-27 15:02:21 +02:00 |
|
Alexander Bock
|
41ef7c1b55
|
Add methods to check for KeyActions and KeyModifiers
|
2016-06-27 01:12:00 +02:00 |
|
Erik Broberg
|
7c0e80b866
|
Enable basic saving and restoring camera position between runs
|
2016-06-22 17:37:55 -04:00 |
|
Alexander Bock
|
896d9bd1db
|
Merge remote-tracking branch 'origin/feature/iSWA' into release/ips
|
2016-06-14 22:52:30 +02:00 |
|
Sebastian Piwell
|
c0b0d45470
|
Linux compile fix
|
2016-06-13 13:50:38 -04:00 |
|
Sebastian Piwell
|
65bacf3119
|
Merge with develop
|
2016-06-13 13:30:26 -04:00 |
|
Sebastian Piwell
|
157ca752b2
|
Find highest value over multiple bins in histogram
|
2016-06-10 15:36:36 -04:00 |
|
Kalle Bladin
|
012bcaefaf
|
Solve merge conflicts.
|
2016-06-07 12:54:52 -04:00 |
|
Sebastian Piwell
|
9e7c420719
|
KameleonTransformationMatrix() in Transformation manager
|
2016-06-06 10:20:53 -04:00 |
|
Alexander Bock
|
55456ae272
|
Add button to reset performance measurements
Clang compile fix
|
2016-06-06 10:23:28 +02:00 |
|
Kalle Bladin
|
f51f282dbb
|
Merge branch 'feature/interaction' into feature/globebrowsing
|
2016-06-05 21:28:12 -04:00 |
|
Kalle Bladin
|
45e7c41690
|
Update camera to use double precition.
|
2016-06-05 21:27:20 -04:00 |
|
Kalle Bladin
|
d7278bfcc8
|
Update camera class.
|
2016-06-05 21:07:36 -04:00 |
|
Alexander Bock
|
55d484205a
|
Rename performance file
|
2016-06-06 02:14:42 +02:00 |
|
Alexander Bock
|
f8f89e6fd1
|
Moving more code into performance files
|
2016-06-06 02:12:46 +02:00 |
|
Alexander Bock
|
2c8e3fd7b9
|
Refactor PerformanceLayout into new file and reuse between RenderEngine and GuiPerformanceComponent
|
2016-06-06 01:54:41 +02:00 |
|
Erik Broberg
|
6285cac488
|
Add more flexibility to construction of Time instances
|
2016-06-05 18:35:40 -04:00 |
|
Alexander Bock
|
4c679c15ea
|
Allow the disabling of ISWA components
|
2016-06-02 13:25:05 +02:00 |
|
Erik Broberg
|
9ddb54d546
|
Add explicit default constructor and copy constructor to class Time
|
2016-05-31 19:50:11 -04:00 |
|
Erik Broberg
|
6d4c9331dd
|
Enable Time conversion to ISO8601 format
|
2016-05-31 19:37:17 -04:00 |
|
Kalle Bladin
|
bbc002514d
|
Possible to render in fisheye mode now that the combinedViewMatrix() function in the camera class actually returns the combined view matrix.
|
2016-05-27 12:13:40 -04:00 |
|
Kalle Bladin
|
060298f74b
|
Solve precision problem that causes jagged movement.
|
2016-05-27 11:09:07 -04:00 |
|
Kalle Bladin
|
8ab0a70886
|
Solve merge conflict for interaction.
|
2016-05-25 13:20:12 -04:00 |
|
Kalle Bladin
|
09ca260778
|
Rotating with orbital interaction mode.
|
2016-05-24 13:26:07 -04:00 |
|
Sebastian Piwell
|
c983ecfb89
|
Histogram eq with group dataprocessor
|
2016-05-20 16:46:33 -04:00 |
|
Kalle Bladin
|
309c97098c
|
Changed interface of camera class
|
2016-05-20 16:09:35 -04:00 |
|
Kalle Bladin
|
3ff322c282
|
Clean up camera class
|
2016-05-20 12:03:05 -04:00 |
|
Kalle Bladin
|
74f190ef7e
|
More clean up in camera class.
|
2016-05-20 11:46:36 -04:00 |
|
Kalle Bladin
|
e057f60a18
|
Remove psc internally from camera class.
|
2016-05-20 10:31:33 -04:00 |
|