Skip to content

Commit 6e2d174

Browse files
authored
Merge pull request #3 from emmabritton/animated
AnimatedIndexedImage support
2 parents 8ff2954 + a5af9fc commit 6e2d174

23 files changed

+1166
-389
lines changed

.github/screenshots/animated.png

117 KB
Loading

.github/screenshots/editor.png

-104 KB
Binary file not shown.

.github/screenshots/image.png

132 KB
Loading

.github/screenshots/new_image.png

132 KB
Loading

.github/screenshots/palette.png

9.57 KB
Loading

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Changelog
22

3+
### Version 0.4.0
4+
- Add support for animated images
5+
36
### Version 0.3.3
47
- Fix crash when selecting edge of preview
58

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[package]
22
name = "image-editor"
3-
version = "0.3.3"
3+
version = "0.4.0"
44
edition = "2021"
55
authors = ["Emma Britton <emmabritton@pm.me>"]
66
description = "Simple image editor for ICI files"
77
license-file = "LICENSE"
8-
repository = "https://github.com/raybritton/ici-image-editor"
8+
repository = "https://github.com/emmabritton/ici-image-editor"
99
readme = "README.md"
10-
homepage = "https://github.com/raybritton/ici-image-editor"
10+
homepage = "https://github.com/emmabritton/ici-image-editor"
1111

1212
[dependencies]
13-
pixels-graphics-lib = "0.11.1"
13+
pixels-graphics-lib = "0.11.7"
1414
color-eyre = "0.6.2"
1515
log = "0.4.17"
1616
directories = "5.0.0"

README.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
11
# ICI Image Editor
22

3-
Used to edit ICI images (`IndexedImage`) from [ici-files](https://github.com/emmabritton/ici-files)
3+
Used to edit ICI images (`IndexedImage` and `AnimatedIndexedImage`) from [ici-files](https://github.com/emmabritton/ici-files)
4+
5+
## Controls
6+
7+
* Undo - Ctrl+Z, Cmd+Z
8+
* Redo - Shift+Ctrl+Z, Shift+Cmd+Z, Ctrl+Y, Cmd+Y
9+
* Save single frame when timeline is visible - Hold Shift when saving
410

511
## Screenshots
612

7-
![Editor](https://github.com/emmabritton/ici-image-editor/raw/main/.github/screenshots/editor.png)
8-
![Edit Palette](https://github.com/emmabritton/ici-image-editor/raw/main/.github/screenshots/palette.png)
13+
![Editor](https://github.com/emmabritton/ici-image-editor/raw/main/.github/screenshots/image.png)
14+
![Editor with timeline](https://github.com/emmabritton/ici-image-editor/raw/main/.github/screenshots/animated.png)
15+
![New file](https://github.com/emmabritton/ici-image-editor/raw/main/.github/screenshots/new_image.png)
16+
![Palette editor](https://github.com/emmabritton/ici-image-editor/raw/main/.github/screenshots/palette.png)
917

1018
## TODO
1119
- Support images bigger than 64x64
1220
- New palette system
1321
- Confirmation before clear/close
1422
- Animation
15-
- Canvas scrolling
23+
- Canvas scrolling
24+
- Support play type

src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fn main() -> Result<()> {
3535
let style = style;
3636
match name {
3737
SceneName::Editor(details) => list.push(Editor::new(WIDTH, HEIGHT, details, style)),
38-
SceneName::NewImage => list.push(NewImageDialog::new(WIDTH, HEIGHT, &style.dialog)),
38+
SceneName::NewImage => list.push(NewImageDialog::new(WIDTH, HEIGHT, style)),
3939
SceneName::Palette(colors) => {
4040
list.push(PaletteDialog::new(colors, WIDTH, HEIGHT, &style.dialog))
4141
}

src/palettes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::palettes::PaletteError::*;
22
use crate::palettes::ParseIssue::*;
3-
use pixels_graphics_lib::prelude::*;
3+
use pixels_graphics_lib::buffer_graphics_lib::prelude::*;
44
use std::error::Error;
55
use std::fmt::{Display, Formatter};
66
use std::str::FromStr;

0 commit comments

Comments
 (0)