Commit Graph

642 Commits

Author SHA1 Message Date
Malin E 14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E f490fccee6 Merge branch 'master' into feature/model-opacity
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
2023-02-01 14:52:33 +01:00
Alexander Bock 4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Malin E 560c58e499 Add manual depth test between models 2022-12-07 14:19:12 +01:00
Malin E 433c2cd3a9 Remove unused hdr framebuffer and texture 2022-11-15 15:57:25 +01:00
Malin E 6c223cd8ae Some clean up 2022-11-03 11:15:21 +01:00
Malin E 0bb6d25e2e Add a new bin in the end of the pipeline 2022-11-03 10:29:53 +01:00
Malin E 8e2f5450f4 Add documentation for texture access functions 2022-11-02 17:34:00 +01:00
Malin E 2fe78e949d Merge branch 'master' into feature/model-opacity 2022-11-02 13:51:22 +01:00
Alexander Bock 6249fa6d89 Collection of a number of changes (#2286)
* Cleanup Property code
* Remove NOLINT statements
* Return Property class types as string_view
* Remove getStringValue function
* Simplify string value retrieval
* Ensure that image paths in the ImageSequenceTileProvider are sorted (closes #2205)
* Some cleanup of OpenSpaceEngine
* Cleanup documentation
* Some more cleanup of engine classes
* Some more cleanup
* Update SGCT repository
* Use new Jenkins node identifiers as the old method broke with update
2022-10-30 12:54:14 +01:00
Malin E a77e227430 Re-use textures in the FramebufferRenderer for model opacity rendering 2022-10-28 10:12:56 +02:00
Alexander Bock 979a5e3378 SkyBrowser Hash Handling (#2201)
* Add the loading of a hash for wwt image files and automatically force a redownload of the files if the hash has changed
* Move the wwtdataimages location into the sync folder
* Some general code cleanup
2022-08-22 15:16:07 +02:00
Alexander Bock 41a4171aeb Expose the SGCT statistics information through a property in the RenderEngine (closes #2195) 2022-08-01 15:27:05 +02:00
Alexander Bock 9cc4c595a8 Code Cleanup (#2191)
* constexpr const -> constexpr
* const char* -> std::string_view
2022-07-25 15:57:45 +02:00
Alexander Bock 2f58e8ec8e Remove some more warnings 2022-07-22 14:27:45 +02:00
Ylva Selling b6d6633e95 Add fading functionality to renderables and set the fading to true for the stars and the milky way sphere 2022-07-20 15:15:02 -04: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
Alexander Bock 69c8750921 Feature/imgui (#2060)
* Some cleanup of the ImGUI code
* Reorder the panels
* Make StringPropertys work without losing value on context loss
* Add a new ImGui compoment that shows the status of the scene graph
2022-04-30 13:54:36 +02:00
Alexander Bock 5751fe26d3 Cleanup handling of warnings (#2030) 2022-04-16 20:57:29 +02:00
Alexander Bock d360f2ae59 Address Visual Studio analyzer warnings 2022-04-12 00:58:11 +02:00
Alexander Bock c206da4a98 Coding style adaptations 2022-04-10 23:25:37 +02: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
Alexander Bock 73292ee54c Rename 'slave' to 'client' in the remaining code 2022-04-05 23:10:49 +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
Micah Acinapura 9e69300642 unified renderbin to renderable; adapted orbitalkepler to codegen; fi… (#1843)
* unified renderbin to renderable; adapted orbitalkepler to codegen; fixes 1842

* update for pr comments

* update for pr comments2
2022-02-17 10:58:32 -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 2222d3d9e0 Update SGCT to enable taking screenshots of individual windows 2022-01-07 12:00:00 +01:00
Alexander Bock d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Alexander Bock 76b9c7587b Adapt to explicit specifcation of texture size (#1794)
* Adapt to explicit specifcation of texture size
2021-12-26 19:19:04 +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
BlueVista bfd220374d Feature/fontcolor (#1726)
* Added two properties to control the font color of the Rotation, Zoom, and Roll toggles.
2021-08-24 10:45:44 +02:00
Alexander Bock db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Alexander Bock c4bddacfeb Remove nonfunctioning ABufferRenderer from RenderEngine 2021-07-30 12:01:07 +02:00
Alexander Bock e994e900ee Feature/intel atmosphere (#1691)
* Add object names to atmosphere textures
* Fix for rendering atmospheres on Intel chips
* General cleanup of the atmosphere rendering code to make a it more modular
2021-07-22 20:42:21 +02:00
Alexander Bock 3025fbc200 Initialize OpenGLCache to nullptr to prevent faulty memory access (thanks Marco S) 2021-07-15 16:18:45 +02:00