Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

[no sq] Reformat the code (adopted) #295

Merged
merged 10 commits into from
Mar 21, 2024
Merged

[no sq] Reformat the code (adopted) #295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
eb4dec4
Add clang-format file, based on that from Minetest
numberZero Oct 4, 2023
2bf1d12
Reformat the code, using:
Desour Mar 20, 2024
565c114
Remove .clang-format again
Desour Mar 20, 2024
d5690cc
Fix ifs clang-format didn’t get
numberZero Oct 4, 2023
014007b
Reformat test/image_loader_test.cpp manually
Desour Mar 20, 2024
8acca66
Fix ugly formatted arrays
Desour Mar 21, 2024
58783e4
Add a small script for tab removal
Desour Mar 21, 2024
e7bbbf9
Replace non-leading tabs with spaces, using:
Desour Mar 21, 2024
0eaf3d3
Remove the tab removal script again
Desour Mar 21, 2024
13cd75f
Move source/Irrlicht/ to src/
Desour Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions include/ECullingTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ enum E_CULLING_TYPE
};

//! Names for culling type
const c8 *const AutomaticCullingNames[] =
{
"false",
"box", // camera box against node box
"frustum_box", // camera frustum against node box
"frustum_sphere", // camera frustum against node sphere
"occ_query", // occlusion query
0};
const c8 *const AutomaticCullingNames[] = {
"false",
"box", // camera box against node box
"frustum_box", // camera frustum against node box
"frustum_sphere", // camera frustum against node sphere
"occ_query", // occlusion query
0,
};
sfan5 marked this conversation as resolved.
Show resolved Hide resolved

} // end namespace scene
} // end namespace irr
14 changes: 7 additions & 7 deletions include/EGUIAlignment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ enum EGUI_ALIGNMENT
};

//! Names for alignments
const c8 *const GUIAlignmentNames[] =
{
"upperLeft",
"lowerRight",
"center",
"scale",
0};
const c8 *const GUIAlignmentNames[] = {
"upperLeft",
"lowerRight",
"center",
"scale",
0,
};

} // namespace gui
} // namespace irr
58 changes: 29 additions & 29 deletions include/EGUIElementTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,35 +99,35 @@ enum EGUI_ELEMENT_TYPE
};

//! Names for built-in element types
const c8 *const GUIElementTypeNames[] =
{
"button",
"checkBox",
"comboBox",
"contextMenu",
"menu",
"editBox",
"fileOpenDialog",
"colorSelectDialog",
"inOutFader",
"image",
"listBox",
"meshViewer",
"messageBox",
"modalScreen",
"scrollBar",
"spinBox",
"staticText",
"tab",
"tabControl",
"table",
"toolBar",
"treeview",
"window",
"element",
"root",
"profiler",
0};
const c8 *const GUIElementTypeNames[] = {
"button",
"checkBox",
"comboBox",
"contextMenu",
"menu",
"editBox",
"fileOpenDialog",
"colorSelectDialog",
"inOutFader",
"image",
"listBox",
"meshViewer",
"messageBox",
"modalScreen",
"scrollBar",
"spinBox",
"staticText",
"tab",
"tabControl",
"table",
"toolBar",
"treeview",
"window",
"element",
"root",
"profiler",
0,
};

} // end namespace gui
} // end namespace irr
16 changes: 8 additions & 8 deletions include/EMaterialTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ enum E_MATERIAL_TYPE
};

//! Array holding the built in material type names
const char *const sBuiltInMaterialTypeNames[] =
{
"solid",
"trans_alphach",
"trans_alphach_ref",
"trans_vertex_alpha",
"onetexture_blend",
0};
const char *const sBuiltInMaterialTypeNames[] = {
"solid",
"trans_alphach",
"trans_alphach_ref",
"trans_vertex_alpha",
"onetexture_blend",
0,
};

