Skip to content

Add matrix and decomposed transforms to baked plugin export frames #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Meekiavelique wants to merge 1 commit into
base: main
Choose a base branch
from
+190 −97
Open

Add matrix and decomposed transforms to baked plugin export frames #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
257 changes: 160 additions & 97 deletions schemas/plugin-blueprint.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,26 @@
"type": "object",
"default": {},
"properties": {
"matrix": {
"type": "object",
"default": {},
"description": "A collection of baked transformation matrix keyframes, identified by a floating-point timestamp.",
"patternProperties": {
"^\\d+\\.\\d+$": {
"$ref": "#/definitions/matrix_keyframe"
}
}
},
"decomposed": {
"type": "object",
"default": {},
"description": "A collection of baked decomposed transformation keyframes, identified by a floating-point timestamp.",
"patternProperties": {
"^\\d+\\.\\d+$": {
"$ref": "#/definitions/decomposed_keyframe"
}
}
},
"position": {
"type": "object",
"default": {},
Expand Down Expand Up @@ -762,110 +782,153 @@
"$ref": "#/definitions/molang_vector3"
},
"interpolation": {
"$ref": "#/definitions/keyframe_interpolation"
}
}
},
"matrix_keyframe": {
"type": "object",
"required": ["value", "interpolation"],
"description": "A baked transformation matrix keyframe, identified by a floating-point timestamp.",
"properties": {
"value": {
"$ref": "#/definitions/matrix"
},
"interpolation": {
"$ref": "#/definitions/keyframe_interpolation"
}
}
},
"decomposed_keyframe": {
"type": "object",
"required": ["value", "interpolation"],
"description": "A baked decomposed transformation keyframe, identified by a floating-point timestamp.",
"properties": {
"value": {
"type": "object",
"oneOf": [
{
"type": "object",
"required": ["type", "easing"],
"properties": {
"type": {
"const": "linear"
},
"easing": {
"type": "string",
"enum": [
"linear",
"step",
"ease_in_quad",
"ease_out_quad",
"ease_in_out_quad",
"ease_in_cubic",
"ease_out_cubic",
"ease_in_out_cubic",
"ease_in_quart",
"ease_out_quart",
"ease_in_out_quart",
"ease_in_quint",
"ease_out_quint",
"ease_in_out_quint",
"ease_in_sine",
"ease_out_sine",
"ease_in_out_sine",
"ease_in_expo",
"ease_out_expo",
"ease_in_out_expo",
"ease_in_circ",
"ease_out_circ",
"ease_in_out_circ",
"ease_in_back",
"ease_out_back",
"ease_in_out_back",
"ease_in_elastic",
"ease_out_elastic",
"ease_in_out_elastic",
"ease_in_bounce",
"ease_out_bounce",
"ease_in_out_bounce"
]
},
"easing_arguments": {
"type": "array",
"items": {
"type": "number"
},
"default": []
}
}
},
{
"type": "object",
"required": [
"type",
"left_handle_time",
"left_handle_value",
"right_handle_time",
"right_handle_value"
],
"properties": {
"type": {
"const": "bezier"
},
"left_handle_time": {
"$ref": "#/definitions/vector3"
},
"left_handle_value": {
"$ref": "#/definitions/vector3"
},
"right_handle_time": {
"$ref": "#/definitions/vector3"
},
"right_handle_value": {
"$ref": "#/definitions/vector3"
}
}
"properties": {
"translation": {
"$ref": "#/definitions/vector3",
"default": [0.0, 0.0, 0.0]
},
{
"type": "object",
"required": ["type"],
"properties": {
"type": {
"const": "catmullrom"
}
}
"left_rotation": {
"$ref": "#/definitions/vector4",
"default": [0.0, 0.0, 0.0, 1.0]
},
{
"type": "object",
"required": ["type"],
"properties": {
"type": {
"const": "step"
}
}
"scale": {
"$ref": "#/definitions/vector3",
"default": [1.0, 1.0, 1.0]
}
]
}
},
"interpolation": {
"$ref": "#/definitions/keyframe_interpolation"
}
}
},
"keyframe_interpolation": {
"type": "object",
"oneOf": [
{
"type": "object",
"required": ["type", "easing"],
"properties": {
"type": {
"const": "linear"
},
"easing": {
"type": "string",
"enum": [
"linear",
"step",
"ease_in_quad",
"ease_out_quad",
"ease_in_out_quad",
"ease_in_cubic",
"ease_out_cubic",
"ease_in_out_cubic",
"ease_in_quart",
"ease_out_quart",
"ease_in_out_quart",
"ease_in_quint",
"ease_out_quint",
"ease_in_out_quint",
"ease_in_sine",
"ease_out_sine",
"ease_in_out_sine",
"ease_in_expo",
"ease_out_expo",
"ease_in_out_expo",
"ease_in_circ",
"ease_out_circ",
"ease_in_out_circ",
"ease_in_back",
"ease_out_back",
"ease_in_out_back",
"ease_in_elastic",
"ease_out_elastic",
"ease_in_out_elastic",
"ease_in_bounce",
"ease_out_bounce",
"ease_in_out_bounce"
]
},
"easing_arguments": {
"type": "array",
"items": {
"type": "number"
},
"default": []
}
}
},
{
"type": "object",
"required": [
"type",
"left_handle_time",
"left_handle_value",
"right_handle_time",
"right_handle_value"
],
"properties": {
"type": {
"const": "bezier"
},
"left_handle_time": {
"$ref": "#/definitions/vector3"
},
"left_handle_value": {
"$ref": "#/definitions/vector3"
},
"right_handle_time": {
"$ref": "#/definitions/vector3"
},
"right_handle_value": {
"$ref": "#/definitions/vector3"
}
}
},
{
"type": "object",
"required": ["type"],
"properties": {
"type": {
"const": "catmullrom"
}
}
},
{
"type": "object",
"required": ["type"],
"properties": {
"type": {
"const": "step"
}
}
}
]
},
"resource_location": {
"type": "string",
"pattern": "^[a-z0-9_\\-]+:[a-z0-9_\\-./]+$",
Expand Down
30 changes: 30 additions & 0 deletions src/systems/pluginCompiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,20 @@ interface TransformationKeyframe {
interpolation: TransformationKeyframeInterpolation
}

interface MatrixKeyframe {
value: number[]
interpolation: TransformationKeyframeInterpolation
}

interface DecomposedKeyframe {
value: {
translation: ArrayVector3
left_rotation: ArrayVector4
scale: ArrayVector3
}
interpolation: TransformationKeyframeInterpolation
}

interface PluginAnimation {
loop_mode: LoopMode
length: number
Expand All @@ -162,6 +176,8 @@ interface PluginAnimation {
node_keyframes?: Record<
string,
{
matrix?: Record<string, MatrixKeyframe>
decomposed?: Record<string, DecomposedKeyframe>
position?: Record<string, TransformationKeyframe>
rotation?: Record<string, TransformationKeyframe>
scale?: Record<string, TransformationKeyframe>
Expand Down Expand Up @@ -637,10 +653,24 @@ function serializeBakedAnimation(options: {
: { type: 'linear', easing: 'linear' }

const channels = (node_keyframes[nodeId] ??= {})
const matrix = (channels.matrix ??= {})
const decomposed = (channels.decomposed ??= {})
const position = (channels.position ??= {})
const rotation = (channels.rotation ??= {})
const scale = (channels.scale ??= {})

matrix[timeKey] = {
value: transform.matrix.elements.slice(),
interpolation,
}
decomposed[timeKey] = {
value: {
translation: transform.decomposed.translation.toArray() as ArrayVector3,
left_rotation: transform.decomposed.left_rotation.toArray() as ArrayVector4,
scale: transform.decomposed.scale.toArray() as ArrayVector3,
},
interpolation,
}
position[timeKey] = {
value: transform.pos.map(toMolangNumber) as StringVector3,
interpolation,
Expand Down
Loading