Commit Graph

121 Commits

Author SHA1 Message Date
Ylva Selling
9dc1f492e4 Remove flag that was causing rendering problems 2022-04-27 11:04:47 -04:00
Ylva Selling
3b76ac711b Update CEF flags 2022-04-27 08:55:00 -04:00
Ylva Selling
1e180a6fa7 Update CEF flags 2022-04-26 18:39:08 -04:00
Ylva Selling
e6cf6d3925 Remove if statement that prevents browsers to be rendered on multiple nodes 2022-04-26 14:59:19 -04:00
Ylva Selling
75aaa0abb3 Remove CEF-command line flag to prevent GPU crash 2022-04-25 17:06:51 -04:00
Alexander Bock
c206da4a98 Coding style adaptations 2022-04-10 23:25:37 +02:00
Ylva Selling
f6763eeeeb Merge branch 'master' into thesis/2021/skybrowser
# Conflicts:
#	modules/webbrowser/CMakeLists.txt
2022-04-04 16:14:50 -04:00
Micah Acinapura
8dd7bd9314 update cef and a few calls for it (#1916)
* update cef and a few calls for it

* fixing ref ptf for cef

* fixes for macos cef update; fixes #1114

* roll back cef version to 91

* remove print from cmake
2022-03-29 13:09:13 -04:00
Ylva Selling
ef79b73ec5 Merge branch 'feature/cef-update' into thesis/2021/skybrowser 2022-03-28 13:38:14 -04:00
Micah
ecfc9975eb roll back cef version to 91 2022-03-24 11:00:48 -04:00
Micah Acinapura
3ec6d84b89 fixes for macos cef update; fixes #1114 2022-03-23 22:32:08 -04:00
Ylva Selling
83ad7db147 Merge branch 'feature/cef-update' into thesis/2021/skybrowser 2022-03-21 16:19:42 -04:00
Micah
440dfa32c7 fixing ref ptf for cef 2022-03-21 16:14:49 -04:00
Micah
bf559c5605 update cef and a few calls for it 2022-03-21 13:08:26 -04:00
Ylva Selling
bd43816060 Pull request fix requested changes 2022-03-03 12:10:41 -05:00
sylvass
bcf463ad66 Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser
# Conflicts:
#	data/assets/util/asset_helper.asset
#	data/assets/util/webgui.asset
2022-02-22 10:25:46 -05:00
Alexander Bock
30212b6768 Adapt to new auto coding style 2022-02-10 15:20:21 +01:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock
76b9c7587b Adapt to explicit specifcation of texture size (#1794)
* Adapt to explicit specifcation of texture size
2021-12-26 19:19:04 +01:00
sylvass
0e548b4a1b Merge branch 'master' into thesis/2021/skybrowser
# Conflicts:
#	data/assets/util/webgui.asset
#	modules/webbrowser/src/screenspacebrowser.cpp
#	src/rendering/renderengine.cpp
2021-11-30 10:47:46 -05:00
Malin E
e075f8ae82 Merge branch 'master' into feature/multiple-joysticks
* Solve conflicts in navigationhandler.cpp
2021-11-12 09:51:05 +01:00
Alexander Bock
55ee3d2785 Remove the user data from the Lua function definition 2021-11-04 16:27:54 +01:00
Malin E
8bddf38f02 Split InputState into MouseInputState and KeyboardInputState 2021-11-03 15:28:37 +01:00
Alexander Bock
34985f64a6 Feature/keybindings (#1708)
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
2021-08-18 10:58:20 +02:00
Emma Broman
77bdfaefd6 Move camera path code into core and refactor navigation code a bit 2021-06-23 09:12:36 +02:00
Alexander Bock
d2f9530885 Windows fix 2021-05-25 20:11:26 +02:00
Alexander Bock
6cf6e450fb Address MacOS compile issues, make ISS model scene graph node visible 2021-05-25 17:50:31 +02:00
Alexander Bock
c3ba532bdb Feature/cleanup (#1608)
* Revert screenlog back to showing Info and above messages
 * Various code cleanup
2021-05-25 14:08:33 +02:00
Alexander Bock
92432caed2 Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string 2021-05-17 00:23:15 +02:00
Alexander Bock
ccdc5a5dc3 Feature/filesystem cleanup (#1587)
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
2021-05-16 20:26:49 +02:00
Ester Lindgren
543e3641ab Set target dimensions from browser dimensions 2021-03-19 09:57:14 +01:00
Ylva Selling
3573859ffe Add resizing functionality to all corners and side of browser 2021-03-18 16:13:46 +01:00
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