From f9f61e1fddf98ea69348ce3757f5dbc746333cd9 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Fri, 26 Sep 2025 17:46:49 +0200 Subject: [PATCH] Move the primitives example asset into the existing structure --- data/assets/examples/primitives.asset | 70 ------------------- ...nts_ring.asset => radialgrid_circle.asset} | 8 +-- .../radialgrid_ellipse.asset | 32 +++++++++ 3 files changed, 36 insertions(+), 74 deletions(-) delete mode 100644 data/assets/examples/primitives.asset rename data/assets/examples/renderable/renderableradialgrid/{radialgrid_segments_ring.asset => radialgrid_circle.asset} (78%) create mode 100644 data/assets/examples/renderable/renderableradialgrid/radialgrid_ellipse.asset diff --git a/data/assets/examples/primitives.asset b/data/assets/examples/primitives.asset deleted file mode 100644 index 3e2cb1432f..0000000000 --- a/data/assets/examples/primitives.asset +++ /dev/null @@ -1,70 +0,0 @@ -local AU = 149597870700 -- 1 AU - -local Circle = { - Identifier = "ExampleCircle", - Transform = { - Scale = { - Type = "StaticScale", - Scale = AU - } - }, - Renderable = { - Type = "RenderableRadialGrid", - Color = { 0.6, 0.6, 0.8 }, - LineWidth = 3.0, - GridSegments = { 1, 1 }, - CircleSegments = 64, - Radii = { 0.0, 1.0 } - }, - GUI = { - Name = "Example Circle", - Path = "/Examples/Primitives" - } -} - -local Ellipse = { - Identifier = "ExampleEllipse", - Transform = { - Scale = { - Type = "NonUniformStaticScale", - Scale = { 1.5, 1.0, 1.0 } - } - }, - Renderable = { - Type = "RenderableRadialGrid", - Color = { 0.6, 0.8, 0.6 }, - LineWidth = 3.0, - GridSegments = { 1, 1 }, - CircleSegments = 64, - Radii = { 0.0, AU } - }, - GUI = { - Name = "Example Ellipse", - Path = "/Examples/Primitives" - } -} - - -asset.onInitialize(function() - openspace.addSceneGraphNode(Circle) - openspace.addSceneGraphNode(Ellipse) -end) - -asset.onDeinitialize(function() - openspace.removeSceneGraphNode(Ellipse) - openspace.removeSceneGraphNode(Circle) -end) - -asset.export(Circle) -asset.export(Ellipse) - - - -asset.meta = { - Name = "Primitives Example", - Description = [[Examples of different simple rendered primitives, such as circles - and ellipses.]], - Author = "OpenSpace Team", - URL = "http://openspaceproject.com", - License = "MIT license" -} diff --git a/data/assets/examples/renderable/renderableradialgrid/radialgrid_segments_ring.asset b/data/assets/examples/renderable/renderableradialgrid/radialgrid_circle.asset similarity index 78% rename from data/assets/examples/renderable/renderableradialgrid/radialgrid_segments_ring.asset rename to data/assets/examples/renderable/renderableradialgrid/radialgrid_circle.asset index e5cb56fb29..1723373213 100644 --- a/data/assets/examples/renderable/renderableradialgrid/radialgrid_segments_ring.asset +++ b/data/assets/examples/renderable/renderableradialgrid/radialgrid_circle.asset @@ -1,16 +1,16 @@ --- Ring --- The `RenderableRadialGrid` can also be used to create a simple ring. This is done by +-- Circle +-- The `RenderableRadialGrid` can also be used to create a simple circle. This is done by -- setting the number of segments in each direction to 1 and make sure the inner radius -- is zero (which is the default). local Node = { - Identifier = "RenderableRadialGrid_Example_Ring", + Identifier = "RenderableRadialGrid_Example_Circle", Renderable = { Type = "RenderableRadialGrid", GridSegments = { 1, 1 } }, GUI = { - Name = "RenderableRadialGrid - Ring", + Name = "RenderableRadialGrid - Circle", Path = "/Examples" } } diff --git a/data/assets/examples/renderable/renderableradialgrid/radialgrid_ellipse.asset b/data/assets/examples/renderable/renderableradialgrid/radialgrid_ellipse.asset new file mode 100644 index 0000000000..e4f94fc4fc --- /dev/null +++ b/data/assets/examples/renderable/renderableradialgrid/radialgrid_ellipse.asset @@ -0,0 +1,32 @@ +-- Ellipse +-- The `RenderableRadialGrid` can also be used to create a simple ellipse. This is done by +-- setting the number of segments in each direction to 1 and make sure the inner radius +-- is zero (which is the default). By then applying a +-- [NonUniformStaticScale](#base_transform_scale_nonuniformstatic) to the scene graph node +-- this circle can be deformed into an ellipse. + +local Node = { + Identifier = "RenderableRadialGrid_Example_Ellipse", + Transform = { + Scale = { + Type = "NonUniformStaticScale", + Scale = { 1.5, 1.0, 1.0 } + } + }, + Renderable = { + Type = "RenderableRadialGrid", + GridSegments = { 1, 1 } + }, + GUI = { + Name = "RenderableRadialGrid - Ellipse", + Path = "/Examples" + } +} + +asset.onInitialize(function() + openspace.addSceneGraphNode(Node) +end) + +asset.onDeinitialize(function() + openspace.removeSceneGraphNode(Node) +end)