Commit Graph

192 Commits

Author SHA1 Message Date
Alexander Bock
a69b636dea Global sweep to cleanup the handling of floating point numbers and glm default initialization 2021-06-16 23:09:49 +02:00
Alexander Bock
dfc42e9467 Rename createSingeColorImage -> createSingleColorImage 2021-03-22 23:17:42 +01:00
Micah
2158dd585c creating user directories if not existing; 2021-03-04 16:00:34 -05:00
Alexander Bock
548d673e8b Add drag and drop support for images and assets (#1497) 2021-02-11 13:43:36 +01:00
Emma Broman
b10e598cd3 Cleanup and improve test 2021-02-04 13:25:17 +01:00
Emma Broman
3f63f92128 Add test cases for the create single color image lua function 2021-02-04 13:25:17 +01:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Alexander Bock
15e6b5519f Making the documentation generation a bit more performant
Outsource the file writing to a second thread to start the rendering earlier
2020-08-21 14:10:33 +02:00
Alexander Bock
4c9555425b Cleanup of asset handling and move more functionality to the Profile 2020-06-18 23:09:26 +02:00
Alexander Bock
433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
GPayne
0f06f9d233 Merge branch 'master' into feature/profiles 2020-05-14 19:31:19 -06:00
GPayne
dfb61097b2 Finished testing new save-settings-to-profile feature 2020-05-14 13:20:05 -06:00
Alexander Bock
3b427bfd15 Cleaning up window delegate 2020-05-10 15:17:51 +02:00
GPayne
1fbb9e8acf Completed code for detecting and storing changes made since startup 2020-04-23 12:06:34 -06:00
Alexander Bock
0dc2fc9430 Make OpenSpace work with the new SGCT version 2020-04-10 17:38:18 +02:00
GPayne
6253a5cf2e First pass on tracking changed properties/assets since initialization 2020-03-22 20:59:15 -06:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
GPayne
f682352b53 Merging with master 2020-01-27 09:14:35 -07:00
Mikael Pettersson
4e75b161db Feature/internal touchhandling (#1038)
* Removal of dead code and compiler warnings

* Added basic internal touch

This commit only adds the description-shell of the touch implementation

* Added callbacks and first WIP of internal touch

Makes use of the TouchInput/TouchInputs class in the TouchModule.
Internally we cache the TouchInputs as an input deque and utilizes it
for motion-vectors.
This commit has bugs and issues, which will be worked upon.

* Happy new year!

Bumped year on branch-local files

* Improvements to internal touch

Almost reached feature-parity with tuio-handled touch events

- Added most of the touch-logic to touchinteraction
- Added helper functions to new TouchInput/TouchInputs classes

* Naming changes to touch interface

* Translate TUIO to TouchInput

This commit translates TUIO messages to an internal TouchInput structure
while still trying to keep feature parity.
Removed TUIO-dependencies from many files.
Changed behavior on tuioear to lock-swap its content.

* Minor cleanup and fixes

- Should fix touch roll
- Simplified some functions

* Build fix

* Use internal touch in webgui

- Added consume-logic to touch callbacks
- Constrained touch-input to either webgui or 3D application as mouse is
  - This fixes some flaws with previous implementation,
    such as ghost inputs

- Initialize touchmodule through init-functions rather than constructor

* Cleanup of comments

* Simplified touch classes

Added timestamp through constructor meaning no more sprinkled timestamps
Renamed TouchInputs to TouchInputHolder for clarity
Added helper functions to the Holder to see if it holds an input
Remade addInput as tryAddInput which return true on successful insertion
+ other cleanup

* Code style cleanup and tweaks

Removed avoidable zero-comparison for code clarity
Cleanup of code style

* Added comments to DirectInputSolver

Clarifying the use of the DirectInputSolver.

* Changes for coding style
Change SGCT version to make it checkout-able

* Clarify magic bitmask

* const -> constexpr const for magic bitmasks

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-01-13 08:27:13 +01:00
GPayne
1ac68f8236 Fixed profile parser so it gets the profile input file first 2020-01-10 15:22:26 -07: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
d0c04cfc6b Various code cleanup 2019-06-18 10:47:15 +02:00
Micah Acinapura
1149a61dce resurrecting consolidated documentation (#897)
* Resurrecting consolidated documentation, lots to improve still but better then before
2019-06-03 06:19:45 -06:00
Emil Axelsson
c08805745b Feature/check latest version (#876)
* Log latest version information
2019-05-20 16:13:56 -06: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
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
Emil Axelsson
1632c09af3 Coordinate Axes
* Add coordinate axes renderable
 * Add debug helper
 * Add example asset
 * Fix bug with dynamic loading of assets. (#763)
2018-11-13 08:09:14 -05: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
Alexander Bock
c03ddf76cc Remove external control callback 2018-09-17 15:13:54 -04:00
Alexander Bock
f429959bba Register path tokens before the sgct configuration is loaded 2018-09-02 12:08:50 -04:00
Alexander Bock
24ef67afa0 Add helper methods to quickly render boxes (finalizing and #closes 696) 2018-09-02 02:18:40 -04:00
Alexander Bock
9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Alexander Bock
7068637c9d Make it possible to click on the friction markers in the image to toggle the friction (closes issue #576) 2018-04-21 19:04:47 +00:00
Alexander Bock
5e1f26cc6b Issue/372 (#606)
* Add commandline argument that applies a Lua script to the configuration
2018-04-21 09:54:05 -04:00
Alexander Bock
818ee225a5 Define a Cache path on default
Cleanup OpenSpaceEngine
Cleanup RenderEngine
  * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr
Cleanup LogFactory
2018-04-21 07:00:43 -04:00
Alexander Bock
b4be63af65 Feature/configuration (#605)
* Switch openspace.cfg file from a Dictionary-based loading to a variable based loading
 * Change ConfigurationManager to not use Dictionary anymore, but a struct with explicit configuration values instead
2018-04-20 18:40:21 -04:00
Alexander Bock
3810209365 Issue/451 (#595)
* Add ability for Joystick input
* Change location of LuaConsole files
2018-04-20 16:12:18 -04:00
Emil Axelsson
d64a0df5f6 Feature/thesis work merge (#566)
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
2018-03-20 09:30:59 +01:00
Emil Axelsson
4675554471 One Property Tree (#500)
* Organize properties in one single property tree
* Update scenes to work with one property tree. Fix documentation issues.
2018-03-06 16:59:06 +01:00
Alexander Bock
475a9f6937 Hide the overlay information on slave nodes 2018-02-15 10:37:49 -05:00
Emil Axelsson
a85eddff4e Clean up lua stack and weak pointers 2018-02-09 16:44:34 +01:00
Alexander Bock
51551bc291 Move VRT specification into separate customization asset
Reenable customization scripts
Remove warning from HTTPRequest class
2017-12-31 22:13:55 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Alexander Bock
b337c3aa1e Windows compile fix 2017-12-28 14:15:06 -05:00
Emil Axelsson
09182c9274 Cleanup code 2017-12-19 11:48:30 +01:00
Emil Axelsson
ff317d4b2f Show loading screen when loading assets 2017-12-18 11:55:14 +01:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Alexander Bock
167222c814 Feature/dashboard (#431)
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable

* Add Onscreen Dashboard
  * Add Dashboard class
  * Add DashboardItem classes and subclasses
  * Added font and fontsize customization to dashboarditems
  * Add default dashboard specifications to all scenes
  * Add tests.scene to test dashboard items
  * Add configuration options to DashboardItemDistance
  * Fix distance conversion to correctly use singular or plural values
  * Make DashboardItems unique when adding them to a dashboard
  * Correctly position test with different font sizes
  * Add Dashboard Item that enables spacing between other items
  * Add performance measurement to dashboard rendering
  * Add method to DashboardItemDistance that computes distance to surface
  * Add DashboardItemAngle that computes and prints the angle between three objects
  * Add DashboardItemInstruments that shows the instruments on New Horizons
  * Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
  * Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00