constexpr u32 numBuiltInMaterials =
sizeof(sBuiltInMaterialTypeNames) / sizeof(char *) - 1;
Expand Down
20 changes: 10 additions & 10 deletions include/EVertexAttributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ enum E_VERTEX_ATTRIBUTES
};

//! Array holding the built in vertex attribute names
const char *const sBuiltInVertexAttributeNames[] =
{
"inVertexPosition",
"inVertexNormal",
"inVertexColor",
"inTexCoord0",
"inTexCoord1",
"inVertexTangent",
"inVertexBinormal",
0};
const char *const sBuiltInVertexAttributeNames[] = {
"inVertexPosition",
"inVertexNormal",
"inVertexColor",
"inTexCoord0",
"inTexCoord1",
"inVertexTangent",
"inVertexBinormal",
0,
};

} // end namespace video
} // end namespace irr
13 changes: 6 additions & 7 deletions include/IBoneSceneNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,12 @@ enum E_BONE_SKINNING_SPACE
};

//! Names for bone animation modes
const c8 *const BoneAnimationModeNames[] =
{
"automatic",
"animated",
"unanimated",
0,
};
const c8 *const BoneAnimationModeNames[] = {
"automatic",
"animated",
"unanimated",
0,
};

//! Interface for bones used for skeletal animation.
/** Used with ISkinnedMesh and IAnimatedMeshSceneNode. */
Expand Down
32 changes: 16 additions & 16 deletions include/ICursorControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ enum ECURSOR_ICON
};

//! Names for ECURSOR_ICON
const c8 *const GUICursorIconNames[ECI_COUNT + 1] =
{
"normal",
"cross",
"hand",
"help",
"ibeam",
"no",
"wait",
"sizeall",
"sizenesw",
"sizenwse",
"sizens",
"sizewe",
"sizeup",
0};
const c8 *const GUICursorIconNames[ECI_COUNT + 1] = {
"normal",
"cross",
"hand",
"help",
"ibeam",
"no",
"wait",
"sizeall",
"sizenesw",
"sizenwse",
"sizens",
"sizewe",
"sizeup",
0,
};

//! structure used to set sprites as cursors.
struct SCursorSprite
Expand Down
46 changes: 22 additions & 24 deletions include/IGUIButton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,16 @@ enum EGUI_BUTTON_STATE
};

//! Names for gui button state icons
const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] =
{
"buttonUp",
"buttonDown",
"buttonMouseOver",
"buttonMouseOff",
"buttonFocused",
"buttonNotFocused",
"buttonDisabled",
0 // count
};
const c8 *const GUIButtonStateNames[EGBS_COUNT + 1] = {
"buttonUp",
"buttonDown",
"buttonMouseOver",
"buttonMouseOff",
"buttonFocused",
"buttonNotFocused",
"buttonDisabled",
0, // count
};

//! State of buttons used for drawing texture images.
//! Note that only a single state is active at a time
Expand Down Expand Up @@ -87,19 +86,18 @@ enum EGUI_BUTTON_IMAGE_STATE
};

//! Names for gui button image states
const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] =
{
"Image", // not "ImageUp" as it otherwise breaks serialization of old files
"ImageUpOver",
"ImageUpFocused",
"ImageUpFocusedOver",
"PressedImage", // not "ImageDown" as it otherwise breaks serialization of old files
"ImageDownOver",
"ImageDownFocused",
"ImageDownFocusedOver",
"ImageDisabled",
0 // count
};
const c8 *const GUIButtonImageStateNames[EGBIS_COUNT + 1] = {
"Image", // not "ImageUp" as it otherwise breaks serialization of old files
"ImageUpOver",
"ImageUpFocused",
"ImageUpFocusedOver",
"PressedImage", // not "ImageDown" as it otherwise breaks serialization of old files
"ImageDownOver",
"ImageDownFocused",
"ImageDownFocusedOver",
"ImageDisabled",
0, // count
};

//! GUI Button interface.
/** \par This element can create the following events of type EGUI_EVENT_TYPE:
Expand Down