ae6ade497b
Merge branch 'feature/render-bins' into feature/rosetta
...
Conflicts:
data/scene/earth/earth.mod
include/openspace/util/updatestructures.h
modules/base/shaders/ephemeris_fs.glsl
modules/base/shaders/plane_fs.glsl
2016-08-29 15:53:59 +02:00
46686d55eb
Set default magnification value to 1
2016-08-29 11:56:26 +02:00
b6be6da974
add support for additive blending in renderable plane
2016-08-25 20:44:00 +02:00
bc58623467
add render bins to improve rendering of transparent objects using framebuffer renderer
2016-08-25 18:26:59 +02:00
d0ec7ac735
render trails with additive blending
2016-08-25 16:32:27 +02:00
5551da922d
Update renderables to higher precision rendering by calculating M and V matrix in double precision.
2016-08-24 16:16:31 -04:00
ed98107214
Small comment in renderabletrailnew
2016-08-24 11:43:09 -04:00
de7a60df9e
Update comments about new renderable trail.
2016-08-23 17:58:59 -04:00
57d47cd856
Implement class RenderableTrailNew and use it for osiris rex. Higher precision than the old one.
2016-08-23 17:29:51 -04:00
628f8b479f
Update updatestructures to have transform with translation, rotation and scale.
2016-08-18 16:59:51 -04:00
23c4a05a96
Merge from globebrowsing
2016-08-17 20:25:58 -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
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
542b9e11e6
Update SceneGraphNode to have a full transformation defined in terms of translation, scale and rotation.
2016-08-17 00:19:25 -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
bd867ec402
Update SceneGraphNode to contain rotation information and remove rotation definition from renderable model.
2016-08-12 12:28:56 -04: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
6b9358f975
Update path to consider line fade and create proper bounding sphere for renderable model.
2016-08-09 19:59:51 -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
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
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
5f1fa3f755
Implement shadowing on RenderableRings
2016-07-31 20:22:29 +02:00
405c66d6f8
Enable separate orientation setting for non-equatorial rings
2016-07-29 13:28:44 +02:00
9f1abc67a2
Enable setting the texture offset for rings
...
Enable setting the color-based transparency for rings
2016-07-29 13:23:43 +02:00
635ce1713b
Add initial implementation of rings for Saturn
2016-07-29 07:54:16 +02:00
0c3b2c55d9
Removing more CppCheck warnings
2016-07-28 20:31:53 +02:00
4068ec747b
Remove CppCheck warnings
2016-07-28 18:04:08 +02:00
5883d75047
Update render function in renderable model to avoid precision errors and remove psc dependency.
2016-07-22 17:05:34 -04:00
0228ca241b
Add Juno scene and scenegraphnodes
...
Enable ability to apply a rotation matrix to the rotation vector to accomodate for model misalignments
2016-07-10 09:40:30 +02:00
20d0fb8474
Fix error in Dictionary construction for ScreenSpaceRenderable
...
Do not access the std::future for cases where a download is not necessary
2016-07-03 14:34:17 +02:00
e40d393824
Make the DownloadManager not a singleton (closing #43 )
2016-06-30 00:43:03 +02:00
6f05ed3b98
Make ProjectionComponent an actual component rather than using inheritance
2016-06-29 23:27:01 +02:00
9fb7814145
Add visibility toggle to Property base class
...
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
b2ce3d774c
Merge remote-tracking branch 'origin/feature/iSWA' into release/ips
2016-06-16 13:51:08 +02:00
78f3b42c3b
Started cleanup of ScreenSpaceImage
2016-06-16 01:22:30 +02:00
ad1893fd6f
Cleanup of ScreenSpaceRenderable
...
Add missing includes to other files
2016-06-16 01:00:10 +02:00
b8025d8c23
New ray ellipsoid intersection routine (initial implementation).
2016-06-09 16:03:28 -04:00
da956af2bc
Update matrix type in atmosphere (new issues present to be fixed).
2016-06-09 15:21:12 -04:00
b2c895dab0
Merged branch Atmosphere.
2016-06-09 11:45:56 -04:00
562e249dc9
Merge branch 'develop' into feature/globebrowsing
2016-06-08 12:32:31 -04:00
8771a238d3
improve galaxy rendering
2016-06-08 15:00:03 +02:00
dd51c71fb1
Fixed bug in shader that was crashing OS in MacOSX.
2016-06-07 13:51:28 -04:00
012bcaefaf
Solve merge conflicts.
2016-06-07 12:54:52 -04:00
Alexander Bock