mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-17 18:36:43 +02:00
Code Issues Releases Wiki Activity

#8 fix camera issues

Browse Source
This commit is contained in:
XProger
2018-02-05 04:50:58 +03:00
parent ef4219911a
commit 976c87d64d
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/camera.h
View File

@@ -581,11 +581,11 @@ struct Camera : ICamera {
traceClip(offset, to); traceClip(offset, to);
} }
move(to);
if (timer <= 0.0f) if (timer <= 0.0f)
resetTarget(); resetTarget();
move(to);
mViewInv = mat4(eye.pos, target.pos, vec3(0, -1, 0)); mViewInv = mat4(eye.pos, target.pos, vec3(0, -1, 0));
} else } else
updateFirstPerson(); updateFirstPerson();

2
src/lara.h
View File

@@ -1963,7 +1963,7 @@ struct Lara : Character {
if (info.trigger == TR::Level::Trigger::COMBAT) if (info.trigger == TR::Level::Trigger::COMBAT)
break; break;
if (info.trigger == TR::Level::Trigger::SWITCH && info.trigInfo.timer && switchIsDown) if (info.trigger == TR::Level::Trigger::SWITCH && info.trigInfo.timer && !switchIsDown)
break; break;
if (info.trigger == TR::Level::Trigger::SWITCH || cmd.args != camera->viewIndexLast) { if (info.trigger == TR::Level::Trigger::SWITCH || cmd.args != camera->viewIndexLast) {

1
src/platform/android/app/CMakeLists.txt
View File

@@ -7,6 +7,7 @@ add_library( game SHARED
src/main/cpp/main.cpp src/main/cpp/main.cpp
../../../libs/stb_vorbis/stb_vorbis.c ../../../libs/stb_vorbis/stb_vorbis.c
../../../libs/minimp3/minimp3.cpp ../../../libs/minimp3/minimp3.cpp
../../../libs/tinf/tinflate.c
) )
include_directories(../../../) include_directories(../../../)

4
src/platform/win/OpenLara.vcxproj
View File

@@ -94,7 +94,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>STB_VORBIS_NO_STDIO;NOMINMAX;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NOMINMAX;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<FloatingPointModel>Strict</FloatingPointModel> <FloatingPointModel>Strict</FloatingPointModel>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
@@ -130,7 +130,7 @@
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>MINIMAL;STB_VORBIS_NO_STDIO;NOMINMAX;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>MINIMAL;NOMINMAX;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>false</ExceptionHandling> <ExceptionHandling>false</ExceptionHandling>
<BufferSecurityCheck>false</BufferSecurityCheck> <BufferSecurityCheck>false</BufferSecurityCheck>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>