Move Solver to RigidBody.

master
Vectozavr 2021-10-17 12:35:12 +07:00
parent 06d0a63a75
commit 3cbe93c6c0
3 changed files with 9 additions and 8 deletions

View File

@ -31,15 +31,23 @@ add_executable(shooter
PlayerController.h PlayerController.h
Shooter.cpp Shooter.cpp
Shooter.h Shooter.h
ShooterConsts.h
# 3d engine: # 3d engine:
engine/Consts.h
engine/utils/Time.h engine/utils/Time.h
engine/utils/Time.cpp engine/utils/Time.cpp
engine/Point4D.h engine/Point4D.h
engine/Point4D.cpp engine/Point4D.cpp
engine/Vec3D.cpp
engine/Vec3D.h
engine/Vec2D.cpp
engine/Vec2D.h
engine/Matrix4x4.h engine/Matrix4x4.h
engine/Matrix4x4.cpp engine/Matrix4x4.cpp
engine/Triangle.h engine/Triangle.h
engine/Triangle.cpp engine/Triangle.cpp
engine/Plane.h
engine/Plane.cpp
engine/Mesh.h engine/Mesh.h
engine/Mesh.cpp engine/Mesh.cpp
engine/utils/Log.h engine/utils/Log.h
@ -54,8 +62,6 @@ add_executable(shooter
engine/Screen.cpp engine/Screen.cpp
engine/Engine.h engine/Engine.h
engine/Engine.cpp engine/Engine.cpp
engine/Plane.h
engine/Plane.cpp
engine/Keyboard.cpp engine/Keyboard.cpp
engine/Keyboard.h engine/Keyboard.h
engine/Mouse.cpp engine/Mouse.cpp
@ -72,8 +78,6 @@ add_executable(shooter
engine/physics/RigidBody.cpp engine/physics/RigidBody.cpp
engine/physics/RigidBody.h engine/physics/RigidBody.h
engine/physics/Simplex.h engine/physics/Simplex.h
engine/physics/Solver.cpp
engine/physics/Solver.h
engine/Object.cpp engine/Object.cpp
engine/Object.h engine/Object.h
engine/gui/Button.cpp engine/gui/Button.cpp
@ -92,9 +96,8 @@ add_executable(shooter
engine/network/UDPConnection.h engine/network/UDPConnection.h
engine/network/UDPSocket.cpp engine/network/UDPSocket.cpp
engine/network/UDPSocket.h engine/network/UDPSocket.h
engine/network/config.h
engine/animation/AFunction.h engine/animation/AFunction.h
engine/Consts.h engine/Vec3D.cpp engine/Vec3D.h engine/Vec2D.cpp engine/Vec2D.h ShooterConsts.h) )
if(APPLE OR UNIX) if(APPLE OR UNIX)
include_directories(/usr/local/include) include_directories(/usr/local/include)

View File

@ -6,7 +6,6 @@
#include "utils/Time.h" #include "utils/Time.h"
#include <iostream> #include <iostream>
#include "ResourceManager.h" #include "ResourceManager.h"
#include "physics/Solver.h"
#include "animation/Timeline.h" #include "animation/Timeline.h"
Engine::Engine() { Engine::Engine() {

View File

@ -5,7 +5,6 @@
#include "World.h" #include "World.h"
#include "utils/Log.h" #include "utils/Log.h"
#include "Plane.h" #include "Plane.h"
#include "physics/Solver.h"
using namespace std; using namespace std;