Skip to content

Commit bf6d5d4

Browse files
electronstudioelectronstudio
authored
fix how regex inserts underscore in function names with '2d' and '3d' (#149)
1 parent 9e5c9b7 commit bf6d5d4

File tree

8 files changed

+81
-81
lines changed

8 files changed

+81
-81
lines changed

‎create_stub_pyray.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
from pathlib import Path
1616
from raylib import rl, ffi
17+
from pyray import _underscore
1718
from inspect import ismethod, getmembers, isbuiltin
1819
import inflection, sys, json
1920

@@ -87,7 +88,7 @@ def ctype_to_python_type(t):
8788
reserved_words = ("in", "list", "tuple", "set", "dict", "from", "range", "min", "max", "any", "all", "len")
8889

8990
for name, attr in getmembers(rl):
90-
uname = inflection.underscore(name).replace('3_d', '_3d').replace('2_d', '_2d')
91+
uname = _underscore(name)
9192
if isbuiltin(attr) or str(type(attr)) == "<class '_cffi_backend.__FFIFunctionWrapper'>":
9293
json_object = known_functions.get(name, None)
9394
if json_object is None:

‎docs/genindex.html

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10666,6 +10666,14 @@ <h2 id="V">V</h2>
1066610666
<li><a href="pyray.html#pyray.vector2_clamp">vector2_clamp() (in module pyray)</a>
1066710667
</li>
1066810668
<li><a href="pyray.html#pyray.vector2_clamp_value">vector2_clamp_value() (in module pyray)</a>
10669+
</li>
10670+
<li><a href="pyray.html#pyray.vector2_distance">vector2_distance() (in module pyray)</a>
10671+
</li>
10672+
<li><a href="pyray.html#pyray.vector2_distance_sqr">vector2_distance_sqr() (in module pyray)</a>
10673+
</li>
10674+
<li><a href="pyray.html#pyray.vector2_divide">vector2_divide() (in module pyray)</a>
10675+
</li>
10676+
<li><a href="pyray.html#pyray.vector2_dot_product">vector2_dot_product() (in module pyray)</a>
1066910677
</li>
1067010678
<li><a href="pyray.html#pyray.vector2_equals">vector2_equals() (in module pyray)</a>
1067110679
</li>
@@ -10790,6 +10798,14 @@ <h2 id="V">V</h2>
1079010798
<li><a href="pyray.html#pyray.vector3_cross_product">vector3_cross_product() (in module pyray)</a>
1079110799
</li>
1079210800
<li><a href="pyray.html#pyray.vector3_cubic_hermite">vector3_cubic_hermite() (in module pyray)</a>
10801+
</li>
10802+
<li><a href="pyray.html#pyray.vector3_distance">vector3_distance() (in module pyray)</a>
10803+
</li>
10804+
<li><a href="pyray.html#pyray.vector3_distance_sqr">vector3_distance_sqr() (in module pyray)</a>
10805+
</li>
10806+
<li><a href="pyray.html#pyray.vector3_divide">vector3_divide() (in module pyray)</a>
10807+
</li>
10808+
<li><a href="pyray.html#pyray.vector3_dot_product">vector3_dot_product() (in module pyray)</a>
1079310809
</li>
1079410810
<li><a href="pyray.html#pyray.vector3_equals">vector3_equals() (in module pyray)</a>
1079510811
</li>
@@ -10839,6 +10855,8 @@ <h2 id="V">V</h2>
1083910855
</li>
1084010856
<li><a href="pyray.html#pyray.vector3_to_float_v">vector3_to_float_v() (in module pyray)</a>
1084110857
</li>
10858+
</ul></td>
10859+
<td style="width: 33%; vertical-align: top;"><ul>
1084210860
<li><a href="pyray.html#pyray.vector3_transform">vector3_transform() (in module pyray)</a>
1084310861
</li>
1084410862
<li><a href="pyray.html#pyray.vector3_unproject">vector3_unproject() (in module pyray)</a>
@@ -10855,8 +10873,6 @@ <h2 id="V">V</h2>
1085510873
</li>
1085610874
<li><a href="raylib.html#raylib.Vector3Clamp">Vector3Clamp() (in module raylib)</a>
1085710875
</li>
10858-
</ul></td>
10859-
<td style="width: 33%; vertical-align: top;"><ul>
1086010876
<li><a href="raylib.html#raylib.Vector3ClampValue">Vector3ClampValue() (in module raylib)</a>
1086110877
</li>
1086210878
<li><a href="raylib.html#raylib.Vector3CrossProduct">Vector3CrossProduct() (in module raylib)</a>
@@ -11018,22 +11034,6 @@ <h2 id="V">V</h2>
1101811034
<li><a href="raylib.html#raylib.Vector4SubtractValue">Vector4SubtractValue() (in module raylib)</a>
1101911035
</li>
1102011036
<li><a href="raylib.html#raylib.Vector4Zero">Vector4Zero() (in module raylib)</a>
11021-
</li>
11022-
<li><a href="pyray.html#pyray.vector_2distance">vector_2distance() (in module pyray)</a>
11023-
</li>
11024-
<li><a href="pyray.html#pyray.vector_2distance_sqr">vector_2distance_sqr() (in module pyray)</a>
11025-
</li>
11026-
<li><a href="pyray.html#pyray.vector_2divide">vector_2divide() (in module pyray)</a>
11027-
</li>
11028-
<li><a href="pyray.html#pyray.vector_2dot_product">vector_2dot_product() (in module pyray)</a>
11029-
</li>
11030-
<li><a href="pyray.html#pyray.vector_3distance">vector_3distance() (in module pyray)</a>
11031-
</li>
11032-
<li><a href="pyray.html#pyray.vector_3distance_sqr">vector_3distance_sqr() (in module pyray)</a>
11033-
</li>
11034-
<li><a href="pyray.html#pyray.vector_3divide">vector_3divide() (in module pyray)</a>
11035-
</li>
11036-
<li><a href="pyray.html#pyray.vector_3dot_product">vector_3dot_product() (in module pyray)</a>
1103711037
</li>
1103811038
<li><a href="pyray.html#pyray.PhysicsBodyData.velocity">velocity (pyray.PhysicsBodyData attribute)</a>
1103911039

‎docs/objects.inv

1 Byte
Binary file not shown.

‎docs/pyray.html

Lines changed: 48 additions & 48 deletions
Large diffs are not rendered by default.

‎docs/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyray/__init__.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929

3030

3131
def _underscore(word: str) -> str:
32-
"""
33-
from inflection
34-
"""
32+
word = re.sub('2D$', '_2d', word)
33+
word = re.sub('3D$', '_3d', word)
3534
word = re.sub(r"([A-Z]+)([A-Z][a-z])", r'\1_\2', word)
3635
word = re.sub(r"([a-z\d])([A-Z])", r'\1_\2', word)
3736
word = word.replace("-", "_")
@@ -136,7 +135,7 @@ def func(*args):
136135

137136
for name, attr in getmembers(rl):
138137
# print(name, attr)
139-
uname = _underscore(name).replace('3_d', '_3d').replace('2_d', '_2d')
138+
uname = _underscore(name)
140139
if isbuiltin(attr) or str(type(attr)) == "<class '_cffi_backend.__FFIFunctionWrapper'>" or str(
141140
type(attr)) == "<class '_cffi_backend._CDataBase'>":
142141
# print(attr.__call__)

‎pyray/__init__.pyi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2982,16 +2982,16 @@ def vector2_clamp(v: Vector2|list|tuple,min_1: Vector2|list|tuple,max_2: Vector2
29822982
def vector2_clamp_value(v: Vector2|list|tuple,min_1: float,max_2: float,) -> Vector2:
29832983
""""""
29842984
...
2985-
def vector_2distance(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
2985+
def vector2_distance(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
29862986
""""""
29872987
...
2988-
def vector_2distance_sqr(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
2988+
def vector2_distance_sqr(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
29892989
""""""
29902990
...
2991-
def vector_2divide(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> Vector2:
2991+
def vector2_divide(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> Vector2:
29922992
""""""
29932993
...
2994-
def vector_2dot_product(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
2994+
def vector2_dot_product(v1: Vector2|list|tuple,v2: Vector2|list|tuple,) -> float:
29952995
""""""
29962996
...
29972997
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
30813081
def vector3_cubic_hermite(v1: Vector3|list|tuple,tangent1: Vector3|list|tuple,v2: Vector3|list|tuple,tangent2: Vector3|list|tuple,amount: float,) -> Vector3:
30823082
""""""
30833083
...
3084-
def vector_3distance(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
3084+
def vector3_distance(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
30853085
""""""
30863086
...
3087-
def vector_3distance_sqr(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
3087+
def vector3_distance_sqr(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
30883088
""""""
30893089
...
3090-
def vector_3divide(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> Vector3:
3090+
def vector3_divide(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> Vector3:
30913091
""""""
30923092
...
3093-
def vector_3dot_product(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
3093+
def vector3_dot_product(v1: Vector3|list|tuple,v2: Vector3|list|tuple,) -> float:
30943094
""""""
30953095
...
30963096
def vector3_equals(p: Vector3|list|tuple,q: Vector3|list|tuple,) -> int:

‎raylib/rlgl.h.modified

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* rlgl v5.0 - A multi-OpenGL abstraction layer with an immediate-mode style API
44
*
55
* DESCRIPTION:
6-
* An abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, 4.3 Core, ES 2.0)
6+
* An abstraction layer for multiple OpenGL versions (1.1, 2.1, 3.3 Core, 4.3 Core, ES 2.0, ES 3.0)
77
* that provides a pseudo-OpenGL 1.1 immediate-mode style API (rlVertex, rlTranslate, rlRotate...)
88
*
99
* ADDITIONAL NOTES:

0 commit comments

Comments
 (0)