UnrealXR/raylib-python-cffi
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to raylib 3.7

Browse source
This commit is contained in:
richard 2021-06-12 21:51:27 +01:00
parent 677dfc0de0
commit 124f0c77a9
6 changed files with 283 additions and 673 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -42,10 +42,10 @@ Build and install Raylib from the raylib-c directory.
cd raylib-python-cffi/raylib-c
mkdir build
cd build
cmake -DWITH_PIC=on -DSTATIC=on -DSHARED=on ..
ccmake -DWITH_PIC=on -DBUILD_SHARED_LIBS=on -DCMAKE_BUILD_TYPE=Release ..
sudo make install
Make a patched version of raylib header.
Make a patched version of raylib header. (Not necessary if you've already got raylib_modifed.h from repo and haven't changed anything.)
cd ../../raylib
cp raylib.h raylib_modified.h

672
raylib/raylib_modified.h
View file

File diff suppressed because it is too large Load diff

274
raylib/raylib_modified.h.patch
View file

@ -1,274 +0,0 @@
--- raylib_modified.h 2021-01-16 16:20:49.658611910 +0000
+++ raylib_modified.h 2021-01-16 16:11:55.862545751 +0000
@@ -71,103 +71,103 @@
*
**********************************************************************************************/
-#ifndef RAYLIB_H
-#define RAYLIB_H
-
-#include <stdarg.h> // Required for: va_list - Only used by TraceLogCallback
-
-#if defined(_WIN32)
- // Microsoft attibutes to tell compiler that symbols are imported/exported from a .dll
- #if defined(BUILD_LIBTYPE_SHARED)
- #define RLAPI __declspec(dllexport) // We are building raylib as a Win32 shared library (.dll)
- #elif defined(USE_LIBTYPE_SHARED)
- #define RLAPI __declspec(dllimport) // We are using raylib as a Win32 shared library (.dll)
- #else
- #define RLAPI // We are building or using raylib as a static library
- #endif
-#else
- #define RLAPI // We are building or using raylib as a static library (or Linux shared library)
-#endif
-
-//----------------------------------------------------------------------------------
-// Some basic Defines
-//----------------------------------------------------------------------------------
-#ifndef PI
- #define PI 3.14159265358979323846f
-#endif
-
-#define DEG2RAD (PI/180.0f)
-#define RAD2DEG (180.0f/PI)
-
-// Allow custom memory allocators
-#ifndef RL_MALLOC
- #define RL_MALLOC(sz) malloc(sz)
-#endif
-#ifndef RL_CALLOC
- #define RL_CALLOC(n,sz) calloc(n,sz)
-#endif
-#ifndef RL_REALLOC
- #define RL_REALLOC(ptr,sz) realloc(ptr,sz)
-#endif
-#ifndef RL_FREE
- #define RL_FREE(ptr) free(ptr)
-#endif
-
-// NOTE: MSC C++ compiler does not support compound literals (C99 feature)
-// Plain structures in C++ (without constructors) can be initialized from { } initializers.
-#if defined(__cplusplus)
- #define CLITERAL(type) type
-#else
- #define CLITERAL(type) (type)
-#endif
-
-// Some Basic Colors
-// NOTE: Custom raylib color palette for amazing visuals on WHITE background
-#define LIGHTGRAY CLITERAL(Color){ 200, 200, 200, 255 } // Light Gray
-#define GRAY CLITERAL(Color){ 130, 130, 130, 255 } // Gray
-#define DARKGRAY CLITERAL(Color){ 80, 80, 80, 255 } // Dark Gray
-#define YELLOW CLITERAL(Color){ 253, 249, 0, 255 } // Yellow
-#define GOLD CLITERAL(Color){ 255, 203, 0, 255 } // Gold
-#define ORANGE CLITERAL(Color){ 255, 161, 0, 255 } // Orange
-#define PINK CLITERAL(Color){ 255, 109, 194, 255 } // Pink
-#define RED CLITERAL(Color){ 230, 41, 55, 255 } // Red
-#define MAROON CLITERAL(Color){ 190, 33, 55, 255 } // Maroon
-#define GREEN CLITERAL(Color){ 0, 228, 48, 255 } // Green
-#define LIME CLITERAL(Color){ 0, 158, 47, 255 } // Lime
-#define DARKGREEN CLITERAL(Color){ 0, 117, 44, 255 } // Dark Green
-#define SKYBLUE CLITERAL(Color){ 102, 191, 255, 255 } // Sky Blue
-#define BLUE CLITERAL(Color){ 0, 121, 241, 255 } // Blue
-#define DARKBLUE CLITERAL(Color){ 0, 82, 172, 255 } // Dark Blue
-#define PURPLE CLITERAL(Color){ 200, 122, 255, 255 } // Purple
-#define VIOLET CLITERAL(Color){ 135, 60, 190, 255 } // Violet
-#define DARKPURPLE CLITERAL(Color){ 112, 31, 126, 255 } // Dark Purple
-#define BEIGE CLITERAL(Color){ 211, 176, 131, 255 } // Beige
-#define BROWN CLITERAL(Color){ 127, 106, 79, 255 } // Brown
-#define DARKBROWN CLITERAL(Color){ 76, 63, 47, 255 } // Dark Brown
-
-#define WHITE CLITERAL(Color){ 255, 255, 255, 255 } // White
-#define BLACK CLITERAL(Color){ 0, 0, 0, 255 } // Black
-#define BLANK CLITERAL(Color){ 0, 0, 0, 0 } // Blank (Transparent)
-#define MAGENTA CLITERAL(Color){ 255, 0, 255, 255 } // Magenta
-#define RAYWHITE CLITERAL(Color){ 245, 245, 245, 255 } // My own White (raylib logo)
-
-// Temporal hack to avoid breaking old codebases using
-// deprecated raylib implementation of these functions
-#define FormatText TextFormat
-#define LoadText LoadFileText
-#define GetExtension GetFileExtension
-#define GetImageData LoadImageColors
-//#define Fade(c, a) ColorAlpha(c, a)
-
-//----------------------------------------------------------------------------------
-// Structures Definition
-//----------------------------------------------------------------------------------
-// Boolean type
-#if defined(__STDC__) && __STDC_VERSION__ >= 199901L
- #include <stdbool.h>
-#elif !defined(__cplusplus) && !defined(bool)
- typedef enum { false, true } bool;
-#endif
+//#ifndef RAYLIB_H
+//#define RAYLIB_H
+//
+//#include <stdarg.h> // Required for: va_list - Only used by TraceLogCallback
+//
+//#if defined(_WIN32)
+// // Microsoft attibutes to tell compiler that symbols are imported/exported from a .dll
+// #if defined(BUILD_LIBTYPE_SHARED)
+// #define RLAPI __declspec(dllexport) // We are building raylib as a Win32 shared library (.dll)
+// #elif defined(USE_LIBTYPE_SHARED)
+// #define RLAPI __declspec(dllimport) // We are using raylib as a Win32 shared library (.dll)
+// #else
+// #define RLAPI // We are building or using raylib as a static library
+// #endif
+//#else
+// #define RLAPI // We are building or using raylib as a static library (or Linux shared library)
+//#endif
+//
+////----------------------------------------------------------------------------------
+//// Some basic Defines
+////----------------------------------------------------------------------------------
+//#ifndef PI
+// #define PI 3.14159265358979323846f
+//#endif
+//
+//#define DEG2RAD (PI/180.0f)
+//#define RAD2DEG (180.0f/PI)
+//
+//// Allow custom memory allocators
+//#ifndef RL_MALLOC
+// #define RL_MALLOC(sz) malloc(sz)
+//#endif
+//#ifndef RL_CALLOC
+// #define RL_CALLOC(n,sz) calloc(n,sz)
+//#endif
+//#ifndef RL_REALLOC
+// #define RL_REALLOC(ptr,sz) realloc(ptr,sz)
+//#endif
+//#ifndef RL_FREE
+// #define RL_FREE(ptr) free(ptr)
+//#endif
+//
+//// NOTE: MSC C++ compiler does not support compound literals (C99 feature)
+//// Plain structures in C++ (without constructors) can be initialized from { } initializers.
+//#if defined(__cplusplus)
+// #define CLITERAL(type) type
+//#else
+// #define CLITERAL(type) (type)
+//#endif
+//
+//// Some Basic Colors
+//// NOTE: Custom raylib color palette for amazing visuals on WHITE background
+//#define LIGHTGRAY CLITERAL(Color){ 200, 200, 200, 255 } // Light Gray
+//#define GRAY CLITERAL(Color){ 130, 130, 130, 255 } // Gray
+//#define DARKGRAY CLITERAL(Color){ 80, 80, 80, 255 } // Dark Gray
+//#define YELLOW CLITERAL(Color){ 253, 249, 0, 255 } // Yellow
+//#define GOLD CLITERAL(Color){ 255, 203, 0, 255 } // Gold
+//#define ORANGE CLITERAL(Color){ 255, 161, 0, 255 } // Orange
+//#define PINK CLITERAL(Color){ 255, 109, 194, 255 } // Pink
+//#define RED CLITERAL(Color){ 230, 41, 55, 255 } // Red
+//#define MAROON CLITERAL(Color){ 190, 33, 55, 255 } // Maroon
+//#define GREEN CLITERAL(Color){ 0, 228, 48, 255 } // Green
+//#define LIME CLITERAL(Color){ 0, 158, 47, 255 } // Lime
+//#define DARKGREEN CLITERAL(Color){ 0, 117, 44, 255 } // Dark Green
+//#define SKYBLUE CLITERAL(Color){ 102, 191, 255, 255 } // Sky Blue
+//#define BLUE CLITERAL(Color){ 0, 121, 241, 255 } // Blue
+//#define DARKBLUE CLITERAL(Color){ 0, 82, 172, 255 } // Dark Blue
+//#define PURPLE CLITERAL(Color){ 200, 122, 255, 255 } // Purple
+//#define VIOLET CLITERAL(Color){ 135, 60, 190, 255 } // Violet
+//#define DARKPURPLE CLITERAL(Color){ 112, 31, 126, 255 } // Dark Purple
+//#define BEIGE CLITERAL(Color){ 211, 176, 131, 255 } // Beige
+//#define BROWN CLITERAL(Color){ 127, 106, 79, 255 } // Brown
+//#define DARKBROWN CLITERAL(Color){ 76, 63, 47, 255 } // Dark Brown
+//
+//#define WHITE CLITERAL(Color){ 255, 255, 255, 255 } // White
+//#define BLACK CLITERAL(Color){ 0, 0, 0, 255 } // Black
+//#define BLANK CLITERAL(Color){ 0, 0, 0, 0 } // Blank (Transparent)
+//#define MAGENTA CLITERAL(Color){ 255, 0, 255, 255 } // Magenta
+//#define RAYWHITE CLITERAL(Color){ 245, 245, 245, 255 } // My own White (raylib logo)
+//
+//// Temporal hack to avoid breaking old codebases using
+//// deprecated raylib implementation of these functions
+//#define FormatText TextFormat
+//#define LoadText LoadFileText
+//#define GetExtension GetFileExtension
+//#define GetImageData LoadImageColors
+////#define Fade(c, a) ColorAlpha(c, a)
+//
+////----------------------------------------------------------------------------------
+//// Structures Definition
+////----------------------------------------------------------------------------------
+//// Boolean type
+//#if defined(__STDC__) && __STDC_VERSION__ >= 199901L
+// #include <stdbool.h>
+//#elif !defined(__cplusplus) && !defined(bool)
+// typedef enum { false, true } bool;
+//#endif
// Vector2 type
typedef struct Vector2 {
@@ -282,7 +282,7 @@
CharInfo *chars; // Characters info data
} Font;
-#define SpriteFont Font // SpriteFont type fallback, defaults to Font
+//#define SpriteFont Font // SpriteFont type fallback, defaults to Font
// Camera type, defines a camera position/orientation in 3d space
typedef struct Camera3D {
@@ -727,8 +727,8 @@
LOC_MAP_BRDF
} ShaderLocationIndex;
-#define LOC_MAP_DIFFUSE LOC_MAP_ALBEDO
-#define LOC_MAP_SPECULAR LOC_MAP_METALNESS
+#define LOC_MAP_DIFFUSE 14 //LOC_MAP_ALBEDO
+#define LOC_MAP_SPECULAR 15 //LOC_MAP_METALNESS
// Shader uniform data types
typedef enum {
@@ -758,8 +758,8 @@
MAP_BRDF
} MaterialMapType;
-#define MAP_DIFFUSE MAP_ALBEDO
-#define MAP_SPECULAR MAP_METALNESS
+#define MAP_DIFFUSE 0 //MAP_ALBEDO
+#define MAP_SPECULAR 1 //MAP_METALNESS
// Pixel formats
// NOTE: Support depends on OpenGL version and platform
@@ -873,11 +873,11 @@
} NPatchType;
// Callbacks to be implemented by users
-typedef void (*TraceLogCallback)(int logType, const char *text, va_list args);
-
-#if defined(__cplusplus)
-extern "C" { // Prevents name mangling of functions
-#endif
+//typedef void (*TraceLogCallback)(int logType, const char *text, va_list args);
+//
+//#if defined(__cplusplus)
+//extern "C" { // Prevents name mangling of functions
+//#endif
//------------------------------------------------------------------------------------
// Global Variables Definition
@@ -969,7 +969,7 @@
RLAPI void SetTraceLogLevel(int logType); // Set the current threshold (minimum) log level
RLAPI void SetTraceLogExit(int logType); // Set the exit threshold (minimum) log level
-RLAPI void SetTraceLogCallback(TraceLogCallback callback); // Set a trace log callback to enable custom logging
+//RLAPI void SetTraceLogCallback(TraceLogCallback callback); // Set a trace log callback to enable custom logging
RLAPI void TraceLog(int logType, const char *text, ...); // Show trace log messages (LOG_DEBUG, LOG_INFO, LOG_WARNING, LOG_ERROR)
RLAPI void *MemAlloc(int size); // Internal memory allocator
@@ -1508,8 +1508,8 @@
RLAPI void SetAudioStreamPitch(AudioStream stream, float pitch); // Set pitch for audio stream (1.0 is base level)
RLAPI void SetAudioStreamBufferSizeDefault(int size); // Default size for new audio streams
-#if defined(__cplusplus)
-}
-#endif
-
-#endif // RAYLIB_H
+//#if defined(__cplusplus)
+//}
+//#endif
+//
+//#endif // RAYLIB_H

