minetest
/
irrlicht
mirror of https://github.com/minetest/irrlicht.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ugly formatted arrays 

Found via: `rg --multiline "=\n\t*\{\n"`
This commit is contained in:
Desour 2024-03-21 15:22:20 +01:00 committed by sfan5
parent 7cf801244c
commit adc96072cd
24 changed files with 589 additions and 596 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/ECullingTypes.h
View File

@ -22,14 +22,14 @@ enum E_CULLING_TYPE
}; };
//! Names for culling type //! Names for culling type
const c8 *const AutomaticCullingNames[] = const c8 *const AutomaticCullingNames[] = {
{
"false", "false",
"box", // camera box against node box "box", // camera box against node box
"frustum_box", // camera frustum against node box "frustum_box", // camera frustum against node box
"frustum_sphere", // camera frustum against node sphere "frustum_sphere", // camera frustum against node sphere
"occ_query", // occlusion query "occ_query", // occlusion query
0}; 0,
};
} // end namespace scene } // end namespace scene
} // end namespace irr } // end namespace irr

6
include/EGUIAlignment.h
View File

@ -23,13 +23,13 @@ enum EGUI_ALIGNMENT
}; };
//! Names for alignments //! Names for alignments
const c8 *const GUIAlignmentNames[] = const c8 *const GUIAlignmentNames[] = {
{
"upperLeft", "upperLeft",
"lowerRight", "lowerRight",
"center", "center",
"scale", "scale",
0}; 0,
};
} // namespace gui } // namespace gui
} // namespace irr } // namespace irr

6
include/EGUIElementTypes.h
View File

@ -99,8 +99,7 @@ enum EGUI_ELEMENT_TYPE
}; };
//! Names for built-in element types //! Names for built-in element types
const c8 *const GUIElementTypeNames[] = const c8 *const GUIElementTypeNames[] = {
{
"button", "button",
"checkBox", "checkBox",
"comboBox", "comboBox",
@ -127,7 +126,8 @@ const c8 *const GUIElementTypeNames[] =
"element", "element",
"root", "root",
"profiler", "profiler",
0}; 0,
};
} // end namespace gui } // end namespace gui
} // end namespace irr } // end namespace irr

6
include/EMaterialTypes.h
View File

@ -58,14 +58,14 @@ enum E_MATERIAL_TYPE
}; };
//! Array holding the built in material type names //! Array holding the built in material type names
const char *const sBuiltInMaterialTypeNames[] = const char *const sBuiltInMaterialTypeNames[] = {
{
"solid", "solid",
"trans_alphach", "trans_alphach",
"trans_alphach_ref", "trans_alphach_ref",
"trans_vertex_alpha", "trans_vertex_alpha",
"onetexture_blend", "onetexture_blend",
0}; 0,
};
constexpr u32 numBuiltInMaterials = constexpr u32 numBuiltInMaterials =
sizeof(sBuiltInMaterialTypeNames) / sizeof(char *) - 1; sizeof(sBuiltInMaterialTypeNames) / sizeof(char *) - 1;

6
include/EVertexAttributes.h
View File

@ -19,8 +19,7 @@ enum E_VERTEX_ATTRIBUTES
}; };
//! Array holding the built in vertex attribute names //! Array holding the built in vertex attribute names
const char *const sBuiltInVertexAttributeNames[] = const char *const sBuiltInVertexAttributeNames[] = {
{
"inVertexPosition", "inVertexPosition",
"inVertexNormal", "inVertexNormal",
"inVertexColor", "inVertexColor",
@ -28,7 +27,8 @@ const char *const sBuiltInVertexAttributeNames[] =
"inTexCoord1", "inTexCoord1",
"inVertexTangent", "inVertexTangent",
"inVertexBinormal", "inVertexBinormal",
0}; 0,
};
} // end namespace video } // end namespace video
} // end namespace irr } // end namespace irr

5
include/IBoneSceneNode.h
View File

@ -40,13 +40,12 @@ enum E_BONE_SKINNING_SPACE
}; };
//! Names for bone animation modes //! Names for bone animation modes
const c8 *const BoneAnimationModeNames[] = const c8 *const BoneAnimationModeNames[] = {
{
"automatic", "automatic",
"animated", "animated",
"unanimated", "unanimated",
0, 0,
}; };
//! Interface for bones used for skeletal animation. //! Interface for bones used for skeletal animation.
/** Used with ISkinnedMesh and IAnimatedMeshSceneNode. */ /** Used with ISkinnedMesh and IAnimatedMeshSceneNode. */

