expvintl/source-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vphysics: update

Browse Source
This commit is contained in:
nillerusr 2020-11-18 23:18:12 +03:00
parent 5e1531e093
commit 6920a3bd08
9 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vphysics/main.cpp
View File

@ -38,7 +38,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
{ {
if ( fdwReason == DLL_PROCESS_ATTACH ) if ( fdwReason == DLL_PROCESS_ATTACH )
{ {
ivp_set_message_print_function( ivu_string_print_function ); // ivp_set_message_print_function( ivu_string_print_function );
MathLib_Init( 2.2f, 2.2f, 0.0f, 2.0f, false, false, false, false ); MathLib_Init( 2.2f, 2.2f, 0.0f, 2.0f, false, false, false, false );
// store out module handle // store out module handle
@ -56,7 +56,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
void __attribute__ ((constructor)) vphysics_init(void); void __attribute__ ((constructor)) vphysics_init(void);
void vphysics_init(void) void vphysics_init(void)
{ {
ivp_set_message_print_function( ivu_string_print_function ); // ivp_set_message_print_function( ivu_string_print_function );
MathLib_Init( 2.2f, 2.2f, 0.0f, 2.0f, false, false, false, false ); MathLib_Init( 2.2f, 2.2f, 0.0f, 2.0f, false, false, false, false );
} }

2
vphysics/perftest/perftest.vpc
View File

@ -5,7 +5,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
$Macro SRCDIR "..\.." $Macro SRCDIR "..\.."
$Macro OUTBINDIR "$LIBPUBLIC" $Macro OUTBINDIR "$SRCDIR\..\game\bin"
$Include "$SRCDIR\vpc_scripts\source_exe_win_win32_base.vpc" $Include "$SRCDIR\vpc_scripts\source_exe_win_win32_base.vpc"

4
vphysics/physics_environment.cpp
View File

@ -28,6 +28,7 @@
#include "ivp_listener_collision.hxx" #include "ivp_listener_collision.hxx"
#include "ivp_listener_object.hxx" #include "ivp_listener_object.hxx"
#include "ivp_mindist.hxx" #include "ivp_mindist.hxx"
#include "ivp_mindist_intern.hxx"
#include "ivp_friction.hxx" #include "ivp_friction.hxx"
#include "ivp_anomaly_manager.hxx" #include "ivp_anomaly_manager.hxx"
#include "ivp_time.hxx" #include "ivp_time.hxx"
@ -35,7 +36,6 @@
#include "ivp_phantom.hxx" #include "ivp_phantom.hxx"
#include "ivp_range_manager.hxx" #include "ivp_range_manager.hxx"
#include "ivp_clustering_visualizer.hxx" #include "ivp_clustering_visualizer.hxx"
#include "ivp_mindist_intern.hxx"
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h" #include "tier0/memdbgon.h"
@ -1540,7 +1540,7 @@ void CPhysicsEnvironment::Simulate( float deltaTime )
{ {
m_pSleepEvents->ProcessActiveObjects( m_pPhysEnv, m_pCollisionListener->GetHandler() ); m_pSleepEvents->ProcessActiveObjects( m_pPhysEnv, m_pCollisionListener->GetHandler() );
} }
VISUALIZE_COLLISIONS(); //visualize_collisions();
VirtualMeshPSI(); VirtualMeshPSI();
GetNextFrameTime(); GetNextFrameTime();
} }

1
vphysics/physics_friction.cpp
View File

@ -10,6 +10,7 @@
#include "vphysics/friction.h" #include "vphysics/friction.h"
#include "ivp_mindist.hxx" #include "ivp_mindist.hxx"
#include "ivp_mindist_intern.hxx"
#include "ivp_listener_collision.hxx" #include "ivp_listener_collision.hxx"
#include "ivp_friction.hxx" #include "ivp_friction.hxx"

3
vphysics/physics_motioncontroller.cpp
View File

@ -188,7 +188,8 @@ void CPhysicsMotionController::do_simulation_controller(IVP_Event_Sim *event,IVP
} }
break; break;
} }
pCore->apply_velocity_limit(); // TODO(mastercoms): apply sv_maxvelocity?
//pCore->apply_velocity_limit();
} }
} }
} }

1
vphysics/physics_object.cpp
View File

@ -9,6 +9,7 @@
#include "ivp_compact_ledge.hxx" #include "ivp_compact_ledge.hxx"
#include "ivp_compact_ledge_solver.hxx" #include "ivp_compact_ledge_solver.hxx"
#include "ivp_mindist.hxx" #include "ivp_mindist.hxx"
#include "ivp_mindist_intern.hxx"
#include "ivp_friction.hxx" #include "ivp_friction.hxx"
#include "ivp_phantom.hxx" #include "ivp_phantom.hxx"
#include "ivp_listener_collision.hxx" #include "ivp_listener_collision.hxx"

1
vphysics/physics_shadow.cpp
View File

@ -14,6 +14,7 @@
// IsInContact // IsInContact
#include "ivp_mindist.hxx" #include "ivp_mindist.hxx"
#include "ivp_mindist_intern.hxx"
#include "ivp_core.hxx" #include "ivp_core.hxx"
#include "ivp_friction.hxx" #include "ivp_friction.hxx"
#include "ivp_listener_object.hxx" #include "ivp_listener_object.hxx"

2
vphysics/traceperf/traceperf.vpc
View File

@ -5,7 +5,7 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
$Macro SRCDIR "..\.." $Macro SRCDIR "..\.."
$Macro OUTBINDIR "$LIBPUBLIC" $Macro OUTBINDIR "$SRCDIR\..\game\bin"
$Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc" $Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc"

2
vphysics/vphysics.vpc
View File

@ -13,7 +13,7 @@ $Configuration
{ {
$Compiler $Compiler
{ {
$AdditionalIncludeDirectories "$BASE;$SRCDIR\ivp\ivp_intern;$SRCDIR\ivp\ivp_collision;$SRCDIR\ivp\ivp_physics;$SRCDIR\ivp\ivp_surface_manager;$SRCDIR\ivp\ivp_utility;$SRCDIR\ivp\ivp_controller;$SRCDIR\ivp\ivp_compact_builder;$SRCDIR\ivp\havana\havok;$SRCDIR\ivp\havana" $AdditionalIncludeDirectories "$BASE;.;$SRCDIR\ivp\ivp_intern;$SRCDIR\ivp\ivp_collision;$SRCDIR\ivp\ivp_physics;$SRCDIR\ivp\ivp_surface_manager;$SRCDIR\ivp\ivp_utility;$SRCDIR\ivp\ivp_controller;$SRCDIR\ivp\ivp_compact_builder;$SRCDIR\ivp\havana\havok;$SRCDIR\ivp\havana"
$PreprocessorDefinitions "$BASE;VPHYSICS_EXPORTS;HAVANA_CONSTRAINTS;HAVOK_MOPP" $PreprocessorDefinitions "$BASE;VPHYSICS_EXPORTS;HAVANA_CONSTRAINTS;HAVOK_MOPP"
$Create/UsePrecompiledHeader "Use Precompiled Header (/Yu)" $Create/UsePrecompiledHeader "Use Precompiled Header (/Yu)"
$Create/UsePCHThroughFile "cbase.h" $Create/UsePCHThroughFile "cbase.h"