Skip to content

Commit

Permalink
Current progress
Browse files Browse the repository at this point in the history
  • Loading branch information
Lilaa3 committed Apr 25, 2024
1 parent ee9cb1b commit 4119549
Show file tree
Hide file tree
Showing 21 changed files with 4,526 additions and 1,349 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/black-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: psf/black@stable
- uses: psf/black@23.12.1
11 changes: 11 additions & 0 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from .fast64_internal.sm64 import sm64_register, sm64_unregister
from .fast64_internal.sm64.sm64_geolayout_bone import SM64_BoneProperties
from .fast64_internal.sm64.sm64_objects import SM64_ObjectProperties
from .fast64_internal.sm64.animation.properties import SM64_ActionProps

from .fast64_internal.oot import OOT_Properties, oot_register, oot_unregister
from .fast64_internal.oot.props_panel_main import OOT_ObjectProperties
Expand Down Expand Up @@ -250,6 +251,14 @@ class Fast64_Properties(bpy.types.PropertyGroup):
renderSettings: bpy.props.PointerProperty(type=Fast64RenderSettings_Properties, name="Fast64 Render Settings")


class Fast64_ActionProperties(bpy.types.PropertyGroup):
"""
Properties in action.fast64.
"""

sm64: bpy.props.PointerProperty(type=SM64_ActionProps, name="SM64 Properties")


class Fast64_BoneProperties(bpy.types.PropertyGroup):
"""
Properties in bone.fast64 (bpy.types.Bone)
Expand Down Expand Up @@ -355,6 +364,7 @@ def draw(self, context):
Fast64Settings_Properties,
Fast64RenderSettings_Properties,
Fast64_Properties,
Fast64_ActionProperties,
Fast64_BoneProperties,
Fast64_ObjectProperties,
# Fast64_GlobalObjectPanel,
Expand Down Expand Up @@ -453,6 +463,7 @@ def register():
)

bpy.types.Scene.fast64 = bpy.props.PointerProperty(type=Fast64_Properties, name="Fast64 Properties")
bpy.types.Action.fast64 = bpy.props.PointerProperty(type=Fast64_ActionProperties, name="Fast64 Action Properties")
bpy.types.Bone.fast64 = bpy.props.PointerProperty(type=Fast64_BoneProperties, name="Fast64 Bone Properties")
bpy.types.Object.fast64 = bpy.props.PointerProperty(type=Fast64_ObjectProperties, name="Fast64 Object Properties")

Expand Down
22 changes: 13 additions & 9 deletions fast64_internal/sm64/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@
sm64_dl_writer_unregister,
)

from .sm64_anim import (
sm64_anim_panel_register,
sm64_anim_panel_unregister,
sm64_anim_register,
sm64_anim_unregister,
from .animation import (
anim_panel_register,
anim_panel_unregister,
anim_props_register,
anim_props_unregister,
anim_operator_register,
anim_operator_unregister,
)

from .tools import tools_panels_register, tools_panels_unregister, tools_operators_register, tools_operators_unregister
Expand All @@ -100,7 +102,7 @@ def sm64_panel_register():
sm64_spline_panel_register()
sm64_dl_writer_panel_register()
sm64_dl_parser_panel_register()
sm64_anim_panel_register()
anim_panel_register()


def sm64_panel_unregister():
Expand All @@ -116,11 +118,13 @@ def sm64_panel_unregister():
sm64_spline_panel_unregister()
sm64_dl_writer_panel_unregister()
sm64_dl_parser_panel_unregister()
sm64_anim_panel_unregister()
anim_panel_unregister()


def sm64_register(register_panels: bool):
tools_operators_register()
anim_props_register()
anim_operator_register()
sm64_col_register()
sm64_bone_register()
sm64_cam_register()
Expand All @@ -131,7 +135,6 @@ def sm64_register(register_panels: bool):
sm64_spline_register()
sm64_dl_writer_register()
sm64_dl_parser_register()
sm64_anim_register()
settings_props_register()

if register_panels:
Expand All @@ -140,6 +143,8 @@ def sm64_register(register_panels: bool):

def sm64_unregister(unregister_panels: bool):
tools_operators_unregister()
anim_props_unregister()
anim_operator_unregister()
sm64_col_unregister()
sm64_bone_unregister()
sm64_cam_unregister()
Expand All @@ -150,7 +155,6 @@ def sm64_unregister(unregister_panels: bool):
sm64_spline_unregister()
sm64_dl_writer_unregister()
sm64_dl_parser_unregister()
sm64_anim_unregister()
settings_props_unregister()

if unregister_panels:
Expand Down
12 changes: 12 additions & 0 deletions fast64_internal/sm64/animation/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
from .operators import (
anim_operator_register,
anim_operator_unregister,
)
from .properties import (
anim_props_register,
anim_props_unregister,
)
from .panels import (
anim_panel_register,
anim_panel_unregister,
)
Loading

0 comments on commit 4119549

Please sign in to comment.