mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-05 03:00:58 -06:00
11bb8e7ac5
* 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 * Allow web dev tools to connect to CEF * Update modules/webbrowser/include/browserinstance.h Co-authored-by: Emma Broman <emma.broman@liu.se> * Update modules/webbrowser/include/webrenderhandler.h Co-authored-by: Emma Broman <emma.broman@liu.se> * Apply suggestions from code review Co-authored-by: Emma Broman <emma.broman@liu.se> --------- Co-authored-by: Ylva Selling <ylva.selling@liu.se> Co-authored-by: Emma Broman <emma.broman@liu.se>
114 lines
4.1 KiB
C++
114 lines
4.1 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_SKYBROWSER___BROWSER___H__
|
|
#define __OPENSPACE_MODULE_SKYBROWSER___BROWSER___H__
|
|
|
|
#include <modules/webbrowser/include/webrenderhandler.h>
|
|
#include <openspace/documentation/documentation.h>
|
|
#include <openspace/properties/stringproperty.h>
|
|
#include <openspace/properties/triggerproperty.h>
|
|
#include <openspace/properties/vector/ivec2property.h>
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma warning (push)
|
|
#pragma warning (disable : 4100)
|
|
#endif // _MSC_VER
|
|
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic push
|
|
#pragma clang diagnostic ignored "-Wunused-parameter"
|
|
#endif // __clang__
|
|
|
|
#include <include/cef_client.h>
|
|
|
|
#ifdef __clang__
|
|
#pragma clang diagnostic pop
|
|
#endif // __clang__
|
|
|
|
#ifdef _MSC_VER
|
|
#pragma warning (pop)
|
|
#endif // _MSC_VER
|
|
|
|
namespace ghoul::opengl { class Texture; }
|
|
|
|
namespace openspace {
|
|
|
|
class BrowserInstance;
|
|
class RenderHandler;
|
|
class WebKeyboardHandler;
|
|
|
|
class Browser {
|
|
public:
|
|
explicit Browser(const ghoul::Dictionary& dictionary);
|
|
virtual ~Browser();
|
|
|
|
void initializeGL();
|
|
void deinitializeGL();
|
|
bool isReady() const;
|
|
|
|
void render();
|
|
void update();
|
|
|
|
void updateBrowserSize();
|
|
void reload();
|
|
|
|
void setRatio(float ratio);
|
|
float browserRatio() const;
|
|
|
|
protected:
|
|
properties::IVec2Property _browserDimensions;
|
|
properties::StringProperty _url;
|
|
properties::TriggerProperty _reload;
|
|
|
|
std::unique_ptr<ghoul::opengl::Texture> _texture;
|
|
|
|
void updateBrowserDimensions();
|
|
void executeJavascript(const std::string& script) const;
|
|
|
|
bool _isUrlDirty = false;
|
|
bool _isDimensionsDirty = false;
|
|
bool _shouldReload = false;
|
|
|
|
private:
|
|
class RenderHandler : public WebRenderHandler {
|
|
public:
|
|
RenderHandler()
|
|
: WebRenderHandler(false)
|
|
{}
|
|
void draw() override;
|
|
void render() override;
|
|
|
|
void setTexture(GLuint t);
|
|
};
|
|
|
|
CefRefPtr<RenderHandler> _renderHandler;
|
|
CefRefPtr<WebKeyboardHandler> _keyboardHandler;
|
|
std::unique_ptr<BrowserInstance> _browserInstance;
|
|
};
|
|
|
|
} // namespace openspace
|
|
|
|
#endif // __OPENSPACE_MODULE_SKYBROWSER___BROWSER___H__
|