Skip to content

Commit

Permalink
fix bugs
Browse files Browse the repository at this point in the history
- fix typing hint error in PyBMap
- remove UNKNOWN_PF in PixelFormat enum in PyBMap.virtools_type. because it is a fallback value and should not be used directly. so when I apply it to Blender plugin, it cause a error.
  • Loading branch information
yyc12345 committed Jan 8, 2024
1 parent 8ed7df6 commit afd4aba
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions BMapBindings/PyBMap/PyBMap/bmap.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ctypes, os, sys
import ctypes, os, sys, typing

#region Type Defines

Expand Down Expand Up @@ -89,15 +89,15 @@ class bm_VxMatrix(ctypes.Structure):
def is_bmap_available() -> bool:
return _g_BMapModule is not None

def _bmap_error_check(result: bm_bool, func, args):
def _bmap_error_check(result: bool, func, args):
if not result:
raise BMapException("BMap operation failed.")
return result

def _create_bmap_func(fct_name: str, fct_params: list[ctypes._SimpleCData]) -> ctypes._CFuncPtr:
def _create_bmap_func(fct_name: str, fct_params: list[typing.Any]) -> typing.Callable[..., bm_bool]:
if _g_BMapModule is None: return None

cache: ctypes._CFuncPtr = getattr(_g_BMapModule, fct_name)
cache: typing.Callable[..., bm_bool] = getattr(_g_BMapModule, fct_name)
cache.argtypes = fct_params
cache.restype = bm_bool
cache.errcheck = _bmap_error_check
Expand Down
2 changes: 1 addition & 1 deletion BMapBindings/PyBMap/PyBMap/virtools_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ class VX_PIXELFORMAT(enum.IntEnum):
"""!
Pixel format types.
"""
UNKNOWN_PF = 0 ##< Unknown pixel format
#UNKNOWN_PF = 0 ##< Unknown pixel format
_32_ARGB8888 = 1 ##< 32-bit ARGB pixel format with alpha
_32_RGB888 = 2 ##< 32-bit RGB pixel format without alpha
_24_RGB888 = 3 ##< 24-bit RGB pixel format
Expand Down
8 changes: 4 additions & 4 deletions CodeGen/BMapBindings/snippets/header.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ctypes, os, sys
import ctypes, os, sys, typing

#region Type Defines

Expand Down Expand Up @@ -89,15 +89,15 @@ class bm_VxMatrix(ctypes.Structure):
def is_bmap_available() -> bool:
return _g_BMapModule is not None

def _bmap_error_check(result: bm_bool, func, args):
def _bmap_error_check(result: bool, func, args):
if not result:
raise BMapException("BMap operation failed.")
return result

def _create_bmap_func(fct_name: str, fct_params: list[ctypes._SimpleCData]) -> ctypes._CFuncPtr:
def _create_bmap_func(fct_name: str, fct_params: list[typing.Any]) -> typing.Callable[..., bm_bool]:
if _g_BMapModule is None: return None

cache: ctypes._CFuncPtr = getattr(_g_BMapModule, fct_name)
cache: typing.Callable[..., bm_bool] = getattr(_g_BMapModule, fct_name)
cache.argtypes = fct_params
cache.restype = bm_bool
cache.errcheck = _bmap_error_check
Expand Down

0 comments on commit afd4aba

Please sign in to comment.