mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,028 Commits 83 Branches 46 Tags
ea6d8d683bcec00a6fafc5045edd8bb839bbe339
Commit Graph

151 Commits

Author SHA1 Message Date
Alexander Bock
2ae7095d9b Fix image dilation (closing #108) 
- Using pixel(=texel) coordinates and integer offsets
 - Using a single channel stencil texture instead of a 4-channel one
 2016-08-18 16:29:00 +02:00
Alexander Bock
72e1e9231a Add an update method to the ProjectionComponent that takes care of Shader rebuildin 2016-08-18 16:27:44 +02:00
Alexander Bock
010b8739f1 Use the correct output in the renderablemodelprojection shader 2016-08-18 15:45:07 +02:00
Alexander Bock
788ec99575 Merge branch 'develop' into feature/projectiontexturemap 
Conflicts:
	support/cmake/support_macros.cmake
 2016-08-18 13:23:55 +02:00
Alexander Bock
e284543434 Make use of a secondary stencil buffer for masking the dilation areas 2016-08-18 11:43:51 +02:00
Emil Axelsson
c4c9396441 add rosetta image of the day crawler 2016-08-18 11:12:28 +02:00
Alexander Bock
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
Alexander Bock
4f1fe0dd49 Add optional image dilation to the ProjectionComponent 2016-08-17 11:25:29 +02:00
Alexander Bock
dd9eeeb092 Remove the use of PowerScaledCoordinates in the RenderableModel as it caused an interpolation issue (closing #107) 2016-08-15 20:06:04 +02: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
37e18441dc Support GDAL on non-Windows platforms 
Fix compile fix with TileProviderManager
Fix projection error on PlanetProjection
 2016-06-22 08:51:58 +02:00
Alexander Bock
e671a59ede Merge branch 'develop' into release/ips 2016-06-21 14:24:53 +02:00
Alexander Bock
3775bbe6b1 Always write values to the projected texture even when normal-test fails (closing #103) 2016-06-21 14:24:23 +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
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
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
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
Alexander Bock
a9a99a51e8 Prevent 67P model from disappearing during projections (closing #83) 2016-05-31 14:40:15 +02:00
Alexander Bock
78c0ed902f Correct displacement factor for planetary heightmap 
Correctly bind F8 key for clearing rosetta projections
 2016-05-30 11:41:14 +02:00
Sebastian Piwell
2459b2c48b Merge fix with develop 2016-05-26 10:42:29 -04:00
Alexander Bock
427d49bfb4 Fix for height maps on RenderablePlanetProjection 2016-05-25 18:34:19 +02:00
Michael Nilsson
8ca457b14c solve merge conflict with develop 2016-05-20 09:33:41 -04: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