oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-05 19:31:04 +00:00
Code Wiki Activity

Fix some compiler warnings (#15596)

Browse source
This commit is contained in:
Lars Müller 2024-12-26 11:29:00 +01:00 • committed by GitHub
parent d2a7875b5b
commit 412cc96bc9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/client/content_mapblock.cpp
View file

@ -13,7 +13,6 @@
#include "nodedef.h"
#include "client/tile.h"
#include "mesh.h"
#include <IMeshManipulator.h>
#include "client/meshgen/collector.h"
#include "client/renderingengine.h"
#include "client.h"
@ -60,12 +59,10 @@ static const auto &quad_indices = quad_indices_02;
const std::string MapblockMeshGenerator::raillike_groupname = "connect_to_raillike";
MapblockMeshGenerator::MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output,
scene::IMeshManipulator *mm):
MapblockMeshGenerator::MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output):
data(input),
collector(output),
nodedef(data->nodedef),
meshmanip(mm),
blockpos_nodes(data->m_blockpos * MAP_BLOCKSIZE),
smooth_liquids(g_settings->getBool("enable_water_reflections"))
{

5
src/client/content_mapblock.h
View file

@ -5,7 +5,6 @@
#pragma once
#include "nodedef.h"
#include <IMeshManipulator.h>
struct MeshMakeData;
struct MeshCollector;
@ -46,8 +45,7 @@ struct LightFrame {
class MapblockMeshGenerator
{
public:
MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output,
scene::IMeshManipulator *mm);
MapblockMeshGenerator(MeshMakeData *input, MeshCollector *output);
void generate();
void renderSingle(content_t node, u8 param2 = 0x00);
@ -56,7 +54,6 @@ private:
MeshCollector *const collector;
const NodeDefManager *const nodedef;
scene::IMeshManipulator *const meshmanip;
const v3s16 blockpos_nodes;

3
src/client/mapblock_mesh.cpp
View file

@ -633,8 +633,7 @@ MapBlockMesh::MapBlockMesh(Client *client, MeshMakeData *data, v3s16 camera_offs
*/
{
MapblockMeshGenerator(data, &collector,
client->getSceneManager()->getMeshManipulator()).generate();
MapblockMeshGenerator(data, &collector).generate();
}
/*

3
src/client/wieldmesh.cpp
View file

@ -299,8 +299,7 @@ static scene::SMesh *createSpecialNodeMesh(Client *client, MapNode n,
MeshMakeData mesh_make_data(client->ndef(), 1);
MeshCollector collector(v3f(0.0f * BS), v3f());
mesh_make_data.setSmoothLighting(false);
MapblockMeshGenerator gen(&mesh_make_data, &collector,
client->getSceneManager()->getMeshManipulator());
MapblockMeshGenerator gen(&mesh_make_data, &collector);
if (n.getParam2()) {
// keep it