Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-04 22:58:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugfix: respect the original bone's rotation order in animation keyframes.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-07-01 13:05:58 +02:00
parent 6579a53d62
commit e8226d94be
6 changed files with 92 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
src/data_formats/parsing/ninja/index.ts
View File

@ -1,7 +1,7 @@
import { BufferCursor } from '../../BufferCursor';
import { parse_nj_model, NjModel } from './nj';
import { parse_xj_model, XjModel } from './xj';
import { Vec3 } from '../../../domain';
import { BufferCursor } from '../../BufferCursor';
import { NjModel, parse_nj_model } from './nj';
import { parse_xj_model, XjModel } from './xj';
// TODO:
// - deal with multiple NJCM chunks
@ -19,22 +19,57 @@ export type NinjaVertex = {
export type NinjaModel = NjModel | XjModel;
export type NinjaObject<M extends NinjaModel> = {
evaluation_flags: {
no_translate: boolean,
no_rotate: boolean,
no_scale: boolean,
hidden: boolean,
break_child_trace: boolean,
zxy_rotation_order: boolean,
skip: boolean,
shape_skip: boolean,
},
model?: M,
position: Vec3,
rotation: Vec3, // Euler angles in radians.
scale: Vec3,
children: NinjaObject<M>[],
export class NinjaObject<M extends NinjaModel> {
private bone_cache = new Map<number, NinjaObject<M> | null>();
constructor(
public evaluation_flags: {
no_translate: boolean,
no_rotate: boolean,
no_scale: boolean,
hidden: boolean,
break_child_trace: boolean,
zxy_rotation_order: boolean,
skip: boolean,
shape_skip: boolean,
},
public model: M | undefined,
public position: Vec3,
public rotation: Vec3, // Euler angles in radians.
public scale: Vec3,
public children: NinjaObject<M>[]
) { }
find_bone(bone_id: number): NinjaObject<M> | undefined {
let bone = this.bone_cache.get(bone_id);
// Strict check because null means there's no bone with this id.
if (bone === undefined) {
bone = this.find_bone_internal(this, bone_id, [0]);
this.bone_cache.set(bone_id, bone || null);
}
return bone || undefined;
}
private find_bone_internal(
object: NinjaObject<M>,
bone_id: number,
id_ref: [number]
): NinjaObject<M> | undefined {
if (!object.evaluation_flags.skip) {
const id = id_ref[0]++;
if (id === bone_id) {
return object;
}
}
for (const child of object.children) {
const bone = this.find_bone_internal(child, bone_id, id_ref);
if (bone) return bone;
}
}
}
export function parse_nj(cursor: BufferCursor): NinjaObject<NjModel>[] {
@ -119,8 +154,8 @@ function parse_sibling_objects<M extends NinjaModel>(
siblings = [];
}
const object: NinjaObject<M> = {
evaluation_flags: {
const object = new NinjaObject<M>(
{
no_translate,
no_rotate,
no_scale,
@ -131,11 +166,11 @@ function parse_sibling_objects<M extends NinjaModel>(
shape_skip,
},
model,
position: new Vec3(pos_x, pos_y, pos_z),
rotation: new Vec3(rotation_x, rotation_y, rotation_z),
scale: new Vec3(scale_x, scale_y, scale_z),
children,
};
new Vec3(pos_x, pos_y, pos_z),
new Vec3(rotation_x, rotation_y, rotation_z),
new Vec3(scale_x, scale_y, scale_z),
children
);
return [object, ...siblings];
}

8
src/data_formats/parsing/ninja/motion.ts
View File

@ -1,7 +1,7 @@
import { BufferCursor } from '../../BufferCursor';
import { Vec3 } from '../../../domain';
const ANGLE_TO_RAD = 2 * Math.PI / 65536;
const ANGLE_TO_RAD = 2 * Math.PI / 0xFFFF;
export type NjAction = {
object_offset: number,
@ -123,7 +123,7 @@ function parse_motion(cursor: BufferCursor): NjMotion {
}
// NJD_MTYPE_POS_0
if ((type & (1 << 0)) !== 0) {
if (type & (1 << 0)) {
cursor.seek_start(keyframe_offsets.shift()!);
const count = keyframe_counts.shift();
@ -136,7 +136,7 @@ function parse_motion(cursor: BufferCursor): NjMotion {
}
// NJD_MTYPE_ANG_1
if ((type & (1 << 1)) !== 0) {
if (type & (1 << 1)) {
cursor.seek_start(keyframe_offsets.shift()!);
const count = keyframe_counts.shift();
@ -149,7 +149,7 @@ function parse_motion(cursor: BufferCursor): NjMotion {
}
// NJD_MTYPE_SCL_2
if ((type & (1 << 2)) !== 0) {
if (type & (1 << 2)) {
cursor.seek_start(keyframe_offsets.shift()!);
const count = keyframe_counts.shift();

8
src/rendering/ModelRenderer.ts
View File

@ -1,7 +1,7 @@
import { Object3D, Vector3, Clock, SkeletonHelper } from "three";
import { autorun } from "mobx";
import { Clock, SkeletonHelper, SkinnedMesh, Vector3 } from "three";
import { model_viewer_store } from "../stores/ModelViewerStore";
import { Renderer } from "./Renderer";
import { autorun } from "mobx";
let renderer: ModelRenderer | undefined;
@ -13,7 +13,7 @@ export function get_model_renderer(): ModelRenderer {
export class ModelRenderer extends Renderer {
private clock = new Clock();
private model?: Object3D;
private model?: SkinnedMesh;
private skeleton_helper?: SkeletonHelper;
constructor() {
@ -27,7 +27,7 @@ export class ModelRenderer extends Renderer {
});
}
set_model(model?: Object3D) {
set_model(model?: SkinnedMesh) {
if (this.model !== model) {
if (this.model) {
this.scene.remove(this.model);

11
src/rendering/animation.ts
View File

@ -1,9 +1,13 @@
import { AnimationClip, Euler, InterpolateLinear, InterpolateSmooth, KeyframeTrack, Quaternion, QuaternionKeyframeTrack, VectorKeyframeTrack } from "three";
import { NjAction, NjInterpolation, NjKeyframeTrackType } from "../data_formats/parsing/ninja/motion";
import { NinjaObject, NinjaModel } from "../data_formats/parsing/ninja";
export const PSO_FRAME_RATE = 30;
export function create_animation_clip(action: NjAction): AnimationClip {
export function create_animation_clip(
object: NinjaObject<NinjaModel>,
action: NjAction
): AnimationClip {
const motion = action.motion;
const interpolation = motion.interpolation === NjInterpolation.Spline
? InterpolateSmooth
@ -12,6 +16,8 @@ export function create_animation_clip(action: NjAction): AnimationClip {
const tracks: KeyframeTrack[] = [];
motion.motion_data.forEach((motion_data, bone_id) => {
const bone = object.find_bone(bone_id);
motion_data.tracks.forEach(({ type, keyframes }) => {
const times: number[] = [];
const values: number[] = [];
@ -20,8 +26,9 @@ export function create_animation_clip(action: NjAction): AnimationClip {
times.push(keyframe.frame / PSO_FRAME_RATE);
if (type === NjKeyframeTrackType.Rotation) {
const order = bone && bone.evaluation_flags.zxy_rotation_order ? 'ZXY' : 'ZYX';
const quat = new Quaternion().setFromEuler(
new Euler(keyframe.value.x, keyframe.value.y, keyframe.value.z)
new Euler(keyframe.value.x, keyframe.value.y, keyframe.value.z, order)
);
values.push(quat.x, quat.y, quat.z, quat.w);

33
src/stores/ModelViewerStore.ts
View File

@ -1,6 +1,6 @@
import Logger from 'js-logger';
import { action, observable } from "mobx";
import { AnimationAction, AnimationClip, AnimationMixer, Object3D } from "three";
import { AnimationAction, AnimationClip, AnimationMixer, SkinnedMesh } from "three";
import { BufferCursor } from "../data_formats/BufferCursor";
import { NinjaModel, NinjaObject, parse_nj, parse_xj } from "../data_formats/parsing/ninja";
import { parse_njm_4 } from "../data_formats/parsing/ninja/motion";
@ -30,7 +30,7 @@ class ModelViewerStore {
];
@observable.ref current_model?: NinjaObject<NinjaModel>;
@observable.ref current_model_obj3d?: Object3D;
@observable.ref current_model_obj3d?: SkinnedMesh;
@observable.ref animation?: {
mixer: AnimationMixer,
@ -127,11 +127,10 @@ class ModelViewerStore {
const model = parse_xj(new BufferCursor(reader.result, true))[0];
this.set_model(model, file.name);
} else if (file.name.endsWith('.njm')) {
this.add_animation(
create_animation_clip(
parse_njm_4(new BufferCursor(reader.result, true))
)
);
if (this.current_model) {
const njm = parse_njm_4(new BufferCursor(reader.result, true));
this.add_animation(create_animation_clip(this.current_model, njm));
}
} else {
logger.error(`Unknown file extension in filename "${file.name}".`);
}
@ -140,22 +139,14 @@ class ModelViewerStore {
private add_to_bone(
object: NinjaObject<NinjaModel>,
head_part: NinjaObject<NinjaModel>,
bone_id: number,
id_ref: [number] = [0]
bone_id: number
) {
if (!object.evaluation_flags.skip) {
const id = id_ref[0]++;
const bone = object.find_bone(bone_id);
if (id === bone_id) {
object.evaluation_flags.hidden = false;
object.evaluation_flags.break_child_trace = false;
object.children.push(head_part);
return;
}
}
for (const child of object.children) {
this.add_to_bone(child, head_part, bone_id, id_ref);
if (bone) {
bone.evaluation_flags.hidden = false;
bone.evaluation_flags.break_child_trace = false;
bone.children.push(head_part);
}
}

4
src/ui/model_viewer/RendererComponent.tsx
View File

@ -1,9 +1,9 @@
import React from 'react';
import { Object3D } from 'three';
import { SkinnedMesh } from 'three';
import { get_model_renderer } from '../../rendering/ModelRenderer';
type Props = {
model?: Object3D
model?: SkinnedMesh
}
export class RendererComponent extends React.Component<Props> {