Cynopolis/Block-Party-Firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finished the animator tool's UI

Browse Source
This commit is contained in:
Quinn
2024-08-28 22:55:52 -04:00
parent ecd516bc6f
commit 2f8469ef6c
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/animation-tools/AnimationExporter.py
View File

@@ -34,8 +34,10 @@ class AnimationFrame:
def to_string(self, frame_number: int): def to_string(self, frame_number: int):
cell_str = "" cell_str = ""
for cell in self.cells: for i, cell in enumerate(self.cells):
if cell.color.x != 0 or cell.color.y != 0 or cell.color.z != 0: if cell.color.x != 0 or cell.color.y != 0 or cell.color.z != 0:
if i != 0:
cell_str += "\t\t"
cell_str += cell.to_string() + "\n\t" cell_str += cell.to_string() + "\n\t"
cell_str = cell_str[:-3] cell_str = cell_str[:-3]
message = f""" message = f"""
@@ -72,5 +74,5 @@ def mesh_to_cell(mesh: Mesh) -> Cell:
def scene_to_frame(scene: Scene, fill_interpolation: FillInterpolation, frame_interpolation: FrameInterpolation, delay: int, scene_number: int) -> str: def scene_to_frame(scene: Scene, fill_interpolation: FillInterpolation, frame_interpolation: FrameInterpolation, delay: int, scene_number: int) -> str:
cells = [mesh_to_cell(cube) for cube in scene.meshes] cells = [mesh_to_cell(cube) for cube in scene.meshes]
frame = AnimationFrame(cells, FillInterpolation.NO_FILL, FrameInterpolation.FADE, 1000) frame = AnimationFrame(cells, fill_interpolation, frame_interpolation, delay)
return frame.to_string(scene_number) return frame.to_string(scene_number)

12
tools/animation-tools/UI.py
View File

@@ -44,7 +44,7 @@ class SceneManager:
def save_frame_to_file(self): def save_frame_to_file(self):
with open("tools/animation-tools/output.txt", 'w') as file: with open("tools/animation-tools/output.txt", 'w') as file:
for i, scene in enumerate(self._scenes): for i, scene in enumerate(self._scenes):
file.write(scene_to_frame(scene.scene, scene.fill_interpolation, scene.frame_interpolation, scene.delay, i)) file.write(scene_to_frame(scene.scene, scene.fill, scene.fade, scene.delay, i))
def generate_meshes(self) -> list[Mesh]: def generate_meshes(self) -> list[Mesh]:
# generate a list of cubes # generate a list of cubes
@@ -131,7 +131,8 @@ class AnimatorUI:
self.updateOptions = False self.updateOptions = False
self._set_dropdown_options() self._set_dropdown_options()
# TODO: add delay field self.delay_text_entry: TextBox = TextBox(self.window, *self.rel2abs(30, 5, 60, 7), placeholderText="Transition Time (ms)", onSubmit=self.set_update_options_flag)
# Make a frame counter as a button but make it not look like a button # Make a frame counter as a button but make it not look like a button
default_color=(150,150,150) default_color=(150,150,150)
self.frame_counter_text: Button = Button(self.window, *self.rel2abs(15, 90, 10, 10), text="0", inactiveColour=default_color, hoverColour=default_color, pressedColour=default_color) self.frame_counter_text: Button = Button(self.window, *self.rel2abs(15, 90, 10, 10), text="0", inactiveColour=default_color, hoverColour=default_color, pressedColour=default_color)
@@ -201,4 +202,9 @@ class AnimatorUI:
def set_scene_options(self): def set_scene_options(self):
self.updateOptions = False self.updateOptions = False
self.sceneManager.update_scene_options(self.fill_dropdown.getSelected(), self.fade_dropdown.getSelected(), 1000) delay_time = 1000
try:
delay_time = int(self.delay_text_entry.getText())
except ValueError:
self.delay_text_entry.setText(str(delay_time))
self.sceneManager.update_scene_options(self.fill_dropdown.getSelected(), self.fade_dropdown.getSelected(), delay_time)