mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-23 04:30:15 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,466 Commits 83 Branches 46 Tags
36d0905ab6e1d2b9a96df0bb556be320cedf4da5
Commit Graph

149 Commits

Author SHA1 Message Date
Alexander Bock
a711591c09 Update Doxygen (#2537) 
* Modernizing Doxygen
* Remove warnings for Doxygen
 2023-03-06 23:41:24 +01:00
Alexander Bock
375e5c6561 Tracy Update (#2534) 
* Update the Tracy repository
* Update submodules
 2023-03-01 11:48:21 -07:00
Alexander Bock
79ad5776cc CMake cleanup (#2489) 
* CMake Cleanup
* Warning suppression with CEF
* Use SGCT tinyxml in skybrowser for now
* Disable warnings about missing field initializers
 2023-02-05 23:24:12 +01:00
Emma Broman
a0f9e88432 Feature/touch fixes (#2463) 
* Add Ceres to touch interaction list (Forgotten in previous commit. OBS! This list will be removed)

* Small code updates (Logical ordering of functions, code standard)

* Fix compilation issue when using debug define

* Make touch navigation abort idle behavior

* Make reset a trigger property

* Fix some broken property sliders (the default step size was too big)

* Update interaction monitor state on touch interaction with WebGui

* Add some documentation of what "LM" means, and make unit test a developer property
 2023-02-01 12:44:34 +01:00
Alexander Bock
4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Alexander Bock
f502922338 CMake cleanup (#2246) 
* Simplification of the DLL copying mechanism on Windows
* Only deploy Qt on Windows
* Use set_target_properties function
 2022-09-21 10:52:05 +02:00
Alexander Bock
664eb60f4f Increase the compile times by including more precompiled headers (#2217) 
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
 2022-08-26 16:32:21 +02:00
Emma Broman
0cc5704b6a Add isGuiWindow check for mouse and keyboard callbacks 
Fix interaction problems when hovering/clicking with the mouse in a non-GUI window, when having a setup with more than one window (e.g. the single_gui.json setup)

Previously, clicking with the mouse in the rendering window without the GUI also triggered mouse clicks in all the other windows, including the GUI windows. This was disturbing for interaction in the single_gui setup

Now, the GUI modules check to see if the clicked window is actually an interaction window
 2022-08-05 11:41:10 +02:00
Emma Broman
0161d514b7 Fix collision between ImGui and WebGui 
The callbacks of WebGui (which is on top) now gets priority
 2022-08-05 11:41:10 +02:00
Alexander Bock
163ac4dcef Cleanup of mostly asset files 
- Fixes for all files
 - constexpr cleanup
 - Cosmetic changes
 - Remove punctuation from the end of messages
 2022-07-28 17:21:59 +02:00
Alexander Bock
c1252902c7 More Code Cleanup (#2192) 
* Harmonizing ( and ) in function calls
* static const -> constexpr
* Fix compile issue
* Unify shader tab size
* Add _fs and _vs to shaders
* Harmonize spacing
 2022-07-26 11:22:41 +02:00
Alexander Bock
9cc4c595a8 Code Cleanup (#2191) 
* constexpr const -> constexpr
* const char* -> std::string_view
 2022-07-25 15:57:45 +02:00
Ylva Selling
b24181e206 Remove --ignore-gpu-blocklist CEF flag 2022-07-21 18:40:03 -04:00
Alexander Bock
7f7d724f91 Globally rename OpenSpace Helper to OpenSpace_Helper to remove space in the application name. Also removes need for CMake CMP0037 (closes #2119) 2022-07-19 14:00:37 +02:00
Alexander Bock
44a9f6421f Update submodules, Suppress CMake warnings, Removal of extra image libraries 2022-07-19 11:51:59 +02:00
Alexander Bock
9b1143f02f Ubuntu 22.04 and GCC11 fixes (#2163) 
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
 2022-06-28 00:46:01 +02:00
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