mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-14 07:30:07 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,915 Commits 85 Branches 46 Tags
6189985ed2f2c75771547eddabfc11e4025827bc
Commit Graph

133 Commits

Author SHA1 Message Date
Gene Payne
e6bbcbbd02 Fix for Linux GNU Make build problem with CEF (#2123) 
* Linux CEF Helper removes space in filename but re-adds space post-build

* Call lua helper functions from session recording to match node names

* Revert "Call lua helper functions from session recording to match node names"

This reverts commit f052f58776, which was
accidentally made to the wrong branch.

* Restrict the CEF Helper file renaming fix to GNU Make builds only

* Typo fix
 2022-05-25 11:42:20 -06:00
Gene Payne
7893210eff Removed superfluous X11 error handler code in CEF process helper 2022-05-16 15:09:03 -06:00
GPayne
77833f86fd Added CMake copy of CEF resource files to avoid linux CEF runtime error 2022-05-15 13:59:15 -06:00
GPayne
8e699790d4 Adjust linker order to link CEF libraries after webgui modules 2022-05-14 19:53:48 -06:00
Gene Payne
db2d2b85d0 Disable CEF sandbox and force module libs to be dependent on CEF libs 2022-05-13 12:25:53 -06:00
GPayne
6af8c004e0 Merging master in to sync with new release 2022-05-12 14:59:15 -06:00
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
Gene Payne
90b22f9af4 CMake changes for default module selections and webbrowser linux 2022-04-21 15:14:25 -06:00
GPayne
3859c6003c Improved linux helper CMake setup 2022-04-14 22:52:12 -06:00
Gene Payne
cf134701ee Created cef processhelper file specific to linux 2022-04-14 13:41:22 -06:00
GPayne
2adb38bef0 Add the windows processhelper for use in linux build 2022-04-13 20:23:12 -06:00
GPayne
5c1b9c1bf1 Added subprocess name for helper in linux 2022-04-13 18:12:06 -06:00
GPayne
fff91f27e4 Initial attempts at getting CEF working in ubuntu linux 2022-04-11 23:01:49 -06: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