23c4a05a96
Merge from globebrowsing
2016-08-17 20:25:58 -04:00
d4f635513d
Merge branch 'develop' into feature/globebrowsing
2016-08-17 19:53:28 -04:00
09ad585be5
Rebase to feature/globebrowsing
2016-08-17 19:16:01 -04:00
1199acc7b9
Re-add and revert back to old ThreadPool. See ticket #128
2016-08-17 18:22:27 -04:00
1be12333ad
Update renderable path to fade away with distance
2016-08-17 16:58:53 -04:00
176fc02748
Increase precision of renderable trail and use that for showing the path of OSIRIS-REx.
2016-08-17 14:44:42 -04:00
93ceb176fa
New model hierarchy for osiris rex and add try catch in determineTarget in renderablefov
2016-08-17 14:08:48 -04:00
6c43d8404a
Added missing files
2016-08-17 16:27:13 +02:00
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
c01808ce10
Convert tabs to spaces.
2016-08-17 00:30:53 -04:00
64ba3d2717
Add new files supposed to be in previous commit.
2016-08-17 00:30:03 -04:00
542b9e11e6
Update SceneGraphNode to have a full transformation defined in terms of translation, scale and rotation.
2016-08-17 00:19:25 -04:00
9125073cc3
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-08-16 22:20:30 -04:00
3cb519ad77
Fix bug where TileDataLayout is created based on an uninitialized variable
2016-08-16 22:20:13 -04:00
7f757bbcb7
Use correct normal for RenderableRings closing ( #124 )
2016-08-16 09:41:13 +02:00
c55872d5f4
Increase precision in renderable plane projection.
2016-08-16 00:49:41 -04:00
fb7104fbed
Add renderable fov to OSIRIS-REx polycam and increse precision in rendering of view frustum (fov)
2016-08-15 20:20:36 -04:00
c7ea365300
Merge branch 'develop' into feature/globebrowsing
2016-08-15 13:06:17 -06:00
dd9eeeb092
Remove the use of PowerScaledCoordinates in the RenderableModel as it caused an interpolation issue (closing #107 )
2016-08-15 20:06:04 +02:00
5bddbcd683
Init lodScaleFactor to better reflect full screen resolution
2016-08-15 12:39:20 -04:00
656426dbe5
Merge
2016-08-12 17:05:44 -04:00
7fc31151ea
Clean up: Remove targetBody from Renderable
2016-08-12 16:42:33 -04:00
b0d8dd59f4
Update function focusPosition in Camera and add a solar path for OSIRIS REx.
2016-08-12 16:13:24 -04:00
fd5355b00f
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-12 12:29:29 -04:00
bd867ec402
Update SceneGraphNode to contain rotation information and remove rotation definition from renderable model.
2016-08-12 12:28:56 -04:00
0f21217f38
Merge branch 'feature/globebrowsing' into feature/osirisrex
2016-08-12 11:06:03 -04:00
42dc2da6f1
Each TileProvider has its own files located in tile/tileprovider/
2016-08-12 00:14:13 -04:00
06dcc05729
Fix un-added file to previous commit
2016-08-11 22:12:34 -04:00
6cb3dd1fea
Update AsyncTileReader according to new features of ghoul::ThreadPool
2016-08-11 22:04:15 -04:00
1dd569a3e1
Solve merge conflicts and fix bug in LayeredTextureUniformProvider
2016-08-11 17:05:14 -04:00
bc9befc970
Clean up ghoul dict parsing in InstrumentTimesParser construcor
2016-08-11 15:40:09 -04:00
88ab0147bf
Fix bug causing the instrument times parser to only work in Debug mode
...
OBS: ghoul asserts are removed in Release mode. So don't put crucial
statements that will have side effects in a ghoul assert. This is what
caused the bug which is fixed in this commit.
2016-08-11 13:03:55 -04:00
af672b6a4e
- Update Ghoul reference
...
- Remove not needed cmake files
- Make ConcurrentJobManager compile again
2016-08-11 11:12:15 +02:00
9ac5476146
Set bounding sphere of RenderableModelProjection based on its geometry
2016-08-10 17:38:19 -04:00
f637a30127
Let RenderableModels have a model rotation property for debugging
2016-08-10 12:55:44 -04:00
82e3dd95c3
Bennu does not have specular light. Fix upper case naming error
2016-08-09 21:03:48 -04:00
740bd7dc08
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-09 20:32:48 -04:00
72252d6a47
Use place holders for projected images (UV coordinates still not working)
2016-08-09 20:31:06 -04:00
6b9358f975
Update path to consider line fade and create proper bounding sphere for renderable model.
2016-08-09 19:59:51 -04:00
df1afdad36
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-09 12:25:48 -04:00
08431d3d88
Add the ability to choose point steps in path rendering.
2016-08-09 11:49:43 -04:00
fb87842b1b
Update path rendering to higher precision.
2016-08-08 22:35:37 -04:00
a0924588fd
Calculate RenderableModelProjection target position in double precision
2016-08-08 20:23:46 -04:00
19ab82174d
Parse basic instrument event times data
2016-08-08 16:44:50 -04:00
088bb8bca2
Loading event data incorrectly is a non-silent error
2016-08-08 12:53:57 -04:00
22d125c192
Add unimplemneted class InstrumentTimesParser
2016-08-05 13:25:02 -04:00
e664929bf2
Allow SequenceTypes to have multiple parsers
2016-08-05 13:19:19 -04:00
662e25963b
Move ThreadPool class from OpenSpace into Ghoul
2016-08-03 10:58:53 +02:00
d6aa4216cc
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-02 19:25:39 -04:00
64668e9feb
Merge from feature/globebrowsing
2016-08-02 19:25:23 -04:00
Erik Broberg