Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-26 04:12:34 +01:00
Code Issues Projects Releases Wiki Activity

- refactor ProcessMDSLump and check MODELS.C

Browse Source
This commit is contained in:
Ilya Shurumov 2020-11-07 23:37:23 +06:00
parent d8a2f00f9d
commit fedbbc26ab
4 changed files with 60 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src_rebuild/GAME/C/CARS.H
View File

@ -16,6 +16,10 @@ extern unsigned char lightsOnDelay[MAX_CARS];
extern CAR_MODEL NewCarModel[MAX_CAR_MODELS];
extern CAR_MODEL NewLowCarModel[MAX_CAR_MODELS];
extern MODEL* gCarLowModelPtr[MAX_CAR_MODELS];
extern MODEL* gCarDamModelPtr[MAX_CAR_MODELS];
extern MODEL* gCarCleanModelPtr[MAX_CAR_MODELS];
extern int whichCP; // car poly counter
extern int baseSpecCP; // special car poly counter

124
src_rebuild/GAME/C/MODELS.C
View File

@ -12,12 +12,14 @@ MODEL dummyModel = { 0 };
char* modelname_buffer = NULL;
char *car_models_lump = NULL;
MODEL* modelpointers[1536] = { NULL };
MODEL* modelpointers[MAX_MODEL_SLOTS];
MODEL* pLodModels[MAX_MODEL_SLOTS];
int num_models_in_pack = 0;
unsigned short *Low2HighDetailTable = NULL;
unsigned short *Low2LowerDetailTable = NULL;
MODEL* pLodModels[1536];
// decompiled code
// original method signature:
@ -47,93 +49,72 @@ MODEL* pLodModels[1536];
/* end block 3 */
// End Line: 79
// [D]
// [D] [T]
void ProcessMDSLump(char *lump_file, int lump_size)
{
int iVar1;
MODEL **ppMVar2;
char* ptr;
char* mdsfile;
MODEL *model;
MODEL *parentmodel;
int iVar4;
int modelAmts;
int i;
int i, size;
modelAmts = *(int *)lump_file;
ptr = (lump_file + 4);
mdsfile = (lump_file + 4);
num_models_in_pack = modelAmts;
// assign model pointers
if (0 < modelAmts)
for (i = 0; i < MAX_MODEL_SLOTS; i++) // [A] bug fix. Init with dummyModel
{
for (i = 0; i < 1536; i++) // [A] bug fix. Init with dummyModel
modelpointers[i] = &dummyModel;
modelpointers[i] = &dummyModel;
pLodModels[i] = &dummyModel;
}
ppMVar2 = modelpointers;
iVar4 = modelAmts;
for (i = 0; i < modelAmts; i++)
{
size = *(int*)mdsfile;
mdsfile += sizeof(int);
for (i = 0; i < modelAmts; i++)
if (size)
modelpointers[i] = (MODEL*)mdsfile;
mdsfile += size;
}
// process parent instances
for (i = 0; i < modelAmts; i++)
{
model = modelpointers[i];
if (model->instance_number != -1)
{
int size = *(int*)ptr;
ptr += sizeof(int);
parentmodel = modelpointers[model->instance_number];
if (size)
modelpointers[i] = (MODEL*)ptr;
if (parentmodel->collision_block != 0)
model->collision_block = (int)(char*)parentmodel + parentmodel->collision_block;
ptr += size;
// convert to real offsets
model->vertices = (int)(char*)parentmodel + parentmodel->vertices;
model->normals = (int)(char*)parentmodel + parentmodel->normals;
model->point_normals = (int)(char*)parentmodel + parentmodel->point_normals;
}
}
if (0 < modelAmts)
{
ppMVar2 = modelpointers;
iVar4 = modelAmts;
// process parent instances
do {
model = *ppMVar2;
if (model->instance_number != -1)
{
parentmodel = modelpointers[model->instance_number];
if (parentmodel->collision_block != 0)
model->collision_block = (int)(char*)parentmodel + parentmodel->collision_block;
// convert to real offsets
model->vertices = (int)(char*)parentmodel + parentmodel->vertices;
model->normals = (int)(char*)parentmodel + parentmodel->normals;
model->point_normals = (int)(char*)parentmodel + parentmodel->point_normals;
}
iVar4--;
ppMVar2++;
} while (iVar4 != 0);
}
// process models without parents
if (0 < modelAmts)
for (i = 0; i < modelAmts; i++)
{
ppMVar2 = modelpointers;
do {
model = *ppMVar2;
model = modelpointers[i];
if (model->instance_number == -1)
{
if (model->collision_block != 0)
model->collision_block += (int)(char*)model;
if (model->instance_number == -1)
{
if (model->collision_block != 0)
model->collision_block += (int)(char*)model;
model->vertices += (int)(char*)model;
model->normals += (int)(char*)model;
model->point_normals += (int)(char*)model;
}
model->vertices += (int)(char*)model;
model->normals += (int)(char*)model;
model->point_normals += (int)(char*)model;
}
model->poly_block += (int)(char*)model;
modelAmts--;
ppMVar2++;
} while (modelAmts != 0);
model->poly_block += (int)(char*)model;
}
}
@ -185,10 +166,9 @@ void ProcessMDSLump(char *lump_file, int lump_size)
/* end block 5 */
// End Line: 460
// [D]
// [D] [T]
int ProcessCarModelLump(char *lump_ptr, int lump_size)
{
int size;
int *offsets;
char *models_offset;
@ -346,7 +326,7 @@ int ProcessCarModelLump(char *lump_ptr, int lump_size)
/* end block 3 */
// End Line: 1175
// [D]
// [D] [T]
MODEL* GetCarModel(char *src, char **dest, int KeepNormals)
{
int size;
@ -357,11 +337,11 @@ MODEL* GetCarModel(char *src, char **dest, int KeepNormals)
char* mem = src;
if (KeepNormals == 0)
size = ((MODEL*)src)->normals;
size = ((MODEL*)mem)->normals;
else
size = ((MODEL*)src)->poly_block;
size = ((MODEL*)mem)->poly_block;
memcpy(*dest, src, size);
memcpy(*dest, mem, size);
if (KeepNormals == 0)
size = model->normals;
@ -372,7 +352,7 @@ MODEL* GetCarModel(char *src, char **dest, int KeepNormals)
model->vertices += (int)model;
model->normals += (int)model;
model->poly_block = (int)src + model->poly_block;
model->poly_block = (int)mem + model->poly_block;
if (KeepNormals == 0)
model->point_normals = 0;

9
src_rebuild/GAME/C/MODELS.H
View File

@ -5,15 +5,12 @@ extern MODEL dummyModel;
extern char* modelname_buffer;
extern char *car_models_lump;
extern MODEL* modelpointers[1536];
extern MODEL* modelpointers[MAX_MODEL_SLOTS];
extern MODEL* pLodModels[MAX_MODEL_SLOTS];
extern unsigned short *Low2HighDetailTable;
extern unsigned short *Low2LowerDetailTable;
extern MODEL* pLodModels[1536];
extern MODEL* gCarLowModelPtr[5];
extern MODEL* gCarDamModelPtr[5];
extern MODEL* gCarCleanModelPtr[5];
extern int num_models_in_pack;

1
src_rebuild/GAME/DR2LIMITS.H
View File

@ -4,6 +4,7 @@
// DRIVER 2 game engine limits
// please populate this file only with engine limits during refactoring
#define MAX_MODEL_SLOTS 1536 // DO NOT CHANGE. No effect in upping it - limited by cell types
#define MAX_CARS 20
#define MAX_CAR_MODELS 5