Skip to content

Commit

Permalink
Merge pull request #13 from jiro4989/actor031-032
Browse files Browse the repository at this point in the history 
actor031とactor032を追加
  • Loading branch information
@jiro4989
jiro4989 authored Oct 24, 2021
2 parents e9600df + 4e76241 commit 0bae010
Show file tree
Hide file tree
Showing 36 changed files with 760 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup
run: make setup
- name: Build
run: make
run: make all
- name: Upload binaries to release
uses: svenstaro/upload-release-action@v2
with:
Expand Down
54 changes: 33 additions & 21 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ GEN_CMD := ./src/sh/generate_images.sh
ARC_CMD := ./src/sh/archive.sh
THUMBNAIL_CMD := ./src/sh/generate_thumbnail.sh

.PHONY: help
help: ## ドキュメントのヘルプを表示する。
@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

################################################################################
# 画像・配布物生成
################################################################################
Expand All @@ -19,79 +23,87 @@ actors: \
done

.PHONY: thumbnail
thumbnail: actors
thumbnail: actors ## サムネイルを生成する
$(THUMBNAIL_CMD)

.PHONY: actor001_019
actor001_019:
actor001_019: ## actor001～019を生成する
for i in `seq 19`; do $(ARC_CMD) actor`printf '%03d' $$i`; done

.PHONY: actor020
actor020:
actor020: ## actor020を生成する
ACTOR_NAME=$@ X=92 Y=240 SCALE_SIZE=44 $(GEN_CMD)

.PHONY: actor021
actor021:
actor021: ## actor021を生成する
ACTOR_NAME=$@ X=32 Y=220 SCALE_SIZE=44 $(GEN_CMD)

.PHONY: actor022
actor022:
actor022: ## actor022を生成する
ACTOR_NAME=$@ X=80 Y=125 SCALE_SIZE=44 $(GEN_CMD)

.PHONY: actor023
actor023:
actor023: ## actor023を生成する
ACTOR_NAME=$@ X=62 Y=230 SCALE_SIZE=50 $(GEN_CMD)

.PHONY: actor024
actor024:
actor024: ## actor024を生成する
ACTOR_NAME=$@ X=73 Y=215 SCALE_SIZE=44 $(GEN_CMD)

.PHONY: actor025
actor025:
actor025: ## actor025を生成する
$(ARC_CMD) $@

.PHONY: actor026
actor026:
actor026: ## actor026を生成する
$(ARC_CMD) $@

.PHONY: actor027
actor027:
actor027: ## actor027を生成する
ACTOR_NAME=$@ X=125 Y=215 SCALE_SIZE=50 $(GEN_CMD)

.PHONY: actor028
actor028:
actor028: ## actor028を生成する
ACTOR_NAME=$@ X=240 Y=369 SCALE_SIZE=29 $(GEN_CMD)

.PHONY: actor029
actor029:
actor029: ## actor029を生成する
ACTOR_NAME=$@ X=174 Y=55 SCALE_SIZE=29 $(GEN_CMD)

.PHONY: actor030
actor030:
actor030: ## actor030を生成する
ACTOR_NAME=$@ X=278 Y=75 SCALE_SIZE=29 $(GEN_CMD)

.PHONY: actor031
actor031: ## actor031を生成する
make actor031_032 ACTOR_NAME=$@

.PHONY: actor032
actor032: ## actor032を生成する
make actor031_032 ACTOR_NAME=$@

.PHONY: actor031_032
actor031_032: ## actor031と032の共通処理
X=110 Y=62 SCALE_SIZE=27 $(GEN_CMD)

################################################################################
# 環境整備
################################################################################

# 依存ツールのDL
.PHONY: setup
setup:
setup: ## 依存ツールのDL
GO111MODULE=off go get -u github.com/jiro4989/imgctl

# 成果物や中間生成物の削除
.PHONY: clean
clean:
clean: ## 成果物や中間生成物の削除
-rm -rf dist/*
-rm -rf tmp/

# kritaの不可視ファイルの削除
.PHONY: clean-backupfiles
clean-backupfiles:
clean-backupfiles: ## kritaの不可視ファイルの削除
find resources/ -name '*.png~' -exec rm {} \;

# 画像サイズを確認する
.PHONY: check-size
check-size:
check-size: ## 画像サイズを確認する
find tmp/actor{001..019} -name '*.png' -exec identify -format '%f: width = %w, height = %h\n' {} \;
find tmp/actor*/actor* -name '*.png' -exec identify -format '%f: width = %w, height = %h\n' {} \;
170 changes: 170 additions & 0 deletions config/actor031/normal.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
{
"srcDir":"left",
"flipDir":"right",
"generate":{
"outDir":"tmp/actor031/generate",
"outFileNameFormat":"001_%03d.png",
"srcPatterns":[
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/normal.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/normal.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/normal.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/smile.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/surprise.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/talk.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/normal.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/nan.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/smile.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/smile.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/normal.png",
"resources/actor031/eyebrows/angry.png",
"resources/actor031/mouse/shout.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/normal.png",
"resources/actor031/eyebrows/sad.png",
"resources/actor031/mouse/talk.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/smile.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/normal.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/close.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/normal.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/close.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/smile.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/close.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/talk.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/close.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/nan.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/close.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/shout.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/normal.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/smile.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/talk.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/nan.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/normal.png",
"resources/actor031/mouse/shout.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/angry.png",
"resources/actor031/mouse/normal.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/angry.png",
"resources/actor031/mouse/smile.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/angry.png",
"resources/actor031/mouse/talk.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/angry.png",
"resources/actor031/mouse/nan.png"
],
[
"resources/actor031/body/normal.png",
"resources/actor031/eye/jito.png",
"resources/actor031/eyebrows/angry.png",
"resources/actor031/mouse/shout.png"
]
]
},
"flip":{
"outDir":"tmp/actor031/flip"
},
"scale":{
"outDir":"tmp/actor031/scale/rpg_maker_vxace",
"size":18
},
"crop":{
"outDir":"tmp/actor031/crop/rpg_maker_vxace",
"x":73,
"y":41,
"width":96,
"height":96
},
"paste":{
"outDir":"tmp/actor031/face/rpg_maker_vxace",
"outFileNameFormat":"001_%03d.png",
"row":2,
"col":4,
"width":96,
"height":96
}
}
Loading

0 comments on commit 0bae010

Please sign in to comment.