[Core] Completely kill math_2d.h, change includes

2018-08-11 03:08:26 -05:00 · 2018-08-11 03:08:26 -05:00 · cf136a91d6
parent 14fe7230f4
commit cf136a91d6
17 changed files with 16 additions and 52 deletions
--- a/core/image.h
+++ b/core/image.h
@ -33,7 +33,7 @@

 #include "color.h"
 #include "dvector.h"
-#include "math_2d.h"
+#include "rect2.h"
 #include "resource.h"

 /**
--- a/core/math/camera_matrix.h
+++ b/core/math/camera_matrix.h
@ -31,7 +31,7 @@
 #ifndef CAMERA_MATRIX_H
 #define CAMERA_MATRIX_H

-#include "math_2d.h"
+#include "rect2.h"
 #include "transform.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
--- a/core/math/delaunay.h
+++ b/core/math/delaunay.h
@ -1,7 +1,7 @@
 #ifndef DELAUNAY_H
 #define DELAUNAY_H

-#include "math_2d.h"
+#include "rect2.h"

 class Delaunay2D {
 public:
--- a/core/math/geometry.h
+++ b/core/math/geometry.h
@ -33,9 +33,9 @@

 #include "dvector.h"
 #include "face3.h"
-#include "math_2d.h"
 #include "object.h"
 #include "print_string.h"
+#include "rect2.h"
 #include "triangulate.h"
 #include "vector.h"
 #include "vector3.h"
--- a/core/math/math_2d.h
+++ b/core/math/math_2d.h
@ -1,36 +0,0 @@
-/*************************************************************************/
-/*  math_2d.h                                                            */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the       */
-/* "Software"), to deal in the Software without restriction, including   */
-/* without limitation the rights to use, copy, modify, merge, publish,   */
-/* distribute, sublicense, and/or sell copies of the Software, and to    */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions:                                             */
-/*                                                                       */
-/* The above copyright notice and this permission notice shall be        */
-/* included in all copies or substantial portions of the Software.       */
-/*                                                                       */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
-/*************************************************************************/
-
-#ifndef MATH_2D_H
-#define MATH_2D_H
-
-#include "transform_2d.h"
-
-#endif
--- a/core/method_ptrcall.h
+++ b/core/method_ptrcall.h
@ -31,7 +31,7 @@
 #ifndef METHOD_PTRCALL_H
 #define METHOD_PTRCALL_H

-#include "math_2d.h"
+#include "transform_2d.h"
 #include "typedefs.h"
 #include "variant.h"

--- a/core/os/input_event.h
+++ b/core/os/input_event.h
@ -31,9 +31,9 @@
 #ifndef INPUT_EVENT_H
 #define INPUT_EVENT_H

-#include "math_2d.h"
 #include "os/copymem.h"
 #include "resource.h"
+#include "transform_2d.h"
 #include "typedefs.h"
 #include "ustring.h"
 /**
--- a/core/variant.h
+++ b/core/variant.h
@ -42,7 +42,6 @@
 #include "dvector.h"
 #include "face3.h"
 #include "io/ip_address.h"
-#include "math_2d.h"
 #include "matrix3.h"
 #include "node_path.h"
 #include "plane.h"
@ -50,6 +49,7 @@
 #include "ref_ptr.h"
 #include "rid.h"
 #include "transform.h"
+#include "transform_2d.h"
 #include "ustring.h"
 #include "vector3.h"

--- a/modules/csg/csg.h
+++ b/modules/csg/csg.h
@ -34,9 +34,9 @@
 #include "aabb.h"
 #include "dvector.h"
 #include "map.h"
-#include "math_2d.h"
 #include "oa_hash_map.h"
 #include "plane.h"
+#include "rect2.h"
 #include "scene/resources/material.h"
 #include "transform.h"
 #include "vector3.h"
--- a/modules/gdnative/gdnative/rect2.cpp
+++ b/modules/gdnative/gdnative/rect2.cpp
@ -30,7 +30,7 @@

 #include "gdnative/rect2.h"

-#include "core/math/math_2d.h"
+#include "core/math/transform_2d.h"
 #include "core/variant.h"

 #ifdef __cplusplus
--- a/modules/gdnative/gdnative/transform2d.cpp
+++ b/modules/gdnative/gdnative/transform2d.cpp
@ -30,7 +30,7 @@

 #include "gdnative/transform2d.h"

-#include "core/math/math_2d.h"
+#include "core/math/transform_2d.h"
 #include "core/variant.h"

 #ifdef __cplusplus
--- a/platform/uwp/os_uwp.h
+++ b/platform/uwp/os_uwp.h
@ -31,7 +31,7 @@
 #ifndef OSUWP_H
 #define OSUWP_H

-#include "core/math/math_2d.h"
+#include "core/math/transform_2d.h"
 #include "core/ustring.h"
 #include "drivers/xaudio2/audio_driver_xaudio2.h"
 #include "gl_context_egl.h"
--- a/scene/gui/control.h
+++ b/scene/gui/control.h
@ -31,13 +31,13 @@
 #ifndef CONTROL_H
 #define CONTROL_H

-#include "math_2d.h"
 #include "rid.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/gui/shortcut.h"
 #include "scene/main/node.h"
 #include "scene/main/timer.h"
 #include "scene/resources/theme.h"
+#include "transform_2d.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@ -31,11 +31,11 @@
 #ifndef VIEWPORT_H
 #define VIEWPORT_H

-#include "math_2d.h"
 #include "scene/main/node.h"
 #include "scene/resources/texture.h"
 #include "scene/resources/world_2d.h"
 #include "servers/visual_server.h"
+#include "transform_2d.h"
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@ -33,9 +33,9 @@

 #include "curve.h"
 #include "io/resource_loader.h"
-#include "math_2d.h"
 #include "os/mutex.h"
 #include "os/thread_safe.h"
+#include "rect2.h"
 #include "resource.h"
 #include "scene/resources/color_ramp.h"
 #include "servers/visual_server.h"
--- a/servers/physics_2d/broad_phase_2d_sw.h
+++ b/servers/physics_2d/broad_phase_2d_sw.h
@ -31,8 +31,8 @@
 #ifndef BROAD_PHASE_2D_SW_H
 #define BROAD_PHASE_2D_SW_H

-#include "math_2d.h"
 #include "math_funcs.h"
+#include "rect2.h"

 class CollisionObject2DSW;

--- a/servers/visual_server.h
+++ b/servers/visual_server.h
@ -34,9 +34,9 @@
 #include "bsp_tree.h"
 #include "geometry.h"
 #include "image.h"
-#include "math_2d.h"
 #include "object.h"
 #include "rid.h"
+#include "transform_2d.h"
 #include "variant.h"

 /**