Commit Graph

40 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
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
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
bd90a0c44c Fix the image flipping on RenderableModelProjection 2016-05-17 19:25:59 +02:00
Michael Nilsson
0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Alexander Bock
cfb895e2e9 Move fboPass shader into NewHorizons module 2016-05-01 13:14:36 +02:00
Michael Nilsson
c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Alexander Bock
906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock
dd98cef974 Enable the RenderableShadowCylinder's color to be set via properties 2016-02-07 20:37:11 +01:00
Alexander Bock
2f7fbb1f39 Uncomment old Progressbar from Kameleon to make jenkins compile again 2016-02-05 23:00:12 +01:00
Alexander Bock
f266f0bcee Updated copyright header 2016-02-05 22:47:37 +01:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Emil Axelsson
d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock
f8f48acb98 Implementation of the windowhandler interface 2015-10-20 23:30:40 +02:00
Alexander Bock
9e06b612a7 Remove the unused location declarations in the shader to make OpenSpace compatible with OpenGL 4.0 2015-07-07 11:17:56 +02:00
Alexander Bock
40c42ff772 Fix the scaling of renderablemodel by making the magnification a floatproperty 2015-07-01 17:56:51 +02:00
Anton Arbring
927cfc2766 Adding the possibility to project to arbitrary bodies model files
Class RenderableModelProjection, using the geometry position and texture
coordinate data instead of reverse engineering the geometry in shader.

Adding the shaders used to project and the modified model shader.
Adding the new Renderable class to newHorizons module and CMakelist
2015-06-25 20:12:37 -04:00
Michal Marcinkowski
7492fa2f6c New Additions:
Shadow cylinders extending from planet terminator in opposite dir of sun
Plane that displays the global texture map of a planet as projections appear
^latter is an addition to RenderablePlane class, a renderable plane can have
boolean keyword "ProjectionListener" - determines whether or not it displays
2015-06-03 19:10:34 -04:00
Alexander Bock
ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00