Skip to content

Commit 98e679a

Browse files
committed
🚧 Fix some missed AnimationNode references
1 parent f67ecba commit 98e679a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/systems/animationRenderer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ let lastFrameCache = new Map<string, ILastFrameCacheItem>()
115115
*/
116116
let keyframeCache = new Map<string, Map<number, _Keyframe | undefined>>()
117117
let excludedNodesCache = new Set<string>()
118-
export function getAnimationNodes(
118+
export function getNodeTransforms(
119119
animation: _Animation,
120120
nodeMap: IRenderedRig['nodeMap'],
121121
time = 0
@@ -292,7 +292,7 @@ export function renderAnimation(animation: _Animation, rig: IRenderedRig) {
292292
updatePreview(animation, time)
293293
const frame: IRenderedFrame = {
294294
time,
295-
node_transforms: getAnimationNodes(animation, rig.nodeMap, time),
295+
node_transforms: getNodeTransforms(animation, rig.nodeMap, time),
296296
variant: getVariantKeyframe(animation, time),
297297
}
298298
frame.node_transforms.forEach(n => includedNodes.add(n.uuid))

src/systems/datapackCompiler/animation.mcb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ dir <%export_namespace%> {
353353
$execute on passengers if entity @s[type=marker] run \
354354
function ./frames/$(frame) with entity @s data.bones
355355
<%%
356-
// A record of node uuid to IAnimationNode.
356+
// A record of node uuid to INodeTransform.
357357
// Keeps track of the last time a bone was updated.
358358
// Only used for step keyframe interpolation.
359359
global.lastActiveFrame = {}

src/systems/jsonCompiler.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ export function exportJSON(options: {
161161
),
162162
},
163163
rig: {
164-
default_transforms: rig.defaultTransforms.map(serailizeAnimationNode),
164+
default_transforms: rig.defaultTransforms.map(serailizeNodeTransform),
165165
node_map: Object.fromEntries(
166166
Object.entries(rig.nodeMap).map(([key, node]) => [key, serailizeRenderedNode(node)])
167167
),
@@ -226,7 +226,7 @@ function serailizeRenderedNode(node: AnyRenderedNode): ExportedRenderedNode {
226226
return json as ExportedRenderedNode
227227
}
228228

229-
function serailizeAnimationNode(node: INodeTransform): ExportedNodetransform {
229+
function serailizeNodeTransform(node: INodeTransform): ExportedNodetransform {
230230
const json: ExportedNodetransform = {
231231
type: node.type,
232232
name: node.name,
@@ -262,7 +262,7 @@ function serializeAnimation(animation: IRenderedAnimation): ExportedBakedAnimati
262262
const frames: ExportedAnimationFrame[] = []
263263
for (const frame of animation.frames) {
264264
const node_transforms: ExportedNodetransform[] =
265-
frame.node_transforms.map(serailizeAnimationNode)
265+
frame.node_transforms.map(serailizeNodeTransform)
266266
frames.push({ ...frame, node_transforms })
267267
}
268268
json.frames = frames

src/systems/rigRenderer.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
import { TRANSPARENT_TEXTURE, TRANSPARENT_TEXTURE_RESOURCE_LOCATION, Variant } from '../variants'
1515
import {
1616
correctSceneAngle,
17-
getAnimationNodes,
17+
getNodeTransforms,
1818
INodeTransform,
1919
restoreSceneAngle,
2020
updatePreview,
@@ -607,7 +607,7 @@ function getDefaultPose(rig: IRenderedRig) {
607607
const anim = new Blockbench.Animation()
608608
correctSceneAngle()
609609
updatePreview(anim, 0)
610-
rig.defaultTransforms = getAnimationNodes(anim, rig.nodeMap)
610+
rig.defaultTransforms = getNodeTransforms(anim, rig.nodeMap)
611611
restoreSceneAngle()
612612
}
613613

0 commit comments

Comments
 (0)