mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-09 13:12:58 -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>
108 lines
4.6 KiB
C++
108 lines
4.6 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__WEB_RENDER_HANDLER_H
|
|
#define __OPENSPACE_MODULE_WEBBROWSER__WEB_RENDER_HANDLER_H
|
|
|
|
#include <vector>
|
|
#include <ghoul/glm.h>
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma warning (push)
|
|
#pragma warning (disable : 4100)
|
|
#elif defined(__clang__)
|
|
//#pragma clang diagnostic push
|
|
//#pragma clang diagnostic ignored "-Wunused-variable"
|
|
#endif // _MSC_VER
|
|
|
|
#include <include/cef_render_handler.h>
|
|
#include <include/cef_display_handler.h>
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma warning (pop)
|
|
#elif defined(__clang__)
|
|
//#pragma clang diagnostic pop
|
|
#endif // _MSC_VER
|
|
|
|
#include <ghoul/opengl/ghoul_gl.h>
|
|
|
|
namespace openspace {
|
|
|
|
class WebRenderHandler : public CefRenderHandler {
|
|
public:
|
|
// @TODO (ylvse 2024-08-20): Remove this argument when the skybrowser rewrite is done.
|
|
// It is necessary atm for making the skybrowser work.
|
|
WebRenderHandler(bool accelerate = true);
|
|
using Pixel = glm::tvec4<char>;
|
|
|
|
virtual void draw(void) = 0;
|
|
virtual void render() = 0;
|
|
|
|
void reshape(int, int);
|
|
|
|
void GetViewRect(CefRefPtr<CefBrowser> browser, CefRect &rect) override;
|
|
|
|
// Regular OnPaint method. Uses CPU allocation
|
|
void OnPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
|
|
const RectList &dirtyRects, const void* buffer, int width, int height) override;
|
|
|
|
// Used when the "shared_texture" flag is set to true for CEF. Uses a shared texture
|
|
// from CEF that is allocated on another part of the GPU. Skip CPU allocationn for
|
|
// better performance. Needs OpenGl 4.5 or higher.
|
|
void OnAcceleratedPaint(CefRefPtr<CefBrowser> browser, PaintElementType type,
|
|
const RectList& dirtyRects, const CefAcceleratedPaintInfo& info) override;
|
|
|
|
// Determines if the alpha value is > 0 at the specified pixel coordinates. Used in
|
|
// the GUI to determine if the click is consumed
|
|
bool hasContent(int x, int y);
|
|
|
|
bool isTextureReady() const;
|
|
void updateTexture();
|
|
void bindTexture();
|
|
|
|
protected:
|
|
GLuint _texture = 0;
|
|
const bool _acceleratedRendering;
|
|
|
|
private:
|
|
glm::ivec2 _windowSize = glm::ivec2(0);
|
|
glm::ivec2 _browserBufferSize = glm::ivec2(0);
|
|
|
|
/**
|
|
* RGBA buffer from browser
|
|
*/
|
|
std::vector<Pixel> _browserBuffer;
|
|
bool _needsRepaint = true;
|
|
bool _textureSizeIsDirty = true;
|
|
bool _textureIsDirty = true;
|
|
glm::ivec2 _lowerDirtyRectBound = glm::ivec2(0);
|
|
glm::ivec2 _upperDirtyRectBound = glm::ivec2(0);
|
|
|
|
IMPLEMENT_REFCOUNTING(WebRenderHandler);
|
|
};
|
|
|
|
} // namespace openspace
|
|
|
|
#endif // __OPENSPACE_MODULE_WEBBROWSER__WEB_RENDER_HANDLER_H
|