Alexander Bock
329986c0c6
Merge branch 'develop' into feature/globebrowsing
...
Conflicts:
modules/base/scale/staticscale.cpp
modules/base/scale/staticscale.h
modules/globebrowsing/meshes/trianglesoup.h
modules/globebrowsing/tile/tiledataset.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
Erik Broberg
9196ec2f50
Remove local, shared, synced versions of Time. Keep one source of true
2016-09-03 19:45:58 -04:00
Alexander Bock
6884eca40e
Merge remote-tracking branch 'origin/feature/rosetta-shadowmapping' into feature/rosetta
...
Conflicts:
modules/newhorizons/rendering/renderablemodelprojection.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
modules/newhorizons/util/projectioncomponent.cpp
2016-08-29 18:34:18 +02:00
Kalle Bladin
22d60779c6
Update renderable planet projection to render in high precision
2016-08-24 11:42:44 -04:00
Kalle Bladin
d042f6c4be
Merge branch 'develop' into feature/osirisrex
2016-08-19 12:33:49 -04:00
Emil Axelsson
6d56b1d38a
implement shadow mapping for image projections on non-convex bodies
2016-08-19 16:56:57 +02:00
Erik Broberg
8f8114fabf
Image has a TimeRange instead of two doubles
2016-08-18 18:23:52 -04: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
e284543434
Make use of a secondary stencil buffer for masking the dilation areas
2016-08-18 11:43:51 +02:00
Erik Broberg
7fc31151ea
Clean up: Remove targetBody from Renderable
2016-08-12 16:42:33 -04: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
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
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
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
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
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
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
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
Alexander Bock
ea91d50b87
Start correcting fixes for wrong image origin
2016-04-20 13:07:01 +02:00
Alexander Bock
acc6095ba3
Removing classes PlanetGeometryProject and SimpleSphereGeometryProjection and replace their use with the generic PlanetGeometry and SImpleSphereGeometry classes
2016-04-20 13:06:40 +02:00
Alexander Bock
906470f28e
Untabify the rest of the source files
...
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
c8da825098
Rename ImageSequencer2 to ImageSequencer
2016-04-18 15:14:59 +02:00
Alexander Bock
2acb2cbd92
Updated ghoul repository
...
Make use of automatic conversion and swizzling of textures
2016-04-07 19:07:18 +02:00
Emil Axelsson
80fe89dbc8
change interfaces from pointer to reference
2016-03-23 14:00:40 +01:00
Alexander Bock
c3aa8fecc2
Update ghoul to account for removed boost dependency
2016-03-15 23:59:57 +01:00
Emil Axelsson
ebbbbb2dfd
Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
...
Conflicts:
src/rendering/renderengine.cpp
2016-02-08 15:07:38 +01:00
Emil Axelsson
781ca62742
fix bugs in fisheye rendering
2016-02-08 14:33:19 +01:00
Alexander Bock
794bbcedda
Fix more GLM degrees->radians changes
2016-02-05 22:48:49 +01:00
Alexander Bock
f266f0bcee
Updated copyright header
2016-02-05 22:47:37 +01:00
Alexander Bock
7e3024959a
Remove the disabling of the blend function after an image projection that caused flickering
...
Set the window resolution in the framebuffer renderer
Fix spelling errors in CK kernel error messages
Reference new leap second kernel
2016-02-05 20:48:35 +01:00
Emil Axelsson
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
