 Alexander Bock
|
50e0c1a43b
|
Reset Earth as camera focus
|
2016-06-04 20:03:16 +02:00 |
|
|
Alexander Bock
|
fe9a97fc80
|
Fix GLSL compile error
|
2016-06-04 19:56:29 +02:00 |
|
|
Alexander Bock
|
c6dc426211
|
Merge remote-tracking branch 'origin/feature/galaxy' into develop
Conflicts:
data/scene/default.scene
shaders/PowerScaling/powerScalingMath.hglsl
|
2016-06-04 19:54:34 +02:00 |
|
|
Alexander Bock
|
36f5f7bb04
|
Only load cdf list if ISWA module is loaded
|
2016-06-04 19:39:22 +02:00 |
|
|
Alexander Bock
|
30264fb00e
|
Add Lua function to check whether a specific module is loaded (closing #36)
|
2016-06-04 19:38:56 +02:00 |
|
|
Alexander Bock
|
4409003524
|
Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop
Conflicts:
data/scene/default.scene
|
2016-06-04 19:06:54 +02:00 |
|
|
Alexander Bock
|
2700ef6ea8
|
Moving potential targets into ProjectionComponent
|
2016-06-04 13:45:55 +02:00 |
|
|
Alexander Bock
|
afe2ecc1e8
|
Allow RenderEngine's removeRenderProgram method to reject passed nullptrs
|
2016-06-04 13:39:11 +02:00 |
|
|
Alexander Bock
|
4dda541d1f
|
More work on refactoring RenderablePlanetProjection and RenderableModelProjection
|
2016-06-04 13:38:50 +02:00 |
|
|
Michael Nilsson
|
79bbd6b01b
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-03 16:27:00 -04:00 |
|
|
Michael Nilsson
|
11245c9ead
|
fix for new ionosphere data
|
2016-06-03 16:26:51 -04:00 |
|
|
Sebastian Piwell
|
4ae4ecca3c
|
Auto filter at start
|
2016-06-03 14:16:15 -04:00 |
|
|
Sebastian Piwell
|
e3dae7abc3
|
Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA
|
2016-06-03 13:43:01 -04:00 |
|
|
Sebastian Piwell
|
8e8d949107
|
Summer school release
|
2016-06-03 13:42:50 -04:00 |
|
|
Michael Nilsson
|
dbe9066829
|
removed shared_ptr from group events.
|
2016-06-03 12:44:18 -04:00 |
|
|
Alexander Bock
|
491226ea7a
|
Started refactoring RenderableModelProjection and RenderablePlanetProjection to place common code into ProjectionComponent
|
2016-06-03 18:30:16 +02:00 |
|
|
Alexander Bock
|
4ef03bb02b
|
Further cleanup of projection code
|
2016-06-03 17:41:35 +02:00 |
|
|
Michael Nilsson
|
f9f9e9abd1
|
cleanup, update ghoul ref
|
2016-06-03 11:32:09 -04:00 |
|
|
Alexander Bock
|
89d5e69da4
|
Enable fading of projection layer
|
2016-06-03 16:57:24 +02:00 |
|
|
Alexander Bock
|
239ac0ab4e
|
Project images of RenderableModelProjection into a separate texture layer that can be cleared faster
|
2016-06-03 16:54:41 +02:00 |
|
|
Alexander Bock
|
104cbcfd39
|
Update Pluto textures to remove superfluous textures
|
2016-06-03 16:02:51 +02:00 |
|
|
Alexander Bock
|
63fb61b783
|
Add a slider for fading the projection in and out
|
2016-06-03 15:57:48 +02:00 |
|
|
Alexander Bock
|
b5466e0a96
|
Project images of RenderablePlanetProjection into a separate texture layer that can be cleared faster
|
2016-06-03 15:53:50 +02:00 |
|
|
Michael Nilsson
|
e694be248f
|
solve merge conflict in kameleonplane
|
2016-06-03 09:20:27 -04:00 |
|
|
Emil Axelsson
|
1901166640
|
improved galaxy rendering
|
2016-06-03 11:16:57 +02:00 |
|
|
Alexander Bock
|
273713aaaa
|
Started cleanup of RenderablePlanetProjection
|
2016-06-03 11:16:10 +02:00 |
|
|
Michael Nilsson
|
c05b417519
|
refactor kameleonplane
|
2016-06-02 18:00:26 -04:00 |
|
|
Sebastian Piwell
|
e1b042b252
|
Do not register backgroundValues when autoFilter is true
|
2016-06-02 17:30:10 -04:00 |
|
|
Sebastian Piwell
|
8c7986bee4
|
Clean up in DataProcessor
|
2016-06-02 17:14:51 -04:00 |
|
|
Sebastian Piwell
|
a4f9789dd9
|
Transfer function bug fix
|
2016-06-02 17:06:41 -04:00 |
|
|
Sebastian Piwell
|
41299f17f7
|
Improved multiple transfer functions
|
2016-06-02 16:56:25 -04:00 |
|
|
Sebastian Piwell
|
d788e31334
|
Change resolution and cdf file in KameleonPlane
|
2016-06-02 16:25:11 -04:00 |
|
|
Alexander Bock
|
7908d8a8b0
|
Premultiply fieldline colors and use fully opaque transparency instead
|
2016-06-02 17:38:33 +02:00 |
|
|
Michael Nilsson
|
7401595e93
|
refactor filloptions in kameleonplane, merge conflict
|
2016-06-02 09:45:14 -04:00 |
|
|
Alexander Bock
|
4c679c15ea
|
Allow the disabling of ISWA components
|
2016-06-02 13:25:05 +02:00 |
|
|
Alexander Bock
|
1e8d329e3d
|
Add a correction factor for ImGui that converts between window coordinates and fbo coordinates (closing #95)
|
2016-06-02 13:12:28 +02:00 |
|
|
Alexander Bock
|
de3edd5022
|
Do not clear Framebuffer in FramebufferRenderer so that multiviewport rendering works
|
2016-06-01 23:15:46 +02:00 |
|
|
Alexander Bock
|
03e0ac4067
|
Fix error with close near plane in cases of angled image planes
|
2016-06-01 23:15:25 +02:00 |
|
|
Alexander Bock
|
0508faf7ce
|
Some changes to make GUI optional
|
2016-06-01 23:15:02 +02:00 |
|
|
Sebastian Piwell
|
a00e29d987
|
Merge fix
|
2016-06-01 16:55:20 -04:00 |
|
|
Sebastian Piwell
|
342b7fa985
|
Renamed IswaGroup to IswaBaseGroup
|
2016-06-01 15:25:11 -04:00 |
|
|
Sebastian Piwell
|
bba419fcf1
|
IswaKameleonGroup
|
2016-06-01 15:08:29 -04:00 |
|
|
Sebastian Piwell
|
27a046d81d
|
IswaDataGroup
|
2016-06-01 14:40:00 -04:00 |
|
|
Michael Nilsson
|
cb601042a6
|
solve merge conflict
|
2016-06-01 14:03:39 -04:00 |
|
|
Alexander Bock
|
a2cad36772
|
Merge remote-tracking branch 'origin/feature/iSWA' into develop
Conflicts:
data/scene/default.scene
scripts/bind_keys.lua
|
2016-06-01 19:46:23 +02:00 |
|
|
Michael Nilsson
|
f029362372
|
refactor datasphere
|
2016-06-01 13:19:45 -04:00 |
|
|
Sebastian Piwell
|
876c86ca75
|
Merge fix
|
2016-06-01 12:09:58 -04:00 |
|
|
Sebastian Piwell
|
d33121d07c
|
New dataprocessor classes works with IswaGroup
|
2016-06-01 11:50:26 -04:00 |
|
|
Michael Nilsson
|
a882d7df6c
|
add class comments to dataplane
|
2016-05-31 18:00:09 -04:00 |
|
|
Michael Nilsson
|
e8238859f8
|
refactor cygnetplane and dataplane
|
2016-05-31 17:54:39 -04:00 |
|