galactica
/
Galactica
1
0
Fork 0
Code Issues Releases Activity

Improved flare animation

master
Mark 2024-01-20 13:10:12 -08:00
parent 67c4a8c259
commit 989712b5e1
Signed by: Mark
GPG Key ID: C6D63995FE72FD80
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO.md
View File

@ -1,6 +1,7 @@
# Specific projects # Specific projects
## Currently working on: ## Currently working on:
- first: fix animation transition timings
- first: fix particles & physics - first: fix particles & physics
- clickable buttons - clickable buttons
- planet outfitter - planet outfitter

2
assets

@ -1 +1 @@
Subproject commit b4fe8111c7b1cb17987bbff095bd50e61e2d8998 Subproject commit f749d99ae63bcdefb4a62774d21f30a7eebc20d3

27
content/sprite.toml
View File

@ -6,12 +6,10 @@
file = "star/B-09.png" file = "star/B-09.png"
[sprite."flare::ion"] [sprite."flare::ion"]
start_at = "rise:top" start_at = "idle:top"
random_start_frame = false
section.idle.timing.duration = 5 section.idle.timing.duration = 3.0
#section.idle.repeat = "reverse" section.idle.frames = ["flare/ion/idle-01.png", "flare/ion/idle-02.png"]
section.idle.frames = ["flare/1.png", "flare/4.png", "flare/5.png"]
section.idle.top = "reverse" section.idle.top = "reverse"
section.idle.bot = "reverse" section.idle.bot = "reverse"
# stop: stop on last frame (special) # stop: stop on last frame (special)
@ -21,20 +19,19 @@ section.idle.bot = "reverse"
# spec: "idle:bot", "idle:top", or "idle:random" # spec: "idle:bot", "idle:top", or "idle:random"
section.rise.timing.duration = 0.15 section.rise.timing.duration = 0.15
section.rise.top = "stop" section.rise.top = "idle:top"
section.rise.bot = "run:top" section.rise.bot = "run:top"
section.rise.frames = [ section.rise.frames = [
"flare/6.png", "flare/ion/rise-01.png",
"flare/5.png", "flare/ion/rise-02.png",
"flare/4.png", "flare/ion/rise-03.png",
"flare/3.png", "flare/ion/rise-04.png",
"flare/2.png",
] ]
section.run.timing.duration = 0.01 section.run.timing.duration = 3.0
section.run.top = "stop" section.run.top = "reverse"
section.run.bot = "stop" section.run.bot = "reverse"
section.run.frames = ["flare/1.png"] section.run.frames = ["flare/ion/run-01.png", "flare/ion/run-02.png"]
[sprite."planet::earth"] [sprite."planet::earth"]

4
crates/system/src/phys/objects/ship.rs
View File

@ -115,7 +115,7 @@ impl PhysSimShip {
let flare = res.ct.get_outfit(flare_outfit); let flare = res.ct.get_outfit(flare_outfit);
if flare.engine_flare_on_stop.is_some() { if flare.engine_flare_on_stop.is_some() {
for (_, e) in &mut self.engine_anim { for (_, e) in &mut self.engine_anim {
e.next_edge(flare.engine_flare_on_stop.unwrap().into()); e.jump_to(res.ct, flare.engine_flare_on_stop.unwrap());
} }
} }
}; };
@ -126,7 +126,7 @@ impl PhysSimShip {
let flare = res.ct.get_outfit(flare_outfit); let flare = res.ct.get_outfit(flare_outfit);
if flare.engine_flare_on_start.is_some() { if flare.engine_flare_on_start.is_some() {
for (_, e) in &mut self.engine_anim { for (_, e) in &mut self.engine_anim {
e.next_edge(flare.engine_flare_on_start.unwrap().into()); e.jump_to(res.ct, flare.engine_flare_on_start.unwrap());
} }
} }
}; };