fix how regex inserts underscore in function names with '2d' and '3d'

create_stub_pyray.py

@@ -14,6 +14,7 @@
 
 from pathlib import Path
 from raylib import rl, ffi
+from pyray import _underscore
 from inspect import ismethod, getmembers, isbuiltin
 import inflection, sys, json
 
@@ -87,7 +88,7 @@ def ctype_to_python_type(t):
 reserved_words = ("in", "list", "tuple", "set", "dict", "from", "range", "min", "max", "any", "all", "len")
 
 for name, attr in getmembers(rl):
-    uname = inflection.underscore(name).replace('3_d', '_3d').replace('2_d', '_2d')
+    uname = _underscore(name)
     if isbuiltin(attr) or str(type(attr)) == "<class '_cffi_backend.__FFIFunctionWrapper'>":
         json_object = known_functions.get(name, None)
         if json_object is None:

docs/genindex.html

@@ -10666,6 +10666,14 @@ <h2 id="V">V</h2>
       <li><a href="pyray.html#pyray.vector2_clamp">vector2_clamp() (in module pyray)</a>
 </li>
       <li><a href="pyray.html#pyray.vector2_clamp_value">vector2_clamp_value() (in module pyray)</a>
+</li>
+      <li><a href="pyray.html#pyray.vector2_distance">vector2_distance() (in module pyray)</a>
+</li>
+      <li><a href="pyray.html#pyray.vector2_distance_sqr">vector2_distance_sqr() (in module pyray)</a>
+</li>
+      <li><a href="pyray.html#pyray.vector2_divide">vector2_divide() (in module pyray)</a>
+</li>
+      <li><a href="pyray.html#pyray.vector2_dot_product">vector2_dot_product() (in module pyray)</a>
 </li>
       <li><a href="pyray.html#pyray.vector2_equals">vector2_equals() (in module pyray)</a>
 </li>
@@ -10790,6 +10798,14 @@ <h2 id="V">V</h2>
       <li><a href="pyray.html#pyray.vector3_cross_product">vector3_cross_product() (in module pyray)</a>
 </li>
       <li><a href="pyray.html#pyray.vector3_cubic_hermite">vector3_cubic_hermite() (in module pyray)</a>
+</li>
+      <li><a href="pyray.html#pyray.vector3_distance">vector3_distance() (in module pyray)</a>
+</li>
+      <li><a href="pyray.html#pyray.vector3_distance_sqr">vector3_distance_sqr() (in module pyray)</a>
+</li>
+      <li><a href="pyray.html#pyray.vector3_divide">vector3_divide() (in module pyray)</a>
+</li>
+      <li><a href="pyray.html#pyray.vector3_dot_product">vector3_dot_product() (in module pyray)</a>
 </li>
       <li><a href="pyray.html#pyray.vector3_equals">vector3_equals() (in module pyray)</a>
 </li>
@@ -10839,6 +10855,8 @@ <h2 id="V">V</h2>
 </li>
       <li><a href="pyray.html#pyray.vector3_to_float_v">vector3_to_float_v() (in module pyray)</a>
 </li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="pyray.html#pyray.vector3_transform">vector3_transform() (in module pyray)</a>
 </li>
       <li><a href="pyray.html#pyray.vector3_unproject">vector3_unproject() (in module pyray)</a>
@@ -10855,8 +10873,6 @@ <h2 id="V">V</h2>
 </li>
       <li><a href="raylib.html#raylib.Vector3Clamp">Vector3Clamp() (in module raylib)</a>
 </li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="raylib.html#raylib.Vector3ClampValue">Vector3ClampValue() (in module raylib)</a>
 </li>
       <li><a href="raylib.html#raylib.Vector3CrossProduct">Vector3CrossProduct() (in module raylib)</a>
@@ -11018,22 +11034,6 @@ <h2 id="V">V</h2>
       <li><a href="raylib.html#raylib.Vector4SubtractValue">Vector4SubtractValue() (in module raylib)</a>
 </li>
       <li><a href="raylib.html#raylib.Vector4Zero">Vector4Zero() (in module raylib)</a>
