Skip to content

Commit f0a8a17

Browse files
authored
Merge pull request #12 from miu200521358/develop
v2.1.4
2 parents 7c75bf0 + 90f5523 commit f0a8a17

16 files changed

+341
-16
lines changed

archive/Readme.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
�@�uVroid2Pmx�@���[�J���Łv
55

6-
�@�@ver2.01.03
6+
�@�@ver2.01.04
77

88
�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@�@miu200521358
99

@@ -208,6 +208,10 @@ https://github.com/miu200521358/vroid2pmx
208208
���@����
209209
----------------------------------------------------------------
210210

211+
ver2.01.04 (2023/04/08)
212+
�EVRoid Studio 1.21.0 �ŋ���{�[���ɔ��ʂȃE�F�C�g�����悤�ɂȂ��Ă��܂����̂ŁA
213+
�@PmxTailor�p�ݒ�t�@�C���������̊��蓖�čގ����̒��o�D�揇�Ԃ𒲐�
214+
211215
ver2.01.03 (2023/03/21)
212216
�EVRoid Studio 1.20.2 �Őe�{�[���Ƃ܂����������ʒu�ɂ���{�[���ɑ��Έʒu��񂪏o�͂���Ȃ��Ȃ����̂ɑΉ�
213217

archive/β版Readme.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@
5454
���@rivision
5555
----------------------------------------------------------------
5656

57+
Vroid2Pmx_2.01.04_��03 (2023/04/02)
58+
�E���‹��Ńr���h���g���C�i�@�\�͕ω��Ȃ��j
59+
60+
Vroid2Pmx_2.01.04_��02 (2023/04/02)
61+
�E���‹��Ńr���h�i�@�\�͕ω��Ȃ��j
62+
63+
Vroid2Pmx_2.01.04_��01 (2023/04/02)
64+
�EVRoid Studio 1.21.0 �ŋ���{�[���ɔ��ʂȃE�F�C�g�����悤�ɂȂ��Ă��܂����̂ŁA
65+
�@PmxTailor�p�ݒ�t�@�C���������̊��蓖�čގ����̒��o�D�揇�Ԃ𒲐�
66+
5767
Vroid2Pmx_2.01.03_��02 (2023/03/12)
5868
�E�r���h�‹����ς�������߁A�ăr���h�i�@�\�͕ω��Ȃ��j
5969

rivision.txt

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,20 +290,28 @@ https://fire.st/surw9If
290290
Vroid2Pmx_2.01.03_��02 (2023/03/12) miumiu
291291
�E�r���h�‹����ς�������߁A�ăr���h�i�@�\�͕ω��Ȃ��j
292292

293+
https://fire.st/0e3bdlc
294+
Vroid2Pmx_2.01.04_��01 (2023/04/02) miumiu
295+
�EVRoid Studio 1.21.0 �ŋ���{�[���ɔ��ʂȃE�F�C�g�����悤�ɂȂ��Ă��܂����̂ŁA
296+
�@PmxTailor�p�ݒ�t�@�C���������̊��蓖�čގ����̒��o�D�揇�Ԃ��E�F�C�g���_���~���ɒ���
293297

294298

299+
https://fire.st/dcYCZZt
300+
Vroid2Pmx_2.01.04_��02 (2023/04/02) miumiu
301+
�E���‹��Ńr���h�������i�@�\�͕ω��Ȃ��j
295302

303+
https://fire.st/idCe4fH
304+
Vroid2Pmx_2.01.04_��03 (2023/04/02) miumiu
305+
�E���‹��Ńr���h������2��ځi�@�\�͕ω��Ȃ��j
306+
�@�i�r���h���̃p�X��`���C���j
296307

297308

298309

299310

311+
Vroid2Pmx_2.01.04_��01 ���������[�X���܂����I
300312

301-
302-
Vroid2Pmx_2.01.02_��04 ���������[�X���܂����I
303-
304-
�E���̃X�t�B�A����01��菭��������������
305-
�E�ގ��Ŋ�{�F���ݒ肳��Ă���ꍇ�Ƀe�N�X�`���p�X������ɐݒ肳��Ȃ������s����C��
306-
�E�O���[�v���[�t�Ō•ʂ̒���������K�v���Ȃ����[�t�����[�t�v���_�E���ƕ\���g����폜
313+
�EVRoid Studio 1.21.0 �ŋ���{�[���ɔ��ʂȃE�F�C�g�����悤�ɂȂ��Ă��܂����̂ŁA
314+
�@PmxTailor�p�ݒ�t�@�C���������̊��蓖�čގ����̒��o�D�揇�Ԃ��E�F�C�g���_���~���ɒ���
307315

308316
�j�R�j�R�~���j�e�B�i�������F�j�ɂă��Ŕz�z���ł��B
309317
https://com.nicovideo.jp/community/co5387214
@@ -312,9 +320,11 @@ https://com.nicovideo.jp/community/co5387214
312320

313321

314322

315-
https://fire.st/rfawBr5
323+
https://fire.st/dcYCZZt
316324
<br>
317325
<br>
318-
�EVRoid Studio 1.20.2 �Őe�{�[���Ƃ܂����������ʒu�ɂ���{�[���ɑ��Έʒu��񂪏o�͂���Ȃ��Ȃ����̂ɑΉ�<br>
326+
�g���C�댟�m�񍐂��������������߁A�m�F�p�ɋ��‹��Ńr���h�������܂���<br>
327+
�\�[�X�R�[�h�̓�01�Ɠ����ł��B<br>
328+
��01�ŃE�B���X���m����āA��02�Ō��m����Ȃ��A�i�����͂��̋t�j�Ȃǂ̎��ۂ�����܂�����A���萔�ł����f���‚ł��A�����������B<br>
319329
<br>
320330
���Ўg���Ă��������āA���z�E�s��񍐓����肢�������܂��B<br>

src/executor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from utils.MLogger import MLogger
1313
from utils import MFileUtils
1414

15-
VERSION_NAME = "2.01.03"
15+
VERSION_NAME = "2.01.04_β01"
1616

1717
# 指数表記なし、有効小数点桁数6、30を超えると省略あり、一行の文字数200
1818
np.set_printoptions(suppress=True, precision=6, threshold=30, linewidth=200)

src/service/VroidExportService.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,15 +179,16 @@ def export_pmxtailor_setting(self, model: PmxModel, setting_dir_path: str):
179179
bone_name = model.bone_indexes.get(bone_idx, None)
180180
for material_name, vidxs in model.material_vertices.items():
181181
# 一定以上ウェイトが乗っている場合のみ対象とする
182-
if [
182+
weighted_vidxs = [
183183
vidx
184184
for vidx in list(set(vidxs) & set(bone_vidxs))
185185
if bone_idx in model.vertex_dict[vidx].deform.get_idx_list(0.3)
186-
]:
186+
]
187+
if weighted_vidxs:
187188
if bone_name not in bone_materials:
188189
bone_materials[bone_name] = []
189190
if material_name not in bone_materials[bone_name]:
190-
bone_materials[bone_name].append(material_name)
191+
bone_materials[bone_name].append((len(weighted_vidxs), material_name))
191192

192193
if material_name not in material_bones:
193194
material_bones[material_name] = []
@@ -310,7 +311,7 @@ def export_pmxtailor_setting(self, model: PmxModel, setting_dir_path: str):
310311

311312
weighted_material_name = None
312313
for target_name in target_names:
313-
for material_name in bone_materials.get(bone.name, []):
314+
for _, material_name in reversed(sorted(bone_materials.get(bone.name, []))):
314315
if target_name in material_name:
315316
weighted_material_name = model.materials[material_name].name
316317
break
@@ -347,7 +348,7 @@ def export_pmxtailor_setting(self, model: PmxModel, setting_dir_path: str):
347348
long_cnt = 1
348349

349350
for bname, hbones in hair_bones.items():
350-
material_name = bone_materials.get(hbones[0], [""])[0]
351+
_, material_name = list(reversed(sorted(bone_materials.get(hbones[0], ["", ""]))))[0]
351352
material_name = model.materials[material_name].name if material_name else None
352353
if len(hbones) > 1 and (model.bones[hbones[0]].position - model.bones[hbones[1]].position).y() < 0:
353354
if (HAIR_AHOGE, material_name) not in pmx_tailor_settings:

vroid2pmx.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ exe = EXE(pyz,
5757
a.zipfiles,
5858
a.datas,
5959
[],
60-
name='Vroid2Pmx_2.01.03',
60+
name='Vroid2Pmx_2.01.04_β01',
6161
debug=False,
6262
bootloader_ignore_signals=False,
6363
strip=False,

0 commit comments

Comments
 (0)