From 6920a3bd080049019b82f096b3f1dfa93b8fced5 Mon Sep 17 00:00:00 2001 From: nillerusr Date: Wed, 18 Nov 2020 23:18:12 +0300 Subject: [PATCH] vphysics: update --- vphysics/main.cpp | 4 ++-- vphysics/perftest/perftest.vpc | 2 +- vphysics/physics_environment.cpp | 4 ++-- vphysics/physics_friction.cpp | 1 + vphysics/physics_motioncontroller.cpp | 3 ++- vphysics/physics_object.cpp | 1 + vphysics/physics_shadow.cpp | 1 + vphysics/traceperf/traceperf.vpc | 2 +- vphysics/vphysics.vpc | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/vphysics/main.cpp b/vphysics/main.cpp index eda9a95c..6aa6a7eb 100644 --- a/vphysics/main.cpp +++ b/vphysics/main.cpp @@ -38,7 +38,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) { 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 ); // store out module handle @@ -56,7 +56,7 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved ) void __attribute__ ((constructor)) 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 ); } diff --git a/vphysics/perftest/perftest.vpc b/vphysics/perftest/perftest.vpc index 8d7222ab..6888662e 100644 --- a/vphysics/perftest/perftest.vpc +++ b/vphysics/perftest/perftest.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_exe_win_win32_base.vpc" diff --git a/vphysics/physics_environment.cpp b/vphysics/physics_environment.cpp index c261f687..4ed5415b 100644 --- a/vphysics/physics_environment.cpp +++ b/vphysics/physics_environment.cpp @@ -28,6 +28,7 @@ #include "ivp_listener_collision.hxx" #include "ivp_listener_object.hxx" #include "ivp_mindist.hxx" +#include "ivp_mindist_intern.hxx" #include "ivp_friction.hxx" #include "ivp_anomaly_manager.hxx" #include "ivp_time.hxx" @@ -35,7 +36,6 @@ #include "ivp_phantom.hxx" #include "ivp_range_manager.hxx" #include "ivp_clustering_visualizer.hxx" -#include "ivp_mindist_intern.hxx" // memdbgon must be the last include file in a .cpp file!!! #include "tier0/memdbgon.h" @@ -1540,7 +1540,7 @@ void CPhysicsEnvironment::Simulate( float deltaTime ) { m_pSleepEvents->ProcessActiveObjects( m_pPhysEnv, m_pCollisionListener->GetHandler() ); } - VISUALIZE_COLLISIONS(); + //visualize_collisions(); VirtualMeshPSI(); GetNextFrameTime(); } diff --git a/vphysics/physics_friction.cpp b/vphysics/physics_friction.cpp index a1afa52f..a6a0513a 100644 --- a/vphysics/physics_friction.cpp +++ b/vphysics/physics_friction.cpp @@ -10,6 +10,7 @@ #include "vphysics/friction.h" #include "ivp_mindist.hxx" +#include "ivp_mindist_intern.hxx" #include "ivp_listener_collision.hxx" #include "ivp_friction.hxx" diff --git a/vphysics/physics_motioncontroller.cpp b/vphysics/physics_motioncontroller.cpp index 75d62da9..9803b24d 100644 --- a/vphysics/physics_motioncontroller.cpp +++ b/vphysics/physics_motioncontroller.cpp @@ -188,7 +188,8 @@ void CPhysicsMotionController::do_simulation_controller(IVP_Event_Sim *event,IVP } break; } - pCore->apply_velocity_limit(); + // TODO(mastercoms): apply sv_maxvelocity? + //pCore->apply_velocity_limit(); } } } diff --git a/vphysics/physics_object.cpp b/vphysics/physics_object.cpp index 601772da..83dedbb2 100644 --- a/vphysics/physics_object.cpp +++ b/vphysics/physics_object.cpp @@ -9,6 +9,7 @@ #include "ivp_compact_ledge.hxx" #include "ivp_compact_ledge_solver.hxx" #include "ivp_mindist.hxx" +#include "ivp_mindist_intern.hxx" #include "ivp_friction.hxx" #include "ivp_phantom.hxx" #include "ivp_listener_collision.hxx" diff --git a/vphysics/physics_shadow.cpp b/vphysics/physics_shadow.cpp index aba34523..07c4acf9 100644 --- a/vphysics/physics_shadow.cpp +++ b/vphysics/physics_shadow.cpp @@ -14,6 +14,7 @@ // IsInContact #include "ivp_mindist.hxx" +#include "ivp_mindist_intern.hxx" #include "ivp_core.hxx" #include "ivp_friction.hxx" #include "ivp_listener_object.hxx" diff --git a/vphysics/traceperf/traceperf.vpc b/vphysics/traceperf/traceperf.vpc index 8ad38412..6fad00c0 100644 --- a/vphysics/traceperf/traceperf.vpc +++ b/vphysics/traceperf/traceperf.vpc @@ -5,7 +5,7 @@ //----------------------------------------------------------------------------- $Macro SRCDIR "..\.." -$Macro OUTBINDIR "$LIBPUBLIC" +$Macro OUTBINDIR "$SRCDIR\..\game\bin" $Include "$SRCDIR\vpc_scripts\source_exe_con_base.vpc" diff --git a/vphysics/vphysics.vpc b/vphysics/vphysics.vpc index ff19400f..698c41a7 100644 --- a/vphysics/vphysics.vpc +++ b/vphysics/vphysics.vpc @@ -13,7 +13,7 @@ $Configuration { $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" $Create/UsePrecompiledHeader "Use Precompiled Header (/Yu)" $Create/UsePCHThroughFile "cbase.h"