mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-03 01:59:35 -06:00
aed2c0b0c8
* Update CEF version number * Set OpenSpace_Helper version of C++ to 20 * Update C++ syntax to v 20 * Remove deprecated function (now default) * Set the cache folder for cef * Make static function in webbrowsermodule that determines if we can use accelerated rendering * Add flag for accelerated rendering to webrenderhandler * Use accelerated rendering * Implement function to see if gui should absorb click * Adhere to 80 char linewidth * Make only the UI GPU accelerated * Use dirty rects size for the texture to remove crash * Better comments * Make has content function work for GPU acceleration * Make it so all browsers can be accelerated Tried making it so only the gui was accelerated for simplicity. Performance plummeted, so reverted that * Tidy up * Add accelerated rendering flag to the screenspacerenderable shader * Add temporary fix to make the sky browser work * Remove flag from gui render handler * Enable webgl in a nicer way * Unbind texture in screenspacerenderable * Add better comments for error handling * Tidy up * Address PR comments * Make the acceleration Windows only * Remove unnecessary setting of shader dictionary * Add display handler to browser client * Make glfw change mouse cursor depending on cef cursor * formatting * Add switch to main * Update modules/webbrowser/src/browserclient.cpp Co-authored-by: Alexander Bock <alexander.bock@liu.se> * Address comments on PR * Update again * Update modules/webbrowser/src/browserclient.cpp Co-authored-by: Emma Broman <emma.broman@liu.se> * Address PR comments --------- Co-authored-by: Ylva Selling <ylva.selling@liu.se> Co-authored-by: Alexander Bock <alexander.bock@liu.se> Co-authored-by: Emma Broman <emma.broman@liu.se>
84 lines
4.0 KiB
C++
84 lines
4.0 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2024 *
|
|
* *
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
|
* software and associated documentation files (the "Software"), to deal in the Software *
|
|
* without restriction, including without limitation the rights to use, copy, modify, *
|
|
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
|
|
* permit persons to whom the Software is furnished to do so, subject to the following *
|
|
* conditions: *
|
|
* *
|
|
* The above copyright notice and this permission notice shall be included in all copies *
|
|
* or substantial portions of the Software. *
|
|
* *
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
|
|
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
|
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
|
|
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
|
****************************************************************************************/
|
|
|
|
#ifndef __OPENSPACE_MODULE_WEBBROWSER___BROWSER_CLIENT___H__
|
|
#define __OPENSPACE_MODULE_WEBBROWSER___BROWSER_CLIENT___H__
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma warning (push)
|
|
#pragma warning (disable : 4100)
|
|
#endif // _MSC_VER
|
|
|
|
#include <include/cef_client.h>
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma warning (pop)
|
|
#endif // _MSC_VER
|
|
|
|
namespace openspace {
|
|
|
|
class WebRenderHandler;
|
|
class WebKeyboardHandler;
|
|
|
|
class BrowserClient : public CefClient {
|
|
public:
|
|
class NoContextMenuHandler : public CefContextMenuHandler {
|
|
bool RunContextMenu(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,
|
|
CefRefPtr<CefContextMenuParams> params, CefRefPtr<CefMenuModel> model,
|
|
CefRefPtr<CefRunContextMenuCallback> callback) override;
|
|
|
|
IMPLEMENT_REFCOUNTING(NoContextMenuHandler);
|
|
};
|
|
|
|
class DisplayHandler : public CefDisplayHandler {
|
|
bool OnCursorChange(CefRefPtr<CefBrowser> browser,
|
|
CefCursorHandle cursor,
|
|
cef_cursor_type_t type,
|
|
const CefCursorInfo& custom_cursor_info) override;
|
|
IMPLEMENT_REFCOUNTING(DisplayHandler);
|
|
};
|
|
BrowserClient(WebRenderHandler* handler, WebKeyboardHandler* keyboardHandler);
|
|
|
|
CefRefPtr<CefRenderHandler> GetRenderHandler() override;
|
|
CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() override;
|
|
CefRefPtr<CefRequestHandler> GetRequestHandler() override;
|
|
CefRefPtr<CefKeyboardHandler> GetKeyboardHandler() override;
|
|
CefRefPtr<CefContextMenuHandler> GetContextMenuHandler() override;
|
|
CefRefPtr<CefDisplayHandler> GetDisplayHandler() override;
|
|
|
|
private:
|
|
CefRefPtr<CefRenderHandler> _renderHandler;
|
|
CefRefPtr<CefKeyboardHandler> _keyboardHandler;
|
|
CefRefPtr<CefLifeSpanHandler> _lifeSpanHandler;
|
|
CefRefPtr<CefRequestHandler> _requestHandler;
|
|
CefRefPtr<CefContextMenuHandler> _contextMenuHandler;
|
|
CefRefPtr<CefDisplayHandler> _displayHandler;
|
|
|
|
IMPLEMENT_REFCOUNTING(BrowserClient);
|
|
};
|
|
|
|
} // namespace openspace
|
|
|
|
#endif // __OPENSPACE_MODULE_WEBBROWSER___BROWSER_CLIENT___H__
|