From b226e30a662f768934061c7cb0fefc5f31d3b71f Mon Sep 17 00:00:00 2001 From: Javier Sancho Date: Sun, 13 Oct 2019 19:58:42 +0200 Subject: [PATCH] C compatible types --- include/EDriverTypes.h | 4 ++-- include/EMaterialFlags.h | 4 ++-- include/IAnimatedMeshMD2.h | 4 ++-- include/IAnimatedMeshSceneNode.h | 6 +++--- include/IGUIEnvironment.h | 8 ++++---- include/ISceneManager.h | 8 ++++---- include/IVideoDriver.h | 8 ++++---- include/SColor.h | 8 ++++---- include/cirrlicht.h | 8 ++++---- include/dimension2d.h | 4 ++-- include/rect.h | 8 ++++---- include/vector3d.h | 6 +++--- src/CIrrlicht.cpp | 8 ++++---- src/IAnimatedMeshSceneNode.cpp | 6 +++--- src/IGUIEnvironment.cpp | 8 ++++---- src/ISceneManager.cpp | 8 ++++---- src/IVideoDriver.cpp | 8 ++++---- 17 files changed, 57 insertions(+), 57 deletions(-) diff --git a/include/EDriverTypes.h b/include/EDriverTypes.h index 1748890..cc1a822 100644 --- a/include/EDriverTypes.h +++ b/include/EDriverTypes.h @@ -22,7 +22,7 @@ #ifndef __C_E_DRIVER_TYPES_H_INCLUDED__ #define __C_E_DRIVER_TYPES_H_INCLUDED__ -enum irr_video_E_DRIVER_TYPE +typedef enum { irr_video_EDT_NULL, irr_video_EDT_SOFTWARE, @@ -31,6 +31,6 @@ enum irr_video_E_DRIVER_TYPE irr_video_EDT_DIRECT3D9, irr_video_EDT_OPENGL, irr_video_EDT_COUNT - }; + } irr_video_E_DRIVER_TYPE; #endif diff --git a/include/EMaterialFlags.h b/include/EMaterialFlags.h index 47f9b26..51157f2 100644 --- a/include/EMaterialFlags.h +++ b/include/EMaterialFlags.h @@ -22,7 +22,7 @@ #ifndef __C_E_MATERIAL_FLAGS_H_INCLUDED__ #define __C_E_MATERIAL_FLAGS_H_INCLUDED__ -enum irr_video_E_MATERIAL_FLAG +typedef enum { irr_video_EMF_WIREFRAME = 0x1, irr_video_EMF_POINTCLOUD = 0x2, @@ -44,6 +44,6 @@ enum irr_video_E_MATERIAL_FLAG irr_video_EMF_USE_MIP_MAPS = 0x20000, irr_video_EMF_BLEND_OPERATION = 0x40000, irr_video_EMF_POLYGON_OFFSET = 0x80000 - }; + } irr_video_E_MATERIAL_FLAG; #endif diff --git a/include/IAnimatedMeshMD2.h b/include/IAnimatedMeshMD2.h index c9b84c9..f5f96d9 100644 --- a/include/IAnimatedMeshMD2.h +++ b/include/IAnimatedMeshMD2.h @@ -22,7 +22,7 @@ #ifndef __C_I_ANIMATED_MESH_MD2_H_INCLUDED__ #define __C_I_ANIMATED_MESH_MD2_H_INCLUDED__ -enum irr_scene_EMD2_ANIMATION_TYPE +typedef enum { irr_scene_EMAT_STAND = 0, irr_scene_EMAT_RUN, @@ -46,6 +46,6 @@ enum irr_scene_EMD2_ANIMATION_TYPE irr_scene_EMAT_DEATH_FALLBACKSLOW, irr_scene_EMAT_BOOM, irr_scene_EMAT_COUNT - }; + } irr_scene_EMD2_ANIMATION_TYPE; #endif diff --git a/include/IAnimatedMeshSceneNode.h b/include/IAnimatedMeshSceneNode.h index 34c3dc7..27f2f5d 100644 --- a/include/IAnimatedMeshSceneNode.h +++ b/include/IAnimatedMeshSceneNode.h @@ -35,14 +35,14 @@ extern "C" { void irr_scene_IAnimatedMeshSceneNode_setMaterialFlag(irr_scene_IAnimatedMeshSceneNode* node, irr_video_E_MATERIAL_FLAG flag, - bool newvalue); + int newvalue); void irr_scene_IAnimatedMeshSceneNode_setMaterialTexture(irr_scene_IAnimatedMeshSceneNode* node, - u_int32_t textureLayer, + unsigned int textureLayer, irr_video_ITexture* texture); - bool + int irr_scene_IAnimatedMeshSceneNode_setMD2Animation(irr_scene_IAnimatedMeshSceneNode* node, irr_scene_EMD2_ANIMATION_TYPE anim); diff --git a/include/IGUIEnvironment.h b/include/IGUIEnvironment.h index 721d029..8cb15b3 100644 --- a/include/IGUIEnvironment.h +++ b/include/IGUIEnvironment.h @@ -36,11 +36,11 @@ extern "C" { irr_gui_IGUIEnvironment_addStaticText(irr_gui_IGUIEnvironment* guienv, const char* text, const irr_core_rect_s32* rectangle, - bool border, - bool wordWrap, + int border, + int wordWrap, irr_gui_IGUIElement* parent, - int32_t id, - bool fillBackground); + int id, + int fillBackground); void irr_gui_IGUIEnvironment_drawAll(irr_gui_IGUIEnvironment* guienv); diff --git a/include/ISceneManager.h b/include/ISceneManager.h index 7d0d04d..0be8e3c 100644 --- a/include/ISceneManager.h +++ b/include/ISceneManager.h @@ -38,19 +38,19 @@ extern "C" { irr_scene_ISceneManager_addAnimatedMeshSceneNode(irr_scene_ISceneManager* smgr, irr_scene_IAnimatedMesh* mesh, irr_scene_ISceneNode* parent, - int32_t id, + int id, irr_core_vector3df* position, irr_core_vector3df* rotation, irr_core_vector3df* scale, - bool alsoAddIfMeshPointerZero); + int alsoAddIfMeshPointerZero); irr_scene_ICameraSceneNode* irr_scene_ISceneManager_addCameraSceneNode(irr_scene_ISceneManager* smgr, irr_scene_ISceneNode* parent, irr_core_vector3df* position, irr_core_vector3df* lookat, - int32_t id, - bool makeActive); + int id, + int makeActive); void irr_scene_ISceneManager_drawAll(irr_scene_ISceneManager* smgr); diff --git a/include/IVideoDriver.h b/include/IVideoDriver.h index ea9ef51..98a837e 100644 --- a/include/IVideoDriver.h +++ b/include/IVideoDriver.h @@ -33,15 +33,15 @@ typedef void irr_video_IVideoDriver; extern "C" { #endif - bool + int irr_video_IVideoDriver_beginScene(irr_video_IVideoDriver* driver, - bool backBuffer, - bool zBuffer, + int backBuffer, + int zBuffer, const irr_video_SColor* color, irr_video_SExposedVideoData* videoData, const irr_core_rect_s32* sourceRect); - bool + int irr_video_IVideoDriver_endScene(irr_video_IVideoDriver* driver); irr_video_ITexture* diff --git a/include/SColor.h b/include/SColor.h index f9657b3..4409a74 100644 --- a/include/SColor.h +++ b/include/SColor.h @@ -24,10 +24,10 @@ typedef struct { - u_int32_t a; - u_int32_t r; - u_int32_t g; - u_int32_t b; + unsigned int a; + unsigned int r; + unsigned int g; + unsigned int b; } irr_video_SColor; #endif diff --git a/include/cirrlicht.h b/include/cirrlicht.h index 8faa0e3..a7a4622 100644 --- a/include/cirrlicht.h +++ b/include/cirrlicht.h @@ -48,10 +48,10 @@ extern "C" { irr_IrrlichtDevice* irr_createDevice(irr_video_E_DRIVER_TYPE deviceType, const irr_core_dimension2d_u32* windowSize, - u_int32_t bits, - bool fullscreen, - bool stencilbuffer, - bool vsync); + unsigned int bits, + int fullscreen, + int stencilbuffer, + int vsync); #ifdef __cplusplus } diff --git a/include/dimension2d.h b/include/dimension2d.h index 118c7a3..1f2daca 100644 --- a/include/dimension2d.h +++ b/include/dimension2d.h @@ -24,8 +24,8 @@ typedef struct { - u_int32_t width; - u_int32_t height; + unsigned int width; + unsigned int height; } irr_core_dimension2d_u32; #endif diff --git a/include/rect.h b/include/rect.h index 195281d..395446a 100644 --- a/include/rect.h +++ b/include/rect.h @@ -24,10 +24,10 @@ typedef struct { - int32_t x; - int32_t y; - int32_t x2; - int32_t y2; + int x; + int y; + int x2; + int y2; } irr_core_rect_s32; #endif diff --git a/include/vector3d.h b/include/vector3d.h index 6019d94..36de9a9 100644 --- a/include/vector3d.h +++ b/include/vector3d.h @@ -24,9 +24,9 @@ typedef struct { - float_t x; - float_t y; - float_t z; + float x; + float y; + float z; } irr_core_vector3df; #endif diff --git a/src/CIrrlicht.cpp b/src/CIrrlicht.cpp index dc0c20d..f04f999 100644 --- a/src/CIrrlicht.cpp +++ b/src/CIrrlicht.cpp @@ -26,10 +26,10 @@ extern "C" { irr_IrrlichtDevice* irr_createDevice(irr_video_E_DRIVER_TYPE deviceType, const irr_core_dimension2d_u32* windowSize, - u_int32_t bits, - bool fullscreen, - bool stencilbuffer, - bool vsync) + unsigned int bits, + int fullscreen, + int stencilbuffer, + int vsync) { irr::core::dimension2d wsize = \ irr::core::dimension2d(windowSize->width, diff --git a/src/IAnimatedMeshSceneNode.cpp b/src/IAnimatedMeshSceneNode.cpp index 0a63c0f..f7348fc 100644 --- a/src/IAnimatedMeshSceneNode.cpp +++ b/src/IAnimatedMeshSceneNode.cpp @@ -26,7 +26,7 @@ extern "C" { void irr_scene_IAnimatedMeshSceneNode_setMaterialFlag(irr_scene_IAnimatedMeshSceneNode* node, irr_video_E_MATERIAL_FLAG flag, - bool newvalue) + int newvalue) { ((irr::scene::IAnimatedMeshSceneNode*)node)->setMaterialFlag((irr::video::E_MATERIAL_FLAG)flag, newvalue); @@ -34,14 +34,14 @@ extern "C" { void irr_scene_IAnimatedMeshSceneNode_setMaterialTexture(irr_scene_IAnimatedMeshSceneNode* node, - u_int32_t textureLayer, + unsigned int textureLayer, irr_video_ITexture* texture) { ((irr::scene::IAnimatedMeshSceneNode*)node)->setMaterialTexture(textureLayer, (irr::video::ITexture*)texture); } - bool + int irr_scene_IAnimatedMeshSceneNode_setMD2Animation(irr_scene_IAnimatedMeshSceneNode* node, irr_scene_EMD2_ANIMATION_TYPE anim) { diff --git a/src/IGUIEnvironment.cpp b/src/IGUIEnvironment.cpp index 7f92386..4a5d68b 100644 --- a/src/IGUIEnvironment.cpp +++ b/src/IGUIEnvironment.cpp @@ -28,11 +28,11 @@ extern "C" { irr_gui_IGUIEnvironment_addStaticText(irr_gui_IGUIEnvironment* guienv, const char* text, const irr_core_rect_s32* rectangle, - bool border, - bool wordWrap, + int border, + int wordWrap, irr_gui_IGUIElement* parent, - int32_t id, - bool fillBackground) + int id, + int fillBackground) { // Convert to wide char text wchar_t *wtext = (wchar_t*)malloc((strlen(text) + 1) * sizeof(wchar_t)); diff --git a/src/ISceneManager.cpp b/src/ISceneManager.cpp index 8139f84..4222505 100644 --- a/src/ISceneManager.cpp +++ b/src/ISceneManager.cpp @@ -27,11 +27,11 @@ extern "C" { irr_scene_ISceneManager_addAnimatedMeshSceneNode(irr_scene_ISceneManager* smgr, irr_scene_IAnimatedMesh* mesh, irr_scene_ISceneNode* parent, - int32_t id, + int id, irr_core_vector3df* position, irr_core_vector3df* rotation, irr_core_vector3df* scale, - bool alsoAddIfMeshPointerZero) + int alsoAddIfMeshPointerZero) { const irr::core::vector3df& iPosition = irr::core::vector3df(position->x, position->y, @@ -57,8 +57,8 @@ extern "C" { irr_scene_ISceneNode* parent, irr_core_vector3df* position, irr_core_vector3df* lookat, - int32_t id, - bool makeActive) + int id, + int makeActive) { const irr::core::vector3df& iPosition = irr::core::vector3df(position->x, position->y, diff --git a/src/IVideoDriver.cpp b/src/IVideoDriver.cpp index cf703b6..ea27d4c 100644 --- a/src/IVideoDriver.cpp +++ b/src/IVideoDriver.cpp @@ -23,10 +23,10 @@ #include "IVideoDriver.h" extern "C" { - bool + int irr_video_IVideoDriver_beginScene(irr_video_IVideoDriver* driver, - bool backBuffer, - bool zBuffer, + int backBuffer, + int zBuffer, const irr_video_SColor* color, irr_video_SExposedVideoData* videoData, const irr_core_rect_s32* sourceRect) @@ -57,7 +57,7 @@ extern "C" { sourceRect != NULL ? &rect : 0); } - bool + int irr_video_IVideoDriver_endScene(irr_video_IVideoDriver* driver) { return ((irr::video::IVideoDriver*)driver)->endScene(); -- 2.39.2