Commit Graph

2827 Commits

Author SHA1 Message Date
Lovisa Hassler
0a0703aa82 fix merge conflict 2018-11-12 18:33:06 -05:00
Lovisa Hassler
5a49c66204 moved the color mapping to the asset files 2018-11-12 18:26:12 -05:00
Agnes Heppich
c3d031e6a5 reduced data struct, clean up 2018-11-12 18:14:32 -05:00
Agnes Heppich
2bdb7fece9 clean up 2018-11-12 18:05:37 -05:00
Agnes Heppich
9aefc203a3 ra dec translation 2018-11-12 17:30:33 -05:00
Agnes Heppich
89e0b20cc4 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into
thesis/2018/dsn merge
2018-11-09 14:09:54 -05:00
Agnes Heppich
648e763abe rename dsnData 2018-11-09 14:09:24 -05:00
Lovisa Hassler
1f27da6778 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-11-09 12:30:19 -05:00
Lovisa Hassler
aba04f7105 added ra dec to cartesian helper function in spicemanager 2018-11-09 12:30:01 -05:00
Agnes Heppich
b5aa872b95 radec translation 2018-11-09 11:33:10 -05:00
Agnes Heppich
65350f7aa6 rename dsnManager to signalManager 2018-11-09 11:11:11 -05:00
Lovisa Hassler
df58130597 added unbindGL(), also some cleanup 2018-11-08 15:52:11 -05:00
Lovisa Hassler
cc18504392 got rid of sub class communicationlines, now all is handled in renderablesignals 2018-11-08 14:48:26 -05:00
Lovisa Hassler
cebe111ee0 renamed renderablecommincationpackage to renderablesignals 2018-11-08 11:37:01 -05:00
Lovisa Hassler
2cf1dc3670 added new webgui to dsn.scene, new z buffer clculations in shader files 2018-11-07 18:33:30 -05:00
Lovisa Hassler
90457d91e2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2018-11-07 11:25:09 -05:00
Alexander Bock
9dfb87e220 Add string sanitization to property description 2018-11-06 16:56:05 -05:00
Alexander Bock
06426c01c2 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2018-11-06 15:27:36 -05:00
Alexander Bock
f8c27629f5 Various small fixes 2018-11-06 15:07:17 -05:00
Emil Axelsson
e206099c4f Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-11-06 14:58:50 -05:00
Emil Axelsson
c58ae52735 Breaking change: Change property owner identifier renderable to Renderable 2018-11-06 14:58:11 -05:00
Alexander Bock
7c0268e87c CMake cleanup 2018-11-06 13:18:40 -05:00
Agnes Heppich
b50f86b330 estimated position from RA DEC and Range 2018-11-06 12:13:34 -05:00
Alexander Bock
7a3a8a5cf6 Misc coding style cleanups 2018-11-06 12:02:56 -05:00
Alexander Bock
d1fa145e0a Jenkins compile fix 2018-11-06 11:10:53 -05:00
Alexander Bock
3ff7b974f5 Adapt ISWAManager and KameleonWrapper to removal of singleton 2018-11-05 21:11:01 -05:00
Alexander Bock
267879878b Beta-3 Release Candidate branch (#753)
* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
2018-11-05 20:51:48 -05:00
Emil Axelsson
7181de4673 Feature/webgui ops (#723)
* Update node packages, download nodejs in build process, start server from openspace process
  * Patch CEF cmake automatically
  * Build webserver automatically
  * Work on CMake for WebBrowser, Webgui and CefWebGui
  * Map key modifiers to CEF
  * Smooth time interpolation in webgui
  * Automatically focus on search field in filter lists
  * Move webgui code to external repositories
  * Use asset system to distribute webgui
  * Remove webgui from main repository
  * Add support for right click in webgui and improve timetopic
  * Resolve cmake policy warning
  * Add relative time interpolation to lua interface
  * Sanitize json error message before logging error. Workaround for #736
  * Added gui properties to scene graph nodes
  * Add version topic
  * Add shortcuttopic
  * Add ability to disable rendering of cefwebgui
  * Don't do message loop work if there is no browser.
  * Set correct path to nodejs on unix
  * Message loop work in presync
  * modifications for shortcuts in gui, added names for shortcuts
  * Set properties via lua scripts
  * Allow gui grouping for shortcuts
  * Add gui paths keybindings
  * Blocking keyboard callbacks when webgui has keyboard focus in an editable field
  * Allow disabling of WebBrowser and CefWebGui
  * Make it possible to hide GUI
  * Get rid of redundant dashboard items if web gui is used
  * Hide WebGUI on slave nodes
  * Hide WebGUI on main rendering window if a GUI window exists
 * Enable WebGUI on default unless it is overwritten in the openspace.cfg
  * Add guiName for propery owners in socket api
2018-11-05 20:45:38 -05:00
Alexander Bock
ec67169854 Add the ability to change the number of significant digits in the globe location
Increase the default number of significant digits to 4
2018-11-05 18:35:26 -05:00
Alexander Bock
932413cf53 Prevent accidental walking of the current working directory when starting OpenSpace that could cause non Lua script files to be loaded as .info files 2018-11-05 16:30:47 -05:00
Alexander Bock
cdfd0d12da Add option for automatic caching of WMS servers into openspace.cfg
Remove all manual specification of caching and offline mode from manual wms servers
2018-11-02 15:34:36 -04:00
Gene Payne
b671ad35e6 Feature/session recording (#737)
* In progress with new version of session recording

* Session recording coding pass for both record and playback, not building yet.

* Working on getting first build of prototype

* Code changes to get playback working with all 3 timing modes

* Fixing session recording interactions with the timemanager

* Bug fixes for newly discovered timing issues, mothballing recording of timing updates

* Fixed camera jitter issue

* Updated new reference to latest ghoul

* Got session recording/playback working with changes made in master

* Added threshold for differences in camera movement as criteria for saving to recording file

* Added support for binary file for session recording/playback

* Minor changes with handling timeManager keyframes in playback

* New timeline structure & keyframes specific to session recording

* Fixed bug with fixed-script size

* Switched to new timeline specific to session recording, bug fixes, currently debugging camera position & rotation

* Formatting changes only

* Fixed scripts not working after timeline change

* Add session recording test scene

* Fixed problem with re-running the same playback multiple times

* Fixed problems with camera interpolation

* Fixed detection of camera playback finishing, and improved camera interpolation

* Added comments for interface of externInteraction include

* Fixed view frustum culling issues in session playback due to not appropiate camera scaling. Also made function in datamessagestructures to read and write this data to streams.

* Added camera scaling fix to code that supports Ascii format

* Added startPlayback default command for playing back while forcing simulation time to match the recording

* Fixed camera jump in sessionRecording after playback finished. Cleanup in playback of camera to re-use same functionality in keyframenavigator.

* Superb fix to sessionRecording. Realized focusNode of globalNavigationHandler needed to be activly update when camera change for either position of camera to be accurate or for rendered objects to be calculated without precision issues. Can now achieve a correct playback, even close to chunks/renderable, which was not possible before.

* sessionRecording cleanup, fixed all warnings and renamed files to lowercase to match current standards.

* Added error handling for bad input playback filename, protection from corrupted playback file

* Implemented code review changes on pull request #737 for sessionRecording
2018-11-01 18:24:10 -06:00
Alexander Bock
45359516f1 Update libCurl to 7.63.0
Update GDAL to 2.3.2
2018-11-01 14:38:32 -04:00
Alexander Bock
b214f1ba75 Trying another timeout method for GDAL GetCapabilities requests 2018-11-01 11:16:34 -04:00
Alexander Bock
da94de3561 Fix longitude/latitude specification for size of GeodeticPatch 2018-11-01 09:47:39 -04:00
Jonathas Costa
c4ff9ec139 Fixed OpenGL invalid state in globebrowsing. 2018-10-31 18:25:44 -04:00
Jonathas Costa
5c0da9e606 Fixed issue 747 and labels orientation. 2018-10-31 17:32:16 -04:00
Alexander Bock
920ae7c374 ImGui cleanup
Update Ghoul
2018-10-31 11:12:20 -04:00
Alexander Bock
9047dc7a3e Feature/globebrowsing speedup (#735)
* Removal of ChunkRenderer, ChunkedLodGlobe, ChunkCuller, chunklevel evaluator, culling classes, layershadermanager, GpuLayer, GPUData, ChunkNode, Grid, BasicGrid, Chunk files, Angle, AABB classes, PointGlobe, Ellipsoid, TileSelector, tiledatatype, iodescription, simplerawtilerreader, rawtilereader
 * Less dynamic allocation for SkirtedGrid, LayerManager, RenderableGlobe, TextureUnit
 * Clean up memory management in RawTiles
 * Code simplification
 * Optimize shader uniform setting
 * Introduce UniformCache
 * Callback simplification
 * Turn ChunkNode into a struct
 * Use a MemoryPool to organize all ChunkNodes rather than use unique_ptr and the necessary memory allocation
 * Collect draw calls
 * Consolidate fragment shaders between local and global renderer
 * Shader cleanup and optimization
 * Update CMake to not include included shaders
 * Integrate traversal function into the looping
 * Replace std::queue with std::vector
 * Merge TextureContainer into MemoryAwareTileCache
 * Lazy computation of chunk bounding boxes
 * Memory management of LayerGroup
 * Remove class hierarchy from tileproviders (temporaltileprovider not working yet)
 * Remove PBO classes
* Chunk status stored in Chunk
* Don't create a copy of the ChunkTilePile
* Enable culling by projected area on default
* Have raw tile reader return a Tile instead of a shared_ptr to a tile
* Start making GDAL mandatory
* Increase the default lod scale factor to 15
2018-10-30 17:20:06 -04:00
Alexander Bock
cf8d2db914 Performance Atmosphere (#746)
* Testing new improvements.
* Torturing shaders for performance.
* Killing some bits...
* A bit or two were killed in this commit.
2018-10-30 17:10:02 -04:00
Lovisa Hassler
51c8b437ac some comments and cleanup, renamed checkSignal to isSignalActive 2018-10-30 11:50:05 -04:00
Lovisa Hassler
8ba26af21e added DSS45 2018-10-30 11:47:40 -04:00
Alexander Bock
f630944fd8 Feature/minvr (#744)
* Move SGCT external library from ext/sgct to apps/OpenSpace/ext/sgct
 * Remove all GLFW dependencies from openspace-core
 * Add MinVR dependency
 * Add new executable OpenSpace-MinVR that uses MinVR instead of SGCT
2018-10-29 22:10:35 -04:00
Agnes Heppich
6a91ed5606 added dss15 to renderablecommunicationpackage 2018-10-29 19:09:39 -04:00
Lovisa Hassler
0e8795b159 added check for getting a scenegraphnode for dish, error if it is not in asset file 2018-10-29 17:35:07 -04:00
Lovisa Hassler
64f88bcfa5 creating pushSignalDataToVertexArray function and clean up some comments 2018-10-29 16:33:25 -04:00
Lovisa Hassler
873e3f2c17 replace for loop with upper_bound binary search through filenames 2018-10-29 15:35:13 -04:00
Lovisa Hassler
c681e2dd3e no longer using xml parser 2018-10-29 13:42:22 -04:00
Agnes Heppich
a38530073b Seperated data into days, and load them depending on open space time 2018-10-29 12:11:16 -04:00
Gene Payne
568143638d Fixed touch interface bug github issue #682, and fixed upper-left corner menu tap toggle. (#739) 2018-10-29 10:01:49 -04:00