raylib C enums are now Python enums

Author: overdev

.gitignore

@@ -19,6 +19,7 @@ __pycache__/
 pylint.html
 .idea/
 .vs/
+.vscode/
 env
 venv/
 .pytest_cache/

raylibpy/__init__.py

@@ -1,6 +1,7 @@
 import sys
 import os
 from math import modf
+from enum import IntEnum
 from typing import Tuple, Union, Sequence, AnyStr
 from ctypes import (
     c_bool,
@@ -2024,97 +2025,185 @@ class VrDeviceInfo(Structure):
 # Enumerators Definition
 # ---------------------------------------------------------------------------------
 # Trace log type
-LOG_INFO = 1
-LOG_WARNING = 2
-LOG_ERROR = 4
-LOG_DEBUG = 8
-LOG_OTHER = 16
+class LogType(IntEnum):
+    LOG_INFO = 1
+    LOG_WARNING = 2
+    LOG_ERROR = 4
+    LOG_DEBUG = 8
+    LOG_OTHER = 16
+
+LOG_INFO = LogType.LOG_INFO
+LOG_WARNING = LogType.LOG_WARNING
+LOG_ERROR = LogType.LOG_ERROR
+LOG_DEBUG = LogType.LOG_DEBUG
+LOG_OTHER = LogType.LOG_OTHER
 
 # Shader location point type
-LOC_VERTEX_POSITION = 1
-LOC_VERTEX_TEXCOORD01 = 2
-LOC_VERTEX_TEXCOORD02 = 3
-LOC_VERTEX_NORMAL = 4
-LOC_VERTEX_TANGENT = 5
-LOC_VERTEX_COLOR = 6
-LOC_MATRIX_MVP = 7
-LOC_MATRIX_MODEL = 8
-LOC_MATRIX_VIEW = 9
-LOC_MATRIX_PROJECTION = 10
-LOC_VECTOR_VIEW = 11
-LOC_COLOR_DIFFUSE = 12
-LOC_COLOR_SPECULAR = 13
-LOC_COLOR_AMBIENT = 14
-LOC_MAP_ALBEDO = 15
-LOC_MAP_METALNESS = 16
-LOC_MAP_NORMAL = 17
-LOC_MAP_ROUGHNESS = 18
-LOC_MAP_OCCLUSION = 19
-LOC_MAP_EMISSION = 20
-LOC_MAP_HEIGHT = 21
-LOC_MAP_CUBEMAP = 22
-LOC_MAP_IRRADIANCE = 23
-LOC_MAP_PREFILTER = 24
-LOC_MAP_BRDF = 25
-LOC_MAP_DIFFUSE = LOC_MAP_ALBEDO
-LOC_MAP_SPECULAR = LOC_MAP_METALNESS
+class ShaderLocationIndex(IntEnum):
+    LOC_VERTEX_POSITION = 1
+    LOC_VERTEX_TEXCOORD01 = 2
+    LOC_VERTEX_TEXCOORD02 = 3
+    LOC_VERTEX_NORMAL = 4
+    LOC_VERTEX_TANGENT = 5
+    LOC_VERTEX_COLOR = 6
+    LOC_MATRIX_MVP = 7
+    LOC_MATRIX_MODEL = 8
+    LOC_MATRIX_VIEW = 9
+    LOC_MATRIX_PROJECTION = 10
+    LOC_VECTOR_VIEW = 11
+    LOC_COLOR_DIFFUSE = 12
+    LOC_COLOR_SPECULAR = 13
+    LOC_COLOR_AMBIENT = 14
+    LOC_MAP_ALBEDO = 15
+    LOC_MAP_METALNESS = 16
+    LOC_MAP_NORMAL = 17
+    LOC_MAP_ROUGHNESS = 18
+    LOC_MAP_OCCLUSION = 19
+    LOC_MAP_EMISSION = 20
+    LOC_MAP_HEIGHT = 21
+    LOC_MAP_CUBEMAP = 22
+    LOC_MAP_IRRADIANCE = 23
+    LOC_MAP_PREFILTER = 24
+    LOC_MAP_BRDF = 25
+
+LOC_VERTEX_POSITION = ShaderLocationIndex.LOC_VERTEX_POSITION
+LOC_VERTEX_TEXCOORD01 = ShaderLocationIndex.LOC_VERTEX_TEXCOORD01
+LOC_VERTEX_TEXCOORD02 = ShaderLocationIndex.LOC_VERTEX_TEXCOORD02
+LOC_VERTEX_NORMAL = ShaderLocationIndex.LOC_VERTEX_NORMAL
+LOC_VERTEX_TANGENT = ShaderLocationIndex.LOC_VERTEX_TANGENT
+LOC_VERTEX_COLOR = ShaderLocationIndex.LOC_VERTEX_COLOR
+LOC_MATRIX_MVP = ShaderLocationIndex.LOC_MATRIX_MVP
+LOC_MATRIX_MODEL = ShaderLocationIndex.LOC_MATRIX_MODEL
+LOC_MATRIX_VIEW = ShaderLocationIndex.LOC_MATRIX_VIEW
+LOC_MATRIX_PROJECTION = ShaderLocationIndex.LOC_MATRIX_PROJECTION
+LOC_VECTOR_VIEW = ShaderLocationIndex.LOC_VECTOR_VIEW
+LOC_COLOR_DIFFUSE = ShaderLocationIndex.LOC_COLOR_DIFFUSE
+LOC_COLOR_SPECULAR = ShaderLocationIndex.LOC_COLOR_SPECULAR
+LOC_COLOR_AMBIENT = ShaderLocationIndex.LOC_COLOR_AMBIENT
+LOC_MAP_ALBEDO = ShaderLocationIndex.LOC_MAP_ALBEDO
+LOC_MAP_METALNESS = ShaderLocationIndex.LOC_MAP_METALNESS
+LOC_MAP_NORMAL = ShaderLocationIndex.LOC_MAP_NORMAL
+LOC_MAP_ROUGHNESS = ShaderLocationIndex.LOC_MAP_ROUGHNESS
+LOC_MAP_OCCLUSION = ShaderLocationIndex.LOC_MAP_OCCLUSION
+LOC_MAP_EMISSION = ShaderLocationIndex.LOC_MAP_EMISSION
+LOC_MAP_HEIGHT = ShaderLocationIndex.LOC_MAP_HEIGHT
+LOC_MAP_CUBEMAP = ShaderLocationIndex.LOC_MAP_CUBEMAP
+LOC_MAP_IRRADIANCE = ShaderLocationIndex.LOC_MAP_IRRADIANCE
+LOC_MAP_PREFILTER = ShaderLocationIndex.LOC_MAP_PREFILTER
+LOC_MAP_BRDF = ShaderLocationIndex.LOC_MAP_BRDF
+LOC_MAP_DIFFUSE = ShaderLocationIndex.LOC_MAP_ALBEDO
+LOC_MAP_SPECULAR = ShaderLocationIndex.LOC_MAP_METALNESS
 
-# Material map type
-MAP_ALBEDO = 0
-MAP_METALNESS = 1
-MAP_NORMAL = 2
-MAP_ROUGHNESS = 3
-MAP_OCCLUSION = 4
-MAP_EMISSION = 5
-MAP_HEIGHT = 6
-MAP_CUBEMAP = 7
-MAP_IRRADIANCE = 8
-MAP_PREFILTER = 9
-MAP_BRDF = 10
-MAP_DIFFUSE = MAP_ALBEDO
-MAP_SPECULAR = MAP_METALNESS
-
-
-UNCOMPRESSED_GRAYSCALE = 1
-UNCOMPRESSED_GRAY_ALPHA = 2
-UNCOMPRESSED_R5G6B5 = 3
-UNCOMPRESSED_R8G8B8 = 4
-UNCOMPRESSED_R5G5B5A1 = 5
-UNCOMPRESSED_R4G4B4A4 = 6
-UNCOMPRESSED_R8G8B8A8 = 7
-UNCOMPRESSED_R32 = 8
-UNCOMPRESSED_R32G32B32 = 9
-UNCOMPRESSED_R32G32B32A32 = 10
-COMPRESSED_DXT1_RGB = 11
-COMPRESSED_DXT1_RGBA = 12
-COMPRESSED_DXT3_RGBA = 13
-COMPRESSED_DXT5_RGBA = 14
-COMPRESSED_ETC1_RGB = 15
-COMPRESSED_ETC2_RGB = 16
-COMPRESSED_ETC2_EAC_RGBA = 17
-COMPRESSED_PVRT_RGB = 18
-COMPRESSED_PVRT_RGBA = 19
-COMPRESSED_ASTC_4x4_RGBA = 20
-COMPRESSED_ASTC_8x8_RGBA = 21
-
-
-FILTER_POINT = 0
-FILTER_BILINEAR = 1
-FILTER_TRILINEAR = 2
-FILTER_ANISOTROPIC_4X = 3
-FILTER_ANISOTROPIC_8X = 4
-FILTER_ANISOTROPIC_16X = 5
-
-
-WRAP_REPEAT = 0
-WRAP_CLAMP = 1
-WRAP_MIRROR = 2
-
-
-BLEND_ALPHA = 0
-BLEND_ADDITIVE = 1
-BLEND_MULTIPLIED = 2
 
+# Material map type
+class TexmapIndex(IntEnum):
+    MAP_ALBEDO = 0
+    MAP_METALNESS = 1
+    MAP_NORMAL = 2
+    MAP_ROUGHNESS = 3
+    MAP_OCCLUSION = 4
+    MAP_EMISSION = 5
+    MAP_HEIGHT = 6
+    MAP_CUBEMAP = 7
+    MAP_IRRADIANCE = 8
+    MAP_PREFILTER = 9
+    MAP_BRDF = 10
+
+MAP_ALBEDO = TexmapIndex.MAP_ALBEDO
+MAP_METALNESS = TexmapIndex.MAP_METALNESS
+MAP_NORMAL = TexmapIndex.MAP_NORMAL
+MAP_ROUGHNESS = TexmapIndex.MAP_ROUGHNESS
+MAP_OCCLUSION = TexmapIndex.MAP_OCCLUSION
+MAP_EMISSION = TexmapIndex.MAP_EMISSION
+MAP_HEIGHT = TexmapIndex.MAP_HEIGHT
+MAP_CUBEMAP = TexmapIndex.MAP_CUBEMAP
+MAP_IRRADIANCE = TexmapIndex.MAP_IRRADIANCE
+MAP_PREFILTER = TexmapIndex.MAP_PREFILTER
+MAP_BRDF = TexmapIndex.MAP_BRDF
+MAP_DIFFUSE = TexmapIndex.MAP_ALBEDO
+MAP_SPECULAR = TexmapIndex.MAP_METALNESS
+
+
+class PixelFormat(IntEnum):
+    UNCOMPRESSED_GRAYSCALE = 1
+    UNCOMPRESSED_GRAY_ALPHA = 2
+    UNCOMPRESSED_R5G6B5 = 3
+    UNCOMPRESSED_R8G8B8 = 4
+    UNCOMPRESSED_R5G5B5A1 = 5
+    UNCOMPRESSED_R4G4B4A4 = 6
+    UNCOMPRESSED_R8G8B8A8 = 7
+    UNCOMPRESSED_R32 = 8
+    UNCOMPRESSED_R32G32B32 = 9
+    UNCOMPRESSED_R32G32B32A32 = 10
+    COMPRESSED_DXT1_RGB = 11
+    COMPRESSED_DXT1_RGBA = 12
+    COMPRESSED_DXT3_RGBA = 13
+    COMPRESSED_DXT5_RGBA = 14
+    COMPRESSED_ETC1_RGB = 15
+    COMPRESSED_ETC2_RGB = 16
+    COMPRESSED_ETC2_EAC_RGBA = 17
+    COMPRESSED_PVRT_RGB = 18
+    COMPRESSED_PVRT_RGBA = 19
+    COMPRESSED_ASTC_4x4_RGBA = 20
+    COMPRESSED_ASTC_8x8_RGBA = 21
+
+
+UNCOMPRESSED_GRAYSCALE = PixelFormat.UNCOMPRESSED_GRAYSCALE
+UNCOMPRESSED_GRAY_ALPHA = PixelFormat.UNCOMPRESSED_GRAY_ALPHA
+UNCOMPRESSED_R5G6B5 = PixelFormat.UNCOMPRESSED_R5G6B5
+UNCOMPRESSED_R8G8B8 = PixelFormat.UNCOMPRESSED_R8G8B8
+UNCOMPRESSED_R5G5B5A1 = PixelFormat.UNCOMPRESSED_R5G5B5A1
+UNCOMPRESSED_R4G4B4A4 = PixelFormat.UNCOMPRESSED_R4G4B4A4
+UNCOMPRESSED_R8G8B8A8 = PixelFormat.UNCOMPRESSED_R8G8B8A8
+UNCOMPRESSED_R32 = PixelFormat.UNCOMPRESSED_R32
+UNCOMPRESSED_R32G32B32 = PixelFormat.UNCOMPRESSED_R32G32B32
+UNCOMPRESSED_R32G32B32A32 = PixelFormat.UNCOMPRESSED_R32G32B32A32
+COMPRESSED_DXT1_RGB = PixelFormat.COMPRESSED_DXT1_RGB
+COMPRESSED_DXT1_RGBA = PixelFormat.COMPRESSED_DXT1_RGBA
+COMPRESSED_DXT3_RGBA = PixelFormat.COMPRESSED_DXT3_RGBA
+COMPRESSED_DXT5_RGBA = PixelFormat.COMPRESSED_DXT5_RGBA
+COMPRESSED_ETC1_RGB = PixelFormat.COMPRESSED_ETC1_RGB
+COMPRESSED_ETC2_RGB = PixelFormat.COMPRESSED_ETC2_RGB
+COMPRESSED_ETC2_EAC_RGBA = PixelFormat.COMPRESSED_ETC2_EAC_RGBA
+COMPRESSED_PVRT_RGB = PixelFormat.COMPRESSED_PVRT_RGB
+COMPRESSED_PVRT_RGBA = PixelFormat.COMPRESSED_PVRT_RGBA
+COMPRESSED_ASTC_4x4_RGBA = PixelFormat.COMPRESSED_ASTC_4x4_RGBA
+COMPRESSED_ASTC_8x8_RGBA = PixelFormat.COMPRESSED_ASTC_8x8_RGBA
+
+
+class TextureFilterMode(IntEnum):
+    FILTER_POINT = 0
+    FILTER_BILINEAR = 1
+    FILTER_TRILINEAR = 2
+    FILTER_ANISOTROPIC_4X = 3
+    FILTER_ANISOTROPIC_8X = 4
+    FILTER_ANISOTROPIC_16X = 5
+
+FILTER_POINT = TextureFilterMode.FILTER_POINT
+FILTER_BILINEAR = TextureFilterMode.FILTER_BILINEAR
+FILTER_TRILINEAR = TextureFilterMode.FILTER_TRILINEAR
+FILTER_ANISOTROPIC_4X = TextureFilterMode.FILTER_ANISOTROPIC_4X
+FILTER_ANISOTROPIC_8X = TextureFilterMode.FILTER_ANISOTROPIC_8X
+FILTER_ANISOTROPIC_16X = TextureFilterMode.FILTER_ANISOTROPIC_16X
+
+
+class TextureWrapMode(IntEnum):
+    WRAP_REPEAT = 0
+    WRAP_CLAMP = 1
+    WRAP_MIRROR = 2
+
+WRAP_REPEAT = TextureWrapMode.WRAP_REPEAT
+WRAP_CLAMP = TextureWrapMode.WRAP_CLAMP
+WRAP_MIRROR = TextureWrapMode.WRAP_MIRROR
+
+class BlendMode(IntEnum):
+    BLEND_ALPHA = 0
+    BLEND_ADDITIVE = 1
+    BLEND_MULTIPLIED = 2
+
+BLEND_ALPHA = BlendMode.BLEND_ALPHA
+BLEND_ADDITIVE = BlendMode.BLEND_ADDITIVE
+BLEND_MULTIPLIED = BlendMode.BLEND_MULTIPLIED
 
 GESTURE_NONE = 0
 GESTURE_TAP = 1