Commit Graph

314 Commits

Author SHA1 Message Date
Alexander Bock
04ce540102 Merge pull request #870 from OpenSpace/issue/848
Bring back stars to the Earth's night.
2020-01-30 14:56:39 -05:00
Alexander Bock
6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
Jonathas Costa
6dcaa9e299 Merged master. 2020-01-27 14:26:21 -05:00
Alexander Bock
b545ab5c5b Merge pull request #1050 from OpenSpace/issue/1049
Fixed issue 1049 and 554 (multiple viewport problems and lua console scales)
2020-01-27 17:32:56 +01:00
GPayne
f682352b53 Merging with master 2020-01-27 09:14:35 -07:00
Alexander Bock
182857cfb8 Update Ghoul and SGCT repositories 2020-01-24 19:38:27 +01:00
eriksunden
e3b3aec1ed Fixed issue 1049(using first viewport size as framebuffer size) and 554(loading and ending screen will be visible on the first viewport only). Also fixed such that Lua Console adapts to window size and not framebuffer size. 2020-01-24 15:53:29 +01:00
Alexander Bock
d125694062 Reset SGCT to a commit that exists 2020-01-10 16:16:42 +01:00
GPayne
797c674f12 Moved profile-to-asset conversion to openspaceengine and using temp dir 2019-12-20 14:12:25 -07:00
Alexander Bock
8feb6d1d2b Small cleanup
Make sure OpenSpace compiles in debug mode
2019-12-17 10:57:37 +01:00
Mikael Pettersson
a33057d830 Feature/integrated touchserver (#1015)
* WINDOWS: Touch server integrated into module

The touch server functionality has been integrated into the touch module
which is enabled by-default when the touch module is used on a windows
build.
The touch-hook checks for a connected digitizer (pen or touchscreen, but
I haven't tested pen)

This commit should also fix two potential low-risk race conditions in
the tuioear.cpp file.

* Added comment regarding which window we use

* Added copyright notice on the win32_touch files

Also changed from #pragma to #ifndef

* Fixes based on review

- Added anonymous namespace
- Put win32hook in openspace namespace
- Fixed indentations and linebreaks
- Fixed an issue regarding global state deinitialization
2019-12-02 14:09:15 +01:00
Emil Axelsson
c469dd78a0 Update sgct 2019-11-11 11:20:17 +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
GPayne
204966b0e0 Got OpenSpace parse and conversion working for profile-to-scene file, then successful run with this resulting scene. 2019-10-22 16:22:44 -06:00
GPayne
e3a842b53f Moving path to lua converter script 2019-10-21 15:38:45 -06:00
GPayne
18810384dc Initial commit of profiles, containing convert-to-scene script 2019-10-18 17:12:57 -06:00
Alexander Bock
d32b4d9f1f Update Ghoul to fix the commandline parsing (closes #950) 2019-08-22 14:34:45 +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
c7c8375ca0 Coding style fixes 2019-07-31 11:13:29 +02:00
Alexander Bock
0e1bc9950d Update SGCT to fix contrast/brightness issue 2019-07-31 10:12:33 +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
David Laidlaw
64f8793ea0 minVR updates (#908)
* changed libopenspace cmake module name to openspace-core
* change mouse button callback to include modifiers
* added some new ghoul initialization from the non-MinVR main.cpp
* Add GLFW as an external dependency for MinVR
2019-07-16 13:51:39 +02:00
Alexander Bock
e9fdd31c56 Feature/flying fixes (#924)
* Removing various warnings
 * Fix the rendering of the touchbar on Mac
 * More warnings
 * Add ghoul deinitialize
 * Update SGCT repository
2019-07-04 09:28:42 +02:00
Micah Acinapura
1308317b87 added viewport tracking to configs (#895)
* Added viewport tracking to configs; updated fov to match default window. cleanup of openspace.cfg
* Update SGCT
2019-06-03 03:27:51 -06:00
Alexander Bock
1f861d8ed5 Remove unused code 2019-05-27 10:47:23 +02:00
Emil Axelsson
d0e9170658 Feature/cef cmake (#873)
* Expose `CMAKE_BUILD_TYPE` to cmake gui (for single configuration generators)
* Use generator expressions to get debug vs release mode
* Fix mac app icon
2019-05-18 22:50:00 +02:00
Alexander Bock
915d57f6f0 Add missing icon file 2019-05-17 17:29:36 -06:00
Gene Payne
64298dea8c Changes to SGCT and OpenSpace render engine to resolve issue #589 (#865)
* Added property for aspect ratio

* Working version with aspect ratio slider controlling the FOV, and also gets updated by a window resize.

* Created horizontal fov property / GUI control that preserves aspect ratio by adjusting vertical fov to match, and updates with window resizing.
2019-05-17 16:49:09 -06:00
Alexander Bock
c13152a9a0 Set window icon for all windows (#864) 2019-05-17 15:33:12 -06:00
Alexander Bock
512e35bea6 Feature/globe speedup (#862)
* Updated GDAL version to 2.4.1
 * Add vtune performance commands
 * Add Nvtools performance commands
 * Add warning if GDAL dataset could not be loaded
2019-05-17 18:24:14 +02:00
Alexander Bock
514d6e6a78 Some minor cleanups in the session recording 2019-05-17 10:18:33 -06:00
Gene Payne
32ebea9e06 Latest changes to session recording with support for new webGUI record/playback controls (#840)
* Added separate directory for session recording files
* Changed recording & playback paths to use RECORDINGS dir and prevent absolute or relative paths in filename.
* Updated .gitignore so that recordings directory is ignored.
* Added session recording topic for synchronization of rec/play state with web gui.
* Added support to sessionRecording for providing a list of available playback files to web GUI.
* Fixed problem with playback filenames in list
* Fixed problem with occasional large jump in camera pos/rotation after playback finishes.
* Fixed the remaining post-playback problem that was causing a jump in position and rotation.
* Fix path issue on mac
* Fixed bug with bad scale values in recordings saved in ascii format.
2019-05-17 14:05:03 +02:00
Alexander Bock
595cbc4bcf Feature/cleanup (#837)
* Style guide fixes
* Various cleanups
* Update SGCT
2019-05-03 13:27:43 +02:00
Emil Axelsson
50ff2d96d2 Cleanup for Spheres and PSC (#827)
* Fade fixes
  * Clean up RenderableSphere. Add orientation properties.
  * Sane defaults for Digital Universe
  * Clean up New Horizons related code
  * Add basic scene
  * Add ability to initialize rotation as quaternion and mat3
  * Adapt legacy code to new Renderable interface
2019-04-24 13:34:49 +02:00
Emil Axelsson
0dcf65ce4f Feature/cef speedup (#806)
* Improve cmake errors
  * Calling doMessageLoopWork more often to increase gui performance
  * Introduce frequent callbacks
  * Restructure browser update callbacks
  * Cleanup cef speedup
  * Add flag to toggle updating browser between renderable calls
  * CEF should not be used in single process mode
  * Update CEF version
  * Postbuild step for finding framework from web helper
  * Load libcef dynamically to fix issue with CEF update
  * Only include dynamic library loader on mac
  * Improve keyboard mapping support on MacOS
  * Add arrow keys
  * Rename manifest
  * Fix bug with missing blinking cursor in text fields
  * Bump minimum cmake version
  * CEF fixes: Runtime and correct helper path
  * Be true to actual sandbox compatibility specified by CEF
  * Cleanup
2019-04-24 10:53:46 +02:00
Emil Axelsson
42d6bb21fd Update SGCT 2019-04-09 15:05:56 +02:00
Emil Axelsson
55979fa2c8 Feature/statistics (#810)
* Add statistics options for dashboarditemframerate
2019-03-24 13:09:31 +01:00
Alexander Bock
bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Emil Axelsson
70babdbd85 Update sgct 2019-03-11 13:58:27 +01:00
Alexander Bock
b65b8b3f42 Update SGCT and Ghoul 2019-03-08 11:52:57 +01:00
Alexander Bock
f49202c36c Update the gitignore file
Update SGCT
2019-03-06 13:07:59 +01:00
Emil Axelsson
3e5b59b46a Add missing BIN path to TaskRunner to fix issue with config file 2019-02-20 12:49:19 +01:00
Emil Axelsson
f60371bdbc Pass on modifier keys to CEF for mouse events (#790)
* Update sgct
* Pass on modifier keys to CEF for mouse events
2019-02-04 15:14:51 +01:00
Alexander Bock
7fefaca345 Feature/jenkins (#788)
* Update Jenkinsfile
* Fix compilation for OSX
* Update SGCT to fix Jenkins compile issue on Ubuntu
* Make OSX Jenkins build not quiet
* Only build OpenSpace target on Mac
2019-01-23 10:17:15 -05:00
Alexander Bock
c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Alexander Bock
7c0268e87c CMake cleanup 2018-11-06 13:18:40 -05:00
Alexander Bock
7a3a8a5cf6 Misc coding style cleanups 2018-11-06 12:02:56 -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
03ae9a771c Cleanup SGCT dependency CMake output 2018-10-29 22:17:19 -04:00