From 3cbe93c6c066236696dc474fc25b46444784f71e Mon Sep 17 00:00:00 2001
From: Vectozavr <60608292+vectozavr@users.noreply.github.com>
Date: Sun, 17 Oct 2021 12:35:12 +0700
Subject: [PATCH] Move Solver to RigidBody.

---
 CMakeLists.txt    | 15 +++++++++------
 engine/Engine.cpp |  1 -
 engine/World.cpp  |  1 -
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 794afd1..12d719b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,15 +31,23 @@ add_executable(shooter
         PlayerController.h
         Shooter.cpp
         Shooter.h
+        ShooterConsts.h
         # 3d engine:
+        engine/Consts.h
         engine/utils/Time.h
         engine/utils/Time.cpp
         engine/Point4D.h
         engine/Point4D.cpp
+        engine/Vec3D.cpp
+        engine/Vec3D.h
+        engine/Vec2D.cpp
+        engine/Vec2D.h
         engine/Matrix4x4.h
         engine/Matrix4x4.cpp
         engine/Triangle.h
         engine/Triangle.cpp
+        engine/Plane.h
+        engine/Plane.cpp
         engine/Mesh.h
         engine/Mesh.cpp
         engine/utils/Log.h
@@ -54,8 +62,6 @@ add_executable(shooter
         engine/Screen.cpp
         engine/Engine.h
         engine/Engine.cpp
-        engine/Plane.h
-        engine/Plane.cpp
         engine/Keyboard.cpp
         engine/Keyboard.h
         engine/Mouse.cpp
@@ -72,8 +78,6 @@ add_executable(shooter
         engine/physics/RigidBody.cpp
         engine/physics/RigidBody.h
         engine/physics/Simplex.h
-        engine/physics/Solver.cpp
-        engine/physics/Solver.h
         engine/Object.cpp
         engine/Object.h
         engine/gui/Button.cpp
@@ -92,9 +96,8 @@ add_executable(shooter
         engine/network/UDPConnection.h
         engine/network/UDPSocket.cpp
         engine/network/UDPSocket.h
-        engine/network/config.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)
     include_directories(/usr/local/include)
diff --git a/engine/Engine.cpp b/engine/Engine.cpp
index b34ec07..c280fa9 100644
--- a/engine/Engine.cpp
+++ b/engine/Engine.cpp
@@ -6,7 +6,6 @@
 #include "utils/Time.h"
 #include <iostream>
 #include "ResourceManager.h"
-#include "physics/Solver.h"
 #include "animation/Timeline.h"
 
 Engine::Engine() {
diff --git a/engine/World.cpp b/engine/World.cpp
index 7207bc8..124cc96 100644
--- a/engine/World.cpp
+++ b/engine/World.cpp
@@ -5,7 +5,6 @@
 #include "World.h"
 #include "utils/Log.h"
 #include "Plane.h"
-#include "physics/Solver.h"
 
 using namespace std;