mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 09:50:00 +00:00
Merge branch 'master' of https://github.com/GTAmodding/re3 into erorcun
This commit is contained in:
commit
d596f979aa
2
librw
2
librw
|
@ -1 +1 @@
|
||||||
Subproject commit 556f6af1b5a15d5ba1a2254a95076578cd160185
|
Subproject commit 853fa44982dcb02d8e6bbe40045ee5c594c78e52
|
|
@ -311,7 +311,11 @@ enum Visbility
|
||||||
VIS_STREAMME
|
VIS_STREAMME
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
#define LOD_DISTANCE (300.0f*TheCamera.LODDistMultiplier)
|
||||||
|
#else
|
||||||
#define LOD_DISTANCE 300.0f
|
#define LOD_DISTANCE 300.0f
|
||||||
|
#endif
|
||||||
#define FADE_DISTANCE 20.0f
|
#define FADE_DISTANCE 20.0f
|
||||||
#define STREAM_DISTANCE 30.0f
|
#define STREAM_DISTANCE 30.0f
|
||||||
|
|
||||||
|
@ -674,14 +678,7 @@ CRenderer::ScanWorld(void)
|
||||||
poly[2].y = CWorld::GetSectorY(vectors[CORNER_LOD_RIGHT].y);
|
poly[2].y = CWorld::GetSectorY(vectors[CORNER_LOD_RIGHT].y);
|
||||||
ScanSectorPoly(poly, 3, ScanSectorList_Subway);
|
ScanSectorPoly(poly, 3, ScanSectorList_Subway);
|
||||||
}else{
|
}else{
|
||||||
if(f <= LOD_DISTANCE){
|
if(f > LOD_DISTANCE){
|
||||||
poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
|
|
||||||
poly[0].y = CWorld::GetSectorY(vectors[CORNER_CAM].y);
|
|
||||||
poly[1].x = CWorld::GetSectorX(vectors[CORNER_FAR_TOPLEFT].x);
|
|
||||||
poly[1].y = CWorld::GetSectorY(vectors[CORNER_FAR_TOPLEFT].y);
|
|
||||||
poly[2].x = CWorld::GetSectorX(vectors[CORNER_FAR_TOPRIGHT].x);
|
|
||||||
poly[2].y = CWorld::GetSectorY(vectors[CORNER_FAR_TOPRIGHT].y);
|
|
||||||
}else{
|
|
||||||
// priority
|
// priority
|
||||||
poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
|
poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
|
||||||
poly[0].y = CWorld::GetSectorY(vectors[CORNER_CAM].y);
|
poly[0].y = CWorld::GetSectorY(vectors[CORNER_CAM].y);
|
||||||
|
@ -698,8 +695,16 @@ CRenderer::ScanWorld(void)
|
||||||
poly[1].y = CWorld::GetSectorY(vectors[CORNER_LOD_LEFT].y);
|
poly[1].y = CWorld::GetSectorY(vectors[CORNER_LOD_LEFT].y);
|
||||||
poly[2].x = CWorld::GetSectorX(vectors[CORNER_LOD_RIGHT].x);
|
poly[2].x = CWorld::GetSectorX(vectors[CORNER_LOD_RIGHT].x);
|
||||||
poly[2].y = CWorld::GetSectorY(vectors[CORNER_LOD_RIGHT].y);
|
poly[2].y = CWorld::GetSectorY(vectors[CORNER_LOD_RIGHT].y);
|
||||||
}
|
|
||||||
ScanSectorPoly(poly, 3, ScanSectorList);
|
ScanSectorPoly(poly, 3, ScanSectorList);
|
||||||
|
}else{
|
||||||
|
poly[0].x = CWorld::GetSectorX(vectors[CORNER_CAM].x);
|
||||||
|
poly[0].y = CWorld::GetSectorY(vectors[CORNER_CAM].y);
|
||||||
|
poly[1].x = CWorld::GetSectorX(vectors[CORNER_FAR_TOPLEFT].x);
|
||||||
|
poly[1].y = CWorld::GetSectorY(vectors[CORNER_FAR_TOPLEFT].y);
|
||||||
|
poly[2].x = CWorld::GetSectorX(vectors[CORNER_FAR_TOPRIGHT].x);
|
||||||
|
poly[2].y = CWorld::GetSectorY(vectors[CORNER_FAR_TOPRIGHT].y);
|
||||||
|
ScanSectorPoly(poly, 3, ScanSectorList);
|
||||||
|
}
|
||||||
#ifdef NO_ISLAND_LOADING
|
#ifdef NO_ISLAND_LOADING
|
||||||
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_INDUSTRIAL));
|
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_INDUSTRIAL));
|
||||||
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_COMMERCIAL));
|
ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_COMMERCIAL));
|
||||||
|
|
Loading…
Reference in a new issue