kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Close #1516.

Browse Source 
Fixe an inconcistency between the C and haxe sides of the OpenGL bindings.
This commit is contained in:
Apprentice-Alchemist
2022-01-24 22:24:01 +01:00
parent 1f954d268f
commit 892d4612c4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
project/include/ui/KeyEvent.h
View File

@@ -21,7 +21,7 @@ namespace lime {
struct KeyEvent { struct KeyEvent {
hl_type* t; hl_type* t;
int keyCode; double keyCode;
int modifier; int modifier;
KeyEventType type; KeyEventType type;
int windowID; int windowID;

2
project/src/ExternalInterface.cpp
View File

@@ -3947,7 +3947,7 @@ namespace lime {
#define _TDROP_EVENT _OBJ (_BYTES _I32) #define _TDROP_EVENT _OBJ (_BYTES _I32)
#define _TGAMEPAD_EVENT _OBJ (_I32 _I32 _I32 _I32 _F64) #define _TGAMEPAD_EVENT _OBJ (_I32 _I32 _I32 _I32 _F64)
#define _TJOYSTICK_EVENT _OBJ (_I32 _I32 _I32 _I32 _F64 _F64) #define _TJOYSTICK_EVENT _OBJ (_I32 _I32 _I32 _I32 _F64 _F64)
#define _TKEY_EVENT _OBJ (_I32 _I32 _I32 _I32) #define _TKEY_EVENT _OBJ (_F64 _I32 _I32 _I32)
#define _TMOUSE_EVENT _OBJ (_I32 _F64 _F64 _I32 _I32 _F64 _F64) #define _TMOUSE_EVENT _OBJ (_I32 _F64 _F64 _I32 _I32 _F64 _F64)
#define _TRECTANGLE _OBJ (_F64 _F64 _F64 _F64) #define _TRECTANGLE _OBJ (_F64 _F64 _F64 _F64)
#define _TRENDER_EVENT _OBJ (_I32) #define _TRENDER_EVENT _OBJ (_I32)

2
project/src/graphics/opengl/OpenGLBindings.cpp
View File

@@ -5620,7 +5620,7 @@ namespace lime {
#define _TBYTES _OBJ (_I32 _BYTES) #define _TBYTES _OBJ (_I32 _BYTES)
#define _TCFFIPOINTER _DYN #define _TCFFIPOINTER _DYN
#define _TGLOBJECT _OBJ (_I32 _TCFFIPOINTER _OBJ (_ARR)) #define _TGLOBJECT _OBJ (_I32 _TCFFIPOINTER _OBJ (_I32 _ARR))
DEFINE_HL_PRIM (_VOID, lime_gl_active_texture, _I32); DEFINE_HL_PRIM (_VOID, lime_gl_active_texture, _I32);