diff options
| author | aap <aap@papnet.eu> | 2021-01-12 13:41:22 +0100 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2021-01-12 13:41:29 +0100 |
| commit | 9b2037419f96c6627cb5f2a6f9d127ef1dcdb9df (patch) | |
| tree | a7873279062f306cfc0371d29d4b015a5920642e /src/core | |
| parent | Merge pull request #948 from Sergeanur/lcsPR/CutsceneMgr (diff) | |
| download | re3-9b2037419f96c6627cb5f2a6f9d127ef1dcdb9df.tar re3-9b2037419f96c6627cb5f2a6f9d127ef1dcdb9df.tar.gz re3-9b2037419f96c6627cb5f2a6f9d127ef1dcdb9df.tar.bz2 re3-9b2037419f96c6627cb5f2a6f9d127ef1dcdb9df.tar.lz re3-9b2037419f96c6627cb5f2a6f9d127ef1dcdb9df.tar.xz re3-9b2037419f96c6627cb5f2a6f9d127ef1dcdb9df.tar.zst re3-9b2037419f96c6627cb5f2a6f9d127ef1dcdb9df.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Cam.cpp | 4 | ||||
| -rw-r--r-- | src/core/re3.cpp | 16 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp index 731537ef..581e219a 100644 --- a/src/core/Cam.cpp +++ b/src/core/Cam.cpp @@ -123,6 +123,7 @@ CCam::Process(void) else TargetOrientation = CGeneral::GetATanOfXY(CamTargetEntity->GetForward().x, CamTargetEntity->GetForward().y); +/* LCS: removed CVector Fwd(0.0f, 0.0f, 0.0f); Fwd.x = CamTargetEntity->GetForward().x; Fwd.y = CamTargetEntity->GetForward().y; @@ -140,6 +141,9 @@ CCam::Process(void) else TargetSpeedVar = -Min(Sqrt(SQR(FwdSpeedX) + SQR(FwdSpeedY))/1.8f, 0.5f); SpeedVar = 0.895f*SpeedVar + 0.105*TargetSpeedVar; +*/ + SpeedVar = 0.0f; + TargetSpeedVar = 0.0f; }else{ if(CamTargetEntity == FindPlayerPed()){ // Some fancy smoothing of player position and speed diff --git a/src/core/re3.cpp b/src/core/re3.cpp index 4bc3bc30..b7f8c8b2 100644 --- a/src/core/re3.cpp +++ b/src/core/re3.cpp @@ -665,21 +665,21 @@ extern bool gbRenderWorld2; e = DebugMenuAddVar("Render", "World Rendering", &CustomPipes::WorldPipeSwitch, nil, 1, CustomPipes::WORLDPIPE_PS2, CustomPipes::WORLDPIPE_MOBILE, worldpipenames); DebugMenuEntrySetWrap(e, true); - static const char *vehpipenames[] = { "MatFX", "Neo" }; + static const char *vehpipenames[] = { "PS2", "Mobile", "Neo" }; e = DebugMenuAddVar("Render", "Vehicle Pipeline", &CustomPipes::VehiclePipeSwitch, nil, - 1, CustomPipes::VEHICLEPIPE_MATFX, CustomPipes::VEHICLEPIPE_NEO, vehpipenames); + 1, CustomPipes::VEHICLEPIPE_PS2, CustomPipes::VEHICLEPIPE_MOBILE, vehpipenames); DebugMenuEntrySetWrap(e, true); DebugMenuAddVarBool8("Render", "Chrome cheat", &CustomPipes::bChromeCheat, nil); extern bool gbRenderDebugEnvMap; DebugMenuAddVarBool8("Render", "Show Env map", &gbRenderDebugEnvMap, nil); - DebugMenuAddVar("Render", "Neo Vehicle Shininess", &CustomPipes::VehicleShininess, nil, 0.1f, 0, 1.0f); - DebugMenuAddVar("Render", "Neo Vehicle Specularity", &CustomPipes::VehicleSpecularity, nil, 0.1f, 0, 1.0f); +// DebugMenuAddVar("Render", "Neo Vehicle Shininess", &CustomPipes::VehicleShininess, nil, 0.1f, 0, 1.0f); +// DebugMenuAddVar("Render", "Neo Vehicle Specularity", &CustomPipes::VehicleSpecularity, nil, 0.1f, 0, 1.0f); DebugMenuAddVarBool8("Render", "Neo Ped Rim light enable", &CustomPipes::RimlightEnable, nil); DebugMenuAddVar("Render", "Mult", &CustomPipes::RimlightMult, nil, 0.1f, 0, 1.0f); - DebugMenuAddVarBool8("Render", "Neo World Lightmaps enable", &CustomPipes::LightmapEnable, nil); - DebugMenuAddVar("Render", "Mult", &CustomPipes::LightmapMult, nil, 0.1f, 0, 1.0f); - DebugMenuAddVarBool8("Render", "Neo Road Gloss enable", &CustomPipes::GlossEnable, nil); - DebugMenuAddVar("Render", "Mult", &CustomPipes::GlossMult, nil, 0.1f, 0, 1.0f); +// DebugMenuAddVarBool8("Render", "Neo World Lightmaps enable", &CustomPipes::LightmapEnable, nil); +// DebugMenuAddVar("Render", "Mult", &CustomPipes::LightmapMult, nil, 0.1f, 0, 1.0f); +// DebugMenuAddVarBool8("Render", "Neo Road Gloss enable", &CustomPipes::GlossEnable, nil); +// DebugMenuAddVar("Render", "Mult", &CustomPipes::GlossMult, nil, 0.1f, 0, 1.0f); #endif DebugMenuAddVarBool8("Render", "Show Ped Paths", &gbShowPedPaths, nil); DebugMenuAddVarBool8("Render", "Show Car Paths", &gbShowCarPaths, nil); |