Browse Source

Rename files and the exposed name for Transform3D

Aaron Franke 4 years ago
parent
commit
a3c29ed899

+ 1 - 1
core/math/camera_matrix.h

@@ -32,7 +32,7 @@
 #define CAMERA_MATRIX_H
 
 #include "core/math/rect2.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 
 struct CameraMatrix {
 	enum Planes {

+ 1 - 1
core/math/face3.h

@@ -33,7 +33,7 @@
 
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector3.h"
 
 class Face3 {

+ 2 - 2
core/math/transform.cpp → core/math/transform_3d.cpp

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  transform.cpp                                                        */
+/*  transform_3d.cpp                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "transform.h"
+#include "transform_3d.h"
 
 #include "core/math/math_funcs.h"
 #include "core/string/print_string.h"

+ 1 - 1
core/math/transform.h → core/math/transform_3d.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  transform.h                                                          */
+/*  transform_3d.h                                                       */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */

+ 1 - 1
core/variant/variant.h

@@ -38,8 +38,8 @@
 #include "core/math/face3.h"
 #include "core/math/plane.h"
 #include "core/math/quat.h"
-#include "core/math/transform.h"
 #include "core/math/transform_2d.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector3.h"
 #include "core/math/vector3i.h"
 #include "core/object/object_id.h"

+ 1 - 1
modules/bullet/bullet_types_converter.h

@@ -32,7 +32,7 @@
 #define BULLET_TYPES_CONVERTER_H
 
 #include "core/math/basis.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector3.h"
 #include "core/typedefs.h"
 

+ 1 - 1
modules/bullet/collision_object_bullet.h

@@ -31,7 +31,7 @@
 #ifndef COLLISION_OBJECT_BULLET_H
 #define COLLISION_OBJECT_BULLET_H
 
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector3.h"
 #include "core/object/class_db.h"
 #include "core/templates/vset.h"

+ 1 - 1
modules/csg/csg.h

@@ -33,7 +33,7 @@
 
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object/reference.h"

+ 1 - 1
modules/fbx/data/pivot_transform.h

@@ -31,7 +31,7 @@
 #ifndef PIVOT_TRANSFORM_H
 #define PIVOT_TRANSFORM_H
 
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/object/reference.h"
 
 #include "model_abstraction.h"

+ 1 - 1
modules/fbx/fbx_parser/FBXDeformer.cpp

@@ -78,7 +78,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXMeshGeometry.h"
 #include "FBXParser.h"
 #include "core/math/math_funcs.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 
 #include <iostream>
 

+ 1 - 1
modules/fbx/fbx_parser/FBXDocument.h

@@ -37,7 +37,7 @@
 #include "FBXCommon.h"
 #include "FBXParser.h"
 #include "FBXProperties.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/string/print_string.h"

+ 1 - 1
modules/fbx/fbx_parser/FBXParser.cpp

@@ -82,7 +82,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FBXParser.h"
 #include "FBXTokenizer.h"
 #include "core/math/math_defs.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector3.h"
 #include "core/string/print_string.h"
 

+ 1 - 1
modules/fbx/fbx_parser/FBXParser.h

@@ -81,7 +81,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <memory>
 
 #include "core/math/color.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 

+ 2 - 2
modules/gdnative/gdnative/transform.cpp

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  transform.cpp                                                        */
+/*  transform_3d.cpp                                                     */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
@@ -30,7 +30,7 @@
 
 #include "gdnative/transform.h"
 
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 
 static_assert(sizeof(godot_transform) == sizeof(Transform3D), "Transform3D size mismatch");
 

+ 1 - 1
modules/gdnative/include/gdnative/transform.h

@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  transform.h                                                          */
+/*  transform_3d.h                                                       */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */

+ 2 - 2
modules/mono/editor/bindings_generator.cpp

@@ -3126,10 +3126,10 @@ bool BindingsGenerator::_arg_default_value_from_variant(const Variant &p_val, Ar
 		case Variant::TRANSFORM3D: {
 			Transform3D transform = p_val.operator Transform3D();
 			if (transform == Transform3D()) {
-				r_iarg.default_argument = "Transform.Identity";
+				r_iarg.default_argument = "Transform3D.Identity";
 			} else {
 				Basis basis = transform.basis;
-				r_iarg.default_argument = "new Transform(new Vector3" + basis.get_column(0).operator String() + ", new Vector3" + basis.get_column(1).operator String() + ", new Vector3" + basis.get_column(2).operator String() + ", new Vector3" + transform.origin.operator String() + ")";
+				r_iarg.default_argument = "new Transform3D(new Vector3" + basis.get_column(0).operator String() + ", new Vector3" + basis.get_column(1).operator String() + ", new Vector3" + basis.get_column(2).operator String() + ", new Vector3" + transform.origin.operator String() + ")";
 			}
 			r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL;
 		} break;

+ 0 - 0
modules/mono/glue/GodotSharp/GodotSharp/Core/Transform.cs → modules/mono/glue/GodotSharp/GodotSharp/Core/Transform3D.cs


+ 1 - 1
modules/mono/glue/GodotSharp/GodotSharp/GodotSharp.csproj

@@ -58,8 +58,8 @@
     <Compile Include="Core\SignalAwaiter.cs" />
     <Compile Include="Core\StringExtensions.cs" />
     <Compile Include="Core\StringName.cs" />
-    <Compile Include="Core\Transform.cs" />
     <Compile Include="Core\Transform2D.cs" />
+    <Compile Include="Core\Transform3D.cs" />
     <Compile Include="Core\UnhandledExceptionArgs.cs" />
     <Compile Include="Core\Vector2.cs" />
     <Compile Include="Core\Vector2i.cs" />

+ 1 - 1
scene/3d/skeleton_ik_3d.h

@@ -37,7 +37,7 @@
  * @author AndreaCatania
  */
 
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "scene/3d/skeleton_3d.h"
 
 class FabrikInverseKinematic {

+ 1 - 1
servers/navigation_server_2d.cpp

@@ -29,8 +29,8 @@
 /*************************************************************************/
 
 #include "servers/navigation_server_2d.h"
-#include "core/math/transform.h"
 #include "core/math/transform_2d.h"
+#include "core/math/transform_3d.h"
 #include "servers/navigation_server_3d.h"
 
 /**

+ 1 - 1
servers/physics_3d/joints/jacobian_entry_3d_sw.h

@@ -50,7 +50,7 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 
 class JacobianEntry3DSW {
 public:

+ 1 - 1
tests/test_math.cpp

@@ -35,7 +35,7 @@
 #include "core/math/delaunay_3d.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/math_funcs.h"
-#include "core/math/transform.h"
+#include "core/math/transform_3d.h"
 #include "core/os/file_access.h"
 #include "core/os/keyboard.h"
 #include "core/os/os.h"