Commit Graph

7817 Commits

Author SHA1 Message Date
Emma Broman b1e03c2b3b Revert "Fix problem with launcher not working..." as it did not actually solve the problem
This reverts commit f4cbadd822.
2021-03-03 08:20:02 +01:00
Malin E da981d766f Merge pull request #1488 from OpenSpace/feature/multitexturing
Feature/multitexturing (closes #112)
2021-03-02 15:59:25 +01:00
Malin Ejdbo 4fb8a36952 Merge branch 'master' into feature/multitexturing
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Malin Ejdbo acc2947576 Update Insight model version 2021-03-02 15:31:59 +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 f4cbadd822 Fix problem with launcher not working if user profile folder doesn't exist 2021-03-02 08:52:37 +01:00
Emma Broman 63fa95504c Expose ImGui external to other modules
And update demo function name to match new version
2021-03-02 08:48:25 +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
Micah Acinapura eec6b15781 Feature/user profiles assets (#1496)
* added user profile/asset tokens to config, launcher and profile editor


* creating one user directory for data, config, screenshots, recordings
2021-03-02 01:36:32 -05:00
Emma Broman 157ffff25b Update imgui external 2021-03-01 13:24:28 +01:00
GPayne 35b96967af Switched kameleon module ref to commit with linux build fixes 2021-02-26 16:07:14 -07:00
Emma Broman a901594907 Generate docs for RenderablePlaneImages 2021-02-25 13:47:49 +01:00
Emma Broman d5671e0321 Include potential explanation when stringifying TestResult Offense 2021-02-25 12:57:46 +01:00
Emma Broman 10eabaa1a6 Prevent TaskRunner crashing on specification error 2021-02-25 12:46:57 +01:00
Emma Broman d630f85cf4 Fix crash in OpenSpaceTest due to missing initialization of the LogManager 2021-02-23 11:07:42 +01:00
Emma Broman ac095acae4 Fix forgotten rename from 'Size' to 'Radius' 2021-02-23 10:50:35 +01:00
Emma Broman bc719f195c Add examples for circle, ellipse and elliptic disc 2021-02-23 10:50:04 +01:00
Emma Broman b07320d1da Add missing documentation for NonUniformStaticScale 2021-02-23 10:12:26 +01:00
Alexander Bock cf3a8cd9b5 Fix crash in TaskRunner and Wormhole due to missing initialization of the LogManager 2021-02-23 09:51:46 +01:00
Micah ed903155b6 added mtl to updated models, except iss 2021-02-23 01:08:11 -05:00
Jonathas Costa c02d4b808e Merge pull request #1505 from OpenSpace/issue/1099
Issue/1099
2021-02-22 12:09:05 -05:00
Jonathas Costa dd40cf8198 Merge branch 'master' into issue/1099 2021-02-22 11:51:30 -05:00
Emma Broman b381bd83d3 Add module property for exoplanet habitable zone opacity 2021-02-22 09:38:59 +01:00
Alexander Bock 8ae817f233 Fix coding style issues 2021-02-19 13:48:23 +01:00
Jonathas Costa ea42de503a Removed test color left by mistake. 2021-02-18 17:37:50 -05:00
Alexander Bock cb5929972a Don't call RenderableOrbitalKeplers's initializeGL only once 2021-02-18 22:42:17 +01:00
Jonathas Costa 10634a5a0e Merge branch 'master' into issue/1099 2021-02-18 11:53:57 -05:00
Malin E 9acbdb2446 Merge pull request #1504 from OpenSpace/issue/1466
Issue/1466
2021-02-18 09:03:35 +01:00
Jonathas Costa c21752f93b Fixed the forward/backward scattering effects. 2021-02-17 21:31:42 -05:00
Jonathas Costa dfd60dfeec Changed to full texture control as Carter wanted. 2021-02-17 20:53:51 -05:00
Jonathas Costa 0307d94983 Added old rendering method for rings texture as an option. 2021-02-17 16:02:14 -05:00
Gene Payne f4e7d01aa7 Fixes for Issue #1409 (#1501)
* Fixed renderablesmallbody selective rendering props to accept asset file settings

* Set to only show selective rendering log info msg if render size is 1

* Mirrored selective rendering behavior from smallbody to satellites

* Added property coupling of values to satellite/asteroid render settings for size, start index, upperlimit

* Fix for selective rendering with synced render settings

* Removed redundant property definitions for codegen compliance

* Improvements to documentation and handling values spec'd in asset file

* Fix for satellites: selective rendering settings specified from assets
2021-02-17 12:41:05 -07:00
Alexander Bock 6837bad5b0 Tiny cleanups 2021-02-17 16:18:08 +01:00
Malin Ejdbo d3a04825bb Merge branch 'master' into issue/1466 2021-02-17 14:25:55 +01:00
Malin Ejdbo 9372382e78 Add possibility to have * at the end and tags + * 2021-02-17 14:16:10 +01:00
Malin Ejdbo 4b6a61354d Add deprecation warning when using several model files for one model 2021-02-17 10:03:54 +01:00
Malin Ejdbo 9143316111 Match property name better to avoid false matches 2021-02-16 09:28:02 +01:00
Alexander Bock aeb726e5f2 Update Ghoul submodule to make it compile in Linux again 2021-02-15 17:46:48 +01:00
Malin Ejdbo edff4b537c Add warning if regex contains two or more wildcards
* Find that replaces std::regex currently does not support two or more
wildcards in an expression
2021-02-15 14:30:25 +01:00
Malin Ejdbo ace8df0692 Do not miss matches when searching with regex 2021-02-15 14:28:23 +01:00
Alexander Bock da31d1e375 Properly handle SpecificationErrors when initializing Modules (closes #1502) 2021-02-15 11:20:27 +01:00
Alexander Bock 23f24c50fe Update Ghoul and remove explicit generation of ConsoleLog 2021-02-13 18:33:28 +01:00
Alexander Bock 2de8ade2b6 Update Ghoul repository 2021-02-13 17:47:18 +01:00
Alexander Bock dfa223abef Make use of std::filesystem::path and cleanup specification error messages 2021-02-13 12:00:26 +01:00
Alexander Bock c039258f64 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2021-02-13 10:44:31 +01:00
Alexander Bock e7bcb774ee Add new verifiers for files and directories. Update codegen to be able to create these 2021-02-13 10:44:21 +01:00
Malin Ejdbo f34805beeb Remove false matches while matching whole string 2021-02-12 16:53:04 +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
Alexander Bock afd484044d Better support for colors in dictionaries (closes #1489)
- Add a new Color3Verifier and Color4Verifier that checks components to be in [0,1]
 - Update codegen to add a new attribute [[codegen::color()]] to mark a vec3/vec4 to be a color value
 - Update RenderableTrail to use the new verion
2021-02-12 12:59:00 +01:00
Malin Ejdbo 5772fc621c Improve find that replace regex
* Enable * in the begining of string

* Enable search without *
2021-02-12 11:23:45 +01:00