Commit Graph

186 Commits

Author SHA1 Message Date
Emma Broman 57dc7dd6b8 Add some missing includes 2022-09-16 08:18:54 +02:00
Emma Broman 47b36e5036 Add multiply color to renderableorbitdisc 2022-08-30 13:06:14 +02:00
Alexander Bock 163ac4dcef Cleanup of mostly asset files
- Fixes for all files
 - constexpr cleanup
 - Cosmetic changes
 - Remove punctuation from the end of messages
2022-07-28 17:21:59 +02:00
Alexander Bock c1252902c7 More Code Cleanup (#2192)
* Harmonizing ( and ) in function calls
* static const -> constexpr
* Fix compile issue
* Unify shader tab size
* Add _fs and _vs to shaders
* Harmonize spacing
2022-07-26 11:22:41 +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 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
Emma Broman 92eefa8189 Add enabled property to Exoplanets and Skybrowser module (#1945)
* Add enabled property to exoplanets and sky browser module

* Create assets for default settings and restructure assets into a components folder

* Update exoplanets data

* Set sky browser enabled to true per default and include hover circle asset

* Add name and description of hover circle, and used synced version of ring image
2022-04-25 15:10:08 +02:00
Alexander Bock c206da4a98 Coding style adaptations 2022-04-10 23:25:37 +02: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 3844df20c9 Feature/codegen lua (#1906)
Adapting Lua functions to new codegen functionality
Improve the documentation itself
Add some styling to generated documentation
Have parameter names for Lua-defined Lua function documentation

Co-authored-by: Emma Broman <emma.broman@liu.se>
2022-03-21 09:05:37 +01:00
Alexander Bock 30212b6768 Adapt to new auto coding style 2022-02-10 15:20:21 +01:00
Alexander Bock 94d9a5a643 Check if the exoplanets data path is configured before trying to access it (closes #1861) 2022-01-31 14:28:45 +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
Emma Broman d7565f65ee Add script to download the expolanets dataset for the dataprep task
* Python script to download all the columns needed
* Update task file. Use strings instead of std::filesystem::path, so that relative paths and tokens can be used
2021-11-15 13:44:57 +01:00
Alexander Bock 55ee3d2785 Remove the user data from the Lua function definition 2021-11-04 16:27:54 +01:00
Alexander Bock 4a860fb01d Some code facelifting 2021-10-14 10:31:46 +02:00
Alexander Bock db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Alexander Bock af617d1d10 Feature/lua function cleanup (#1719)
General cleanup of Lua functions and handling of variable extract from a Lua state
2021-08-19 16:02:14 +02:00
Emma Broman 16173d7afe Merge branch 'master' into thesis/2019/camera-paths and resolve conflicts
# Conflicts:
#	modules/globebrowsing/globebrowsingmodule.cpp
#	modules/globebrowsing/globebrowsingmodule_lua.inl
2021-07-09 15:43:17 +02:00
Alexander Bock 87da9a27ab Feature/path normalization (#1674)
* Path normalization (making sure there are fewer cases of '"..."'
* Using more std::filesystem::path instead of std::string
* Update Ghoul
2021-07-01 23:46:22 +02:00
Emma Broman 77bdfaefd6 Move camera path code into core and refactor navigation code a bit 2021-06-23 09:12:36 +02:00
Emma Broman 1695937749 Feature/numeric slider updates (#1609)
* Remove Logarithmic ViewOption and instead always use exponent of NumericalProperty + set exponent of some renderables' properties

* Add MinMaxRange ViewOption for Vec2 properties

* Add MinMaxRange viewoption to some existing vec2 properties and combine some other related properties to be able to utilize it. For example Min and Max label sizes, fade in/out distances, inner and outer radius. OBS! Includes renaming several properties (**breaking change**)

* Refactor and document labels code. OBS! Includes renaming several properties (**breaking change**)

* Add comments for some assets that have labels that are not working correctly


Renderables with rename properties: RenderableLabels , GlobeLabelsComponent, RenderableBillboardsCloud, RenderableDUMeshes, RenderableRadialGrid )
2021-05-28 17:00:55 +02:00
Alexander Bock 63cbf270ee Adapt to changes in codegen that require specifying the identifier in the codegen::doc function 2021-05-25 23:10:12 +02: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 92432caed2 Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string 2021-05-17 00:23:15 +02:00
Alexander Bock ccdc5a5dc3 Feature/filesystem cleanup (#1587)
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
2021-05-16 20:26:49 +02:00
Alexander Bock 139d2c6c6d Apply more codegen checks (#1579)
* Apply more codegen checks
2021-05-08 00:44:23 +02:00
Alexander Bock e88650f22c Tiny coding style fixups 2021-03-27 23:49:02 +01:00
Emma Broman 20519d007b Remove hardcoded path to B-V colormap (#1531)
Also prevent future problems in reading the file (e.g. if number of lines of comments would change)
2021-03-15 13:22:41 +01:00
Emma Broman 97144df4da Add a colored glare to exoplanet stars (#1511)
* Add possibility to multiply color to an image plane

* Add a colored glare to exoplanet stars (issue #1305)
2021-03-02 09:30:03 +01:00
Emma Broman 29e77534c7 Make use of new verifiers (Color and File) (#1510)
* Use codegen for renderable discs

* Utilize color and file verifier

* Add missing property assignment in exoplanets module
2021-03-02 08:11:49 +01:00
Emma Broman b381bd83d3 Add module property for exoplanet habitable zone opacity 2021-02-22 09:38:59 +01:00
Emma Broman e21edaa13e Expose exoplanet creation settings to user as module properties (#1499)
* Expose exoplanet creation settings to user as module properties

* Set default textures from asset to avoid explicit paths to sync folder
2021-02-12 14:32:37 +01:00
Emma Broman f9e712a8e7 Supress a warning in exoplanets task 2021-02-09 13:56:42 +01:00
Alexander Bock 6d821d4f91 Feature/codegen (#1480)
* Add the ability to automatically generate code to extract values out of a Dictionary (see https://github.com/openspace/codegen for more information on how to use this)
* Applied this technique to a large number of cases in the codebase
* Don't add _codegen files to the repository

Co-authored-by: Emma Broman <emma.broman@liu.se>
2021-02-09 09:12:43 +01:00
Emma Broman f2eb81a450 Merge branch 'master' into issue/1438 2021-02-01 13:16:18 +01:00
Emma Broman ef091a1044 Adress review comments 2021-02-01 11:01:14 +01:00
Emma Broman 54c5b052a5 Update disc and habitable zone textures 2021-01-29 13:14:40 +01:00
Emma Broman dc067e0d5f Add 1 AU size comparison ring for exoplanet systems (closes #1413) 2021-01-28 11:31:26 +01:00
Emma Broman f7e1d48d83 Solve interpolation issue at egde of texture (closes issue #1430) 2021-01-26 15:09:24 +01:00
Emma Broman 3fcc02d0b5 Update habitable zone textures 2021-01-26 15:09:24 +01:00
Emma Broman e90b52af93 Add wrapping mode to texture component 2021-01-26 15:09:24 +01:00
Emma Broman 968d0eea64 Move habitable zone renderable to space module 2021-01-26 15:09:23 +01:00
Emma Broman 6380e5b307 Change plane size to radius rather than diameter 2021-01-26 15:09:22 +01:00
Emma Broman fd835688b5 Add a habitable zone renderable 2021-01-26 15:09:15 +01:00
Emma Broman 37aa7c6ab4 Tiny cleanup 2021-01-26 15:08:38 +01:00
Emma Broman 72ebeb7f6f Add generic texture component for renderables 2021-01-26 15:08:37 +01:00
Emma Broman c075dbcdeb Add simple plane geometry class 2021-01-26 15:08:37 +01:00
Emma Broman b2c5e334f8 Merge pull request #1436 from OpenSpace/issue/1395
Add habitable zone for exoplanet systems (#1436)

* add lumosity and temperature data for the stars
* add Lua function to generate a cached 1 pixel texture on demand
* minor updates to RenderableOrbitDisc to make it more intuitive. Size is now the semi-major axis.

closes #1395
2021-01-26 14:48:11 +01:00