Added all standard player models to the model viewer.

src/bin_data/loading/player.ts

@@ -59,7 +59,7 @@ function add_to_bone(
     bone_id: number,
     id_ref: [number] = [0]
 ) {
-    if (!object.evaluation_flags.eval_skip) {
+    if (!object.evaluation_flags.skip) {
         const id = id_ref[0]++;
 
         if (id === bone_id) {

src/bin_data/parsing/ninja/index.ts

@@ -27,8 +27,8 @@ export type NinjaObject<M extends NinjaModel> = {
         hidden: boolean,
         break_child_trace: boolean,
         zxy_rotation_order: boolean,
-        eval_skip: boolean,
+        skip: boolean,
-        eval_shape_skip: boolean,
+        shape_skip: boolean,
     },
     model?: M,
     position: Vec3,
@@ -80,8 +80,8 @@ function parse_sibling_objects<M extends NinjaModel>(
     const hidden = (eval_flags & 0b1000) !== 0;
     const break_child_trace = (eval_flags & 0b10000) !== 0;
     const zxy_rotation_order = (eval_flags & 0b100000) !== 0;
-    const eval_skip = (eval_flags & 0b1000000) !== 0;
+    const skip = (eval_flags & 0b1000000) !== 0;
-    const eval_shape_skip = (eval_flags & 0b1000000) !== 0;
+    const shape_skip = (eval_flags & 0b10000000) !== 0;
 
     const model_offset = cursor.u32();
     const pos_x = cursor.f32();
@@ -127,8 +127,8 @@ function parse_sibling_objects<M extends NinjaModel>(
             hidden,
             break_child_trace,
             zxy_rotation_order,
-            eval_skip,
+            skip,
-            eval_shape_skip,
+            shape_skip,
         },
         model,
         position: new Vec3(pos_x, pos_y, pos_z),

src/rendering/animation.ts

@@ -13,22 +13,15 @@ export function create_animation_clip(action: NjAction): AnimationClip {
 
     motion.motion_data.forEach((motion_data, bone_id) => {
         motion_data.tracks.forEach(({ type, keyframes }) => {
-            let name: string;
             const times: number[] = [];
             const values: number[] = [];
 
             for (const keyframe of keyframes) {
                 times.push(keyframe.frame / PSO_FRAME_RATE);
 
-                if (type === NjKeyframeTrackType.Position) {
+                if (type === NjKeyframeTrackType.Position || type === NjKeyframeTrackType.Scale) {
-                    name = `.bones[${bone_id}].position`;
-                    values.push(keyframe.value.x, keyframe.value.y, keyframe.value.z);
-                } else if (type === NjKeyframeTrackType.Scale) {
-                    name = `.bones[${bone_id}].scale`;
                     values.push(keyframe.value.x, keyframe.value.y, keyframe.value.z);
                 } else {
-                    name = `.bones[${bone_id}].quaternion`;
-                    
                     const quat = new Quaternion().setFromEuler(
                         new Euler(keyframe.value.x, keyframe.value.y, keyframe.value.z)
                     );
@@ -38,13 +31,17 @@ export function create_animation_clip(action: NjAction): AnimationClip {
             }
 
             if (type === NjKeyframeTrackType.Rotation) {
-                tracks.push(
+                tracks.push(new QuaternionKeyframeTrack(
-                    new QuaternionKeyframeTrack(
+                    `.bones[${bone_id}].quaternion`, times, values, interpolation
-                        name!, times, values, interpolation
+                ));
-                    )
-                );
             } else {
-                tracks.push(new VectorKeyframeTrack(name, times, values, interpolation));
+                const name = type === NjKeyframeTrackType.Position
+                    ? `.bones[${bone_id}].position`
+                    : `.bones[${bone_id}].scale`;
+
+                tracks.push(new VectorKeyframeTrack(
+                    name, times, values, interpolation
+                ));
             }
         });
     });

src/rendering/models.ts

@@ -14,6 +14,9 @@ const DEFAULT_SKINNED_MATERIAL = new MeshLambertMaterial({
     side: DoubleSide
 });
 const DEFAULT_NORMAL = new Vector3(0, 1, 0);
+const NO_TRANSLATION = new Vector3(0, 0, 0);
+const NO_ROTATION = new Quaternion(0, 0, 0, 1);
+const NO_SCALE = new Vector3(1, 1, 1);
 
 export function ninja_object_to_buffer_geometry(
     object: NinjaObject<NinjaModel>,
@@ -109,7 +112,7 @@ class Object3DCreator {
         parent_matrix: Matrix4
     ) {
         const {
-            no_translate, no_rotate, no_scale, hidden, break_child_trace, zxy_rotation_order, eval_skip
+            no_translate, no_rotate, no_scale, hidden, break_child_trace, zxy_rotation_order, skip
         } = object.evaluation_flags;
         const { position, rotation, scale } = object;
 
@@ -118,15 +121,15 @@ class Object3DCreator {
         );
         const matrix = new Matrix4()
             .compose(
-                no_translate ? new Vector3() : vec3_to_threejs(position),
+                no_translate ? NO_TRANSLATION : vec3_to_threejs(position),
-                no_rotate ? new Quaternion(0, 0, 0, 1) : new Quaternion().setFromEuler(euler),
+                no_rotate ? NO_ROTATION : new Quaternion().setFromEuler(euler),
-                no_scale ? new Vector3(1, 1, 1) : vec3_to_threejs(scale)
+                no_scale ? NO_SCALE : vec3_to_threejs(scale)
             )
             .premultiply(parent_matrix);
 
         let bone: Bone | undefined;
 
-        if (eval_skip) {
+        if (skip) {
             bone = parent_bone;
         } else {
             bone = new Bone();
@@ -162,7 +165,6 @@ class Object3DCreator {
         }
     }
 
-    // TODO: use indices and don't add duplicate positions/normals.
     private nj_model_to_geometry(model: NjModel, matrix: Matrix4) {
         const normal_matrix = new Matrix3().getNormalMatrix(matrix);
 

src/stores/ModelViewerStore.ts

@@ -18,9 +18,11 @@ class ModelViewerStore {
         new PlayerModel('HUcast', 5, 0, new Set()),
         new PlayerModel('HUcaseal', 5, 0, new Set()),
         new PlayerModel('RAmar', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
+        new PlayerModel('RAmarl', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
         new PlayerModel('RAcast', 5, 0, new Set()),
         new PlayerModel('RAcaseal', 5, 0, new Set()),
         new PlayerModel('FOmarl', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
+        new PlayerModel('FOmar', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
         new PlayerModel('FOnewm', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
         new PlayerModel('FOnewearl', 1, 10, new Set([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])),
     ];
@@ -93,7 +95,7 @@ class ModelViewerStore {
         bone_id: number,
         id_ref: [number]
     ) {
-        if (!object.evaluation_flags.eval_skip) {
+        if (!object.evaluation_flags.skip) {
             const id = id_ref[0]++;
 
             if (id === bone_id) {