6
include/ICursorControl.h
View File

@ -41,8 +41,7 @@ enum ECURSOR_ICON
}; };
//! Names for ECURSOR_ICON //! Names for ECURSOR_ICON
const c8 *const GUICursorIconNames[ECI_COUNT + 1] = const c8 *const GUICursorIconNames[ECI_COUNT + 1] = {
{
"normal", "normal",
"cross", "cross",
"hand", "hand",
@ -56,7 +55,8 @@ const c8 *const GUICursorIconNames[ECI_COUNT + 1] =
"sizens", "sizens",
"sizewe", "sizewe",
"sizeup", "sizeup",
0}; 0,
};
//! structure used to set sprites as cursors. //! structure used to set sprites as cursors.
struct SCursorSprite struct SCursorSprite

14
include/IGUIButton.h
View File

@ -45,8 +45,7 @@ enum EGUI_BUTTON_STATE
}; };
//! Names for gui button state icons //! Names for gui button state icons
const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] = const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] = {
{
"buttonUp", "buttonUp",
"buttonDown", "buttonDown",
"buttonMouseOver", "buttonMouseOver",
@ -54,8 +53,8 @@ const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] =
"buttonFocused", "buttonFocused",
"buttonNotFocused", "buttonNotFocused",
"buttonDisabled", "buttonDisabled",
0 // count 0, // count
}; };
//! State of buttons used for drawing texture images. //! State of buttons used for drawing texture images.
//! Note that only a single state is active at a time //! Note that only a single state is active at a time
@ -87,8 +86,7 @@ enum EGUI_BUTTON_IMAGE_STATE
}; };
//! Names for gui button image states //! Names for gui button image states
const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] = const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] = {
{
"Image", // not "ImageUp" as it otherwise breaks serialization of old files "Image", // not "ImageUp" as it otherwise breaks serialization of old files
"ImageUpOver", "ImageUpOver",
"ImageUpFocused", "ImageUpFocused",
@ -98,8 +96,8 @@ const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] =
"ImageDownFocused", "ImageDownFocused",
"ImageDownFocusedOver", "ImageDownFocusedOver",
"ImageDisabled", "ImageDisabled",
0 // count 0, // count
}; };
//! GUI Button interface. //! GUI Button interface.
/** \par This element can create the following events of type EGUI_EVENT_TYPE: /** \par This element can create the following events of type EGUI_EVENT_TYPE:

34
include/IGUISkin.h
View File

@ -45,14 +45,13 @@ enum EGUI_SKIN_TYPE
}; };
//! Names for gui element types //! Names for gui element types
const c8 *const GUISkinTypeNames[EGST_COUNT + 1] = const c8 *const GUISkinTypeNames[EGST_COUNT + 1] = {
{
"windowsClassic", "windowsClassic",
"windowsMetallic", "windowsMetallic",
"burning", "burning",
"unknown", "unknown",
0, 0,
}; };
//! Enumeration for skin colors //! Enumeration for skin colors
enum EGUI_DEFAULT_COLOR enum EGUI_DEFAULT_COLOR
@ -114,8 +113,7 @@ enum EGUI_DEFAULT_COLOR
}; };
//! Names for default skin colors //! Names for default skin colors
const c8 *const GUISkinColorNames[EGDC_COUNT + 1] = const c8 *const GUISkinColorNames[EGDC_COUNT + 1] = {
{
"3DDarkShadow", "3DDarkShadow",
"3DShadow", "3DShadow",
"3DFace", "3DFace",
@ -142,7 +140,7 @@ const c8 *const GUISkinColorNames[EGDC_COUNT + 1] =
"GrayEditable", "GrayEditable",
"FocusedEditable", "FocusedEditable",
0, 0,
}; };
//! Enumeration for default sizes. //! Enumeration for default sizes.
enum EGUI_DEFAULT_SIZE enum EGUI_DEFAULT_SIZE
@ -200,8 +198,7 @@ enum EGUI_DEFAULT_SIZE
}; };
//! Names for default skin sizes //! Names for default skin sizes
const c8 *const GUISkinSizeNames[EGDS_COUNT + 1] = const c8 *const GUISkinSizeNames[EGDS_COUNT + 1] = {
{
"ScrollBarSize", "ScrollBarSize",
"MenuHeight", "MenuHeight",
"WindowButtonWidth", "WindowButtonWidth",
@ -225,7 +222,8 @@ const c8 *const GUISkinSizeNames[EGDS_COUNT + 1] =
"ButtonPressedTextOffsetY", "ButtonPressedTextOffsetY",
"ButtonPressedSpriteOffsetX", "ButtonPressedSpriteOffsetX",
"ButtonPressedSpriteOffsetY", "ButtonPressedSpriteOffsetY",
0}; 0,
};
enum EGUI_DEFAULT_TEXT enum EGUI_DEFAULT_TEXT
{ {
@ -251,8 +249,7 @@ enum EGUI_DEFAULT_TEXT
}; };
//! Names for default skin sizes //! Names for default skin sizes
const c8 *const GUISkinTextNames[EGDT_COUNT + 1] = const c8 *const GUISkinTextNames[EGDT_COUNT + 1] = {
{
"MessageBoxOkay", "MessageBoxOkay",
"MessageBoxCancel", "MessageBoxCancel",
"MessageBoxYes", "MessageBoxYes",
@ -261,7 +258,8 @@ const c8 *const GUISkinTextNames[EGDT_COUNT + 1] =
"WindowButtonMaximize", "WindowButtonMaximize",
"WindowButtonMinimize", "WindowButtonMinimize",
"WindowButtonRestore", "WindowButtonRestore",
0}; 0,
};
//! Customizable symbols for GUI //! Customizable symbols for GUI
enum EGUI_DEFAULT_ICON enum EGUI_DEFAULT_ICON
@ -318,8 +316,7 @@ enum EGUI_DEFAULT_ICON
EGDI_COUNT EGDI_COUNT
}; };
const c8 *const GUISkinIconNames[EGDI_COUNT + 1] = const c8 *const GUISkinIconNames[EGDI_COUNT + 1] = {
{
"windowMaximize", "windowMaximize",
"windowRestore", "windowRestore",
"windowClose", "windowClose",
@ -343,7 +340,8 @@ const c8 *const GUISkinIconNames[EGDI_COUNT + 1] =
"collapse", "collapse",
"file", "file",
"directory", "directory",
0}; 0,
};
// Customizable fonts // Customizable fonts
enum EGUI_DEFAULT_FONT enum EGUI_DEFAULT_FONT
@ -363,14 +361,14 @@ enum EGUI_DEFAULT_FONT
EGDF_COUNT EGDF_COUNT
}; };
const c8 *const GUISkinFontNames[EGDF_COUNT + 1] = const c8 *const GUISkinFontNames[EGDF_COUNT + 1] = {
{
"defaultFont", "defaultFont",
"buttonFont", "buttonFont",
"windowFont", "windowFont",
"menuFont", "menuFont",
"tooltipFont", "tooltipFont",
0}; 0,
};
//! A skin modifies the look of the GUI elements. //! A skin modifies the look of the GUI elements.
class IGUISkin : virtual public IReferenceCounted class IGUISkin : virtual public IReferenceCounted

6
include/IVideoDriver.h
View File

@ -107,12 +107,12 @@ enum E_FOG_TYPE
EFT_FOG_EXP2 EFT_FOG_EXP2
}; };
const c8 *const FogTypeNames[] = const c8 *const FogTypeNames[] = {
{
"FogExp", "FogExp",
"FogLinear", "FogLinear",
"FogExp2", "FogExp2",
0}; 0,
};
//! Interface to driver which is able to perform 2d and 3d graphics functions. //! Interface to driver which is able to perform 2d and 3d graphics functions.
/** This interface is one of the most important interfaces of /** This interface is one of the most important interfaces of

6
include/S3DVertex.h
View File

@ -31,12 +31,12 @@ enum E_VERTEX_TYPE
}; };
//! Array holding the built in vertex type names //! Array holding the built in vertex type names
const char *const sBuiltInVertexTypeNames[] = const char *const sBuiltInVertexTypeNames[] = {
{
"standard", "standard",
"2tcoords", "2tcoords",
"tangents", "tangents",
0}; 0,
};
//! standard vertex used by the Irrlicht engine. //! standard vertex used by the Irrlicht engine.
struct S3DVertex struct S3DVertex

6
include/SColor.h
View File

@ -88,8 +88,7 @@ enum ECOLOR_FORMAT
}; };
//! Names for ECOLOR_FORMAT types //! Names for ECOLOR_FORMAT types
const c8 *const ColorFormatNames[ECF_UNKNOWN + 2] = const c8 *const ColorFormatNames[ECF_UNKNOWN + 2] = {
{
"A1R5G5B5", "A1R5G5B5",
"R5G6B5", "R5G6B5",
"R8G8B8", "R8G8B8",
@ -108,7 +107,8 @@ const c8 *const ColorFormatNames[ECF_UNKNOWN + 2] =
"D32", "D32",
"D24S8", "D24S8",
"UNKNOWN", "UNKNOWN",
0}; 0,
};
//! Creates a 16 bit A1R5G5B5 color //! Creates a 16 bit A1R5G5B5 color
inline u16 RGBA16(u32 r, u32 g, u32 b, u32 a = 0xFF) inline u16 RGBA16(u32 r, u32 g, u32 b, u32 a = 0xFF)

12
include/SMaterial.h
View File

@ -219,11 +219,11 @@ enum E_COLOR_MATERIAL
}; };
//! Names for polygon offset direction //! Names for polygon offset direction
const c8 *const PolygonOffsetDirectionNames[] = const c8 *const PolygonOffsetDirectionNames[] = {
{
"Back", "Back",
"Front", "Front",
0}; 0,
};
//! For SMaterial.ZWriteEnable //! For SMaterial.ZWriteEnable
enum E_ZWRITE enum E_ZWRITE
@ -243,12 +243,12 @@ enum E_ZWRITE
}; };
//! Names for E_ZWRITE //! Names for E_ZWRITE
const c8 *const ZWriteNames[] = const c8 *const ZWriteNames[] = {
{
"Off", "Off",
"Auto", "Auto",
"On", "On",
0}; 0,
};
//! Maximum number of texture an SMaterial can have. //! Maximum number of texture an SMaterial can have.
/** SMaterial might ignore some textures in most function, like assignment and comparison, /** SMaterial might ignore some textures in most function, like assignment and comparison,

6
source/Irrlicht/BuiltInFont.h
View File

@ -11,8 +11,7 @@ namespace irr
{ {
namespace gui namespace gui
{ {
const u8 BuiltInFontData[] = const u8 BuiltInFontData[] = {
{
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x80,
0x04, 0x03, 0x00, 0x00, 0x00, 0x31, 0x10, 0x7c, 0xf8, 0x00, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0x00, 0x31, 0x10, 0x7c, 0xf8, 0x00, 0x00, 0x00,
@ -128,7 +127,8 @@ const u8 BuiltInFontData[] =
0x70, 0x71, 0x01, 0x06, 0x22, 0x10, 0x90, 0x3d, 0x47, 0x82, 0x48, 0xa6, 0x70, 0x71, 0x01, 0x06, 0x22, 0x10, 0x90, 0x3d, 0x47, 0x82, 0x48, 0xa6,
0x23, 0x13, 0x8c, 0x02, 0x00, 0xe7, 0xfb, 0x84, 0x1b, 0xf9, 0x8e, 0xc0, 0x23, 0x13, 0x8c, 0x02, 0x00, 0xe7, 0xfb, 0x84, 0x1b, 0xf9, 0x8e, 0xc0,
0x23, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x23, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60,
0x82}; 0x82
};
const u32 BuiltInFontDataSize = sizeof(BuiltInFontData); const u32 BuiltInFontDataSize = sizeof(BuiltInFontData);
} // end namespace gui } // end namespace gui

6
source/Irrlicht/CBlit.h
View File

@ -784,8 +784,7 @@ struct blitterTable
tExecuteBlit func; tExecuteBlit func;
}; };
static const blitterTable blitTable[] = static const blitterTable blitTable[] = {
{
{BLITTER_TEXTURE, -2, -2, executeBlit_TextureCopy_x_to_x}, {BLITTER_TEXTURE, -2, -2, executeBlit_TextureCopy_x_to_x},
{BLITTER_TEXTURE, video::ECF_A1R5G5B5, video::ECF_A8R8G8B8, executeBlit_TextureCopy_32_to_16}, {BLITTER_TEXTURE, video::ECF_A1R5G5B5, video::ECF_A8R8G8B8, executeBlit_TextureCopy_32_to_16},
{BLITTER_TEXTURE, video::ECF_A1R5G5B5, video::ECF_R8G8B8, executeBlit_TextureCopy_24_to_16}, {BLITTER_TEXTURE, video::ECF_A1R5G5B5, video::ECF_R8G8B8, executeBlit_TextureCopy_24_to_16},
@ -809,7 +808,8 @@ static const blitterTable blitTable[] =
{BLITTER_TEXTURE_COMBINE_ALPHA, video::ECF_A1R5G5B5, video::ECF_A1R5G5B5, executeBlit_TextureCombineColor_16_to_16}, {BLITTER_TEXTURE_COMBINE_ALPHA, video::ECF_A1R5G5B5, video::ECF_A1R5G5B5, executeBlit_TextureCombineColor_16_to_16},
{BLITTER_TEXTURE_COMBINE_ALPHA, video::ECF_A1R5G5B5, video::ECF_R8G8B8, executeBlit_TextureCopy_24_to_16}, {BLITTER_TEXTURE_COMBINE_ALPHA, video::ECF_A1R5G5B5, video::ECF_R8G8B8, executeBlit_TextureCopy_24_to_16},
{BLITTER_TEXTURE_COMBINE_ALPHA, video::ECF_R8G8B8, video::ECF_A1R5G5B5, executeBlit_TextureCombineColor_16_to_24}, {BLITTER_TEXTURE_COMBINE_ALPHA, video::ECF_R8G8B8, video::ECF_A1R5G5B5, executeBlit_TextureCombineColor_16_to_24},
{BLITTER_INVALID, -1, -1, 0}}; {BLITTER_INVALID, -1, -1, 0},
};
static inline tExecuteBlit getBlitter2(eBlitter operation, const video::IImage *dest, const video::IImage *source) static inline tExecuteBlit getBlitter2(eBlitter operation, const video::IImage *dest, const video::IImage *source)
{ {

12
source/Irrlicht/CEGLManager.cpp
View File

@ -182,8 +182,7 @@ EGLConfig CEGLManager::chooseConfig(EConfigStyle confStyle)
} }
if (confStyle == ECS_EGL_CHOOSE_FIRST_LOWER_EXPECTATIONS) { if (confStyle == ECS_EGL_CHOOSE_FIRST_LOWER_EXPECTATIONS) {
EGLint Attribs[] = EGLint Attribs[] = {
{
EGL_RED_SIZE, 8, EGL_RED_SIZE, 8,
EGL_GREEN_SIZE, 8, EGL_GREEN_SIZE, 8,
EGL_BLUE_SIZE, 8, EGL_BLUE_SIZE, 8,
@ -197,7 +196,8 @@ EGLConfig CEGLManager::chooseConfig(EConfigStyle confStyle)
#ifdef EGL_VERSION_1_3 #ifdef EGL_VERSION_1_3
EGL_RENDERABLE_TYPE, eglOpenGLBIT, EGL_RENDERABLE_TYPE, eglOpenGLBIT,
#endif #endif
EGL_NONE, 0}; EGL_NONE, 0,
};
EGLint numConfigs = 0; EGLint numConfigs = 0;
u32 steps = 5; u32 steps = 5;
@ -488,12 +488,12 @@ bool CEGLManager::generateContext()
break; break;
} }
EGLint ContextAttrib[] = EGLint ContextAttrib[] = {
{
#ifdef EGL_VERSION_1_3 #ifdef EGL_VERSION_1_3
EGL_CONTEXT_CLIENT_VERSION, OpenGLESVersion, EGL_CONTEXT_CLIENT_VERSION, OpenGLESVersion,
#endif #endif
EGL_NONE, 0}; EGL_NONE, 0,
};
EglContext = eglCreateContext(EglDisplay, EglConfig, EGL_NO_CONTEXT, ContextAttrib); EglContext = eglCreateContext(EglDisplay, EglConfig, EGL_NO_CONTEXT, ContextAttrib);

11
source/Irrlicht/CGLXManager.cpp
View File

@ -41,8 +41,7 @@ CGLXManager::CGLXManager(const SIrrlichtCreationParameters &params, const SExpos
if (major == 1 && minor > 2 && glxChooseFBConfig) { if (major == 1 && minor > 2 && glxChooseFBConfig) {
os::Printer::log("GLX >= 1.3", ELL_DEBUG); os::Printer::log("GLX >= 1.3", ELL_DEBUG);
// attribute array for the draw buffer // attribute array for the draw buffer
int visualAttrBuffer[] = int visualAttrBuffer[] = {
{
GLX_RENDER_TYPE, GLX_RENDER_TYPE,
GLX_RGBA_BIT, GLX_RGBA_BIT,
GLX_RED_SIZE, GLX_RED_SIZE,
@ -77,7 +76,7 @@ CGLXManager::CGLXManager(const SIrrlichtCreationParameters &params, const SExpos
#endif #endif
GLX_STEREO, GLX_STEREO,
Params.Stereobuffer ? True : False, Params.Stereobuffer ? True : False,
None None,
}; };
GLXFBConfig *configList = 0; GLXFBConfig *configList = 0;
@ -180,8 +179,7 @@ CGLXManager::CGLXManager(const SIrrlichtCreationParameters &params, const SExpos
#endif #endif
{ {
// attribute array for the draw buffer // attribute array for the draw buffer
int visualAttrBuffer[] = int visualAttrBuffer[] = {
{
GLX_RGBA, GLX_USE_GL, GLX_RGBA, GLX_USE_GL,
GLX_RED_SIZE, 4, GLX_RED_SIZE, 4,
GLX_GREEN_SIZE, 4, GLX_GREEN_SIZE, 4,
@ -194,7 +192,8 @@ CGLXManager::CGLXManager(const SIrrlichtCreationParameters &params, const SExpos
// GLX_USE_GL, which is silently ignored by glXChooseVisual // GLX_USE_GL, which is silently ignored by glXChooseVisual
Params.Doublebuffer ? GLX_DOUBLEBUFFER : GLX_USE_GL, // 14 Params.Doublebuffer ? GLX_DOUBLEBUFFER : GLX_USE_GL, // 14
Params.Stereobuffer ? GLX_STEREO : GLX_USE_GL, // 15 Params.Stereobuffer ? GLX_STEREO : GLX_USE_GL, // 15
None}; None,
};
VisualInfo = glXChooseVisual(display, screennr, visualAttrBuffer); VisualInfo = glXChooseVisual(display, screennr, visualAttrBuffer);
if (!VisualInfo) { if (!VisualInfo) {

6
source/Irrlicht/CIrrDeviceWin32.cpp
View File

@ -533,8 +533,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
irr::s32 irrMessage; irr::s32 irrMessage;
}; };
static messageMap mouseMap[] = static messageMap mouseMap[] = {
{
{0, WM_LBUTTONDOWN, irr::EMIE_LMOUSE_PRESSED_DOWN}, {0, WM_LBUTTONDOWN, irr::EMIE_LMOUSE_PRESSED_DOWN},
{1, WM_LBUTTONUP, irr::EMIE_LMOUSE_LEFT_UP}, {1, WM_LBUTTONUP, irr::EMIE_LMOUSE_LEFT_UP},
{0, WM_RBUTTONDOWN, irr::EMIE_RMOUSE_PRESSED_DOWN}, {0, WM_RBUTTONDOWN, irr::EMIE_RMOUSE_PRESSED_DOWN},
@ -543,7 +542,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{1, WM_MBUTTONUP, irr::EMIE_MMOUSE_LEFT_UP}, {1, WM_MBUTTONUP, irr::EMIE_MMOUSE_LEFT_UP},
{2, WM_MOUSEMOVE, irr::EMIE_MOUSE_MOVED}, {2, WM_MOUSEMOVE, irr::EMIE_MOUSE_MOVED},
{3, WM_MOUSEWHEEL, irr::EMIE_MOUSE_WHEEL}, {3, WM_MOUSEWHEEL, irr::EMIE_MOUSE_WHEEL},
{-1, 0, 0}}; {-1, 0, 0},
};
// handle grouped events // handle grouped events
messageMap *m = mouseMap; messageMap *m = mouseMap;

6
source/Irrlicht/CNSOGLManager.mm
View File

@ -46,8 +46,7 @@ bool CNSOGLManager::generateSurface()
if (Params.WithAlphaChannel && Params.Bits == 32) if (Params.WithAlphaChannel && Params.Bits == 32)
alphaSize = 8; alphaSize = 8;
NSOpenGLPixelFormatAttribute Attribs[] = NSOpenGLPixelFormatAttribute Attribs[] = {
{
NSOpenGLPFANoRecovery, NSOpenGLPFANoRecovery,
NSOpenGLPFAAccelerated, NSOpenGLPFAAccelerated,
NSOpenGLPFADoubleBuffer, NSOpenGLPFADoubleBuffer,
@ -58,7 +57,8 @@ bool CNSOGLManager::generateSurface()
NSOpenGLPFASamples, Params.AntiAlias, NSOpenGLPFASamples, Params.AntiAlias,
NSOpenGLPFAStencilSize, static_cast<NSOpenGLPixelFormatAttribute>(Params.Stencilbuffer ? 1 : 0), NSOpenGLPFAStencilSize, static_cast<NSOpenGLPixelFormatAttribute>(Params.Stencilbuffer ? 1 : 0),
// NSOpenGLPFAFullScreen, // NSOpenGLPFAFullScreen,
0}; 0,
};
u32 Steps = 6; u32 Steps = 6;

3
source/Irrlicht/COGLESCoreExtensionHandler.h
View File

@ -90,8 +90,7 @@ protected:
const char *getFeatureString(size_t index) const const char *getFeatureString(size_t index) const
{ {
// One for each EOGLESFeatures // One for each EOGLESFeatures
static const char *const OGLESFeatureStrings[IRR_OGLES_Feature_Count] = static const char *const OGLESFeatureStrings[IRR_OGLES_Feature_Count] = {
{
"GL_APPLE_texture_2D_limited_npot", "GL_APPLE_texture_2D_limited_npot",
"GL_APPLE_texture_format_BGRA8888", "GL_APPLE_texture_format_BGRA8888",
"GL_EXT_blend_minmax", "GL_EXT_blend_minmax",

12
source/Irrlicht/COGLESDriver.cpp
View File

@ -846,12 +846,12 @@ void COGLES1Driver::draw2DImage(const video::ITexture *texture, const core::rect
sourceRect.LowerRightCorner.X * invW, sourceRect.LowerRightCorner.X * invW,
(isRTT ? sourceRect.UpperLeftCorner.Y : sourceRect.LowerRightCorner.Y) * invH); (isRTT ? sourceRect.UpperLeftCorner.Y : sourceRect.LowerRightCorner.Y) * invH);
const video::SColor temp[4] = const video::SColor temp[4] = {
{
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF}; 0xFFFFFFFF,
};
const video::SColor *const useColor = colors ? colors : temp; const video::SColor *const useColor = colors ? colors : temp;
@ -2209,8 +2209,7 @@ core::dimension2du COGLES1Driver::getMaxTextureSize() const
GLenum COGLES1Driver::getGLBlend(E_BLEND_FACTOR factor) const GLenum COGLES1Driver::getGLBlend(E_BLEND_FACTOR factor) const
{ {
static GLenum const blendTable[] = static GLenum const blendTable[] = {
{
GL_ZERO, GL_ZERO,
GL_ONE, GL_ONE,
GL_DST_COLOR, GL_DST_COLOR,
@ -2221,7 +2220,8 @@ GLenum COGLES1Driver::getGLBlend(E_BLEND_FACTOR factor) const
GL_ONE_MINUS_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
GL_DST_ALPHA, GL_DST_ALPHA,
GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA,
GL_SRC_ALPHA_SATURATE}; GL_SRC_ALPHA_SATURATE,
};
return blendTable[factor]; return blendTable[factor];
} }

6
source/Irrlicht/COpenGLDriver.cpp
View File

@ -1133,12 +1133,12 @@ void COpenGLDriver::draw2DImage(const video::ITexture *texture, const core::rect
sourceRect.LowerRightCorner.X * invW, sourceRect.LowerRightCorner.X * invW,
sourceRect.LowerRightCorner.Y * invH); sourceRect.LowerRightCorner.Y * invH);
const video::SColor temp[4] = const video::SColor temp[4] = {
{
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF}; 0xFFFFFFFF,
};
const video::SColor *const useColor = colors ? colors : temp; const video::SColor *const useColor = colors ? colors : temp;

12
source/Irrlicht/CWGLManager.cpp
View File

@ -198,8 +198,7 @@ bool CWGLManager::initialize(const SIrrlichtCreationParameters &params, const SE
Params.AntiAlias = 32; Params.AntiAlias = 32;
f32 fAttributes[] = {0.0, 0.0}; f32 fAttributes[] = {0.0, 0.0};
s32 iAttributes[] = s32 iAttributes[] = {
{
WGL_DRAW_TO_WINDOW_ARB, 1, WGL_DRAW_TO_WINDOW_ARB, 1,
WGL_SUPPORT_OPENGL_ARB, 1, WGL_SUPPORT_OPENGL_ARB, 1,
WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB, WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
@ -221,7 +220,8 @@ bool CWGLManager::initialize(const SIrrlichtCreationParameters &params, const SE
WGL_SAMPLE_BUFFERS_3DFX, (Params.AntiAlias > 0) ? 1 : 0, WGL_SAMPLE_BUFFERS_3DFX, (Params.AntiAlias > 0) ? 1 : 0,
#endif #endif
// WGL_DEPTH_FLOAT_EXT, 1, // WGL_DEPTH_FLOAT_EXT, 1,
0, 0, 0, 0}; 0, 0, 0, 0,
};
int iAttrSize = sizeof(iAttributes) / sizeof(int); int iAttrSize = sizeof(iAttributes) / sizeof(int);
if (!multi_sample_supported) { if (!multi_sample_supported) {
memmove(&iAttributes[20], &iAttributes[24], sizeof(int) * (iAttrSize - 24)); memmove(&iAttributes[20], &iAttributes[24], sizeof(int) * (iAttrSize - 24));
@ -349,12 +349,12 @@ bool CWGLManager::generateContext()
if (wglCreateContextAttribs_ARB) { if (wglCreateContextAttribs_ARB) {
// with 3.0 all available profiles should be usable, higher versions impose restrictions // with 3.0 all available profiles should be usable, higher versions impose restrictions
// we need at least 1.1 // we need at least 1.1
const int iAttribs[] = const int iAttribs[] = {
{
WGL_CONTEXT_MAJOR_VERSION_ARB, 1, WGL_CONTEXT_MAJOR_VERSION_ARB, 1,
WGL_CONTEXT_MINOR_VERSION_ARB, 1, WGL_CONTEXT_MINOR_VERSION_ARB, 1,
// WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB, // enable to get a debug context (depends on driver if that does anything) // WGL_CONTEXT_FLAGS_ARB, WGL_CONTEXT_DEBUG_BIT_ARB, // enable to get a debug context (depends on driver if that does anything)
0}; 0,
};
hrc = wglCreateContextAttribs_ARB(HDc, 0, iAttribs); hrc = wglCreateContextAttribs_ARB(HDc, 0, iAttribs);
} else } else
#endif #endif

12
source/Irrlicht/OpenGL/Driver.cpp
View File

@ -802,12 +802,12 @@ void COpenGL3DriverBase::draw2DImage(const video::ITexture *texture, const core:
sourceRect.LowerRightCorner.X * invW, sourceRect.LowerRightCorner.X * invW,
(isRTT ? sourceRect.UpperLeftCorner.Y : sourceRect.LowerRightCorner.Y) * invH); (isRTT ? sourceRect.UpperLeftCorner.Y : sourceRect.LowerRightCorner.Y) * invH);
const video::SColor temp[4] = const video::SColor temp[4] = {
{
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF, 0xFFFFFFFF,
0xFFFFFFFF}; 0xFFFFFFFF,
};
const video::SColor *const useColor = colors ? colors : temp; const video::SColor *const useColor = colors ? colors : temp;
@ -1939,8 +1939,7 @@ core::dimension2du COpenGL3DriverBase::getMaxTextureSize() const
GLenum COpenGL3DriverBase::getGLBlend(E_BLEND_FACTOR factor) const GLenum COpenGL3DriverBase::getGLBlend(E_BLEND_FACTOR factor) const
{ {
static GLenum const blendTable[] = static GLenum const blendTable[] = {
{
GL_ZERO, GL_ZERO,
GL_ONE, GL_ONE,
GL_DST_COLOR, GL_DST_COLOR,
@ -1951,7 +1950,8 @@ GLenum COpenGL3DriverBase::getGLBlend(E_BLEND_FACTOR factor) const
GL_ONE_MINUS_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
GL_DST_ALPHA, GL_DST_ALPHA,
GL_ONE_MINUS_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA,
GL_SRC_ALPHA_SATURATE}; GL_SRC_ALPHA_SATURATE,
};
return blendTable[factor]; return blendTable[factor];
} }