Commit Graph

89 Commits

Author SHA1 Message Date
Ylva Selling
c32c1fff6a Add functionality to drag skybrowser 2021-03-11 09:23:10 +01:00
Ester Lindgren
c11b66173e Create subclass of ScreenSpaceBrowser in SkyBrowserModule and change name of module Skybrowser to SkyBrowser 2021-03-08 13:47:50 +01:00
Ester Lindgren
d85bdd0239 Merge resolve 2021-03-05 15:45:31 +01:00
Ester Lindgren
1eb29ab5ca Add centered target frame 2021-03-05 15:33:48 +01:00
Ylva Selling
7965ed5d24 Make WWT follow OpenSpace w thread, change interval for zoom and fix coordinate conversion error 2021-03-03 16:45:35 +01:00
Ester Lindgren
f444fcfa80 Add function to disable faceCamera prpoerty 2021-03-03 10:24:13 +01:00
Ylva Selling
87df6932f8 Create functions to look in WWT-window at direction in OpenSpace and some cleanup 2021-03-01 16:50:01 +01:00
Ylva Selling
b24a75e484 Clean up structure so ScreenSpaceBrowser only executes string for javascript 2021-03-01 13:32:53 +01:00
Ester Lindgren
a00013af1c Test to setup message communication 2021-02-25 11:03:22 +01:00
Alexander Bock
6d821d4f91 Feature/codegen (#1480)
* Add the ability to automatically generate code to extract values out of a Dictionary (see https://github.com/openspace/codegen for more information on how to use this)
* Applied this technique to a large number of cases in the codebase
* Don't add _codegen files to the repository

Co-authored-by: Emma Broman <emma.broman@liu.se>
2021-02-09 09:12:43 +01:00
Alexander Bock
f6132b04c9 Update CEF download to new Spotify link 2021-01-27 14:06:40 +01:00
Alexander Bock
595d23ec75 Fix issue where the CEF libraries would not be copied to the bin folder 2021-01-12 11:26:00 +01:00
Alexander Bock
29a76c7d33 Coding style pass on shader code 2021-01-02 21:11:13 +01:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Alexander Bock
067c0f4b27 Introduction of new Dictionary class (#1446)
* Adapting to introduction of new Dictionary class in Ghoul
 * Mainly replacing usage of float instead of doubles as expected
 * Adjust to the lack of the hasKeyAndValue function
2021-01-02 15:07:11 +01:00
Alexander Bock
ad8af3ffeb Feature/CMake (#1443)
General CMake cleanup/overhaul
* Enable precompiled headers for all projects
* Move specifications itto separate CMakeLists files
  * Add openspace-core as a subdirectory
  * Move handle_modules functionality into modules/CMakeLists.txt
  * Move handleapplications logic into apps/CMakeLists.txt
* Introduce openspace-module-collection interface library to simplify inclusion of modules in applications
* Turn module initialization into a two-step process to adapt to the new minimal dependency scenario
* Compile time speedup
  * Remove circular dependencies between modules and core preventing multithreaded compilation on MSVC
  * Build Spice multithreaded and as static library
  * Remove dependency from core to module-webbrowser
  * Remove unused dependency from kameleon
  * Remove additional unnecessary dependencies
  * Cleanup volume/kameleon/kameleonvolume modules
  * Fix visibility issues. Restrict include paths
  * Compile kameleon in parallel
* Other cleanup
  * Only copy CEF files from one target (hard-coded to OpenSpace right now)
  * Remove unused instrumentation code
  * Remove the ability to render AABB for globes as it caused a circular dependency between GlobeBrowsing and Debugging
  * Removing compiler and cppcheck warnings
  * Turn almost all includes into non-system includes
  * Don't warn on deprecrated copy
* Updated submodules
2020-12-28 18:26:57 +01:00
Alexander Bock
d95c6c4a47 Removing Clang on MacOS warnings. No longer create external control that doesn't work anymore 2020-12-08 00:24:24 +01:00
Alexander Bock
51470c0a0d Issue/1355 (#1424)
* Move glfw init after macOS window is ready
* MacOS fixes for BigSur
* Compile fixs
* Rename hirise.asset since linux filenames are case-sensitive
* Modified globals DataStorage method to make Linux and Mac happy
* Switched to unsecure http URLs for satellites due to httprequest problem
* Keep the QApplication around on Mac because of some reason otherwise the keyboard handler crashes
* Add comment explaining the madness
* Apply same techniques to the globalscallback file

Co-authored-by: Micah Acinapura <micahnyc@gmail.com>
Co-authored-by: Gene Payne <payne.gene@gmail.com>
2020-12-07 23:41:20 +01:00
Alexander Bock
efffc25ce0 Feature/globals handling (#1352)
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
2020-10-21 22:30:05 +02:00
Alexander Bock
9d3e181d38 Fix issue that makes swiftshader folder to appear over and over again 2020-10-20 22:54:05 +02:00
Micah Acinapura
b7c566089b fixes to cmake for macos 2020-10-13 06:06:26 -04:00
Alexander Bock
5c054e008a CMake fixes 2020-10-11 12:10:08 +02:00
Alexander Bock
7e06f310eb Update submodules
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
Micah Acinapura
6db7d503a3 Linux fixes clang (#1216)
* Changes to work on Linux.

* Multiple small fixes for Linux.

* Changes to have trails working on Linux again.

* Bring back AA Trail Lines on Linux.

* Included new branch with correction in cfitsio library linking.

* Updated SGCT.

* Changes to work on Linux.

* Remove extra #endif

* Changes to compile in Clang on Linux.

* Other fixes.

* Bring back some of the changes lost and updated clang building commands.

* requiring 10.15 for sgct, upadating sgct

Co-authored-by: Jonathas <jon.costa@gmail.com>
Co-authored-by: Tom Schober <tom@tomschober.com>
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-06-25 18:55:20 -04:00
Alexander Bock
f138708fd9 Update SGCT to not require the specification of projection planes if 3D rendering in not required
Remove comments as it is the preferred way of handling the web gui
2020-06-23 15:18:25 +02:00
Micah Acinapura
621772dbb8 starting up webgui even if now window with guitag available 2020-06-22 11:58:38 -04:00
Micah Acinapura
386e7d9312 fixed reading config files, single_gui.xml, and updating webmodules for sgct init changes 2020-06-22 10:23:04 -04:00
Alexander Bock
5a94c486f0 Removing warnings 2020-04-14 22:32:26 +02:00
Alexander Bock
f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Mikael Pettersson
fa5bbc5a44 Added keymodifiers to touch event handling 2020-03-25 09:52:16 +01:00
Mikael Pettersson
3210dfd315 Made these changes only apply on Win32 builds 2020-03-25 09:52:16 +01:00
Mikael Pettersson
c9b5ffd021 Changed webbrowser to use cef touch events
rather than injected mouse events.
2020-03-25 09:52:16 +01:00
Alexander Bock
5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock
43851899c7 Cleanup of more copyright headers
Add debug groups and object names to the OpenGL objects in the framebuffer renderer
2020-02-13 14:59:13 +01:00
Micah Acinapura
eaa1b5025f cmake macos fixes 2020-02-12 23:38:21 -05:00
Alexander Bock
de24e81bda Fix copyright header information
Remove TimelineView application
2020-02-12 22:36:11 +01:00
Alexander Bock
c8799dcc80 Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0 2020-02-11 00:21:42 +01:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock
8f81360628 Move the OpenSpace unit tests from GTest to Catch2
Fix for default.scene
2020-02-10 21:10:35 +01:00
Alexander Bock
49c793d976 Update Ghoul version
Add initial Tracy profiling macros
2020-02-10 14:50:41 +01:00
Alexander Bock
24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
Alexander Bock
6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
GPayne
f682352b53 Merging with master 2020-01-27 09:14:35 -07: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
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
Alexander Bock
a51cee1f36 Add a method for creating a unique name for screenspace renderable (closes #652) 2019-12-27 21:25:22 +01:00
Alexander Bock
8feb6d1d2b Small cleanup
Make sure OpenSpace compiles in debug mode
2019-12-17 10:57:37 +01:00
Stefan Seibert
a66e872e4e Improvements in Performance due to adopted usage of CEF Message Loop (#1017)
* Changing the way how we pump the CEF update loop to improve performance

* Updated Intervall description
2019-12-04 10:01:35 +01:00
Emil Axelsson
c96794bf27 Update modules to call InteractionMonitor.markInteraction 2019-10-30 16:20:26 +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