summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-11 20:05:01 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-11 20:05:01 +0200
commit5f5babe7fe1330bfc2a4f420f7531c06d5af4795 (patch)
treec53d63372761cfa31bd56a90a3c5db025c3c35e8 /src/core
parentgarages + script (diff)
parentCRenderer (diff)
downloadre3-5f5babe7fe1330bfc2a4f420f7531c06d5af4795.tar
re3-5f5babe7fe1330bfc2a4f420f7531c06d5af4795.tar.gz
re3-5f5babe7fe1330bfc2a4f420f7531c06d5af4795.tar.bz2
re3-5f5babe7fe1330bfc2a4f420f7531c06d5af4795.tar.lz
re3-5f5babe7fe1330bfc2a4f420f7531c06d5af4795.tar.xz
re3-5f5babe7fe1330bfc2a4f420f7531c06d5af4795.tar.zst
re3-5f5babe7fe1330bfc2a4f420f7531c06d5af4795.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/Cam.cpp2
-rw-r--r--src/core/Frontend.cpp4
-rw-r--r--src/core/Streaming.cpp6
-rw-r--r--src/core/main.cpp11
-rw-r--r--src/core/re3.cpp1
5 files changed, 15 insertions, 9 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index a8787675..e6a10267 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -4539,6 +4539,8 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient
Rotating = false;
}
+ if(TheCamera.m_bUseTransitionBeta)
+ Beta = CGeneral::GetATanOfXY(-Cos(m_fTransitionBeta), -Sin(m_fTransitionBeta));
Front = CVector(Cos(Alpha) * Cos(Beta), Cos(Alpha) * Sin(Beta), Sin(Alpha));
Source = TargetCoors - Front*CamDist;
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 06b9a151..5663b9ab 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1088,7 +1088,7 @@ CMenuManager::Draw()
rightText = TheText.Get(gbShowCollisionPolys ? "FEM_ON" : "FEM_OFF");
break;
case MENUACTION_SHOWCULL:
- rightText = TheText.Get(gbShowCullZoneDebugStuff ? "FEM_ON" : "FEM_OFF");
+ // REMOVED(MIAMI)
break;
case MENUACTION_SHOWHEADBOB:
rightText = TheText.Get(TheCamera.m_bHeadBob ? "FEM_ON" : "FEM_OFF");
@@ -4464,7 +4464,7 @@ CMenuManager::ProcessButtonPresses(void)
CGame::ReloadIPLs();
break;
case MENUACTION_SHOWCULL:
- gbShowCullZoneDebugStuff = !gbShowCullZoneDebugStuff;
+ // REMOVED(MIAMI)
break;
case MENUACTION_MEMCARDSAVECONFIRM:
return;
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 4d6ac215..c1f0be5d 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -234,7 +234,7 @@ CStreaming::Init(void)
}
}
#else
- CStreaming::Init();
+ CStreaming::Init2();
#endif
}
@@ -725,7 +725,7 @@ CStreaming::RequestBigBuildings(eLevelName level, const CVector &pos)
b = CPools::GetBuildingPool()->GetSlot(i);
if(b && b->bIsBIGBuilding && b->m_level == level)
if(b->bStreamBIGBuilding){
- if(CRenderer::ShouldModelBeStreamed(b))
+ if(CRenderer::ShouldModelBeStreamed(b, pos))
RequestModel(b->GetModelIndex(), 0);
}else
RequestModel(b->GetModelIndex(), BIGBUILDINGFLAGS);
@@ -745,7 +745,7 @@ CStreaming::InstanceBigBuildings(eLevelName level, const CVector &pos)
b = CPools::GetBuildingPool()->GetSlot(i);
if(b && b->bIsBIGBuilding && b->m_level == level &&
b->bStreamBIGBuilding && b->m_rwObject == nil)
- if(CRenderer::ShouldModelBeStreamed(b))
+ if(CRenderer::ShouldModelBeStreamed(b, pos))
b->CreateRwObject();
}
}
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 6bf8228d..00ae3774 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -778,14 +778,17 @@ RenderScene(void)
DoRWRenderHorizon();
CRenderer::RenderRoads();
CCoronas::RenderReflections();
- RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
CRenderer::RenderEverythingBarRoads();
- CRenderer::RenderBoats();
- DefinedState();
+ RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
CWaterLevel::RenderWater();
+ CRenderer::RenderBoats();
+ CRenderer::RenderFadingInUnderwaterEntities();
+ RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+ // CWaterLevel::RenderTransparentWater();
CRenderer::RenderFadingInEntities();
- CRenderer::RenderVehiclesButNotBoats();
+ RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
CWeather::RenderRainStreaks();
+ // CCoronas::RenderSunReflection
}
void
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 8ed27eef..1915e135 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -329,6 +329,7 @@ DebugMenuPopulate(void)
DebugMenuAddCmd("Spawn", "Spawn Predator", [](){ SpawnCar(MI_PREDATOR); });
DebugMenuAddVarBool8("Render", "Draw hud", &CHud::m_Wants_To_Draw_Hud, nil);
+ DebugMenuAddVarBool8("Render", "Backface Culling", &gBackfaceCulling, nil);
#ifdef LIBRW
DebugMenuAddVarBool8("Render", "PS2 Alpha test Emu", &gPS2alphaTest, nil);
#endif