mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Issue/2244 different mouse cursors (#3388)

Browse Source 
* 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>
This commit is contained in:
Ylva Selling
2024-08-28 10:44:17 +02:00
committed by GitHub
parent fd586e30a3
commit aed2c0b0c8
6 changed files with 128 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/openspace/engine/windowdelegate.h
View File

@@ -34,6 +34,9 @@ namespace openspace {
struct WindowDelegate {
enum class Frustum { Mono, LeftEye, RightEye };
enum class Cursor { Arrow, IBeam, CrossHair, PointingHand, ResizeEW, ResizeNS,
ResizeNWSE, ResizeNESW, ResizeAll, NotAllowed };
void (*terminate)() = [](){};
void (*setBarrier)(bool enabled) = [](bool) {};
@@ -126,6 +129,8 @@ struct WindowDelegate {
[](const glm::vec2&) { return glm::vec2(0); };
void (*setStatisticsGraphScale)(float scale) = [](float) {};
void (*setMouseCursor)(Cursor cursor) = [](Cursor) {};
};
} // namespace openspace