Commit Graph

121 Commits

Author SHA1 Message Date
Alexander Bock d81644ecc5 Move temporal information from the XML file format into the asset file 2021-12-31 12:23:28 +01:00
Alexander Bock 064a483b81 Cleanup and unifying coding style for asset files 2021-12-28 23:40:09 +01:00
Alexander Bock fdd995ba01 No longer require the filenames from a synced resource to start with a / 2021-12-28 00:10:01 +01:00
Malin E 01e17266b6 Merge pull request #1787 from OpenSpace/feature/multiple-joysticks
Feature/multiple joysticks
2021-12-22 13:22:01 +01:00
Alexander Bock debcb43ade Feature/assets (#1784)
General overhaul of the Asset loading system
2021-12-19 18:04:01 +01:00
Malin E 8766ba1242 Remove local variable in example 2021-11-30 17:22:46 +01:00
Malin E cc0a7b05ce Add example asset for binding property to joystick 2021-11-30 12:11:08 +01:00
eriksunden 24ce66aad4 Feature/tileinterpolation (#1769)
* Interpolation of tiles added to tileprovider, with additional new shaders to make this work.
 * Asset file for testing interpolation

Co-authored-by: tobiasp93 <tobias.pettersson@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2021-11-01 09:24:40 +01:00
ElonOlsson d7f9c1a124 merge with master 2021-10-14 11:07:01 -04:00
Alexander Bock 76dd45e5ce Event System (#1741)
* Add implementation of the EventEngine to handle global event chains
* Add properties to SceneGraphNodes to determine two distance radii for camera-based events
2021-10-11 21:53:00 +02:00
ElonOlsson 9d503ff86e Merge branch 'master' into thesis/2020/radiation 2021-09-17 11:06:15 -04:00
Micah af95d9895e update slidedeck example for actions 2021-09-14 12:25:05 -04:00
ElonOlsson 423d854615 Merge branch 'master' into thesis/2020/radiation 2021-09-13 18:23:33 -04:00
Emma Broman 82ecf60ea2 Issue/1527 - GlobeRotation (#1737)
* Add GlobeRotation and example

* Put latitude before longitude in GlobeTranslation files
2021-09-06 09:28:12 +02:00
Alexander Bock b649509bf0 Feature/model shader (#1723)
* Add support for RenderableModel to take custom shader code
 * Added example to highlight usage
2021-08-24 10:45:19 +02:00
Alexander Bock 34985f64a6 Feature/keybindings (#1708)
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
2021-08-18 10:58:20 +02:00
Emma Broman 2a5e6dc502 Make state machine's enter/exit scripts optional 2021-08-17 08:33:00 +02:00
ElonOlsson 743e2452f8 merge master to thesis branch 2021-08-16 15:23:49 -04:00
Emma Broman 8d7d8b9ba4 Feature/state machine (#1705)
* Fix script error in old state machine example

* Add a module with a more complex state machine, that can be created and controlled through the Lua API. Useful for interactive installations

* Add an example asset for the new state machine and rename the old linear "state machine" to luastatemachine


Co-authored-by: Malin Ejdbo <malin.ejdbo@gmail.com>
2021-08-16 09:29:45 +02:00
Micah 53c05ef1af updated globetranslation example to code changes 2021-08-03 11:24:16 -04:00
elon b248e23ea4 some minor fixes from notes on PR 2021-07-23 12:40:40 +02:00
Emma Broman 7461303aa5 Fix to make slide deck work with new strict Lua 2021-07-13 09:03:49 +02:00
Malin Ejdbo 89fa6de0b9 Add simple animation example asset 2021-06-17 11:16:29 +02:00
ElonOlsson 7689cf1f65 master merge 2021-06-16 18:22:57 -04:00
Malin Ejdbo d139b38d31 Seperate the different joystick configurations into their own assets 2021-06-11 16:30:16 +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
ElonOlsson fcc690fa09 master merge + seed point files from directory fix 2021-05-18 12:00:53 -04:00
ElonOlsson 9d1ece1163 finish merge + manual time offset property 2021-05-12 15:37:22 -04:00
Emma Broman 3d824f970e Fix misspelled function that prevented grids example asset from loading 2021-05-07 14:43:05 +02:00
Alexander Bock fb8e80ea80 Adjust tab width for asset and task files 2021-04-28 19:19:51 +02:00
Alexander Bock 94d2db7376 Fix an issue that prevented the spheres from being rendered 2021-04-16 17:24:41 +02: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
elon 8ea0f245d3 submodule update 2021-02-11 12:38:07 -05:00
elon 92529fa6d4 merging master, conflicts 2021-02-10 11:33:01 -05:00
Emma Broman 0b9b42e0bf Rename single color image function 2021-02-03 08:33:55 +01:00
Emma Broman f2eb81a450 Merge branch 'master' into issue/1438 2021-02-01 13:16:18 +01:00
Emma Broman 19e5960020 Small grid renderable updates/fixes (#1473)
* Make sure we have examples for all grid types

* Fix problems with blending when rendering transparent grids

* Rename 'GridColor' to 'Color' for better consistenty among renderables

* Fix issue with resizing box grid

* Avoid problems with line width on Mac
2021-01-28 09:22:50 +01:00
Emma Broman 8aad6f98bc Fix missing new line 2021-01-26 15:24:23 +01:00
Emma Broman 76d599d284 Add a basic disc renderable 2021-01-26 15:08:37 +01:00
Micah Acinapura 4935ae8814 Update keys for slidedeck example (#1320) 2020-10-13 09:20:25 +02:00
Micah 0f667685da update for modelgeometry; fix for pioneer sync 2020-10-09 16:28:22 -04:00
Christian Adamsson e3e471124c New asset fixes with transforms/versions. Colortable changed 2020-09-15 13:35:36 +02:00
Alexander Bock d4291163ba Move ColorTexture from RenderableModel to ModelGeometry 2020-08-18 16:00:32 +02:00
Emma Broman cb19f730df Mixed cleanup 2020-07-10 11:25:26 +02:00
Emma Broman bdb6e626ba Color values specified with vec3 instead of vec4 2020-07-10 11:25:26 +02:00
Emma Broman bdc7f7b637 Add example assets and cleanup code 2020-07-08 09:39:21 +02:00
GPayne ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06: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 f43bcadee3 Feature/navigation state (#930)
* Replace setCameraState with setNavigationState + equivalents
* Add documentation and verification of NavigationState-related interfaces
* Documentation and verification fixes
* Change reference frame behavior
* Scene fixes
* Replace earthrise recording with navigation state and time
2019-07-16 13:13:33 +02:00