mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,557 Commits 99 Branches 46 Tags
c6b460ab74ef9843357651bda0f7eee772483efd
Commit Graph

3208 Commits

Author SHA1 Message Date
Jonathas Costa
c6b460ab74 Added planet label rendering. Added Earth's label. 2019-11-22 18:11:49 -05:00
Alexander Bock
c3510948fd Add script function to easily add GIBS image layers to Earth 2019-11-10 13:52:45 +01:00
Emil Axelsson
afb889ff82 Feature/serve screenshots (#1003) 
* Take screnshots using lua function, returning screenshot number. Add screenshot endpoint.
* Change capitalization from screenShot to screenshot
* Fix screenshot filename collision bug when using multiple windows.
 2019-11-01 10:41:59 +01:00
Emil Axelsson
c96794bf27 Update modules to call InteractionMonitor.markInteraction 2019-10-30 16:20:26 +01:00
liuloppan
da8beff8e9 Feature/interaction monitor (#999) 
* interaction monitor first commit

* Renaming some member variables with underscore

* Interaction monitor registering mouse events and touch events

* Added setIdleTime

* Adding to CMakeLists

* Moved interactionmoitor.cpp to correct locatioN

* Cleanup after review. Removed interaction type string and fixed indentation

* Changed documentation description

* Renamed hasNewWebInput to processNewWebInput

* Some cleanup

* Rename registerInteraction to markInteraction
Add markInteraction calls to mouse and keyboard event sin OpenSpaceEngine
 2019-10-30 13:18:46 +01:00
Jonathas Costa
5d1a217936 Changed star speck file reading to work with problematic getline function in Windows. 2019-09-27 15:30:19 -04:00
Lovisa Hassler
f205a82cb1 Minor cleanup 2019-09-24 09:22:41 +02:00
liuloppan
78eb673611 Feature/gui for touch (#967) 
Merging in feature gui for touch. Enable touch module to run.
Currently only run on development mode with the "touch" scene.
 2019-09-18 23:49:51 +02:00
Alexander Bock
e3d5a856df Do not query non-existing server to remove warning at scene-loading 2019-09-17 20:03:28 +02:00
Alexander Bock
af4dee8d01 Update version number to 0.15.0 
Move AllowAddresses out of Interface into Server in openspace.cfg to circumvent potential stack corruption
Make lua_state not being copied
 2019-09-17 18:38:40 +02:00
Alexander Bock
febe62e4d6 Correctly set render bin for RenderableSphere to prevent flickering of atmosphere 2019-09-16 22:19:59 +02:00
Alexander Bock
743c9e314c Ignore uniform errors when setting distance scale factor in RenderableGlobe (closes #974) 2019-09-16 11:37:23 +02:00
Emil Axelsson
f92e17141f Fade Milky Way when camera is close and far 2019-09-10 15:08:06 +02:00
Alexander Bock
c6c2eb85fb Feature/du updates (#972) 
* Updating DU for new data.
* Changed how OS handles partiview colormaps.
* Multiple changes to adapt OS' behavior for cmaps.
* Small tweaks. MW sphere is now fading in the correct spacetime.
* Added all the Star Orbits.
* Fixing bug in speck reading procedure.
* Changed code to allow comments into data region of a speck file.
* Added deep sky objects.
* Added Home label
* Fixed bug in drawelements.
* Added Sun as a separated star for better control.
* Update version numbers on DU assets
* Move starorbits into their own asset file
* Making some of the digital universe renderables fully opaque for performance gains
 2019-09-09 13:46:57 +02:00
Emil Axelsson
0ba0a9f852 Fix Milky Way Galaxy projection issue in fisheye 2019-09-06 17:07:56 +02:00
Alexander Bock
d4e7885a71 Correctly set camera space normal for local patches (closes #945) 2019-08-26 11:42:03 +02:00
Jonathas Costa
fbbcc6fc56 Fixing shader on Mac. 2019-08-23 13:18:06 -04:00
Alexander Bock
157c653afc Moved the volume.asset from customization to scene/milkyway/milkyway/volume.asset 
Make the Galaxy volume a default
Small changes here and there
 2019-08-23 16:36:43 +02:00
Jonathas Costa
ae58cdc093 Merged 2019-08-22 17:35:19 -04:00
Jonathas Costa
d46b5d458c Merge branch 'feature/DUUpdates' into integration/FXAA_Vol_Milkway 2019-08-22 17:04:59 -04:00
Jonathas Costa
766051c837 Changes to correct orient the Milky Way. 2019-08-22 16:01:04 -04:00
Jonathas Costa
54a5746815 Changes in DU for have back old Stars colors and align Constellations and stars. 2019-08-22 13:02:02 -04:00
Alexander Bock
7064c02738 Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway 2019-08-22 17:45:43 +02:00
Alexander Bock
e68de29ec6 Merge branch 'master' into integration/FXAA_Vol_Milkway 2019-08-22 17:45:20 +02:00
Alexander Bock
071d4af9dc Remove warnings duplicating property initialization for renderabletrails 2019-08-22 16:09:54 +02:00
Alexander Bock
21d799dd29 Force an even number of vertices for the RenderableSpheres (closes #957) 2019-08-22 09:31:07 +02:00
Jonathas Costa
b51eb799a5 Clean up and re-nameing. 2019-08-21 11:25:38 -04:00
eriksunden
8bfea472d5 Increased shine of galaxy stars to match volume nicer. 2019-08-21 10:23:18 +02:00
Jonathas Costa
33ce712e3a Fixed Model rendering to work with the new HDR. 2019-08-20 15:34:48 -04:00
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