Skip to content

Commit

Permalink
Merge branch 'main' into feat/yaw
Browse files Browse the repository at this point in the history
  • Loading branch information
vasarhelyi committed Nov 12, 2023
2 parents b4a6fe0 + 5ef3cfb commit f83f6b4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- The static CSV import option of the "Generate Markers" operator got fixed,
now it works properly without runtime errors
- Fixed the static CSV import option of the "Generate Markers" operator.

## [3.0.0] - 2023-10-22

Expand Down
7 changes: 6 additions & 1 deletion doc/modules/ROOT/pages/concepts.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,12 @@ Note that the automatic transition planner tries to find an optimal matching bet

A drone show does not end with the last visible formation on the sky -- one should also bring the drones back to the takeoff area in a safe manner. This is typically done in two parts: the _return-to-home_ (RTH) maneuver makes the drones fly back above the takeoff area to a designated altitude (typically between 10-20 meters), while the _landing_ maneuver lands them in a straight vertical line. In *Skybrush Studio for Blender*, the RTH maneuver is simply treated as a transition to an extra formation in which the desired positions of the drones are arranged in a grid identical to the takeoff grid, lifted 10-20 meters above ground. The landing maneuver is optional; the firmware running on Skybrush-compatible drones will land the drones automatically when they reach the end of the show trajectories, therefore you only need to design the RTH maneuver.

NOTE: It is not guaranteed that each drone will land at the same position where it took off from. In the vast majority of cases, they will land at a different position in the grid. This is intentional; safe collision-free trajectories are easier and faster to design when the software is free to choose which drone should occupy which landing position.
NOTE: While using the regular return to home, it is not guaranteed that each drone will land at the same position where it took off from. In the vast majority of cases, they will land at a different position in the grid. This is intentional; safe collision-free trajectories are easier and faster to design when the software is free to choose which drone should occupy which landing position. If you need to enforce that all drones return to their individual takeoff places, use the smart return to home pro feature that creates a more complex transition for the entire swarm that ensures collision free transition for all drones to their own initial location.


== Light design

*Skybrush Studio for Blender* also supports flawless light design for your drone light shows. In Blender we support a single RGB color to be mapped to each drone at each frame in the timeline by simple baked colors or by complex parametric light effects overlayed to the base color. The RGB color output from Blender will be transformed to the RGB or RGBW color of your led driver on your drones by the Skybrush backend and firmware. There are several smart tools dedicated in *Skybrush Studio for Blender* for light design, to see these options please checkout the description of the xref:panels/leds.adoc[LEDs tab].


== Useful Blender settings
Expand Down
2 changes: 2 additions & 0 deletions doc/modules/ROOT/pages/panels/leds/light_effects.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ Use the btn:[Effect Type] dropdown list to select a light effect based on a colo

The most trivial usage of a color image is where e.g. the `X` axis represents time (`TEMPORAL` output type) and all pixel columns along the `Y` axis at a given `X` represent "discrete color ramps" for different time instants (e.g. using the 'INDEXED_BY_FORMATION' output type). This way color effect design is reduced back to simple color image design that can be performed with any external tool.

Another usage is to project a static image onto the drones in a grid formation, using the properly selected `Gradient (...)` axis assignments on both axis.

Note that there is no interpolation between pixels in the color image, they are selected for each drone and each frame discretely. Therefore, color images should be used with a width/height that correspond to the selected output mapping perfectly (e.g. same height as the number of drones, same width as the number of frames in the light effect etc.), or they are suggested to be smooth images without sharp edges to compensate for the rounding errors of the discrete mapping. You can also scale up a low-resolution image in an external image editor tool and use the scaled-up version to simulate interpolation.

== Temporal constraints
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "skybrush-studio-for-blender"
version = "3.0.0"
version = "3.0.1"
description = "Skybrush Studio for Blender is a professional drone show designer framework integrated into Blender"
license = "GPL-3.0-or-later"
authors = ["CollMot Robotics Ltd. <hello@skybrush.io>"]
Expand Down
2 changes: 1 addition & 1 deletion src/addons/ui_skybrush_studio.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Skybrush Studio",
"author": "CollMot Robotics Ltd.",
"description": "Extends Blender with UI components for drone show design",
"version": (3, 0, 0),
"version": (3, 0, 1),
"blender": (3, 3, 0),
"category": "Interface",
"doc_url": "https://doc.collmot.com/public/skybrush-studio-for-blender/latest/",
Expand Down
6 changes: 1 addition & 5 deletions src/modules/sbstudio/plugin/operators/export_to_csv.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
"""This file is mostly a copy of addons/io_export_skybrush_csv.py, which
will probably be deprecated soon as its functionality is merged with the
"main" Blender addon.
The operator provided in this file exports drone show trajectories and light
"""The operator provided in this file exports drone show trajectories and light
animation to a simple (zipped) .csv format compatible with the Skybrush suite.
The primary and recommended drone show format of the Skybrush suite is the
Expand Down
2 changes: 1 addition & 1 deletion tbump.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[version]
current = "3.0.0"
current = "3.0.1"
regex = '''
(?P<major>\d+)
\.
Expand Down

0 comments on commit f83f6b4

Please sign in to comment.