Update binding
Build by default for OpenGL 4.3 (may be changed in the future) Now consider LUA_PATH environment variable.
This commit is contained in:
parent
9fa0231089
commit
f501ca9512
@ -13,8 +13,8 @@ local include_paths = "-I. -Iexternal/glfw/include -Iexternal/glfw/deps/mingw"
|
|||||||
local los = require "los"
|
local los = require "los"
|
||||||
|
|
||||||
local consts = {
|
local consts = {
|
||||||
RAYLIB_VERSION = "3.7.0",
|
RAYLIB_VERSION = "4.0.0",
|
||||||
RAYLIB_API_VERSION = "370",
|
RAYLIB_API_VERSION = "400",
|
||||||
}
|
}
|
||||||
|
|
||||||
local vars = saphire.map({
|
local vars = saphire.map({
|
||||||
@ -23,7 +23,7 @@ local vars = saphire.map({
|
|||||||
{ "RAYLIB_LIB_NAME", "raylib" },
|
{ "RAYLIB_LIB_NAME", "raylib" },
|
||||||
{ "RAYLIB_RES_FILE", "./raylib.dll.rc.data" },
|
{ "RAYLIB_RES_FILE", "./raylib.dll.rc.data" },
|
||||||
{ "PLATFORM", "PLATFORM_DESKTOP" },
|
{ "PLATFORM", "PLATFORM_DESKTOP" },
|
||||||
{ "GRAPHICS", "GRAPHICS_API_OPENGL_33" },
|
{ "GRAPHICS", "GRAPHICS_API_OPENGL_43" },
|
||||||
{ "USE_EXTERNAL_GLFW", "FALSE" },
|
{ "USE_EXTERNAL_GLFW", "FALSE" },
|
||||||
{ "USE_WAYLAND_DISPLAY", "FALSE" }
|
{ "USE_WAYLAND_DISPLAY", "FALSE" }
|
||||||
}, function (v)
|
}, function (v)
|
||||||
|
2
makefile
2
makefile
@ -13,7 +13,7 @@ MODULES := raymath rlgl easings gestures physac raygui
|
|||||||
|
|
||||||
# raylib settings
|
# raylib settings
|
||||||
PLATFORM ?= PLATFORM_DESKTOP
|
PLATFORM ?= PLATFORM_DESKTOP
|
||||||
GRAPHICS ?= GRAPHICS_API_OPENGL_33
|
GRAPHICS ?= GRAPHICS_API_OPENGL_43
|
||||||
|
|
||||||
USE_WAYLAND_DISPLAY ?= FALSE
|
USE_WAYLAND_DISPLAY ?= FALSE
|
||||||
USE_EXTERNAL_GLFW ?= FALSE
|
USE_EXTERNAL_GLFW ?= FALSE
|
||||||
|
2
raylib
2
raylib
@ -1 +1 @@
|
|||||||
Subproject commit 9b3d74db6bd9e38bc1447f636897990bbd698b4b
|
Subproject commit 99f6707e2c80be2ac4c169fd6986ff2fd8d181a7
|
@ -644,6 +644,14 @@ ffi.cdef [[
|
|||||||
|
|
||||||
-- rlgl cdef
|
-- rlgl cdef
|
||||||
ffi.cdef [[
|
ffi.cdef [[
|
||||||
|
typedef enum {
|
||||||
|
OPENGL_11 = 1,
|
||||||
|
OPENGL_21,
|
||||||
|
OPENGL_33,
|
||||||
|
OPENGL_43,
|
||||||
|
OPENGL_ES_20
|
||||||
|
} rlGlVersion;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
RL_LOG_ALL = 0,
|
RL_LOG_ALL = 0,
|
||||||
RL_LOG_TRACE,
|
RL_LOG_TRACE,
|
||||||
@ -773,10 +781,6 @@ ffi.cdef [[
|
|||||||
typedef struct rlVertexBuffer {
|
typedef struct rlVertexBuffer {
|
||||||
int elementCount;
|
int elementCount;
|
||||||
|
|
||||||
int vCounter;
|
|
||||||
int tcCounter;
|
|
||||||
int cCounter;
|
|
||||||
|
|
||||||
float *vertices;
|
float *vertices;
|
||||||
float *texcoords;
|
float *texcoords;
|
||||||
unsigned char *colors;
|
unsigned char *colors;
|
||||||
|
@ -45,6 +45,10 @@ end
|
|||||||
|
|
||||||
package.path = "?.lua;?/init.lua"
|
package.path = "?.lua;?/init.lua"
|
||||||
|
|
||||||
|
if os.getenv "LUA_PATH" then
|
||||||
|
package.path = package.path .. ";" .. os.getenv "LUA_PATH"
|
||||||
|
end
|
||||||
|
|
||||||
if raylua.loadfile then
|
if raylua.loadfile then
|
||||||
-- Change the second loader to load files using raylua.loadfile
|
-- Change the second loader to load files using raylua.loadfile
|
||||||
package.loaders[2] = function (name)
|
package.loaders[2] = function (name)
|
||||||
|
@ -217,6 +217,7 @@ bool CheckCollisionPointRec(Vector2 point, Rectangle rec)
|
|||||||
bool CheckCollisionPointCircle(Vector2 point, Vector2 center, float radius)
|
bool CheckCollisionPointCircle(Vector2 point, Vector2 center, float radius)
|
||||||
bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2 p3)
|
bool CheckCollisionPointTriangle(Vector2 point, Vector2 p1, Vector2 p2, Vector2 p3)
|
||||||
bool CheckCollisionLines(Vector2 startPos1, Vector2 endPos1, Vector2 startPos2, Vector2 endPos2, Vector2 *collisionPoint)
|
bool CheckCollisionLines(Vector2 startPos1, Vector2 endPos1, Vector2 startPos2, Vector2 endPos2, Vector2 *collisionPoint)
|
||||||
|
bool CheckCollisionPointLine(Vector2 point, Vector2 p1, Vector2 p2, int threshold)
|
||||||
Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2)
|
Rectangle GetCollisionRec(Rectangle rec1, Rectangle rec2)
|
||||||
Image LoadImage(const char *fileName)
|
Image LoadImage(const char *fileName)
|
||||||
Image LoadImageRaw(const char *fileName, int width, int height, int format, int headerSize)
|
Image LoadImageRaw(const char *fileName, int width, int height, int format, int headerSize)
|
||||||
@ -233,7 +234,6 @@ Image GenImageGradientH(int width, int height, Color left, Color right)
|
|||||||
Image GenImageGradientRadial(int width, int height, float density, Color inner, Color outer)
|
Image GenImageGradientRadial(int width, int height, float density, Color inner, Color outer)
|
||||||
Image GenImageChecked(int width, int height, int checksX, int checksY, Color col1, Color col2)
|
Image GenImageChecked(int width, int height, int checksX, int checksY, Color col1, Color col2)
|
||||||
Image GenImageWhiteNoise(int width, int height, float factor)
|
Image GenImageWhiteNoise(int width, int height, float factor)
|
||||||
Image GenImagePerlinNoise(int width, int height, int offsetX, int offsetY, float scale)
|
|
||||||
Image GenImageCellular(int width, int height, int tileSize)
|
Image GenImageCellular(int width, int height, int tileSize)
|
||||||
Image ImageCopy(Image image)
|
Image ImageCopy(Image image)
|
||||||
Image ImageFromImage(Image image, Rectangle rec)
|
Image ImageFromImage(Image image, Rectangle rec)
|
||||||
@ -368,7 +368,9 @@ void DrawSphere(Vector3 centerPos, float radius, Color color)
|
|||||||
void DrawSphereEx(Vector3 centerPos, float radius, int rings, int slices, Color color)
|
void DrawSphereEx(Vector3 centerPos, float radius, int rings, int slices, Color color)
|
||||||
void DrawSphereWires(Vector3 centerPos, float radius, int rings, int slices, Color color)
|
void DrawSphereWires(Vector3 centerPos, float radius, int rings, int slices, Color color)
|
||||||
void DrawCylinder(Vector3 position, float radiusTop, float radiusBottom, float height, int slices, Color color)
|
void DrawCylinder(Vector3 position, float radiusTop, float radiusBottom, float height, int slices, Color color)
|
||||||
|
void DrawCylinderEx(Vector3 startPos, Vector3 endPos, float startRadius, float endRadius, int sides, Color color)
|
||||||
void DrawCylinderWires(Vector3 position, float radiusTop, float radiusBottom, float height, int slices, Color color)
|
void DrawCylinderWires(Vector3 position, float radiusTop, float radiusBottom, float height, int slices, Color color)
|
||||||
|
void DrawCylinderWiresEx(Vector3 startPos, Vector3 endPos, float startRadius, float endRadius, int sides, Color color)
|
||||||
void DrawPlane(Vector3 centerPos, Vector2 size, Color color)
|
void DrawPlane(Vector3 centerPos, Vector2 size, Color color)
|
||||||
void DrawRay(Ray ray, Color color)
|
void DrawRay(Ray ray, Color color)
|
||||||
void DrawGrid(int slices, float spacing)
|
void DrawGrid(int slices, float spacing)
|
||||||
|
@ -96,7 +96,7 @@ unsigned int rlLoadTexture(void *data, int width, int height, int format, int mi
|
|||||||
unsigned int rlLoadTextureDepth(int width, int height, bool useRenderBuffer)
|
unsigned int rlLoadTextureDepth(int width, int height, bool useRenderBuffer)
|
||||||
unsigned int rlLoadTextureCubemap(void *data, int size, int format)
|
unsigned int rlLoadTextureCubemap(void *data, int size, int format)
|
||||||
void rlUpdateTexture(unsigned int id, int offsetX, int offsetY, int width, int height, int format, const void *data)
|
void rlUpdateTexture(unsigned int id, int offsetX, int offsetY, int width, int height, int format, const void *data)
|
||||||
void rlGetGlTextureFormats(int format, unsigned int *glInternalFormat, unsigned int *glFormat, unsigned int *glType)
|
void rlGetGlTextureFormats(int format, int *glInternalFormat, int *glFormat, int *glType)
|
||||||
const char *rlGetPixelFormatName(unsigned int format)
|
const char *rlGetPixelFormatName(unsigned int format)
|
||||||
void rlUnloadTexture(unsigned int id)
|
void rlUnloadTexture(unsigned int id)
|
||||||
void rlGenTextureMipmaps(unsigned int id, int width, int height, int format, int *mipmaps)
|
void rlGenTextureMipmaps(unsigned int id, int width, int height, int format, int *mipmaps)
|
||||||
|
Loading…
Reference in New Issue
Block a user