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

- misc gte macro changes

Browse Source
This commit is contained in:
InspirationByte 2022-01-23 13:13:05 +03:00
parent 7911127a3e
commit bab7b6d2b8
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src_rebuild/Game/C/cars.c
View File

@ -330,11 +330,12 @@ void setupLightingMatrices(void)
if (gTimeOfDay == 3) if (gTimeOfDay == 3)
{ {
gte_ldbkdir(0x400, 0x400, 0x400); gte_SetBackColor(64, 64, 64);
return; }
else
{
gte_SetBackColor(140, 140, 140);
} }
gte_ldbkdir(0x8c0, 0x8c0, 0x8c0);
} }
// [D] [T] // [D] [T]
@ -877,8 +878,7 @@ void buildNewCars(void)
// [D] [T] // [D] [T]
void buildNewCarFromModel(CAR_MODEL *car, MODEL *model, int first) void buildNewCarFromModel(CAR_MODEL *car, MODEL *model, int first)
{ {
u_char ptype; u_char ptype, clut;
u_char clut;
u_char *polyList; u_char *polyList;
CAR_POLY *cp; CAR_POLY *cp;
@ -911,10 +911,9 @@ void buildNewCarFromModel(CAR_MODEL *car, MODEL *model, int first)
else if (pass == 2) else if (pass == 2)
car->pB3 = carPolyBuffer + whichCP; car->pB3 = carPolyBuffer + whichCP;
i = 0;
newNumPolys = whichCP; newNumPolys = whichCP;
while (newNumPolys < 2000 && i < model->num_polys) for (i = 0; newNumPolys < 2000 && i < model->num_polys; i++)
{ {
ptype = *polyList; ptype = *polyList;
@ -939,7 +938,7 @@ void buildNewCarFromModel(CAR_MODEL *car, MODEL *model, int first)
cp->vindices = M_INT_4R(polyList[4], polyList[5], polyList[6], 0); cp->vindices = M_INT_4R(polyList[4], polyList[5], polyList[6], 0);
cp->originalindex = i; cp->originalindex = i;
cp = carPolyBuffer + newNumPolys + 1; cp++;
cp->vindices = M_INT_4R(polyList[4], polyList[6], polyList[7], 0); cp->vindices = M_INT_4R(polyList[4], polyList[6], polyList[7], 0);
cp->originalindex = i; cp->originalindex = i;
@ -972,7 +971,7 @@ void buildNewCarFromModel(CAR_MODEL *car, MODEL *model, int first)
cp->uv3_uv2 = *(ushort*)&pft4->uv2; cp->uv3_uv2 = *(ushort*)&pft4->uv2;
cp->originalindex = i; cp->originalindex = i;
cp = carPolyBuffer + newNumPolys + 1; cp++;
cp->vindices = M_INT_4R(pft4->v0, pft4->v2, pft4->v3, 0); cp->vindices = M_INT_4R(pft4->v0, pft4->v2, pft4->v3, 0);
cp->clut_uv0 = M_INT_2(texture_cluts[polyList[1]][polyList[2]], *(ushort*)&pft4->uv0); cp->clut_uv0 = M_INT_2(texture_cluts[polyList[1]][polyList[2]], *(ushort*)&pft4->uv0);
@ -1016,7 +1015,7 @@ void buildNewCarFromModel(CAR_MODEL *car, MODEL *model, int first)
cp->uv3_uv2 = *(ushort*)&pgt4->uv2; cp->uv3_uv2 = *(ushort*)&pgt4->uv2;
cp->originalindex = i; cp->originalindex = i;
cp = carPolyBuffer + newNumPolys + 1; cp++;
cp->vindices = M_INT_4R(pgt4->v0, pgt4->v2, pgt4->v3, 0); cp->vindices = M_INT_4R(pgt4->v0, pgt4->v2, pgt4->v3, 0);
cp->nindices = M_INT_4R(pgt4->n0, pgt4->n2, pgt4->n3, 0); cp->nindices = M_INT_4R(pgt4->n0, pgt4->n2, pgt4->n3, 0);
@ -1030,7 +1029,6 @@ void buildNewCarFromModel(CAR_MODEL *car, MODEL *model, int first)
} }
polyList += PolySizes[ptype & 0x1f]; polyList += PolySizes[ptype & 0x1f];
i++;
} }
if (pass == 1) if (pass == 1)
@ -1050,13 +1048,10 @@ void MangleWheelModels(void)
{ {
UV_INFO tmpUV2; UV_INFO tmpUV2;
u_char tmpUV; u_char tmpUV;
int i; u_int v0, v1, v2;
u_int v0;
u_int v1;
u_int v2;
POLYFT4*src; POLYFT4*src;
MODEL *m; MODEL *m;
int j; int i, j;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
{ {

12
src_rebuild/Game/C/handling.c
View File

@ -840,22 +840,22 @@ void initOBox(CAR_DATA* cp)
gte_stlvnl(&cp->hd.oBox.location); gte_stlvnl(&cp->hd.oBox.location);
VECTOR svx = { length, 0 ,0 }; SVECTOR svx = { length, 0 ,0 };
VECTOR svy = { 0, car_cos->colBox.vy ,0 }; SVECTOR svy = { 0, car_cos->colBox.vy ,0 };
VECTOR svz = { 0, 0 ,car_cos->colBox.vz }; SVECTOR svz = { 0, 0 ,car_cos->colBox.vz };
gte_ldlvl(&svx); gte_ldsv(&svx);
gte_rtir(); gte_rtir();
cp->hd.oBox.length[1] = car_cos->colBox.vy; cp->hd.oBox.length[1] = car_cos->colBox.vy;
gte_stsv(&cp->hd.oBox.radii[0]); gte_stsv(&cp->hd.oBox.radii[0]);
gte_ldlvl(&svy); gte_ldsv(&svy);
gte_rtir(); gte_rtir();
cp->hd.oBox.length[2] = car_cos->colBox.vz; cp->hd.oBox.length[2] = car_cos->colBox.vz;
gte_stsv(&cp->hd.oBox.radii[1]); gte_stsv(&cp->hd.oBox.radii[1]);
gte_ldlvl(&svz); gte_ldsv(&svz);
gte_rtir(); gte_rtir();
gte_stsv(&cp->hd.oBox.radii[2]); gte_stsv(&cp->hd.oBox.radii[2]);
} }