Kalle Bladin
b0d8dd59f4
Update function focusPosition in Camera and add a solar path for OSIRIS REx.
2016-08-12 16:13:24 -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
Erik Broberg
a4ee56c571
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-08-12 11:01:40 -04:00
Erik Broberg
42dc2da6f1
Each TileProvider has its own files located in tile/tileprovider/
2016-08-12 00:14:13 -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
Erik Broberg
06dcc05729
Fix un-added file to previous commit
2016-08-11 22:12:34 -04:00
Erik Broberg
6cb3dd1fea
Update AsyncTileReader according to new features of ghoul::ThreadPool
2016-08-11 22:04:15 -04: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
Erik Broberg
bc9befc970
Clean up ghoul dict parsing in InstrumentTimesParser construcor
2016-08-11 15:40:09 -04:00
Erik Broberg
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
Alexander Bock
af672b6a4e
- Update Ghoul reference
...
- Remove not needed cmake files
- Make ConcurrentJobManager compile again
2016-08-11 11:12:15 +02:00
Erik Broberg
9ac5476146
Set bounding sphere of RenderableModelProjection based on its geometry
2016-08-10 17:38:19 -04:00
Erik Broberg
fa93a78d9f
Rotate Osiris Rex model to match Spice specification
2016-08-10 13:57:12 -04:00
Erik Broberg
f637a30127
Let RenderableModels have a model rotation property for debugging
2016-08-10 12:55:44 -04:00
Erik Broberg
82e3dd95c3
Bennu does not have specular light. Fix upper case naming error
2016-08-09 21:03:48 -04:00
Erik Broberg
740bd7dc08
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-09 20:32:48 -04:00
Erik Broberg
19b659df2d
Add Osiris-rex instrumnet times for Kalle
2016-08-09 20:31:57 -04:00
Erik Broberg
72252d6a47
Use place holders for projected images (UV coordinates still not working)
2016-08-09 20:31:06 -04:00
Kalle Bladin
6b9358f975
Update path to consider line fade and create proper bounding sphere for renderable model.
2016-08-09 19:59:51 -04:00
Erik Broberg
a729e067ec
Set scale of bennu and osiris-rex to be more reasonable wrt osiris-rex trail
2016-08-09 17:15:51 -04:00
Erik Broberg
0e610a3807
Fix Bennu positioning bug
2016-08-09 17:12:22 -04:00
Erik Broberg
50ef251838
Solve conflicts in mod files
2016-08-09 13:31:05 -04:00
Erik Broberg
b02409eb6d
Add osirisrex.mod and bennu.mod
2016-08-09 13:16:17 -04:00
Kalle Bladin
a99040d661
Add osiris rex and bennu mod files.
2016-08-09 13:12:58 -04:00
Erik Broberg
df1afdad36
Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace into feature/osirisrex
2016-08-09 12:25:48 -04:00
Kalle Bladin
08431d3d88
Add the ability to choose point steps in path rendering.
2016-08-09 11:49:43 -04:00
Kalle Bladin
fb87842b1b
Update path rendering to higher precision.
2016-08-08 22:35:37 -04:00
Erik Broberg
a0924588fd
Calculate RenderableModelProjection target position in double precision
2016-08-08 20:23:46 -04:00
Erik Broberg
87595b3452
Default sgct config is single
2016-08-08 20:22:24 -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
7ecc8d397f
Use the new way of updating and syncing camera
2016-08-08 17:13:32 -04:00
Erik Broberg
b780e694c4
Set openspace time to right before first instrument event
2016-08-08 16:52:07 -04:00
Erik Broberg
19ab82174d
Parse basic instrument event times data
2016-08-08 16:44:50 -04:00
Erik Broberg
088bb8bca2
Loading event data incorrectly is a non-silent error
2016-08-08 12:53:57 -04:00
Erik Broberg
22d125c192
Add unimplemneted class InstrumentTimesParser
2016-08-05 13:25:02 -04:00
Erik Broberg
e664929bf2
Allow SequenceTypes to have multiple parsers
2016-08-05 13:19:19 -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
596205e640
Fix compilation error from auto merge
2016-08-04 13:16:32 -04:00
Matthew Territo
dd74204eb7
Add ghoul/misc/threadpool.h
...
Fix namespaces to include ghoul::
2016-08-03 15:04:47 -06:00
Erik Broberg
ab9af89a0b
Resolve merge conflict
2016-08-03 11:27:16 -04:00
Alexander Bock
42542bbb68
Include Jenkins compile fix
2016-08-03 11:08:57 +02:00
Alexander Bock
662e25963b
Move ThreadPool class from OpenSpace into Ghoul
2016-08-03 10:58:53 +02:00
Erik Broberg
95da433397
Re-enable scene switching again after incorrect merge from develop
2016-08-02 20:48:53 -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
Erik Broberg
64668e9feb
Merge from feature/globebrowsing
2016-08-02 19:25:23 -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
