DarklightGames/io_scene_psk_psa
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Fixed a bug where the action name prefix could be applied even if the checkbox was deselected

Browse Source 
* Fixed a typo in the PSA reader
* Added the ability to define the bone length of imported PSK armatures
* The PSK import options (extra UVs, vertex colors etc.) are now actually respected if turned off
* Ran automated formatting on all the code to quell the PEP8 gods
* Incremented version to 3.0.0
This commit is contained in:
Colin Basnett
2022-04-24 22:08:36 -07:00
parent d56aa3ab65
commit 1eafb71dce
13 changed files with 147 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
io_scene_psk_psa/psk/builder.py
View File

@@ -1,6 +1,5 @@
import bpy
import bmesh
from collections import OrderedDict
from .data import *
from ..helpers import *

2
io_scene_psk_psa/psk/data.py
View File

@@ -1,9 +1,9 @@
from typing import List
from ..data import *
class Psk(object):
class Wedge(object):
def __init__(self):
self.point_index: int = 0

17
io_scene_psk_psa/psk/exporter.py
View File

@@ -1,11 +1,13 @@
from .data import *
from ..types import BoneGroupListItem
from ..helpers import populate_bone_group_list
from .builder import PskBuilder, PskBuilderOptions
from typing import Type
from bpy.props import StringProperty, CollectionProperty, IntProperty, EnumProperty
from bpy.types import Operator, PropertyGroup
from bpy_extras.io_utils import ExportHelper
from bpy.props import StringProperty, CollectionProperty, IntProperty, BoolProperty, EnumProperty
from .builder import PskBuilder, PskBuilderOptions
from .data import *
from ..helpers import populate_bone_group_list
from ..types import BoneGroupListItem
MAX_WEDGE_COUNT = 65536
MAX_POINT_COUNT = 4294967296
@@ -144,7 +146,8 @@ class PskExportPropertyGroup(PropertyGroup):
description='',
items=(
('ALL', 'All', 'All bones will be exported.'),
('BONE_GROUPS', 'Bone Groups', 'Only bones belonging to the selected bone groups and their ancestors will be exported.')
('BONE_GROUPS', 'Bone Groups',
'Only bones belonging to the selected bone groups and their ancestors will be exported.')
)
)
bone_group_list: CollectionProperty(type=BoneGroupListItem)
@@ -154,4 +157,4 @@ class PskExportPropertyGroup(PropertyGroup):
classes = (
PskExportOperator,
PskExportPropertyGroup
)
)

40
io_scene_psk_psa/psk/importer.py
View File

@@ -1,16 +1,19 @@
import os
import bpy
import bmesh
import numpy as np
import sys
from math import inf
from typing import Optional
from .data import Psk
from ..helpers import rgb_to_srgb
from mathutils import Quaternion, Vector, Matrix
from .reader import PskReader
from bpy.props import StringProperty, EnumProperty, BoolProperty
import bmesh
import bpy
import numpy as np
from bpy.props import BoolProperty, EnumProperty, FloatProperty, StringProperty
from bpy.types import Operator, PropertyGroup
from bpy_extras.io_utils import ImportHelper
from mathutils import Quaternion, Vector, Matrix
from .data import Psk
from .reader import PskReader
from ..helpers import rgb_to_srgb
class PskImportOptions(object):
@@ -20,6 +23,7 @@ class PskImportOptions(object):
self.vertex_color_space = 'sRGB'
self.should_import_vertex_normals = True
self.should_import_extra_uvs = True
self.bone_length = 1.0
class PskImporter(object):
@@ -60,7 +64,6 @@ class PskImporter(object):
self.post_quat: Quaternion = Quaternion()
import_bones = []
new_bone_size = 8.0
for bone_index, psk_bone in enumerate(psk.bones):
import_bone = ImportBone(bone_index, psk_bone)
@@ -93,7 +96,7 @@ class PskImporter(object):
else:
import_bone.local_rotation.conjugate()
edit_bone.tail = Vector((0.0, new_bone_size, 0.0))
edit_bone.tail = Vector((0.0, options.bone_length, 0.0))
edit_bone_matrix = import_bone.local_rotation.conjugated()
edit_bone_matrix.rotate(import_bone.world_matrix)
edit_bone_matrix = edit_bone_matrix.to_matrix().to_4x4()
@@ -209,7 +212,8 @@ class PskImporter(object):
# Get a list of all bones that have weights associated with them.
vertex_group_bone_indices = set(map(lambda weight: weight.bone_index, psk.weights))
for import_bone in map(lambda x: import_bones[x], sorted(list(vertex_group_bone_indices))):
import_bone.vertex_group = mesh_object.vertex_groups.new(name=import_bone.psk_bone.name.decode('windows-1252'))
import_bone.vertex_group = mesh_object.vertex_groups.new(
name=import_bone.psk_bone.name.decode('windows-1252'))
for weight in psk.weights:
import_bones[weight.bone_index].vertex_group.add((weight.point_index,), weight.weight, 'ADD')
@@ -256,6 +260,15 @@ class PskImportPropertyGroup(PropertyGroup):
options=set(),
description='Import extra UV maps from PSKX files, if available'
)
bone_length: FloatProperty(
default=1.0,
min=sys.float_info.epsilon,
step=100,
soft_min=1.0,
name='Bone Length',
options=set(),
description='Length of the bones'
)
class PskImportOperator(Operator, ImportHelper):
@@ -277,7 +290,11 @@ class PskImportOperator(Operator, ImportHelper):
psk = reader.read(self.filepath)
options = PskImportOptions()
options.name = os.path.splitext(os.path.basename(self.filepath))[0]
options.should_import_extra_uvs = pg.should_import_extra_uvs
options.should_import_vertex_colors = pg.should_import_vertex_colors
options.should_import_vertex_normals = pg.should_import_vertex_normals
options.vertex_color_space = pg.vertex_color_space
options.bone_length = pg.bone_length
PskImporter().import_psk(psk, context, options)
return {'FINISHED'}
@@ -291,6 +308,7 @@ class PskImportOperator(Operator, ImportHelper):
layout.prop(pg, 'should_import_vertex_colors')
if pg.should_import_vertex_colors:
layout.prop(pg, 'vertex_color_space')
layout.prop(pg, 'bone_length')
classes = (

3
io_scene_psk_psa/psk/reader.py
View File

@@ -1,6 +1,7 @@
from .data import *
import ctypes
from .data import *
class PskReader(object):