mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 02:29:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,292 Commits 99 Branches 46 Tags
a0e5fe34fea684e085f549e6331d04c8db6e1ffc
Commit Graph

2292 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock
a0e5fe34fe Use more fine-grained texture specification for Pluto and Charon 2016-06-06 00:49:09 +02:00
Alexander Bock
e85144b4eb Performance optimization of ImageSequencer::instrumentActive 2016-06-06 00:45:40 +02:00
Alexander Bock
6a2624dbb2 Enable the sorting of performance measurement values 2016-06-05 23:27:24 +02:00
Alexander Bock
6a4362d6ed Make OpenSpace not crash on a fault rebuild of shaders 2016-06-05 18:52:00 +02:00
Alexander Bock
25b49e882d Automatically remove placeholder.png for the projection cases where a real image is available 2016-06-05 16:11:06 +02:00
Alexander Bock
9a3818f007 ProjectionComponent always loads the placeholder textures and reuses it 2016-06-04 20:58:58 +02:00
Alexander Bock
ef75066478 Rename projection shaders to more sensible names 2016-06-04 20:42:10 +02:00
Alexander Bock
3d82173ff0 Don't set alpha value to 1.0 for all projection images 2016-06-04 20:33:17 +02:00
Alexander Bock
6362318399 Make textured milkyway show again 2016-06-04 20:17:28 +02:00
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
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