mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-25 06:19:02 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,386 Commits 87 Branches 46 Tags
f09f79f6c984cdf0beebb033c265eada29d99735
Commit Graph

6386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock
f09f79f6c9 Upload "fix" for globebrowsing stuttering 2019-08-19 17:53:49 +02:00
Alexander Bock
194db41b81 Merge pull request #949 from OpenSpace/feature/cancel-rotation-interpolation 
Cancel follow anchor node rotation interpolation when the anchor is changed
 2019-08-19 03:47:44 -06:00
Alexander Bock
3097ea28a8 Small coding style fix 2019-08-19 11:47:34 +02:00
Alexander Bock
d8ae62dfa3 Merge pull request #951 from OpenSpace/feature/satellitesgroupednodes 
Pull code from 2019 space debris thesis into Master
 2019-08-19 03:45:30 -06:00
Alexander Bock
ac867c4e9e Some rudimentary cleanup 2019-08-19 11:35:48 +02:00
Alexander Bock
d825b3d008 Restore original colors for the satellites 2019-08-19 11:34:17 +02:00
Gene Payne
1fbeb00646 Change AssetLoader unloadAsset to clear init/deinitialization functions for only one asset. (#953) 2019-08-19 02:01:32 -06: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
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
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
GPayne
da890474ee Changing default trail color in satellite asset files. 2019-08-15 08:43:01 -06:00
Emil Axelsson
729bb18975 Fix typo leading to strange (currently unused) rotation value 2019-08-15 11:32:24 +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
GPayne
b87370c1e5 Corrected syntax in satellites scene file. 2019-08-13 16:15:13 -06: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
Emil Axelsson
e06993332c Cancel follow anchor node rotation interpolation when the anchor is changed 2019-08-13 18:35:22 +02:00
GPayne
ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06:00
Emil Axelsson
4ab094e681 Fix camera jump when switching anchor when time is progressing 2019-08-13 08:50:58 +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
Emil Axelsson
798ba573cf Quick fix for startup issue on mac 2019-08-12 18:07:44 +02: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
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
0e1bc9950d Update SGCT to fix contrast/brightness issue 2019-07-31 10:12:33 +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
fbeec151db Set correct interaction sensitivity factor when adjusting joystick sensitivity (closes #815) 2019-07-30 15:01:34 +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
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
Alexander Bock
c45e5de33a Update copyright header 
Update Ghoul
 2019-07-22 14:19:11 +02: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
Emil Axelsson
5079f3fc60 Feature/multiple endpoints (#938) 
* Add support for multiple endpoints for webserver
* Add support for a default endpoint (redirect) in webgui
* Always serve prod gui
* Update webgui deps
 2019-07-19 16:49:54 +02:00
Emil Axelsson
134468b0d5 Add missing asset file 2019-07-19 11:31:58 +02:00
Emil Axelsson
9934fc03b9 Fix scaling issue with screenspace renderables (#939) 2019-07-19 11:09:04 +02:00
Alexander Bock
852115e309 Compile fix if instrumentation is disabled 2019-07-19 11:08:07 +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
Emil Axelsson
2a30b499d8 Update Apollo assets 2019-07-18 17:06:00 +02:00
Alexander Bock
2fca9a2a2c Remove torrent-based synchronization 2019-07-18 12:10:49 +02:00
Alexander Bock
66cd0413dd Cleanup of Wormhole application 
Updated Ghoul to fix commandline argument extraction bug
 2019-07-18 11:52:09 +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