[OOT] Detailed Actor Panel (Actors, Transition Actors, Entrance Actors) #242
Conversation
|
this should be ready to review now, issues will most likely be caused by the XML documentation but it should be fine |
fast64_internal/oot/oot_utility.py
Outdated
| """Returns the parameter with the correct format""" | ||
| shift = getShiftFromMask(mask) if mask is not None else 0 | ||
|
|
||
| if not int(getEvalParams(value), base=16): |
There was a problem hiding this comment.
not sure what this means, you want to check for 0 ? == 0 would be clearer
also getEvalParams should be modified to return an int instead of a string
or do something like:
def getEvalParamsInt(...):
... current getEvalParams code minus stringify
def getEvalParams(...):
i = getEvalParamsInt(...)
return f"{i:X}"There was a problem hiding this comment.
shift = shift_from_mask if there's a mask else if there's no mask then there's no shift
|
|
||
| actorParam: StringProperty(name="Actor Parameter", default="0x0000") | ||
| rotOverride: BoolProperty(name="Override Rotation", default=False) | ||
| rotOverrideX: StringProperty(name="Rot X", default="0") | ||
| rotOverrideY: StringProperty(name="Rot Y", default="0") | ||
| rotOverrideZ: StringProperty(name="Rot Z", default="0") | ||
| rotOverrideX: StringProperty(name="Rot X", default="0x0000") | ||
| rotOverrideY: StringProperty(name="Rot Y", default="0x0000") | ||
| rotOverrideZ: StringProperty(name="Rot Z", default="0x0000") | ||
|
|
||
| params: StringProperty( | ||
| name="Actor Parameter", |
There was a problem hiding this comment.
could there be a comment somewhere about the difference between actorParam and params
There was a problem hiding this comment.
actorParam is used for custom actors (actors with the id custom)
There was a problem hiding this comment.
both are a StringProperty without get/set, it doesn't seem there needs to be two?
fast64_internal/oot/oot_upgrade.py
Outdated
There was a problem hiding this comment.
there's upgrade code but no cur_version bump anywhere?
There was a problem hiding this comment.
yeaaaaahhhhhh I guess, that PR is kinda old now so I probably didn't know yet about that and end up forgetting about it
There was a problem hiding this comment.
since I remembered why, cur_version doesn't exist anymore. we discussed about that a while ago and figured out checking if old props exist in a blend is stronger than a version check (idr the specifics though, iirc it was kure's idea)
| override = "Override" if actorProp.actorID == "Custom" else "" | ||
| overrideRots = [getattr(actorProp, f"rot{override}{rot}") for rot in ["X", "Y", "Z"]] | ||
| exportRots = [f"DEG_TO_BINANG({(rot * (180 / 0x8000)):.3f})" for rot in blendRots] |
There was a problem hiding this comment.
so there are three sets of rotations?
- one from the blender object
- two "override", one for non-custom actors and one for custom? why are these two different? why are the properties for "Custom" named "Override"?
There was a problem hiding this comment.
- blender object (which won't be used if the actor can have parameters in its rotation, which makes sense to me)
- string prop rotation for actors without the id "custom"
- string prop rotation for custom actors
iirc the override thing is gone and it all depend on the xml data, I fail to see how using rotations as real rotation and not parameter can be useful if the actor is using rotations
btw this depends on other parameters, some actors doesn't always actually check for the rotation for params, in this case the blender object rotation can be used (aka if you don't see any rotation param field in the fast64 ui)
|
@Dragorn421 I'm using this rn and it works great, it makes oot scene creation 100 times easier and it's a crime that it's not merged :( |
|
(just so I don't forget) todo: look into upgrade issues edit: apparently it works?? I'm confused |
|
I added this to the next milestone a while ago so it will be merged before september for sure (hopefully) also I don't remember if it was this PR specifically but I think I had another issue but I can't remember what is was 🥲 |
There was a problem hiding this comment.
Some issues:
- For Treasure Chest / Navi Msg, choosing a custom chest content / message value causes an error.
- If eval params is enabled but the params fail to evaluate, I think the value should still be the unevaluated params. Currently its left blank, which results in an invalid export.
- For Rot XYZ + Params, if string input is used, I think masking / shifting should still be applied, so that its consistent with numerical input.
Dragorn421
added
enhancement
|
I fixed the issues you mentioned, the only thing left is this: |
Remake of PR #56 but the code is shorter by a lot, also the XML data might not be always accurate so I'll probably do some documentation (which I did a bit)
Anyway, tl;dr this is basically that tool but in Fast64, and this is a draft as most features are done, I just forgot to make a small upgrade logic and also the UI for entrances and transition actors