oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-22 17:18:39 +00:00
Code Wiki Activity

Fix various performance issues reported by cppcheck + code style (CI) (#5635)

Browse source 
* Make CI happy with code style on master
* guiFileSelectMenu: remove useless includes
* some performance fixes pointed by cppcheck
* remove some useless casts
* TextDest: remove unused setFormSpec function
This commit is contained in:
Loïc Blot 2017-04-21 23:40:48 +02:00 • committed by GitHub
parent f151b23220
commit dc0e9097d3
7 changed files with 70 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/wieldmesh.h
View file

@ -31,7 +31,8 @@ struct ContentFeatures;
/*!
* Holds color information of an item mesh's buffer.
*/
struct ItemPartColor {
struct ItemPartColor
{
/*!
* If this is false, the global base color of the item
* will be used instead of the specific color of the
@ -43,15 +44,12 @@ struct ItemPartColor {
*/
video::SColor color;
ItemPartColor():
override_base(false),
color(0)
{}
ItemPartColor() : override_base(false), color(0) {}
ItemPartColor(bool override, video::SColor color):
override_base(override),
color(color)
{}
ItemPartColor(bool override, video::SColor color)
: override_base(override), color(color)
{
}
};
struct ItemMesh
@ -75,8 +73,7 @@ public:
s32 id = -1, bool lighting = false);
virtual ~WieldMeshSceneNode();
void setCube(const ContentFeatures &f, v3f wield_scale,
ITextureSource *tsrc);
void setCube(const ContentFeatures &f, v3f wield_scale, ITextureSource *tsrc);
void setExtruded(const std::string &imagename, v3f wield_scale,
ITextureSource *tsrc, u8 num_frames);
void setItem(const ItemStack &item, Client *client);
@ -133,7 +130,7 @@ scene::SMesh *getExtrudedMesh(ITextureSource *tsrc, const std::string &imagename
* be NULL to leave the original material.
* \param colors returns the colors of the mesh buffers in the mesh.
*/
void postProcessNodeMesh(scene::SMesh *mesh, const ContentFeatures &f,
bool use_shaders, bool set_material, video::E_MATERIAL_TYPE *mattype,
std::vector<ItemPartColor> *colors);
void postProcessNodeMesh(scene::SMesh *mesh, const ContentFeatures &f, bool use_shaders,
bool set_material, video::E_MATERIAL_TYPE *mattype,
std::vector<ItemPartColor> *colors);
#endif