Skip to content

Commit 00a5cde

Browse files
committed
Merge tag '0.16.0-dev' into develop
0.16.0-dev
2 parents f9e9835 + 1e1c346 commit 00a5cde

2 files changed

Lines changed: 299 additions & 130 deletions

File tree

README.md

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ This is a modified version of Alacritty that includes:
1414
- Drawing time series charts (prometheus based or internal counters)
1515
- Drawing prometheus alerts, static reference units and other decorations on the time series (see below for example).
1616
- Hexagon background decorations (Like James Webb Telescope, Starcraft).
17-
- Lyon decorations (these are decorations that can be generated by creating lyon tesselations, text and wgpu not supported yet).
17+
- Nannou decorations (these are decorations that can be generated by creating lyon tesselations, text and wgpu not supported yet).
1818
- Moon phase decorations (Gather moon-phase data and use lyon to draw it).
1919
- "Suspended in a light beam" (from Sagan's poem The Pale Blue Dot). a beam of "light" that travels through the background decorations "now and then".
2020
- Shader Toy [Vortex Street](https://www.shadertoy.com/view/MlS3Rh)
2121
- Shader Toy [Snowy](https://www.shadertoy.com/view/4dl3R4)
2222

23-
## Lyon State
23+
## Nannou State
2424

25-
Nannou crate is not being worked on much and has some vulnerabilities, this project has moved to lyon.
25+
We're back with nannou, using a small fork sebop_nannou.
2626

2727
## Integrating Shader Toys
2828

@@ -114,14 +114,15 @@ The goal is to make environment immerssive and learn about terminals, generative
114114
And just have fun in general...
115115

116116
## TODO:
117-
- The moon phase is not working as expected when moving to Lyon. The stroke-path tesselator vs fill-tesselator needs to be worked on.
118117
- The toml configuration for the charts/decorations looks ugly since it's array based. As much as I hate yaml I don't know how to properly encode the same functionality there without making a mess.
119118

120119
## Mirror the screenshot setup
121120

122121
```yaml
123-
key_bindings:
124-
- { key: Comma, mods: Alt, action: ToggleChartShow } # This hides the charts TODO hide decorations
122+
keyboard:
123+
bindings:
124+
- { key: Comma, mods: Alt, action: ToggleChartShow }
125+
- { key: Period, mods: Alt, chars: "\x1b." }
125126
charts:
126127
default_dimensions:
127128
x: 50
@@ -130,6 +131,13 @@ charts:
130131
x: 1000
131132
spacing: 10
132133
charts:
134+
- name: async loaded items
135+
series:
136+
- name: Number of input items for TimeSeries
137+
type: async_items_loaded
138+
refresh: 1
139+
color: "0x9c27b0"
140+
alpha: 1.0
133141
- name: output newlines
134142
series:
135143
- name: output
@@ -226,9 +234,27 @@ decorations:
226234
radius: 100
227235
- type: Triangles
228236
props:
229-
type: Lyon
237+
type: Nannou
230238
props:
231239
color: "0x1958a7"
232240
alpha: 0.2
233241
radius: 100 # This needs to be the same as the above radius or the hexs won't match
242+
# - type: Points
243+
# props:
244+
# type: Hexagon
245+
# props:
246+
# animated: true
247+
# color: "0x1958a7"
248+
# alpha: 0.4
249+
# radius: 100
250+
# update_interval: 15
251+
# - type: Lines
252+
# props:
253+
# type: Hexagon
254+
# props:
255+
# color: "0x1958a7"
256+
# alpha: 0.3
257+
# radius: 100
258+
#debug:
259+
# print_events: true
234260
```

0 commit comments

Comments
 (0)