Commit Graph

105 Commits

Author SHA1 Message Date
Alexander Bock
93c0f75ef2 Remove Clang warnings 2025-06-14 15:42:38 +02:00
Alexander Bock
8495acd171 Remove unused boolean return value for ScreenSpaceRenderable initialize and deinitialize functions 2025-05-16 23:57:40 +02:00
Alexander Bock
fc9b2ab091 Increase the compilation speed (#3545)
- Remove toStringConversion function and move json_helper include out of numericalproperty.inl
  - Optimizing some header files
  - Remove duplicate Lua functions from properties. 
  - Move List,Option,Selection,String, and TriggerProperty into misc folder
  - Move lua_helper include out of inline file
  - Add lua_helper to the precompiled header
  - Declare property functions as final. No longer have OptionProperty derive from IntProperty
  - Remove Dictionary header from properties
2025-03-14 11:22:40 +01:00
Alexander Bock
096363fd06 Make constructors explicit 2025-02-05 23:22:32 +01:00
Alexander Bock
820e90eab4 Happy new year 2025-01-14 16:21:08 +01:00
Ylva Selling
8ad84b6d35 Make useAcceleratedRendering a uniform for screenspace renderables 2024-09-17 17:17:46 +02:00
Ylva Selling
11bb8e7ac5 GPU accelerate CEF (#3386)
* 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>
2024-08-23 09:37:01 +02:00
Alexander Bock
43ada7fa1f Add the ability to feather borders of screenspace renderables 2024-08-13 13:37:39 +02:00
Alexander Bock
6edea5cae7 Apply the hue, value, saturation, and gamma values from the renderengine to screenspace renderables. Change the screenspace's own gamma value into an offset (#3293)
* Apply the hue, value, saturation, and gamma values from the renderengine to screenspace renderables.  Change the screenspace's own gamma value into an offset

* Make it clearer that the gamma correction is now an offset
2024-06-04 16:28:52 +02:00
Alexander Bock
203cff04cc Make use of the new uniform cache method that uses the variable names as uniform names (#3217) 2024-04-30 08:12:33 +02:00
Alexander Bock
2759c00e4b Pass through the code to address clang-tidy linting (#3083) 2024-03-17 00:58:50 +01:00
Alexander Bock
6e29d898cf Update copyright header 2024-02-06 15:53:24 +01:00
Alexander Bock
7db7c40841 Doxygen style overhaul (#2954)
Reformatting the existing Doxygen comments to be unified
2023-11-20 23:39:17 +01:00
Alexander Bock
455ee9335a Add a proper blackout to the ScreenSpaceRenderables and a property and codegen option to toggle that behavior (#2868) 2023-08-31 18:19:37 +02:00
Alexander Bock
e7cad060c2 Adapt to coding style 2023-08-11 20:58:41 +02:00
Ylva Selling
0b20affc5d Add border to screenspace renderables 2023-06-15 15:42:32 -04:00
Emma Broman
554373eb3e Fading of propertyowners through GUI, and more owners with fade property (#2557)
* Add property in OpenSpaceEngine for fading duration when enabling / disabling

* Add interface for fadeable components and apply to renderable

* Make layers a fadeable component

* Make globelabels a fadeable component

* Make labelscomponent a fadeable, and give it an enabled property

* Make screenspace renderables fadeable components

* Introduce concept of parent fadeables, to fade out subowners with parent

* Make rings fadeable as well

---------

Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2023-04-06 12:49:49 +02:00
Alexander Bock
4f4764209f Happy new year 2023-01-02 11:19:33 +01: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
bcb5c7bd28 Merge branch 'master' into feature/gamma-correction 2022-06-29 04:21:46 -04: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
Ylva Selling
d23969b8d3 Add gamma correction to screen space renderable (SSR) shader, property for SSR and default value gamma = 2.2 for sky browser display copies 2022-06-21 10:47:44 -04:00
Ylva Selling
d3a955e6be Add scale to topic 2022-05-04 12:27:44 -04:00
Ylva Selling
c9bbb4a533 Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser
# Conflicts:
#	include/openspace/rendering/screenspacerenderable.h
#	src/rendering/screenspacerenderable.cpp
2022-04-08 11:46:09 -04:00
Alexander Bock
02adcf570e Add a hidden "Fade" property that modifies the effective opacity to enable other functionality (closes #1970) 2022-04-05 23:53:33 +02:00
Ylva Selling
7d3a88f007 Make it possible to add two copies of the sky browser, which will make it possible to display many copies in a dome environment and have an interactive copy on the master node 2022-03-16 16:22:56 -04:00
Ylva Selling
bd43816060 Pull request fix requested changes 2022-03-03 12:10:41 -05:00
sylvass
21e572149e Fix comments from pull request 2022-03-02 16:39:44 -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
0e49606706 Feature/Science on the Sphere (#1863)
Add all available Science-on-a-Sphere datasets from their public FTP as assets.  Many of the datasets include large files that are downloaded the first time the asset is loaded
2022-02-10 13:53:30 +01:00
sylvass
51496956fc Pass data regarding if sky browser and target are facing camera and using radius azimuth elevation to gui 2022-02-07 09:46:00 -05:00
sylvass
5128056272 Make hover circle work again and remove unneccessary conversion function 2022-01-26 05:41:46 -05:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
ENG-VIDAVIZ-0\ylvas
e839ee05b7 Make target work with RAE coordinates so it can be used in a dome setup 2021-12-16 10:32:06 -05:00
sylvass
79e85c36dd Set max with to 90 columns 2021-12-02 11:55:21 -05:00
sylvass
816b394dc9 Set selection of target/browser in the Pair class instead of the module 2021-12-02 11:29:57 -05:00
sylvass
ef1af3b6be Add set cartesian position to screenspace renderable 2021-12-01 11:10:48 -05: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
sylvass
1542209c42 Add setter for enabled property for screenspacerenderable 2021-11-23 15:48:16 -05:00
sylvass
c895f24989 Cleanup 2021-10-25 09:38:09 -04:00
Alexander Bock
c3ba532bdb Feature/cleanup (#1608)
* Revert screenlog back to showing Info and above messages
 * Various code cleanup
2021-05-25 14:08:33 +02:00
Alexander Bock
09e28ff49e Enable Screenspace renderable to have a multiplicative color; Add new asset to show a target marker (closes #85); Fix bug with wrong documentation shown in RenderablePlane 2021-05-08 18:08:56 +02:00
Ylva Selling
fbc05244e1 Make it possible to add many browsers and targets by moving functionality to ScreenSpaceRenderable 2021-03-23 09:44:14 +01:00
Ylva Selling
3573859ffe Add resizing functionality to all corners and side of browser 2021-03-18 16:13:46 +01:00
Alexander Bock
7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Emma Broman
9a683bb29a Rename ScreenSpaceRenderable alpha to opacity (closes #1416) (#1421) 2020-12-05 23:22:24 +01:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock
24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
Alexander Bock
a51cee1f36 Add a method for creating a unique name for screenspace renderable (closes #652) 2019-12-27 21:25:22 +01:00
Emil Axelsson
9934fc03b9 Fix scaling issue with screenspace renderables (#939) 2019-07-19 11:09:04 +02:00