Commit Graph

105 Commits

Author SHA1 Message Date
Kalle Bladin
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
Erik Broberg
7fc31151ea Clean up: Remove targetBody from Renderable 2016-08-12 16:42:33 -04:00
Erik Broberg
9ac5476146 Set bounding sphere of RenderableModelProjection based on its geometry 2016-08-10 17:38:19 -04:00
Erik Broberg
72252d6a47 Use place holders for projected images (UV coordinates still not working) 2016-08-09 20:31:06 -04:00
Erik Broberg
a0924588fd Calculate RenderableModelProjection target position in double precision 2016-08-08 20:23:46 -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
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
Alexander Bock
93b30f5078 Some cleanup of RenderableShadowCylinder 2016-07-31 22:23:20 +02:00
Alexander Bock
3fb6d3aa84 Some cleanup of RenderableFov 2016-07-31 21:43:55 +02:00
Alexander Bock
0c3b2c55d9 Removing more CppCheck warnings 2016-07-28 20:31:53 +02:00
Alexander Bock
4068ec747b Remove CppCheck warnings 2016-07-28 18:04:08 +02:00
Alexander Bock
7267aacea2 Do not retroactively project images when time passes with disable projections 2016-06-30 00:20:39 +02:00
Alexander Bock
6f05ed3b98 Make ProjectionComponent an actual component rather than using inheritance 2016-06-29 23:27:01 +02:00
Alexander Bock
a4b0d36048 Reenable up-vector definition in RenderableModelProjection 2016-06-17 17:00:45 +02:00
Alexander Bock
e1460575f5 Reenable up-vector definition in RenderablePlanetProjection 2016-06-17 16:49:04 +02:00
Alexander Bock
b2ce3d774c Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-16 13:51:08 +02:00
Alexander Bock
ad1893fd6f Cleanup of ScreenSpaceRenderable
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Kalle Bladin
012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -04:00
Kalle Bladin
45e7c41690 Update camera to use double precition. 2016-06-05 21:27:20 -04: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
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
2700ef6ea8 Moving potential targets into ProjectionComponent 2016-06-04 13:45:55 +02:00
Alexander Bock
4dda541d1f More work on refactoring RenderablePlanetProjection and RenderableModelProjection 2016-06-04 13:38:50 +02: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
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
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
Alexander Bock
273713aaaa Started cleanup of RenderablePlanetProjection 2016-06-03 11:16:10 +02:00
Alexander Bock
0508faf7ce Some changes to make GUI optional 2016-06-01 23:15:02 +02:00
Alexander Bock
a9a99a51e8 Prevent 67P model from disappearing during projections (closing #83) 2016-05-31 14:40:15 +02:00
Kalle Bladin
1db9f2f60c Clean up camera class. 2016-05-19 23:21:48 -04:00
Alexander Bock
50d8b93d30 Convert projected images instead of swizzling for RenderablePlanetProjection 2016-05-19 17:17:18 +02:00
Alexander Bock
54fa1c8cbc Merge branch 'feature/rosetta' into develop 2016-05-19 13:24:26 +02:00
Alexander Bock
dba650c80d Create separate key bindings for rosetta mission
Prolong rosetta trail
2016-05-18 21:37:27 +02:00
Alexander Bock
7d32dba5cb Enable SingleSphereGeometry to have more segments
Another fix for RenderablePlanetProjection heightmap offset
2016-05-18 20:19:47 +02:00
Alexander Bock
0ab3f0c026 Some fixes on heightmap displacement for RenderablePlanet
Some fixes on heightmap displacement for RenderablePlanetProjection
Enable optional normal map on RenderablePlanetProjection
2016-05-18 19:03:03 +02:00
Alexander Bock
74c7413115 Adding functionality to clear projections on RenderableModelProjection (closing #22) 2016-05-18 00:36:11 +02:00
Alexander Bock
bd90a0c44c Fix the image flipping on RenderableModelProjection 2016-05-17 19:25:59 +02:00
Alexander Bock
ecc6c8d63f Reintroduce powerscaled coordinates to modelgeometry to fix scaling issue
Correctly set magnification property in RenderableModelProjection
2016-05-16 14:44:55 +02:00
Alexander Bock
9fd0e02cb7 Flip placeholder texture 2016-05-16 09:16:33 +02:00
Alexander Bock
02674cb1c5 Cleanup in projection classes 2016-05-08 16:20:51 +02:00
Michael Nilsson
e4a8683aba fixed path to fboPass shaders in renderablePlanetProjection 2016-05-03 16:30:04 -04:00
Alexander Bock
472d35b7c4 Use correct orientation for renderableplaneprojection 2016-04-23 04:07:51 +02:00
Alexander Bock
def64f7c24 Correctly clear imageprojections in case the base texture is not RGB 2016-04-20 23:15:34 +02:00
Alexander Bock
4b4a7805c2 Fix the image orientation in the FBO passing for planetprojection 2016-04-20 15:44:06 +02:00
Alexander Bock
c14aa7b11b Fix inverted texture problem
- Change texture indices of PowerScaledSphere
- Change texture generation in FBOBass for projections
- Updated NewHorizons to download unflipped texture
- Use new Ghoul version
2016-04-20 14:28:11 +02:00