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

Refactored xj parsing code somewhat.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-07-16 17:12:57 +02:00
parent 769e0e8377
commit 3122c256fb
1 changed files with 66 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/data_formats/parsing/ninja/xj.ts
View File

@ -61,12 +61,32 @@ export function parse_xj_model(cursor: Cursor): XjModel {
logger.warn(`Vertex info count of ${vertex_info_count} was larger than expected.`); logger.warn(`Vertex info count of ${vertex_info_count} was larger than expected.`);
} }
model.vertices.push(...parse_vertex_info_table(cursor, vertex_info_table_offset));
}
model.meshes.push(
...parse_triangle_strip_table(cursor, triangle_strip_table_offset, triangle_strip_count)
);
model.meshes.push(
...parse_triangle_strip_table(
cursor,
transparent_triangle_strip_table_offset,
transparent_triangle_strip_count
)
);
return model;
}
function parse_vertex_info_table(cursor: Cursor, vertex_info_table_offset: number): XjVertex[] {
cursor.seek_start(vertex_info_table_offset); cursor.seek_start(vertex_info_table_offset);
const vertex_type = cursor.u16(); const vertex_type = cursor.u16();
cursor.seek(2); // Flags? cursor.seek(2); // Flags?
const vertex_table_offset = cursor.u32(); const vertex_table_offset = cursor.u32();
const vertex_size = cursor.u32(); const vertex_size = cursor.u32();
const vertex_count = cursor.u32(); const vertex_count = cursor.u32();
const vertices: XjVertex[] = [];
for (let i = 0; i < vertex_count; ++i) { for (let i = 0; i < vertex_count; ++i) {
cursor.seek_start(vertex_table_offset + i * vertex_size); cursor.seek_start(vertex_table_offset + i * vertex_size);
@ -100,39 +120,14 @@ export function parse_xj_model(cursor: Cursor): XjModel {
break; break;
} }
// if (vertex_size === 28 || vertex_size === 32 || vertex_size === 36) { vertices.push({
// normal = cursor.vec3_f32();
// }
// if (vertex_size === 24 || vertex_size === 32 || vertex_size === 36) {
// uv = cursor.vec2_f32();
// }
model.vertices.push({
position, position,
normal, normal,
uv, uv,
}); });
} }
}
if (triangle_strip_table_offset) { return vertices;
model.meshes.push(
...parse_triangle_strip_table(cursor, triangle_strip_table_offset, triangle_strip_count)
);
}
if (transparent_triangle_strip_table_offset) {
model.meshes.push(
...parse_triangle_strip_table(
cursor,
transparent_triangle_strip_table_offset,
transparent_triangle_strip_count
)
);
}
return model;
} }
function parse_triangle_strip_table( function parse_triangle_strip_table(
@ -189,13 +184,10 @@ function parse_triangle_strip_material_properties(
props.texture_id = cursor.u32(); props.texture_id = cursor.u32();
break; break;
case 5: case 5:
{ props.diffuse_r = cursor.u8();
const rgba = cursor.u32(); props.diffuse_g = cursor.u8();
props.diffuse_r = (rgba & 0xff) / 0xff; props.diffuse_b = cursor.u8();
props.diffuse_g = ((rgba >>> 8) & 0xff) / 0xff; props.diffuse_a = cursor.u8();
props.diffuse_b = ((rgba >>> 16) & 0xff) / 0xff;
props.diffuse_a = ((rgba >>> 24) & 0xff) / 0xff;
}
break; break;
} }
} }