-</li>
-      <li><a href="pyray.html#pyray.vector_2distance">vector_2distance() (in module pyray)</a>
-</li>
-      <li><a href="pyray.html#pyray.vector_2distance_sqr">vector_2distance_sqr() (in module pyray)</a>
-</li>
-      <li><a href="pyray.html#pyray.vector_2divide">vector_2divide() (in module pyray)</a>
-</li>
-      <li><a href="pyray.html#pyray.vector_2dot_product">vector_2dot_product() (in module pyray)</a>
-</li>
-      <li><a href="pyray.html#pyray.vector_3distance">vector_3distance() (in module pyray)</a>
-</li>
-      <li><a href="pyray.html#pyray.vector_3distance_sqr">vector_3distance_sqr() (in module pyray)</a>
-</li>
-      <li><a href="pyray.html#pyray.vector_3divide">vector_3divide() (in module pyray)</a>
-</li>
-      <li><a href="pyray.html#pyray.vector_3dot_product">vector_3dot_product() (in module pyray)</a>
 </li>
       <li><a href="pyray.html#pyray.PhysicsBodyData.velocity">velocity (pyray.PhysicsBodyData attribute)</a>
 

pyray/__init__.py

@@ -29,9 +29,8 @@
 
 
 def _underscore(word: str) -> str:
-    """
-    from inflection
-    """
+    word = re.sub('2D$', '_2d', word)
+    word = re.sub('3D$', '_3d', word)
     word = re.sub(r"([A-Z]+)([A-Z][a-z])", r'\1_\2', word)
     word = re.sub(r"([a-z\d])([A-Z])", r'\1_\2', word)
     word = word.replace("-", "_")
@@ -136,7 +135,7 @@ def func(*args):
 
 for name, attr in getmembers(rl):
     # print(name, attr)
-    uname = _underscore(name).replace('3_d', '_3d').replace('2_d', '_2d')
+    uname = _underscore(name)
     if isbuiltin(attr) or str(type(attr)) == "<class '_cffi_backend.__FFIFunctionWrapper'>" or str(
             type(attr)) == "<class '_cffi_backend._CDataBase'>":
         # print(attr.__call__)

pyray/__init__.pyi

@@ -2982,16 +2982,16 @@ def vector2_clamp(v: Vector2|list|tuple,min_1: Vector2|list|tuple,max_2: Vector2
 def vector2_clamp_value(v: Vector2|list|tuple,min_1: float,max_2: float,) -> Vector2:
         """"""
         ...
-def vector_2distance(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
+def vector2_distance(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
         """"""
         ...
-def vector_2distance_sqr(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
+def vector2_distance_sqr(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
         """"""
         ...
-def vector_2divide(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> Vector2:
+def vector2_divide(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> Vector2:
         """"""
         ...
-def vector_2dot_product(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
+def vector2_dot_product(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
         """"""
         ...
 def vector2_equals(p: Vector2|list|tuple,q: Vector2|list|tuple,) -> int:
@@ -3081,16 +3081,16 @@ def vector3_cross_product(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> Vec
 def vector3_cubic_hermite(v1: Vector3|list|tuple,tangent1: Vector3|list|tuple,v2: Vector3|list|tuple,tangent2: Vector3|list|tuple,amount: float,) -> Vector3:
         """"""
         ...
-def vector_3distance(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
+def vector3_distance(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
         """"""
         ...
-def vector_3distance_sqr(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
+def vector3_distance_sqr(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
         """"""
         ...
-def vector_3divide(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> Vector3:
+def vector3_divide(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> Vector3:
         """"""
         ...
-def vector_3dot_product(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
+def vector3_dot_product(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
         """"""
         ...
 def vector3_equals(p: Vector3|list|tuple,q: Vector3|list|tuple,) -> int:

raylib/rlgl.h.modified

@@ -3,7 +3,7 @@
 *   rlgl v5.0 - A multi-OpenGL abstraction layer with an immediate-mode style API
 *
 *   DESCRIPTION:
-*       An abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, 4.3 Core, ES 2.0)
+*       An abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, 4.3 Core, ES 2.0, ES 3.0)
 *       that provides a pseudo-OpenGL 1.1 immediate-mode style API (rlVertex, rlTranslate, rlRotate...)
 *
 *   ADDITIONAL NOTES: