mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 03:00:58 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,564 Commits 99 Branches 46 Tags
caa02ca20ac68c5564a21ecb7e985d602807b78c
Commit Graph

1678 Commits

Author SHA1 Message Date
Jonathas Costa
9aba885b15 Merge branch 'master' into feature/FastVolume 2019-11-10 14:50:59 -05:00
Jonathas Costa
0fce6a8d26 Super-fast volume (aka Downscaled Volume Rendering). 2019-11-10 14:17:23 -05: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
98079cea3c Feature/get navigation state (#1001) 
Implement lua function getNavigationState
 2019-10-30 14:26:53 +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
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
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
Emil Axelsson
93c6bf3429 Add missing operators 2019-08-27 16:49:56 +02:00
Alexander Bock
b453f93feb Merge remote-tracking branch 'origin/master' into integration/FXAA_Vol_Milkway 2019-08-23 16:25:28 +02:00
Alexander Bock
d3836b508c Merge pull request #954 from OpenSpace/feature/FXAA 
Feature/fxaa
 2019-08-23 16:21:59 +02:00
Emil Axelsson
a53581d6c6 Cancel request when the version checker is destructed 2019-08-23 14:32:11 +02:00
Emil Axelsson
a25106886b Cancel version check when application closes 2019-08-23 14:19:24 +02:00
Jonathas Costa
2c5fab7120 Removed unsused files and code. 2019-08-22 18:04:06 -04:00
Jonathas Costa
ff2e6db26a Merge branch 'master' into feature/FXAA 2019-08-22 16:03:14 -04:00
Alexander Bock
e68de29ec6 Merge branch 'master' into integration/FXAA_Vol_Milkway 2019-08-22 17:45:20 +02:00
Alexander Bock
40545d99e5 Make Screenspace renderable work again (closes #959) 2019-08-22 16:31:55 +02:00
Emil Axelsson
13cb950480 Fix bug with camera following anchor node 2019-08-22 10:29:03 +02:00
Alexander Bock
9d2d3d8a83 Merge branch 'master' into feature/FXAA 2019-08-21 15:58:02 +02:00
Alexander Bock
dd76a9bd7b Improve information presented for current frame number in stereo mode and when swap groups are used 2019-08-21 15:57:29 +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
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
53fee40937 Merge branch 'master' into feature/FXAA 2019-08-19 14:57:37 -04:00
Jonathas Costa
15d6586e06 Get rid of MSAA GUI and updated framebuffer volume rendering (need more tests here). 2019-08-19 14:31:28 -04:00
Jonathas Costa
1fb65887d2 Even faster... 2019-08-19 10:39:48 -04: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
Jonathas Costa
844ea5f3d2 Added FXAA. 2019-08-16 13:44:56 -04:00
Jonathas Costa
f69545a4d7 Added HDR bypass. 2019-08-15 17:07:25 -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
Emil Axelsson
e06993332c Cancel follow anchor node rotation interpolation when the anchor is changed 2019-08-13 18:35:22 +02:00
Emil Axelsson
904811f60d Small cleanup 2019-08-13 11:28:33 +02:00
Emil Axelsson
137e012cd1 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/hdrOS 2019-08-13 08:52:07 +02:00
Gene Payne
dc45be045b Added a check to prevent buffer sync buffer overflow, and expand buff… (#937) 
* Added a check to prevent buffer sync buffer overflow, and expand buffer size if needed.

* Removed unnecessary asserts and added sync buffer overflow check to encode template
 2019-08-12 13:25:56 -06:00
Jonathas Costa
482631aa54 Fixed failed merging of master. 2019-07-31 15:05:52 -04:00
Alexander Bock
87ce1925b9 Fixing issue displaying negative numbers when download sizes are bigger than 2 GB (closes #925) 2019-07-31 11:46:20 +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
0426367572 Allow the user to abort the loading screen through ESC (closes #668) 2019-07-30 15:22:31 +02:00
Alexander Bock
4a070c939f Add the ability to query and rearrange globebrowsing layers at runtime 2019-07-30 14:28:23 +02:00
Alexander Bock
f7fafa5255 Add scripts to manipulate the camera 
Add example asset using the new scripts for an IPAC
 2019-07-29 13:13:16 +02: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
Jonathas Costa
20d24764e7 Cleaned code and removed unused features. 2019-07-22 16:05:00 -04:00
Jonathas Costa
df6c90b1ee Separated filters and cache from HDR. 2019-07-22 10:25:44 -04:00
Emil Axelsson
9934fc03b9 Fix scaling issue with screenspace renderables (#939) 2019-07-19 11:09:04 +02:00
Alexander Bock
fc28b98db9 Add basic instrumentation options to the renderengine and globebrowsing module 
Instrumentation is disabled on default, but can be enabled in CMake
 2019-07-19 09:55:41 +02:00
Alexander Bock
277aee5c0c Make constructor of Time explicit 
Module breaking change
 2019-07-17 15:39:43 +02:00
Emil Axelsson
c97d5126ec Feature/timeline translation (#931) 
* Work on timeline translations
* Add Apollo 11 Descent data
* Ability to display negative altitudes
* Expose globe translation properties
* Added timeline rotation, and some scene updates. 
* Cleaning up apollo_sites scene; fixing boulder 1 in place to adress heightmap issue
* Use quaternion slerp instaet of linear interpolation + Cleanup
* Change to old lem model while waiting for new version to be pushed to data repo
* Small fixes
 2019-07-17 15:21:13 +02:00
Emil Axelsson
6d725a7d50 Revive screen space browser and add example (#932) 
* Revive screen space browser and add example
* Add reload triggerproperty and change autoplay policy
 2019-07-16 13:29:21 +02:00