2
test_dynamic.py
View file

@ -14,7 +14,7 @@ texture = rl.LoadTextureFromImage(image)
mesh = rl.GenMeshHeightmap(image, [16, 8, 16])
model = rl.LoadModelFromMesh(mesh)
print(model.materials) # SHOULD BE A pointer to a 'struct Material' but some is NULL pointer to 'Material' ?
model.materials.maps[rl.MAP_DIFFUSE].texture = texture
model.materials.maps[rl.MATERIAL_MAP_DIFFUSE].texture = texture
rl.UnloadImage(image)
rl.SetCameraMode(camera[0], rl.CAMERA_ORBITAL)

2
test_pyray.py
View file

@ -15,7 +15,7 @@ image = pyray.load_image("examples/models/resources/heightmap.png")
texture = pyray.load_texture_from_image(image)
mesh = pyray.gen_mesh_heightmap(image, (16, 8, 16))
model = pyray.load_model_from_mesh(mesh)
model.materials.maps[pyray.MAP_DIFFUSE].texture = texture
model.materials.maps[pyray.MATERIAL_MAP_DIFFUSE].texture = texture
pyray.unload_image(image)
pyray.set_camera_mode(camera, pyray.CAMERA_ORBITAL)

2
test_static.py
View file

@ -13,7 +13,7 @@ image = LoadImage(b"examples/models/resources/heightmap.png")
texture = LoadTextureFromImage(image)
mesh = GenMeshHeightmap(image, (16, 8, 16))
model = LoadModelFromMesh(mesh)
model.materials.maps[MAP_DIFFUSE].texture = texture
model.materials.maps[MATERIAL_MAP_DIFFUSE].texture = texture
UnloadImage(image)
SetCameraMode(camera[0], CAMERA_ORBITAL)