falso
/
dethrace
mirror of https://github.com/dethrace-labs/dethrace.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Little changes (#139) 

* br_material.power is a br_scalar (=float)

* Implement FopRead_OLD_VERTICES

* Fix FopRead_OLD_MATERIAL_INDEX

* Use BR_ASIZE in appropriate places

* Use br_material* instead of intptr_t

* Reset resource parent after reading struct

* Use flags of correct type

* Use NULL instead of 0

* Ignore utf-8 errors when decoding carmageddon-"encrypted" files to utf-8
This commit is contained in:
Anonymous Maarten 2022-09-02 02:50:55 +02:00 committed by GitHub
parent c220ad0b5e
commit b3bdbb2650
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BRSRC13/CORE/V1DB/def_mat.c
View File

@ -17,7 +17,7 @@ br_material* SetupDefaultMaterial() {
default_mat->ka = 0.1f;
default_mat->kd = 0.7f;
default_mat->ks = 0.0f;
default_mat->power = 20;
default_mat->power = 20.f;
default_mat->flags = BR_MATF_LIGHT;
BrMatrix23Identity(&default_mat->map_transform);
default_mat->index_base = 10;

27
src/BRSRC13/CORE/V1DB/v1dbfile.c
View File

@ -42,7 +42,7 @@ br_file_struct_member br_old_vertex_uv_FM[5] = {
br_file_struct br_old_vertex_uv_F = { "br_old_vertex_uv", BR_ASIZE(br_old_vertex_uv_FM), br_old_vertex_uv_FM, sizeof(br_vertex) };
br_file_struct_member br_face_FM[5] = {
{ DF_TYPE_BR_UINT_16, offsetof(br_face, vertices), "vertices[0]", NULL },
{ DF_TYPE_BR_UINT_16, offsetof(br_face, vertices[0]), "vertices[0]", NULL },
{ DF_TYPE_BR_UINT_16, offsetof(br_face, vertices[1]), "vertices[1]", NULL },
{ DF_TYPE_BR_UINT_16, offsetof(br_face, vertices[2]), "vertices[2]", NULL },
{ DF_TYPE_BR_UINT_16, offsetof(br_face, smoothing), "smoothing", NULL },
@ -77,14 +77,14 @@ br_file_struct br_model_F = { "br_model", BR_ASIZE(br_model_FM), br_model_FM, si
br_file_struct_member br_old_model_1_FM[1] = {
{ DF_TYPE_ASCIZ, offsetof(br_model, identifier), "identifier", NULL },
};
br_file_struct br_old_model_1_F = { "br_old_model_1", 1, br_old_model_1_FM, sizeof(br_model) };
br_file_struct br_old_model_1_F = { "br_old_model_1", BR_ASIZE(br_old_model_1_FM), br_old_model_1_FM, sizeof(br_model) };
br_file_struct_member br_pivot_FM[3] = {
{ DF_TYPE_BR_SCALAR, offsetof(br_model, pivot.v[0]), "pivot.v[X]", NULL },
{ DF_TYPE_BR_SCALAR, offsetof(br_model, pivot.v[1]), "pivot.v[Y]", NULL },
{ DF_TYPE_BR_SCALAR, offsetof(br_model, pivot.v[2]), "pivot.v[Z]", NULL },
};
br_file_struct br_pivot_F = { "br_pivot", 3, br_pivot_FM, sizeof(br_model) };
br_file_struct br_pivot_F = { "br_pivot", BR_ASIZE(br_pivot_FM), br_pivot_FM, sizeof(br_model) };
br_file_struct_member br_material_old_FM[13] = {
{ DF_TYPE_BR_COLOUR, offsetof(br_material, colour), "colour", NULL },
@ -374,7 +374,12 @@ int FopRead_VERTICES(br_datafile* df, br_uint_32 id, br_uint_32 length, br_uint_
int FopRead_OLD_VERTICES(br_datafile* df, br_uint_32 id, br_uint_32 length, br_uint_32 count) {
void* ptr;
LOG_TRACE("(%p, %d, %d, %d)", df, id, length, count);
NOT_IMPLEMENTED();
count = length / df->prims->struct_size(df, &br_vertex_F, NULL);
ptr = BrResAllocate(v1db.res, count * sizeof(br_vertex), BR_MEMORY_VERTICES);
DfStructReadArray(df, &br_vertex_F, ptr, count);
DfPush(DF_VERTEX, ptr, count);
return 0;
}
// IDA: int __usercall FopWrite_VERTEX_UV@<EAX>(br_datafile *df@<EAX>, br_vertex *vertices@<EDX>, int nvertices@<EBX>)
@ -417,7 +422,7 @@ int FopRead_MATERIAL_INDEX(br_datafile* df, br_uint_32 id, br_uint_32 length, br
br_uint_32 i;
LOG_TRACE9("(%p, %d, %d, %d)", df, id, length, count);
mip = (br_material**)BrResAllocate(v1db.res, sizeof(intptr_t) * (count + 1), BR_MEMORY_MATERIAL_INDEX);
mip = (br_material**)BrResAllocate(v1db.res, sizeof(br_material*) * (count + 1), BR_MEMORY_MATERIAL_INDEX);
mip[0] = NULL;
for (i = 1; i < count + 1; i++) {
df->prims->name_read(df, name);
@ -467,14 +472,15 @@ int FopRead_OLD_MATERIAL_INDEX(br_datafile* df, br_uint_32 id, br_uint_32 length
}
mip = BrResAllocate(v1db.res, num_materials * sizeof(br_material*), BR_MEMORY_MATERIAL_INDEX);
cp = mblock;
for (i = 0; i < length; i++) {
*mip = BrMaterialFind(*cp);
for (i = 0; i < num_materials; i++) {
mip[i] = BrMaterialFind(cp);
while (*cp != '\0') {
cp++;
}
cp++;
}
BrScratchFree(mblock);
DfPush(DF_MATERIAL_INDEX, mip, count);
DfPush(DF_MATERIAL_INDEX, mip, num_materials);
return 0;
}
@ -649,6 +655,7 @@ int FopRead_OLD_MODEL_1(br_datafile* df, br_uint_32 id, br_uint_32 length, br_ui
mp = BrModelAllocate(NULL, 0, 0);
df->res = mp;
df->prims->struct_read(df, &br_old_model_1_F, mp);
df->res = NULL;
DfPush(DF_MODEL, df->res, 1);
return 0;
}
@ -669,7 +676,7 @@ int FopRead_OLD_MODEL(br_datafile* df, br_uint_32 id, br_uint_32 length, br_uint
mp->nvertices = i;
BrResAdd(mp, mp->faces);
BrResAdd(mp, mp->vertices);
mp->flags = mp->flags & (BR_STATE_SURFACE | BR_STATE_MATRIX | BR_STATE_ENABLE | BR_STATE_CLIP);
mp->flags = mp->flags & (BR_MODF_DONT_WELD | BR_MODF_KEEP_ORIGINAL | BR_MODF_GENERATE_TAGS | BR_MODF_QUICK_UPDATE);
DfPush(DF_MODEL, mp, 1);
return 0;
}
@ -968,7 +975,7 @@ int FopRead_TRANSFORM(br_datafile* df, br_uint_32 id, br_uint_32 length, br_uint
break;
}
}
if (t == 7) {
if (t == BR_ASIZE(TransformTypes)) {
LOG_PANIC("transform type not found!");
}
tp = (br_transform*)BrResAllocate(v1db.res, sizeof(br_transform), BR_MEMORY_TRANSFORM);

11
src/DETHRACE/common/world.c
View File

@ -2546,7 +2546,7 @@ void LoadTrack(char* pFile_name, tTrack_spec* pTrack_spec, tRace_info* pRace_inf
GetThreeScalars(f, &spec->mat.m[2][0], &spec->mat.m[2][1], &spec->mat.m[2][2]);
GetThreeScalars(f, &spec->mat.m[3][0], &spec->mat.m[3][1], &spec->mat.m[3][2]);
FindInverseAndWorldBox(spec);
ParseSpecialVolume(f, spec, 0);
ParseSpecialVolume(f, spec, NULL);
} else if (strcmp(s, "DEFAULT WATER") == 0) {
spec->bounds.min.v[0] = 0.0;
spec->bounds.min.v[1] = 0.0;
@ -2554,7 +2554,7 @@ void LoadTrack(char* pFile_name, tTrack_spec* pTrack_spec, tRace_info* pRace_inf
spec->bounds.max.v[0] = 0.0;
spec->bounds.max.v[1] = 0.0;
spec->bounds.max.v[2] = 0.0;
ParseSpecialVolume(f, spec, 0);
ParseSpecialVolume(f, spec, NULL);
gDefault_water_spec_vol = spec;
spec->no_mat = 1;
} else {
@ -2569,10 +2569,11 @@ void LoadTrack(char* pFile_name, tTrack_spec* pTrack_spec, tRace_info* pRace_inf
GetThreeScalars(f, &spec->bounds.max.v[0], &spec->bounds.max.v[1], &spec->bounds.max.v[2]);
BrMatrix34Identity(&spec->mat);
for (k = 0; k < 3; ++k) {
// TODO: ? spec->mat.m[3][k] = (v64[k] + v63[k]) / 2.0;
// spec->mat.m[0][4 * k] = v64[k] - spec->mat.m[3][k];
// FIXME: not 100% sure this is correct
spec->mat.m[3][k] = (spec->bounds.max.v[k] + spec->bounds.min.v[k]) / 2.f;
spec->mat.m[k][k] = spec->bounds.max.v[k] - spec->bounds.min.v[k];
}
ParseSpecialVolume(f, spec, 0);
ParseSpecialVolume(f, spec, NULL);
}
spec++;
}

4
tools/decode_datatxt.py
View File

@ -48,12 +48,12 @@ def decode_line(line: bytes, method: int) -> str:
if c == 0x9f:
c = ord(b'\t')
dline[i] = c
return dline.decode()
return dline.decode(errors="replace")
def main():
parser = argparse.ArgumentParser(allow_abbrev=False, description="Decode a Carmageddon encoded file")
parser.add_argument("file", metavar="FILE", nargs="?", help="input file (default=stdin)")
parser.add_argument("--method", choices=["1", "2"], default="1", help="decryption method to use")
parser.add_argument("--method", choices=[1, 2], type=int, default=2, help="decryption method to use")
args = parser.parse_args()
istream = open(args.file, "rb") if args.file else sys.stdin.buffer