Commit Graph

67 Commits

Author SHA1 Message Date
Alexander Bock
ea4d9c8e44 Cleanup of RenderableCrawlingLine
Cleanup of RenderableFOV
Add function to SpiceManager that does not return the light travel time
2017-03-12 16:05:14 -04:00
Alexander Bock
dc40812df9 Fix warnings in code
Make OpenSpaceTest not flood the console on Jenkins
Fix Vec3 property to signal change correctly
Let RenderablePlanetProject correctly reload base map and height map
Update Ghoul
2017-03-11 11:26:25 -05:00
Alexander Bock
bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Alexander Bock
34f1b55c3c Enable shifting the meridian of a RenderablePlanetProjection by 180 for Pluto 2017-03-05 17:26:22 -05:00
Alexander Bock
6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
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
Alexander Bock
95b1a2a1ad Make the RenderableModelProjection shader work without a depth map 2016-09-07 17:21:08 +02:00
Alexander Bock
574e6db29d Remove the false image flipping in the renderableplanetprojection shader 2016-09-01 11:07:18 +02:00
Alexander Bock
fa904ef1df Merge remote-tracking branch 'origin/feature/rosetta-shadowmapping' into feature/rosetta 2016-09-01 11:01:09 +02:00
Alexander Bock
d9016f9a98 Fix projection fading in renderable model 2016-09-01 10:42:19 +02:00
Kalle Bladin
64be557abf Use alpha from projection texture in RenderableModelProjection. 2016-08-30 14:17:00 -04:00
Emil Axelsson
86a0661aef perform bias matrix operation in shader instead of on cpu, for renderableplanetprojection 2016-08-30 13:36:57 +02: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
547807a8d1 Fix problem with projection texture getting overwritten upon image projection. 2016-08-26 17:54:15 -04:00
Kalle Bladin
5551da922d Update renderables to higher precision rendering by calculating M and V matrix in double precision. 2016-08-24 16:16:31 -04:00
Kalle Bladin
22d60779c6 Update renderable planet projection to render in high precision 2016-08-24 11:42:44 -04:00
Emil Axelsson
3d000a5bb1 flip texture access to correct projection error 2016-08-24 11:38:32 +02: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
Kalle Bladin
cd0fd8fb5c Update Rosetta scene to render correctly with new scene graph structure. 2016-08-18 20:47:05 -04:00
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
010b8739f1 Use the correct output in the renderablemodelprojection shader 2016-08-18 15:45:07 +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
23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Alexander Bock
4f1fe0dd49 Add optional image dilation to the ProjectionComponent 2016-08-17 11:25:29 +02:00
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
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
Erik Broberg
82e3dd95c3 Bennu does not have specular light. Fix upper case naming error 2016-08-09 21:03:48 -04:00
Kalle Bladin
6b9358f975 Update path to consider line fade and create proper bounding sphere for renderable model. 2016-08-09 19:59:51 -04:00
Erik Broberg
a0924588fd Calculate RenderableModelProjection target position in double precision 2016-08-08 20:23:46 -04: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
e1460575f5 Reenable up-vector definition in RenderablePlanetProjection 2016-06-17 16:49:04 +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
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
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
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
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
Alexander Bock
7d32dba5cb Enable SingleSphereGeometry to have more segments
Another fix for RenderablePlanetProjection heightmap offset
2016-05-18 20:19:47 +02:00