Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CREDITS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# クレジット(画像・動画)

## Parrot.jpg(`docs/assets/images/Parrot.jpg`)
## Parrot.jpg(`web/assets/images/Parrot.jpg`)
- 作者:**Contributor50**(Wikimedia Commons ユーザー)
- 出典:https://commons.wikimedia.org/wiki/File:Parrot.jpg
- ライセンス:**CC BY-SA 4.0**(https://creativecommons.org/licenses/by-sa/4.0/)
Expand Down
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

| 元画像 | 貪欲法の可視化アニメーション |
| ------------------------------------------------------------------ | -------------------------------------------------------------- |
| <img src="./docs/assets/images/Parrot.jpg" alt="元画像" width="360"> | <img src="./docs/assets/gifs/parrot_greedy.gif" alt="貪欲法の可視化" width="360"> |
| <img src="./web/assets/images/Parrot.jpg" alt="元画像" width="360"> | <img src="./docs/assets/gifs/parrot_greedy.gif" alt="貪欲法の可視化" width="360"> |

## 使い方

Expand Down Expand Up @@ -67,8 +67,13 @@ python -m http.server

## ライセンス

- **コード**:**MIT License**(`LICENSE` を参照)
- **メディア(デモ用画像・動画)**:**CC BY-SA 4.0**(`CREDITS.md` および `assets/licenses/` を参照)
- **コード**:**MIT License**([`LICENSE`](./LICENSE) を参照)
- **メディア(デモ用画像・動画/GIF)**:**CC BY-SA 4.0**
詳細は [`CREDITS.md`](./CREDITS.md) および [`docs/assets/licenses/CC-BY-SA-4.0.txt`](./docs/assets/licenses/CC-BY-SA-4.0.txt)を参照

### メディア配置
- 画像(デモ用画像):`web/assets/images/`
- GIF(README 用):`docs/assets/gifs/`

## 参考資料 / 謝辞

Expand Down
4 changes: 3 additions & 1 deletion docs/assets/licenses/LICENSE-CC-BY-SA-4.0.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
This repository includes media licensed under the Creative Commons Attribution-ShareAlike 4.0 International License.
This repository includes media licensed under CC BY-SA 4.0.
Demo GIFs are under docs/assets/gifs/. Original images used by the web app are under web/assets/images/.
The CC BY-SA terms apply to all media listed in CREDITS.md, regardless of location.
Full legalcode follows (verbatim from Creative Commons).
https://creativecommons.org/licenses/by-sa/4.0/

Expand Down
File renamed without changes
2 changes: 1 addition & 1 deletion web/js/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ async function onFileChange() {
}

async function fetchDefaultAsFile() {
const resp = await fetch("./../docs/assets/images/Parrot.jpg");
const resp = await fetch("./assets/images/Parrot.jpg");
const blob = await resp.blob();
return new File([blob], "Parrot.jpg", { type: blob.type });
}
Expand Down