mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-13 23:40:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,469 Commits 83 Branches 46 Tags
8bbf1c3d0dca6360d83fd00a759ea751aaee4ec2
Commit Graph

70 Commits

Author SHA1 Message Date
Alexander Bock
ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta 
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
 2016-08-29 15:53:59 +02:00
Emil Axelsson
b6be6da974 add support for additive blending in renderable plane 2016-08-25 20:44:00 +02:00
Emil Axelsson
d0ec7ac735 render trails with additive blending 2016-08-25 16:32:27 +02: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
57d47cd856 Implement class RenderableTrailNew and use it for osiris rex. Higher precision than the old one. 2016-08-23 17:29:51 -04:00
Erik Broberg
23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Kalle Bladin
1be12333ad Update renderable path to fade away with distance 2016-08-17 16:58:53 -04:00
Kalle Bladin
176fc02748 Increase precision of renderable trail and use that for showing the path of OSIRIS-REx. 2016-08-17 14:44:42 -04: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
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Alexander Bock
7f757bbcb7 Use correct normal for RenderableRings closing (#124) 2016-08-16 09:41:13 +02:00
Kalle Bladin
c55872d5f4 Increase precision in renderable plane projection. 2016-08-16 00:49:41 -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
Kalle Bladin
08431d3d88 Add the ability to choose point steps in path rendering. 2016-08-09 11:49:43 -04:00
Kalle Bladin
fb87842b1b Update path rendering to higher precision. 2016-08-08 22:35:37 -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
Erik Broberg
64668e9feb Merge from feature/globebrowsing 2016-08-02 19:25:23 -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
5f1fa3f755 Implement shadowing on RenderableRings 2016-07-31 20:22:29 +02:00
Alexander Bock
9f1abc67a2 Enable setting the texture offset for rings 
Enable setting the color-based transparency for rings
 2016-07-29 13:23:43 +02:00
Alexander Bock
635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +02:00
Kalle
5883d75047 Update render function in renderable model to avoid precision errors and remove psc dependency. 2016-07-22 17:05:34 -04:00
Alexander Bock
b2ce3d774c Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-16 13:51:08 +02:00
Alexander Bock
77c8ecf6df Rename screnspace* to screenspace shaders 2016-06-16 01:02:13 +02:00
Alexander Bock
ad1893fd6f Cleanup of ScreenSpaceRenderable 
Add missing includes to other files
 2016-06-16 01:00:10 +02:00
Jonathas Costa
b8025d8c23 New ray ellipsoid intersection routine (initial implementation). 2016-06-09 16:03:28 -04:00
Jonathas Costa
b2c895dab0 Merged branch Atmosphere. 2016-06-09 11:45:56 -04:00
Emil Axelsson
8771a238d3 improve galaxy rendering 2016-06-08 15:00:03 +02:00
Jonathas Costa
dd51c71fb1 Fixed bug in shader that was crashing OS in MacOSX. 2016-06-07 13:51:28 -04:00
Jonathas Costa
f0b76267c4 Added night texture. 2016-06-07 10:49:26 -04:00
Jonathas Costa
388bb15461 Initial implementation of Atmosphere Effects. Use framebuffer to render it. 2016-06-07 10:35:18 -04:00
Jonathas Costa
de6446282f Fixed small bug in shadows. 2016-06-06 18:23:06 -04:00
Jonathas Costa
700f411784 Merged develop branch into PlanetShadows. 2016-06-06 17:19:11 -04:00
Alexander Bock
c6dc426211 Merge remote-tracking branch 'origin/feature/galaxy' into develop 
Conflicts:
	data/scene/default.scene
	shaders/PowerScaling/powerScalingMath.hglsl
 2016-06-04 19:54:34 +02:00
Emil Axelsson
1901166640 improved galaxy rendering 2016-06-03 11:16:57 +02:00
Michael Nilsson
8ca457b14c solve merge conflict with develop 2016-05-20 09:33:41 -04: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
caeb8618a8 Enable heightmaps for RenderablePlanet (closing #21) 2016-05-18 12:12:28 +02:00
Jonathas Costa
36ebe69f60 Changed default moon scene for a total lunar eclipse. 2016-05-16 16:41:09 -04:00
Jonathas Costa
3fa5ed39d5 Planet Shadows 2016-05-16 15:41:04 -04:00
Michael Nilsson
0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Alexander Bock
eb4904fc17 Moving pscstandard shader into base 2016-05-01 13:21:57 +02:00
Alexander Bock
6daf8cb6a0 Move nighttexture shader into base module 2016-05-01 13:08:30 +02:00
Alexander Bock
472d35b7c4 Use correct orientation for renderableplaneprojection 2016-04-23 04:07:51 +02:00
Michael Nilsson
c72536fbbc untabify to make merge easier 2016-04-20 15:21:30 -04:00
Michael Nilsson
07dfafeddb solve merge conflict with develop 2016-04-20 15:03:51 -04:00
Sebastian Piwell
cb49805b07 Update ghoul 2016-04-20 10:28:53 -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
3de5fb3b55 Add FloatProperty to RenderableStars to modify transparency (closing #150) 2016-04-08 15:11:46 +02:00
Sebastian Piwell
a2fb30b432 Depth working again 2016-03-31 09:39:05 -04:00