mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,469 Commits 99 Branches 46 Tags
dfd85fddb6215da8b08100d0fc4bbf5bdf15362f
Commit Graph

3179 Commits

Author SHA1 Message Date
Alexander Bock
dfd85fddb6 Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway 2019-08-20 14:49:31 +02:00
Alexander Bock
aa3ac0e3f2 Merge branch 'master' into feature/FXAA 
# Conflicts:
#	include/openspace/rendering/framebufferrenderer.h
#	include/openspace/rendering/renderer.h
#	src/rendering/framebufferrenderer.cpp
 2019-08-20 14:47:01 +02:00
eriksunden
7509d1abd6 Proper discard of stars if the volume is not visible. 2019-08-20 10:59:42 +02:00
Alexander Bock
2806935c64 Merge pull request #943 from OpenSpace/feature/hdrOS 
HDR Rendering Branch
 2019-08-20 02:05:42 -06:00
Alexander Bock
ed6082aace Some smaller fixes 2019-08-20 10:04:20 +02:00
Jonathas Costa
e1ef84fb16 Merge branch 'feature/milkyway-galaxy' into integration/FXAA_Vol_Milkway 2019-08-19 15:41:54 -04:00
Jonathas Costa
53fee40937 Merge branch 'master' into feature/FXAA 2019-08-19 14:57:37 -04:00
Alexander Bock
67b736dd26 Merge branch 'master' into feature/FXAA 2019-08-19 17:54:14 +02:00
eriksunden
ebb433584e Dictionary fix. 2019-08-19 14:25:39 +02:00
eriksunden
a9fd242386 Fixed boundary artifacts in general for volume rendering. Look and feel of rendering is now very nice. Also the stars fade nicely now. 2019-08-19 14:16:36 +02:00
Alexander Bock
ac867c4e9e Some rudimentary cleanup 2019-08-19 11:35:48 +02:00
Jonathas Costa
bb44ed59d1 Ultra fast OpenSpace (still need some cleanning here and there). :-p 2019-08-18 15:59:17 -04:00
Jonathas Costa
701afc7daf Fixed bug causing atm leaking. 2019-08-18 11:50:22 -04:00
GPayne
ab873cd699 Merge branch 'feature/satellitesgroupednodes' of https://github.com/OpenSpace/OpenSpace into feature/satellitesgroupednodes 2019-08-16 17:32:59 -06:00
GPayne
bb335d37b4 Fix for crashing when removing the final satellite asset 2019-08-16 17:22:50 -06:00
eriksunden
3d0d446497 Fixes for emiitance and volume cut (still weird that it disappears). 2019-08-16 14:58:08 +02:00
eriksunden
0f00bff444 Merge branch 'feature/hdrOS' of https://github.com/OpenSpace/OpenSpace into feature/milkyway-galaxy 2019-08-16 13:40:21 +02:00
eriksunden
03543d8fe4 Can now choose point or billboard for star rendering in galaxy module, point is preferred due to massive better performance. Time for HDR :). 2019-08-16 13:35:46 +02:00
Gene Payne
b7d12bb6d4 Fixed indents 2019-08-15 16:17:46 -06:00
GPayne
7e6a9b71fa Changed to standard position method for renderablesatellites 2019-08-15 16:13:41 -06:00
Jonathas Costa
a713403a09 Removed interpolation from ATM. 2019-08-15 16:15:32 -04:00
Jonathas Costa
17d43d4c93 Removed unsused TMOs. Removed unused sliders and adjusted to default position others. 2019-08-15 14:23:14 -04:00
GPayne
e60c77b415 Added graceful exit and logging for case of missing or corrupt TLE file, and removed some commented-out code. 2019-08-15 10:21:57 -06:00
GPayne
c01e59635c Restored ability to change trail colors in satellite asset files. 2019-08-15 08:51:18 -06:00
eriksunden
a966457641 Star rendering with halo texture implemented. 2019-08-15 14:48:19 +02:00
GPayne
b99389ae30 Fixed problem with satellite trails rendered at a time prior to TLE epoch. Also debris added shader files to CMake file for space module. 2019-08-14 16:07:14 -06:00
eriksunden
9a1a3e397b PointCloud data rendered and location for volume and pc seems to be correct (need some cleanup). PSFtexture for billboards next thing. 2019-08-14 14:59:58 +02:00
GPayne
39f4dc33cb Initial pass of merging satellite debris into master and switching satellites to use grouped scenegraphnodes. 2019-08-13 15:39:06 -06:00
GPayne
ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06:00
Emil Axelsson
1cba7e1d88 Render trails last 2019-08-13 11:57:08 +02:00
Emil Axelsson
904811f60d Small cleanup 2019-08-13 11:28:33 +02:00
eriksunden
9892adca36 Merge branch 'master' into feature/milkyway-galaxy 2019-08-05 12:09:13 +02:00
eriksunden
320a213a7b Minor shader compile fix 2019-08-05 12:05:28 +02:00
Jonathas Costa
3a0b5f0c15 Changed rendering order back for orbits and other improvements. 2019-08-01 12:20:36 -04:00
Jonathas Costa
482631aa54 Fixed failed merging of master. 2019-07-31 15:05:52 -04:00
Alexander Bock
c7c8375ca0 Coding style fixes 2019-07-31 11:13:29 +02:00
Alexander Bock
f2a0cb18b0 Feature/websocketnavigation (#882) 
* Upgrade JSON Library
* Added support for navigation based on websocket communication
 2019-07-31 11:07:25 +02:00
Alexander Bock
566fe7f434 Adding documentation to RenderableGlobe and layers (closes #651) 
Fix mars after detecting that identifiers were missing
 2019-07-30 17:48:43 +02:00
Alexander Bock
4a070c939f Add the ability to query and rearrange globebrowsing layers at runtime 2019-07-30 14:28:23 +02:00
Jonathas Costa
77bc2d4e6d Improved Mars illumination. 2019-07-24 15:52:27 -04:00
Jonathas Costa
4360246863 Fixed small issues. 2019-07-23 15:37:42 -04:00
Elon
029e67797f merging 2019-07-22 16:25:47 -06:00
Elon
46c22488d7 wrapping up thesis project 2019 space debris 2019-07-22 16:16:21 -06:00
Jonathas Costa
67ba8a14dc Fixed problems after merging master into this branch. 2019-07-22 17:52:30 -04:00
Jonathas Costa
a6b90991b2 Merging Master 2019-07-22 16:47:58 -04:00
Alexander Bock
8f112fa219 Compile and runtime fixes when running in Debug 
Do not crash if ScreenSpaceLocalImage does not exist
Add ability to specify identifier/name when adding screenspace items in the UI
 2019-07-22 14:14:12 +02:00
Emil Axelsson
ce15381fb2 Fix browser mask bug introduced when flipping y axis 2019-07-19 22:16:13 +02:00
Jonathan Fransson
a3b511c7a7 Final Merge 2019-07-19 10:12:02 -06:00
Jonathan Fransson
e3378bc615 Final Merge 2019-07-19 10:09:03 -06:00
Emil Axelsson
14d9bbe58b Fix crash related to deinitialization of screenspacebrowser 2019-07-19 16:52:23 +02:00