This commit is contained in:
youxie
2019-11-29 11:03:20 +01:00
parent 8c73ee7c4e
commit 56a95ec733

View File

@@ -23,7 +23,8 @@ using namespace GamePhysics;
//#define TEMPLATE_DEMO //#define TEMPLATE_DEMO
//#define MASS_SPRING_SYSTEM //#define MASS_SPRING_SYSTEM
//#define RIGID_BODY_SYSTEM //#define RIGID_BODY_SYSTEM
#define SPHERE_SYSTEM //#define SPH_SYSTEM
#define DIFFUSION_SYSTEM
#ifdef TEMPLATE_DEMO #ifdef TEMPLATE_DEMO
#include "TemplateSimulator.h" #include "TemplateSimulator.h"
@@ -32,10 +33,14 @@ using namespace GamePhysics;
#include "MassSpringSystemSimulator.h" #include "MassSpringSystemSimulator.h"
#endif #endif
#ifdef RIGID_BODY_SYSTEM #ifdef RIGID_BODY_SYSTEM
#include "RigidBodySystemSimulator.h" //#include "RigidBodySystemSimulator.h"
#endif #endif
#ifdef SPHERE_SYSTEM #ifdef SPH_SYSTEM
#include "SphereSystemSimulator.h" //#include "SPHSystemSimulator.h"
#endif
#ifdef DIFFUSION_SYSTEM
#include "DiffusionSimulator.h"
#endif #endif
DrawingUtilitiesClass * g_pDUC; DrawingUtilitiesClass * g_pDUC;
@@ -204,8 +209,10 @@ void CALLBACK OnMouse( bool bLeftButtonDown, bool bRightButtonDown, bool bMiddle
g_pSimulator->onClick(xPos,yPos); g_pSimulator->onClick(xPos,yPos);
} }
else else
{
g_pSimulator->onMouse(xPos, yPos); g_pSimulator->onMouse(xPos, yPos);
} }
}
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
@@ -363,10 +370,13 @@ int main(int argc, char* argv[])
g_pSimulator= new MassSpringSystemSimulator(); g_pSimulator= new MassSpringSystemSimulator();
#endif #endif
#ifdef RIGID_BODY_SYSTEM #ifdef RIGID_BODY_SYSTEM
g_pSimulator= new RigidBodySystemSimulator(); //g_pSimulator= new RigidBodySystemSimulator();
#endif #endif
#ifdef SPHERE_SYSTEM #ifdef SPH_SYSTEM
g_pSimulator= new SphereSystemSimulator(); //g_pSimulator= new SPHSystemSimulator();
#endif
#ifdef DIFFUSION_SYSTEM
g_pSimulator= new DiffusionSimulator();
#endif #endif
g_pSimulator->reset(); g_pSimulator->reset();