Commit Graph

82 Commits

Author SHA1 Message Date
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
Emil Axelsson 6d725a7d50 Revive screen space browser and add example (#932)
* Revive screen space browser and add example
* Add reload triggerproperty and change autoplay policy
2019-07-16 13:29:21 +02:00
Emil Axelsson e78121febc Feature/screenspace renderables (#830)
* Add ability to position screen space renderables in 3D
  * Independent face camera setting
  * More intuitive local rotation
  * Cleanup
  * Introduce global and master rotation. Remove DisableSceneOnMaster. Revisit screenspace renderables.
2019-04-24 13:34:01 +02:00
Alexander Bock bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Alexander Bock a993c8ef65 Remove quad from screenspacerenderable (working on #525) 2018-09-03 00:58:08 -04:00
Alexander Bock 4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Alexander Bock db7ae7e384 Issue/453 (#556)
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
Alexander Bock 58f79a8851 Issue/518 (#529)
* Adding ScreenSpaceSpout object to display spout textures in screen space
 * Enable the clearing of option properties
 * Fix crash in ScreenSpaceImageLocal specification
 * Split RenderablePlane into RenderablePlaneImageLocal and RenderablePlaneImageOnline
 * Add RenderablePlane Spout
 * Rename Texture parameter in ScreenSpaceImageOnline into URL

Closes #518
2018-02-23 13:24:35 -05:00
Alexander Bock 47233b8e6f Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases 2017-12-31 17:31:10 -05:00
Alexander Bock dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock 026f51735b Show distance from current focus object
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
Alexander Bock 7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Alexander Bock b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Alexander Bock 78e3320cde Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
Alexander Bock aa969795cc Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296) 2017-10-10 14:16:55 -04:00
Alexander Bock 2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs
Adjust accordingly
2017-03-01 22:03:48 -05:00
Alexander Bock 8fd60ce8e6 - Remove documentation.h include and replace with forward declaration
- Move Documentation struct into documentation namespace
2017-03-01 18:13:15 -05:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock d139dd2d22 Clean include guards in OpenSpace core
Remove unused files
2016-12-09 13:54:22 +01:00
Alexander Bock af21e40074 Split up scalar, vector, and matrix properties into their own files for improved compile times 2016-11-27 01:17:38 +01:00
Alexander Bock 8867b3439f Add central location for the core to register documentations
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
2016-09-19 14:03:42 +02:00
Alexander Bock 9fb7814145 Add visibility toggle to Property base class
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00