Commit Graph

11869 Commits

Author SHA1 Message Date
Wilhelm Björkström 825a2a6f6d Cleanup in C++ files
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-12 09:21:44 +01:00
Wilhelm Björkström fb61984c85 Re render on r distance change
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-12 09:20:37 +01:00
Wilhelm Björkström 29b30dc62d Clean up in blackhole fragment shader
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-11 15:01:18 +01:00
Wilhelm Björkström 4cccc132f6 Merge branch 'master' into thesis/2025/black-hole 2025-03-10 14:50:45 +01:00
Wilhelm Björkström cfe824bddc Interpolation between angels for camera to env-map
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-10 14:49:53 +01:00
Wilhelm Björkström 25df480b72 Replaced linear search to BST in fragment shader
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-10 11:33:44 +01:00
Wilhelm Björkström d703fd2746 Fixed warnings and general clean up in C++
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-10 11:33:08 +01:00
Wilhelm Björkström aeb491078f Black hole placment movment
Temporaly made camera distance to acerNode handle moving the placment of the black hole in the scene
2025-03-07 11:40:49 +01:00
Wilhelm Björkström 90fadafddf Change of varible name in CUDA to better match C++ files 2025-03-07 09:49:44 +01:00
Wilhelm Björkström 8e99e99297 Change in one varible name in renderblackhole 2025-03-07 09:48:57 +01:00
Wilhelm Björkström 11a6e1749f Fixe for warnings, variable conversations, and unused variables 2025-03-07 09:35:37 +01:00
Wilhelm Björkström 91d83e34af Added varibels for raytracing inputs in renderablackgole.h 2025-03-07 09:34:28 +01:00
Wilhelm Björkström 5321026626 Cleanup in fragment shader and start conditions 2025-03-06 17:30:45 +01:00
Wilhelm Björkström f0a5f948cc Updated blackhole profile init data
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-06 13:29:59 +01:00
Alexander Bock b6d380d84c Add new class TimelineScale (#3536) 2025-03-06 13:06:19 +01:00
Roxeena 737976a8d2 Enable depth for RenderableSphericalGrid 2025-03-06 11:44:37 +01:00
Wilhelm Björkström caf4b6e7f9 Refactor of renderableblackhole and blackhole fragment shader
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-06 11:14:19 +01:00
Wilhelm Björkström 386b92f29d Merge branch 'master' into thesis/2025/black-hole 2025-03-06 09:34:39 +01:00
Wilhelm Björkström 7e198a0009 WIP: Schwarzchild implementation in OpenGL from pre computed map
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-05 17:40:51 +01:00
Wilhelm Björkström 6eaa87c433 Raytracer slice in cuda, end and start angles as output
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-05 11:22:42 +01:00
Alexander Bock 25f7a2f1e4 Fix assertion failures in the ImGUI UI code 2025-03-04 11:43:44 +01:00
Alexander Bock 501fab40e8 Make the "Clear Projections" in the ProjectionComponent actually a button 2025-03-04 09:42:55 +01:00
Alexander Bock 80dcc0db3a Revert C++ version back to 20 due to a bug in Clang17
https://github.com/llvm/llvm-project/issues/61415
2025-03-03 22:48:50 +01:00
Alexander Bock b9910befcf Fix spelling error in the HEEQ rotation asset 2025-03-03 17:34:47 +01:00
Emma Broman 938ce57802 Update nautical mile abbreviation to an accepted one
"nm" is non-standard. It should apparently be either M, NM or nmi
2025-03-03 17:24:15 +01:00
Wilhelm Björkström f0224c0fe9 Merge branch 'master' into thesis/2025/black-hole 2025-03-03 16:03:23 +01:00
Wilhelm Björkström 5e5b1b69cb submodule update --remote --merge 2025-03-03 16:01:26 +01:00
Wilhelm Björkström 50d9e0ca93 Merge branch 'master' into thesis/2025/black-hole 2025-03-03 15:54:29 +01:00
Wilhelm Björkström 33a1fcba3b 2D Schwarszchild cuda rk4 blackhole
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-03-03 15:52:08 +01:00
Alexander Bock 7905f5b63f Add the ability to the backend to specify a background color and a text color for actions (#3551) 2025-03-03 13:17:57 +01:00
David Wagner cb66065445 Add a "time offset" option to the SpiceRotation and SpiceTranslation (#3544)
Lets SpiceTranslation and SpiceRotation compute the transformation with a given time offset compared to the simulation time (or fixed date if one is configured)
2025-03-03 10:17:20 +01:00
Michael Zingale 12de9d8697 Add a cast from json to std::string for the anchor in the Horizonsdialog(#3548)
This fixes compilation with GCC 14.2.1
2025-03-03 09:59:57 +01:00
Alexander Bock cc395ce340 Update C++ version to 23, add new warnings and the fix them 2025-03-01 15:49:38 +01:00
Alexander Bock cd8924ed22 Remove compiler warnings on Clang/GCC (#3546) 2025-02-28 23:29:38 +01:00
Alexander Bock 1260ebf309 Don't throw warnings when disabling trails where none are currently loaded 2025-02-28 19:53:25 +01:00
Malin E 80b1061b26 Update time conversion to mirror distance conversion code (#3507) 2025-02-28 18:25:05 +01:00
Alexander Bock 3c811a488f Add a new DashboardItem to show the camera orientation (#3542) 2025-02-28 16:50:33 +01:00
Wilhelm Björkström f327a39cd3 Applying viewMatrix to the blackhole camera plane
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-02-28 14:15:31 +01:00
Wilhelm Björkström 2d092e75d4 Moved spherical coordinates conversion to shader.
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-02-28 14:03:12 +01:00
Wilhelm Björkström 7f7f2e5854 Environment map from spherical coordinates.
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-02-28 14:03:12 +01:00
Wilhelm Björkström 02cc35e424 Blackhole.profile
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-02-28 14:03:12 +01:00
Wilhelm Björkström b2332f00f5 WIP: CMake build with CUDA
There is still a problem with the CMakeList that adds two unwanted tags "/MP /bigobj", have to be manually removed from the CUDA compile commands in MSVS as of right now

Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-02-28 14:03:12 +01:00
Emil Wallberg 9fe0fdeea5 WIP: CUDA build setup with CMake
The current CUDA build setup fails due to invalid flags in the nvcc command, leading to the error:

nvcc fatal: A single input file is required for a non-link phase when an output file is specified

The problematic flags are /MP and /bigobj, which cause nvcc to misinterpret the command structure. Removing these flags allows the compilation to succeed.

Further investigation is needed to determine how they can be removed form the CMake build system.
2025-02-28 14:03:12 +01:00
Emil Wallberg 7ec8e33678 Refractor of blackhole renderable 2025-02-28 14:03:12 +01:00
Emil Wallberg 12de1366ec Texture rendering
Rendering texture to the camera quad

Co-Authored-By: Wilhelm Björkström <143391787+Grantallkotten@users.noreply.github.com>
2025-02-28 14:03:12 +01:00
Emil Wallberg 0a05bfff24 Camera Quad, Rendering screen
A quad in screen space that will be used to render the result of blackhole ray tracing

Co-Authored-By: Wilhelm Björkström <143391787+Grantallkotten@users.noreply.github.com>
2025-02-28 14:03:12 +01:00
Emil Wallberg 64338da974 Init of black hole module 2025-02-28 14:03:12 +01:00
Wilhelm Björkström e6a477c8d2 Applying viewMatrix to the blackhole camera plane
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-02-28 13:56:08 +01:00
Wilhelm Björkström 7ba7875ba7 Merge branch 'thesis/2025/black-hole' of https://github.com/OpenSpace/OpenSpace into thesis/2025/black-hole 2025-02-28 10:47:21 +01:00
Wilhelm Björkström 06b7a49699 Moved spherical coordinates conversion to shader.
Co-Authored-By: Emil Wallberg <49481622+EmilWallberg@users.noreply.github.com>
2025-02-28 10:41:22 +01:00