From 761d6b1bc8066dd762976e3f87c40579dfe64344 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 2 Jun 2023 14:06:15 +0200 Subject: [PATCH] Fix some method names. --- generation/builtins_templates/aabb.tmpl.pxi | 2 -- generation/builtins_templates/basis.tmpl.pxi | 6 +++--- generation/builtins_templates/string_name.tmpl.pxi | 6 +++--- generation/builtins_templates/vector2.tmpl.pxi | 2 +- tests/bindings/test_basis.py | 6 +++--- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/generation/builtins_templates/aabb.tmpl.pxi b/generation/builtins_templates/aabb.tmpl.pxi index 4f600fc..ae546e7 100644 --- a/generation/builtins_templates/aabb.tmpl.pxi +++ b/generation/builtins_templates/aabb.tmpl.pxi @@ -52,8 +52,6 @@ cdef class AABB: {{ render_operator_eq() | indent }} {{ render_operator_ne() | indent }} {{ render_method("as_string") | indent }} - {{ render_method("get_area") | indent }} - {{ render_method("has_no_area") | indent }} {{ render_method("has_no_surface") | indent }} {{ render_method("intersects") | indent }} {{ render_method("encloses") | indent }} diff --git a/generation/builtins_templates/basis.tmpl.pxi b/generation/builtins_templates/basis.tmpl.pxi index 5128d03..98c6537 100644 --- a/generation/builtins_templates/basis.tmpl.pxi +++ b/generation/builtins_templates/basis.tmpl.pxi @@ -117,11 +117,11 @@ cdef class Basis: {{ render_method("scaled") | indent }} {{ render_method("get_scale") | indent }} {{ render_method("get_euler") | indent }} - {{ render_method("get_quat") | indent }} - {{ render_method("set_quat") | indent }} + {{ render_method("get_quaternion") | indent }} + {{ render_method("set_quaternion") | indent }} {{ render_method("set_axis_angle_scale") | indent }} {{ render_method("set_euler_scale") | indent }} - {{ render_method("set_quat_scale") | indent }} + {{ render_method("set_quaternion_scale") | indent }} {{ render_method("tdotx") | indent }} {{ render_method("tdoty") | indent }} {{ render_method("tdotz") | indent }} diff --git a/generation/builtins_templates/string_name.tmpl.pxi b/generation/builtins_templates/string_name.tmpl.pxi index cb7ea3d..e95ddae 100644 --- a/generation/builtins_templates/string_name.tmpl.pxi +++ b/generation/builtins_templates/string_name.tmpl.pxi @@ -29,16 +29,16 @@ cdef class StringName: gdapi10.pandemonium_string_name_destroy(&self._gd_data) def __repr__(StringName self): - return f"" + return f"" def __str__(StringName self): - return str(self.as_string()) + return str(self.get_name()) {{ render_operator_eq() | indent }} {{ render_operator_ne() | indent }} {{ render_method("destroy") | indent }} - {{ render_method("as_string") | indent }} + {{ render_method("get_name") | indent }} {% endblock %} {%- block python_consts %} diff --git a/generation/builtins_templates/vector2.tmpl.pxi b/generation/builtins_templates/vector2.tmpl.pxi index bdadb33..1a83822 100644 --- a/generation/builtins_templates/vector2.tmpl.pxi +++ b/generation/builtins_templates/vector2.tmpl.pxi @@ -107,7 +107,7 @@ cdef class Vector2: {{ render_method("bounce") | indent }} {{ render_method("reflect") | indent }} {{ render_method("abs") | indent }} - {{ render_method("clamped") | indent }} + {{ render_method("limit_length") | indent }} {% endblock %} {%- block python_consts %} diff --git a/tests/bindings/test_basis.py b/tests/bindings/test_basis.py index 44294e6..e0d09a3 100644 --- a/tests/bindings/test_basis.py +++ b/tests/bindings/test_basis.py @@ -98,11 +98,11 @@ def test_repr(): ["scaled", Basis, (Vector3(),)], ["get_scale", Vector3, ()], ["get_euler", Vector3, ()], - ["get_quat", Quaternion, ()], - ["set_quat", type(None), (Quaternion(),)], + ["get_quaternion", Quaternion, ()], + ["set_quaternion", type(None), (Quaternion(),)], ["set_axis_angle_scale", type(None), (Vector3.ONE, 1.1, Vector3.ONE)], ["set_euler_scale", type(None), (Vector3.ONE, Vector3.ONE)], - ["set_quat_scale", type(None), (Quaternion(), Vector3.ONE)], + ["set_quaternion_scale", type(None), (Quaternion(), Vector3.ONE)], ["tdotx", float, (Vector3(),)], ["tdoty", float, (Vector3(),)], ["tdotz", float, (Vector3(),)],