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

Additive blending now also works for xj models. Darkened the collision geometry to better accommodate additive blending.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2020-01-18 21:26:49 +01:00
parent 06e1a8e60b
commit f4d9cb290e
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/data_formats/parsing/ninja/xj.ts
View File

@ -28,8 +28,8 @@ export type XjMesh = {
};
export type XjMaterialProperties = {
alpha_src?: number;
alpha_dst?: number;
src_alpha?: number;
dst_alpha?: number;
texture_id?: number;
diffuse_r?: number;
diffuse_g?: number;
@ -177,8 +177,8 @@ function parse_triangle_strip_material_properties(
switch (type) {
case 2:
props.alpha_src = cursor.u32();
props.alpha_dst = cursor.u32();
props.src_alpha = cursor.u32();
props.dst_alpha = cursor.u32();
break;
case 3:
props.texture_id = cursor.u32();

14
src/core/rendering/conversion/ninja_geometry.ts
View File

@ -239,6 +239,8 @@ class GeometryCreator {
}
let current_mat_idx: number | undefined;
let current_src_alpha: number | undefined;
let current_dst_alpha: number | undefined;
for (const mesh of model.meshes) {
const start_index_count = this.builder.index_count;
@ -288,14 +290,24 @@ class GeometryCreator {
clockwise = !clockwise;
}
if (mesh.material_properties.texture_id != null) {
if (mesh.material_properties.texture_id != undefined) {
current_mat_idx = mesh.material_properties.texture_id;
}
if (mesh.material_properties.src_alpha != undefined) {
current_src_alpha = mesh.material_properties.src_alpha;
}
if (mesh.material_properties.dst_alpha != undefined) {
current_dst_alpha = mesh.material_properties.dst_alpha;
}
this.builder.add_group(
start_index_count,
this.builder.index_count - start_index_count,
current_mat_idx,
true,
current_src_alpha !== 4 || current_dst_alpha !== 5,
);
}
}

12
src/quest_editor/rendering/conversion/areas.ts
View File

@ -28,17 +28,17 @@ const materials = [
}),
// Ground
new MeshLambertMaterial({
color: 0xc0c0c0,
color: 0x405050,
side: DoubleSide,
}),
// Vegetation
new MeshLambertMaterial({
color: 0x60c080,
color: 0x306040,
side: DoubleSide,
}),
// Section transition zone
new MeshLambertMaterial({
color: 0x8040a0,
color: 0x402050,
side: DoubleSide,
}),
];
@ -52,17 +52,17 @@ const wireframe_materials = [
}),
// Ground
new MeshBasicMaterial({
color: 0xd0d0d0,
color: 0x506060,
wireframe: true,
}),
// Vegetation
new MeshBasicMaterial({
color: 0x80e0a0,
color: 0x405050,
wireframe: true,
}),
// Section transition zone
new MeshBasicMaterial({
color: 0x9070b0,
color: 0x503060,
wireframe: true,
}),
];