Skip to content
Snippets Groups Projects
Commit e3f777c6 authored by iggy's avatar iggy Committed by q3k
Browse files

py: st[3|4]m refactoring

parent 55713608
No related branches found
No related tags found
1 merge request!35py: grand st3m unification
Hide whitespace changes
Inline Side-by-side
python_payload/main.py
+ 1
− 252
View file @ e3f777c6
......@@ -13,16 +13,12 @@ import st4m
from st4m.goose import Optional, List, ABCBase, abstractmethod
from st4m.ui.view import View, ViewManager, ViewTransitionBlend
from st4m.ui.menu import (
MenuItem,
MenuController,
MenuItemBack,
MenuItemForeground,
MenuItemNoop,
)
from st4m import Responder, InputState, Ctx
# from apps import flow3r
from st4m.ui.elements.menus import FlowerMenu, SimpleMenu
log.info("import apps done")
log.info(f"free memory: {gc.mem_free()}")
......@@ -36,255 +32,8 @@ log.info("calibrating captouch, reset volume")
captouch.calibration_request()
audio.set_volume_dB(0)
import math, random
from st3m.ui import xy_from_polar
WIDTH = 240
HEIGHT = 240
# Define a few RGB (0.0 to 1.0) colors
BLACK = (0, 0, 0)
RED = (1, 0, 0)
GREEN = (0, 1, 0)
BLUE = (0, 0, 1)
WHITE = (1, 1, 1)
GREY = (0.5, 0.5, 0.5)
GO_GREEN = (63 / 255, 255 / 255, 33 / 53)
PUSH_RED = (251 / 255, 72 / 255, 196 / 255)
tau = 2 * math.pi
vm = ViewManager(ViewTransitionBlend())
def lerp(a: float, b: float, v: float) -> float:
if v <= 0:
return a
if v >= 1.0:
return b
return a + (b - a) * v
class GroupRing(Responder):
def __init__(self, r=100, x=0, y=0):
self.r = r
self.x = x
self.y = y
self.items_ring = []
self.item_center = None
self.angle_offset = 0
self.ts = 0.0
def think(self, ins: InputState, delta_ms: int) -> None:
self.ts += delta_ms
self.item_center.think(ins, delta_ms)
for item in self.items_ring:
item.think(ins, delta_ms)
def draw(self, ctx: Ctx) -> None:
if self.item_center:
self.item_center.has_highlight = False
self.item_center.draw(ctx)
# self.items_ring[0].draw(ctx)
# ctx.save()
for index, item in enumerate(self.items_ring):
if item is None:
continue
angle = tau / len(self.items_ring) * index + self.angle_offset
(x, y) = xy_from_polar(self.r, angle)
ctx.save()
# ctx.translate(self.x + x, self.y + y)
ctx.rotate(-angle).translate(0, self.r).rotate(math.pi)
item.draw(ctx)
ctx.restore()
# ctx.restore()
class FlowerIcon(Responder):
"""
A flower icon
"""
def __init__(self, label="?") -> None:
self.x = 0.0
self.y = 0.0
self.size = 50.0
self.ts = 1.0
self.bg = (random.random(), random.random(), random.random())
self.label = label
self.highlighted = False
self.rotation_time = 0.0
self.petal_count = random.randint(2, 3)
self.petal_color = (random.random(), random.random(), random.random())
self.phi_offset = random.random()
self.size_offset = random.randint(0, 20)
def think(self, ins: InputState, delta_ms: int) -> None:
self.ts += delta_ms
pass
def draw(self, ctx: Ctx) -> None:
x = self.x
y = self.y
petal_size = 0
if self.petal_count:
petal_size = 2.3 * self.size / self.petal_count + self.size_offset
hs = 5
# print(self.ts)
ctx.save()
ctx.move_to(x, y)
ctx.text_align = ctx.CENTER
ctx.text_baseline = ctx.MIDDLE
ctx.font_size = self.size / 3
ctx.line_width = 5
if self.rotation_time:
phi_rotate = tau * ((self.ts % self.rotation_time) / self.rotation_time)
else:
phi_rotate = 0
for i in range(self.petal_count):
# ctx.save()
phi = (tau / self.petal_count * i + self.phi_offset + phi_rotate) % tau
r = self.size / 2
(x_, y_) = xy_from_polar(r, phi)
size_offset = abs(math.pi - (phi + math.pi) % tau) * 5
ctx.move_to(x + x_, y + y_)
if self.highlighted:
# ctx.move_to(x + x_ - petal_size / 2 - size_offset - 5, y + y_)
ctx.arc(x + x_, y + y_, petal_size / 2 + size_offset + 1, 0, tau, 0)
ctx.rgb(*GO_GREEN).stroke()
ctx.arc(x + x_, y + y_, petal_size / 2 + size_offset, 0, tau, 0)
ctx.rgb(*self.petal_color).fill()
# ctx.restore()
ctx.move_to(x, y)
if self.highlighted:
ctx.arc(x, y, self.size / 2, 0, tau, 1)
ctx.rgb(*GO_GREEN).stroke()
ctx.arc(x, y, self.size / 2, 0, tau, 0)
ctx.rgb(*self.bg).fill()
# label
# y += self.size / 3
w = max(self.size, ctx.text_width(self.label) + 10)
h = self.size / 3 + 8
if False and self.highlighted:
ctx.rgb(*BLACK).move_to(x, y - height / 2).round_rectangle(
x - width / 2, y - height / 2, width, height, width // 2
).fill()
ctx.rgb(*GO_GREEN).move_to(x, y).text(self.label)
else:
ctx.save()
ctx.translate(0, self.size / 3)
ctx.rgb(*PUSH_RED).round_rectangle(
x - w / 2, y - h / 2, w, h, w // 2
).fill()
ctx.rgb(*BLACK).move_to(x, y).text(self.label)
ctx.restore()
ctx.restore()
class FlowerMenu(MenuController):
"""
A circular menu with flowers.
"""
__slots__ = (
"_ts",
"_sun",
)
def __init__(self, items: List[MenuItem], vm: ViewManager, name="flow3r") -> None:
self._ts = 0
self.name = name
self.ui = GroupRing(r=80)
for item in items:
self.ui.items_ring.append(FlowerIcon(label=item.label()))
super().__init__(items, vm)
self._scroll_controller.wrap = True
self.icon = FlowerIcon(label=self.name)
self.icon.rotation_time = -5000
self.ui.item_center = self.icon
self.angle = 0
self.angle_step = 0.2
def think(self, ins: InputState, delta_ms: int) -> None:
super().think(ins, delta_ms)
self.ui.think(ins, delta_ms)
self._ts += delta_ms
def draw(self, ctx: Ctx) -> None:
ctx.gray(0)
ctx.rectangle(-120, -120, 240, 240).fill()
for item in self.ui.items_ring:
item.highlighted = False
item.rotation_time = 10000
current = self._scroll_controller.current_position()
self.ui.items_ring[int(current)].highlighted = True
self.ui.items_ring[int(current)].rotation_time = 3000
self.ui.angle_offset = math.pi - (tau * current / len(self.ui.items_ring))
self.ui.draw(ctx)
# print("here")
# ctx.font_size = 40
# ctx.text_align = ctx.CENTER
# ctx.text_baseline = ctx.MIDDLE
# angle_per_item = 0.4
# current = self._scroll_controller.current_position()
# for ix, item in enumerate(self._items):
# rot = (ix - current) * angle_per_item
# self._draw_text_angled(ctx, item.label(), rot, 1 - abs(rot))
def _draw_text_angled(
self, ctx: Ctx, text: str, angle: float, activity: float
) -> None:
size = lerp(20, 40, activity)
color = lerp(0, 1, activity)
if color < 0.01:
return
ctx.save()
ctx.translate(-120, 0).rotate(angle).translate(140, 0)
ctx.font_size = size
ctx.rgba(1.0, 1.0, 1.0, color).move_to(0, 0).text(text)
ctx.restore()
class SimpleMenu(MenuController):
"""
A simple line-by-line menu.
"""
def draw(self, ctx: Ctx) -> None:
ctx.gray(0)
ctx.rectangle(-120, -120, 240, 240).fill()
ctx.text_align = ctx.CENTER
ctx.text_baseline = ctx.MIDDLE
current = self._scroll_controller.current_position()
ctx.gray(1)
for ix, item in enumerate(self._items):
offs = (ix - current) * 30
size = lerp(30, 20, abs(offs / 20))
ctx.font_size = size
ctx.move_to(0, offs).text(item.label())
menu_music = SimpleMenu(
[
MenuItemBack(),
......
python_payload/main_st4m.py
+ 21
− 8
View file @ e3f777c6
......@@ -22,17 +22,30 @@ from st4m import Responder, InputState, Ctx
import math, hardware
from st4m.ui.elements.menus import SunMenu, SimpleMenu
vm = ViewManager(ViewTransitionBlend())
menu_music = SimpleMenu(
[
MenuItemBack(),
MenuItemNoop("Harmonic"),
MenuItemNoop("Melodic"),
MenuItemNoop("TinySynth"),
MenuItemNoop("CrazySynth"),
MenuItemNoop("Sequencer"),
],
vm,
)
def lerp(a: float, b: float, v: float) -> float:
if v <= 0:
return a
if v >= 1.0:
return b
return a + (b - a) * v
menu_apps = SimpleMenu(
[
MenuItemBack(),
MenuItemNoop("captouch"),
MenuItemNoop("worms"),
],
vm,
)
class USBIcon(Responder):
"""
......@@ -205,7 +218,7 @@ menu_apps = SimpleMenu(
vm,
)
menu_main = MainMenu(
menu_main = SunMenu(
[
MenuItemForeground("Music", menu_music),
MenuItemForeground("Apps", menu_apps),
......
python_payload/st4m/color.py 0 → 100644
+ 9
− 0
View file @ e3f777c6
# Define a few RGB (0.0 to 1.0) colors
BLACK = (0, 0, 0)
RED = (1, 0, 0)
GREEN = (0, 1, 0)
BLUE = (0, 0, 1)
WHITE = (1, 1, 1)
GREY = (0.5, 0.5, 0.5)
GO_GREEN = (63 / 255, 255 / 255, 33 / 255)
PUSH_RED = (251 / 255, 72 / 255, 196 / 255)
python_payload/st4m/ui/elements/__init__.py 0 → 100644
+ 0
− 0
View file @ e3f777c6
python_payload/st4m/ui/elements/menus.py 0 → 100644
+ 130
− 0
View file @ e3f777c6
from st4m.goose import Optional, List, ABCBase, abstractmethod
from st4m.ui.view import ViewManager
from st4m.ui.elements.visuals import Sun, GroupRing, FlowerIcon
from st4m.ui.menu import MenuController, MenuItem
from st4m import Ctx, InputState
from st4m.utils import lerp
import math
from st4m.vector import tau
class SimpleMenu(MenuController):
"""
A simple line-by-line menu.
"""
def draw(self, ctx: Ctx) -> None:
ctx.gray(0)
ctx.rectangle(-120, -120, 240, 240).fill()
ctx.text_align = ctx.CENTER
ctx.text_baseline = ctx.MIDDLE
current = self._scroll_controller.current_position()
ctx.gray(1)
for ix, item in enumerate(self._items):
offs = (ix - current) * 30
size = lerp(30, 20, abs(offs / 20))
ctx.font_size = size
ctx.move_to(0, offs).text(item.label())
class SunMenu(MenuController):
"""
A circular menu with a rotating sun.
"""
__slots__ = (
"_ts",
"_sun",
)
def __init__(self, items: List[MenuItem], vm: ViewManager) -> None:
self._ts = 0
self._sun = Sun()
super().__init__(items, vm)
def think(self, ins: InputState, delta_ms: int) -> None:
super().think(ins, delta_ms)
self._sun.think(ins, delta_ms)
self._ts += delta_ms
def _draw_text_angled(
self, ctx: Ctx, text: str, angle: float, activity: float
) -> None:
size = lerp(20, 40, activity)
color = lerp(0, 1, activity)
if color < 0.01:
return
ctx.save()
ctx.translate(-120, 0).rotate(angle).translate(140, 0)
ctx.font_size = size
ctx.rgba(1.0, 1.0, 1.0, color).move_to(0, 0).text(text)
ctx.restore()
def draw(self, ctx: Ctx) -> None:
ctx.gray(0)
ctx.rectangle(-120, -120, 240, 240).fill()
self._sun.draw(ctx)
ctx.font_size = 40
ctx.text_align = ctx.CENTER
ctx.text_baseline = ctx.MIDDLE
angle_per_item = 0.4
current = self._scroll_controller.current_position()
for ix, item in enumerate(self._items):
rot = (ix - current) * angle_per_item
self._draw_text_angled(ctx, item.label(), rot, 1 - abs(rot))
class FlowerMenu(MenuController):
"""
A circular menu with flowers.
"""
__slots__ = (
"_ts",
"_sun",
)
def __init__(self, items: List[MenuItem], vm: ViewManager, name="flow3r") -> None:
self._ts = 0
self.name = name
self.ui = GroupRing(r=80)
for item in items:
self.ui.items_ring.append(FlowerIcon(label=item.label()))
super().__init__(items, vm)
self._scroll_controller.wrap = True
self.icon = FlowerIcon(label=self.name)
self.icon.rotation_time = -5000
self.ui.item_center = self.icon
self.angle = 0
self.angle_step = 0.2
def think(self, ins: InputState, delta_ms: int) -> None:
super().think(ins, delta_ms)
self.ui.think(ins, delta_ms)
self._ts += delta_ms
def draw(self, ctx: Ctx) -> None:
ctx.gray(0)
ctx.rectangle(-120, -120, 240, 240).fill()
for item in self.ui.items_ring:
item.highlighted = False
item.rotation_time = 10000
current = self._scroll_controller.current_position()
self.ui.items_ring[int(current)].highlighted = True
self.ui.items_ring[int(current)].rotation_time = 3000
self.ui.angle_offset = math.pi - (tau * current / len(self.ui.items_ring))
self.ui.draw(ctx)
python_payload/st4m/ui/elements/visuals.py 0 → 100644
+ 178
− 0
View file @ e3f777c6
from st4m.utils import xy_from_polar
from st4m.color import PUSH_RED, GO_GREEN, BLACK
from st4m import Responder, Ctx, InputState
import random
import math
from st4m.vector import tau
class Sun(Responder):
"""
A rotating sun widget.
"""
def __init__(self) -> None:
self.x = 0.0
self.y = 0.0
self.size = 50.0
self.ts = 1.0
def think(self, ins: InputState, delta_ms: int) -> None:
self.ts += delta_ms
pass
def draw(self, ctx: Ctx) -> None:
nrays = 10
angle_per_ray = 6.28 / nrays
for i in range(nrays):
angle = i * angle_per_ray + self.ts / 4000
angle %= 3.14159 * 2
if angle > 2 and angle < 4:
continue
ctx.save()
ctx.rgb(0.5, 0.5, 0)
ctx.line_width = 30
ctx.translate(-120, 0).rotate(angle)
ctx.move_to(20, 0)
ctx.line_to(260, 0)
ctx.stroke()
ctx.restore()
ctx.save()
ctx.rgb(0.92, 0.89, 0)
ctx.translate(-120, 0)
ctx.arc(self.x, self.y, self.size, 0, 6.29, 0)
ctx.fill()
ctx.restore()
class GroupRing(Responder):
def __init__(self, r=100, x=0, y=0):
self.r = r
self.x = x
self.y = y
self.items_ring = []
self.item_center = None
self.angle_offset = 0
self.ts = 0.0
def think(self, ins: InputState, delta_ms: int) -> None:
self.ts += delta_ms
self.item_center.think(ins, delta_ms)
for item in self.items_ring:
item.think(ins, delta_ms)
def draw(self, ctx: Ctx) -> None:
if self.item_center:
self.item_center.has_highlight = False
self.item_center.draw(ctx)
# self.items_ring[0].draw(ctx)
# ctx.save()
for index, item in enumerate(self.items_ring):
if item is None:
continue
angle = tau / len(self.items_ring) * index + self.angle_offset
(x, y) = xy_from_polar(self.r, angle)
ctx.save()
# ctx.translate(self.x + x, self.y + y)
ctx.rotate(-angle).translate(0, self.r).rotate(math.pi)
item.draw(ctx)
ctx.restore()
# ctx.restore()
class FlowerIcon(Responder):
"""
A flower icon
"""
def __init__(self, label="?") -> None:
self.x = 0.0
self.y = 0.0
self.size = 50.0
self.ts = 1.0
self.bg = (random.random(), random.random(), random.random())
self.label = label
self.highlighted = False
self.rotation_time = 0.0
self.petal_count = random.randint(2, 3)
self.petal_color = (random.random(), random.random(), random.random())
self.phi_offset = random.random()
self.size_offset = random.randint(0, 20)
def think(self, ins: InputState, delta_ms: int) -> None:
self.ts += delta_ms
pass
def draw(self, ctx: Ctx) -> None:
x = self.x
y = self.y
petal_size = 0
if self.petal_count:
petal_size = 2.3 * self.size / self.petal_count + self.size_offset
hs = 5
# print(self.ts)
ctx.save()
ctx.move_to(x, y)
ctx.text_align = ctx.CENTER
ctx.text_baseline = ctx.MIDDLE
ctx.font_size = self.size / 3
ctx.line_width = 5
if self.rotation_time:
phi_rotate = tau * ((self.ts % self.rotation_time) / self.rotation_time)
else:
phi_rotate = 0
for i in range(self.petal_count):
# ctx.save()
phi = (tau / self.petal_count * i + self.phi_offset + phi_rotate) % tau
r = self.size / 2
(x_, y_) = xy_from_polar(r, phi)
size_offset = abs(math.pi - (phi + math.pi) % tau) * 5
ctx.move_to(x + x_, y + y_)
if self.highlighted:
# ctx.move_to(x + x_ - petal_size / 2 - size_offset - 5, y + y_)
ctx.arc(x + x_, y + y_, petal_size / 2 + size_offset + 1, 0, tau, 0)
ctx.rgb(*GO_GREEN).stroke()
ctx.arc(x + x_, y + y_, petal_size / 2 + size_offset, 0, tau, 0)
ctx.rgb(*self.petal_color).fill()
# ctx.restore()
ctx.move_to(x, y)
if self.highlighted:
ctx.arc(x, y, self.size / 2, 0, tau, 1)
ctx.rgb(*GO_GREEN).stroke()
ctx.arc(x, y, self.size / 2, 0, tau, 0)
ctx.rgb(*self.bg).fill()
# label
# y += self.size / 3
w = max(self.size, ctx.text_width(self.label) + 10)
h = self.size / 3 + 8
if False and self.highlighted:
ctx.rgb(*BLACK).move_to(x, y - height / 2).round_rectangle(
x - width / 2, y - height / 2, width, height, width // 2
).fill()
ctx.rgb(*GO_GREEN).move_to(x, y).text(self.label)
else:
ctx.save()
ctx.translate(0, self.size / 3)
ctx.rgb(*PUSH_RED).round_rectangle(
x - w / 2, y - h / 2, w, h, w // 2
).fill()
ctx.rgb(*BLACK).move_to(x, y).text(self.label)
ctx.restore()
ctx.restore()
python_payload/st4m/utils.py 0 → 100644
+ 13
− 0
View file @ e3f777c6
import math
def lerp(a: float, b: float, v: float) -> float:
if v <= 0:
return a
if v >= 1.0:
return b
return a + (b - a) * v
def xy_from_polar(r, phi):
return (r * math.sin(phi), r * math.cos(phi)) # x # y
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment