Header clean up

src/items/item.hpp

@@ -30,7 +30,7 @@
 #include "utils/no_copy.hpp"
 #include "utils/vec3.hpp"
 
-#include <line2d.h>
+#include <line3d.h>
 
 class AbstractKart;
 class Item;

src/karts/controller/skidding_ai.hpp

@@ -48,6 +48,8 @@
 #include "tracks/drive_node.hpp"
 #include "utils/random_generator.hpp"
 
+#include <line3d.h>
+
 class LinearWorld;
 class DriveGraph;
 class ShowCurve;

src/karts/controller/test_ai.hpp

@@ -49,6 +49,8 @@
 #include "tracks/drive_node.hpp"
 #include "utils/random_generator.hpp"
 
+#include <line3d.h>
+
 #ifdef AI_DEBUG
   class ShowCurve;
 

src/tracks/arena_node.hpp

@@ -22,6 +22,7 @@
 #include "tracks/quad.hpp"
 #include "utils/cpp2011.hpp"
 
+#include <line3d.h>
 #include <vector>
 
 /**

src/tracks/drive_node.cpp

@@ -20,7 +20,6 @@
 
 #include "io/file_manager.hpp"
 #include "io/xml_node.hpp"
-#include "matrix4.h"
 #include "tracks/drive_graph.hpp"
 #include "utils/log.hpp"
 

src/tracks/drive_node_3d.hpp

@@ -23,6 +23,8 @@
 #include "tracks/drive_node.hpp"
 #include "utils/cpp2011.hpp"
 
+#include <line3d.h>
+
 /**
   * \ingroup tracks
   */

src/utils/vec3.hpp

@@ -20,7 +20,6 @@
 #ifndef HEADER_VEC3_HPP
 #define HEADER_VEC3_HPP
 
-#include <triangle3d.h>
 #include <vector3d.h>
 #include <vector2d.h>
 using namespace irr;
@@ -216,12 +215,8 @@ public:
 
     float sideofPlane(const Vec3& x1, const Vec3& x2, const Vec3& x3) const
     {
-        core::triangle3df triangle(x1.toIrrVector(), x2.toIrrVector(), x3.toIrrVector());
-        core::vector3df normal = triangle.getNormal();
-        return normal.dotProduct((*this - x1).toIrrVector());
-
+        return ((x2 - x1).cross(x3 - x1)).dot(*this - x1);
     } // sideOfPlane
 };    // Vec3
 
-
 #endif