mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-26 22:19:17 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,711 Commits 83 Branches 46 Tags
c578941bab309f5e4c19d95a84381776112ece56
Commit Graph

179 Commits

Author SHA1 Message Date
Jonathas Costa
b8025d8c23 New ray ellipsoid intersection routine (initial implementation). 2016-06-09 16:03:28 -04:00
Jonathas Costa
da956af2bc Update matrix type in atmosphere (new issues present to be fixed). 2016-06-09 15:21:12 -04:00
Jonathas Costa
b2c895dab0 Merged branch Atmosphere. 2016-06-09 11:45:56 -04:00
Kalle Bladin
562e249dc9 Merge branch 'develop' into feature/globebrowsing 2016-06-08 12:32:31 -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
Kalle Bladin
012bcaefaf Solve merge conflicts. 2016-06-07 12:54:52 -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
2f4f50b796 Using the correct boolean test for shadows. 2016-06-06 17:30:57 -04:00
Jonathas Costa
700f411784 Merged develop branch into PlanetShadows. 2016-06-06 17:19:11 -04:00
Kalle Bladin
45e7c41690 Update camera to use double precition. 2016-06-05 21:27:20 -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
Sebastian Piwell
678ecc6370 RenderableTrail bug fix 2016-05-25 17:19:20 -04:00
Michael Nilsson
8ca457b14c solve merge conflict with develop 2016-05-20 09:33:41 -04:00
Alexander Bock
f9358d4e45 Remove debugging code from RenderableTrail 2016-05-19 16:45:15 +02:00
Alexander Bock
54fa1c8cbc Merge branch 'feature/rosetta' into develop 2016-05-19 13:24:26 +02:00
Alexander Bock
94bac5d886 Fix RenderableTrails artifacts with high delta time (closing #84) 2016-05-19 12:46:11 +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
caeb8618a8 Enable heightmaps for RenderablePlanet (closing #21) 2016-05-18 12:12:28 +02:00
Michael Nilsson
7549beb5f2 solve merge conflict 2016-05-17 12:53:29 -04: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
Alexander Bock
31e6b0e2b3 Add debugging module with RenderableDebugPlane, closing #56 2016-05-16 14:50:48 +02:00
Alexander Bock
ecc6c8d63f Reintroduce powerscaled coordinates to modelgeometry to fix scaling issue 
Correctly set magnification property in RenderableModelProjection
 2016-05-16 14:44:55 +02:00
Sebastian Piwell
c2443a9ee2 Merge branch 'develop' into feature/iSWA 2016-05-11 13:30:59 -04:00
Alexander Bock
bee9309f98 Using correct w-component for multimodelgeometry rendering 2016-05-08 16:19:34 +02:00
Michael Nilsson
ea5006f9c6 removee displaying propery owner name from gui properties 2016-05-06 17:21:48 -04:00
Michael Nilsson
ab62eaada5 solve merge conflict 2016-05-06 17:06:09 -04:00
Sebastian Piwell
e6ac01a1c7 Set names on screenSpaceImage 2016-05-06 16:27:55 -04:00
Sebastian Piwell
d25f2e60ab ScreenSpaceImage can take urls and is parent to ScreenSpaceCygnet 2016-05-06 16:12:30 -04:00
Sebastian Piwell
e6adcfba27 Replaced SimpleSphereGeometry with PowerScaledSphere 2016-05-06 10:32:09 -04:00
Sebastian Piwell
c284986c21 Implemented dataSphere 2016-05-05 17:57:52 -04:00
Sebastian Piwell
b56f85e968 Refactor of ISWACygnet class tree 2016-05-05 15:36:00 -04:00
Michael Nilsson
bf9a819617 windows fix, add base module as dependency to iswa 2016-05-04 12:43:59 -04:00
Michael Nilsson
3a80405c30 solve merge conflict 2016-05-04 12:10:49 -04:00
Michael Nilsson
0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Sebastian Piwell
1e4e8919c3 Set attributes of screenspacerenderable through dictionary 2016-05-03 15:35:33 -04:00
Michael Nilsson
4d61694f75 ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory 2016-05-03 10:39:32 -04:00
Alexander Bock
3f9cd92767 Use correct shader in RenderablePlanet 2016-05-01 13:39:09 +02: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
c6ffc48c10 Remove DynamicEphemeris as it is superseded by StaticEphemeris 2016-04-25 14:04:05 +02:00
Alexander Bock
472d35b7c4 Use correct orientation for renderableplaneprojection 2016-04-23 04:07:51 +02:00
Michael Nilsson
3d3e59eabe solve merge conflict with develop 2016-04-20 16:38:41 -04: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