mirror of
https://github.com/minetest/minetest.git
synced 2024-12-23 14:42:24 +01:00
Clean up header includes related to settings.h
This commit is contained in:
parent
e3813cf027
commit
4975afb5ff
@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
#include "settings.h"
|
||||||
#include "util/strfnd.h"
|
#include "util/strfnd.h"
|
||||||
#include "util/string.h"
|
#include "util/string.h"
|
||||||
#include "util/numeric.h"
|
#include "util/numeric.h"
|
||||||
|
@ -19,6 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <set>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <list>
|
#include <list>
|
||||||
@ -26,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
|
|
||||||
#include "irrlichttypes.h"
|
#include "irrlichttypes.h"
|
||||||
#include "util/enriched_string.h"
|
#include "util/enriched_string.h"
|
||||||
#include "settings.h"
|
|
||||||
|
|
||||||
// Chat console related classes
|
// Chat console related classes
|
||||||
|
|
||||||
|
@ -38,6 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "script/scripting_client.h"
|
#include "script/scripting_client.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
#include <SViewFrustum.h>
|
#include <SViewFrustum.h>
|
||||||
|
#include <IGUIFont.h>
|
||||||
#include <IVideoDriver.h>
|
#include <IVideoDriver.h>
|
||||||
|
|
||||||
#define CAMERA_OFFSET_STEP 200
|
#define CAMERA_OFFSET_STEP 200
|
||||||
|
@ -24,8 +24,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "porting.h"
|
#include "porting.h"
|
||||||
#include "filesys.h"
|
#include "filesys.h"
|
||||||
#include "gettext.h"
|
#include "gettext.h"
|
||||||
|
#include "settings.h"
|
||||||
#include "irrlicht_changes/CGUITTFont.h"
|
#include "irrlicht_changes/CGUITTFont.h"
|
||||||
#include "util/numeric.h" // rangelim
|
#include "util/numeric.h" // rangelim
|
||||||
|
#include <IGUIEnvironment.h>
|
||||||
|
#include <IGUIFont.h>
|
||||||
|
|
||||||
/** reference to access font engine, has to be initialized by main */
|
/** reference to access font engine, has to be initialized by main */
|
||||||
FontEngine *g_fontengine = nullptr;
|
FontEngine *g_fontengine = nullptr;
|
||||||
|
@ -22,12 +22,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include "util/basic_macros.h"
|
#include "util/basic_macros.h"
|
||||||
#include "irrlichttypes.h"
|
#include "irrlichttypes.h"
|
||||||
#include <IGUIFont.h>
|
#include "irrString.h" // utf8_to_wide
|
||||||
#include <IGUISkin.h>
|
|
||||||
#include <IGUIEnvironment.h>
|
|
||||||
#include "settings.h"
|
|
||||||
#include "threading/mutex_auto_lock.h"
|
#include "threading/mutex_auto_lock.h"
|
||||||
|
|
||||||
|
namespace irr {
|
||||||
|
namespace gui {
|
||||||
|
class IGUIEnvironment;
|
||||||
|
class IGUIFont;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#define FONT_SIZE_UNSPECIFIED 0xFFFFFFFF
|
#define FONT_SIZE_UNSPECIFIED 0xFFFFFFFF
|
||||||
|
|
||||||
enum FontMode : u8 {
|
enum FontMode : u8 {
|
||||||
|
@ -20,15 +20,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "imagesource.h"
|
#include "imagesource.h"
|
||||||
|
|
||||||
#include <IFileSystem.h>
|
#include <IFileSystem.h>
|
||||||
#include "settings.h"
|
|
||||||
#include "mesh.h"
|
|
||||||
#include "util/strfnd.h"
|
|
||||||
#include "renderingengine.h"
|
|
||||||
#include "util/base64.h"
|
|
||||||
#include "irrlicht_changes/printing.h"
|
|
||||||
#include "imagefilters.h"
|
#include "imagefilters.h"
|
||||||
|
#include "mesh.h"
|
||||||
|
#include "renderingengine.h"
|
||||||
|
#include "settings.h"
|
||||||
#include "texturepaths.h"
|
#include "texturepaths.h"
|
||||||
|
#include "irrlicht_changes/printing.h"
|
||||||
|
#include "util/base64.h"
|
||||||
#include "util/numeric.h"
|
#include "util/numeric.h"
|
||||||
|
#include "util/strfnd.h"
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////
|
////////////////////////////////
|
||||||
@ -1832,6 +1832,12 @@ bool ImageSource::generateImagePart(std::string_view part_of_name,
|
|||||||
|
|
||||||
#undef CHECK_DIM
|
#undef CHECK_DIM
|
||||||
|
|
||||||
|
ImageSource::ImageSource() :
|
||||||
|
m_setting_mipmap{g_settings->getBool("mip_map")},
|
||||||
|
m_setting_trilinear_filter{g_settings->getBool("trilinear_filter")},
|
||||||
|
m_setting_bilinear_filter{g_settings->getBool("bilinear_filter")},
|
||||||
|
m_setting_anisotropic_filter{g_settings->getBool("anisotropic_filter")}
|
||||||
|
{}
|
||||||
|
|
||||||
video::IImage* ImageSource::generateImage(std::string_view name,
|
video::IImage* ImageSource::generateImage(std::string_view name,
|
||||||
std::set<std::string> &source_image_names)
|
std::set<std::string> &source_image_names)
|
||||||
|
@ -20,8 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <IImage.h>
|
#include <IImage.h>
|
||||||
|
#include <map>
|
||||||
|
#include <set>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "settings.h"
|
|
||||||
|
using namespace irr;
|
||||||
|
|
||||||
// This file is only used for internal generation of images.
|
// This file is only used for internal generation of images.
|
||||||
// Use texturesource.h to handle textures.
|
// Use texturesource.h to handle textures.
|
||||||
@ -45,6 +48,8 @@ private:
|
|||||||
|
|
||||||
// Generates images using texture modifiers, and caches source images.
|
// Generates images using texture modifiers, and caches source images.
|
||||||
struct ImageSource {
|
struct ImageSource {
|
||||||
|
ImageSource();
|
||||||
|
|
||||||
/*! Generates an image from a full string like
|
/*! Generates an image from a full string like
|
||||||
* "stone.png^mineral_coal.png^[crack:1:0".
|
* "stone.png^mineral_coal.png^[crack:1:0".
|
||||||
* The returned Image should be dropped.
|
* The returned Image should be dropped.
|
||||||
@ -58,13 +63,6 @@ struct ImageSource {
|
|||||||
// TODO should probably be moved elsewhere
|
// TODO should probably be moved elsewhere
|
||||||
static video::SColor getImageAverageColor(const video::IImage &image);
|
static video::SColor getImageAverageColor(const video::IImage &image);
|
||||||
|
|
||||||
ImageSource() :
|
|
||||||
m_setting_mipmap{g_settings->getBool("mip_map")},
|
|
||||||
m_setting_trilinear_filter{g_settings->getBool("trilinear_filter")},
|
|
||||||
m_setting_bilinear_filter{g_settings->getBool("bilinear_filter")},
|
|
||||||
m_setting_anisotropic_filter{g_settings->getBool("anisotropic_filter")}
|
|
||||||
{};
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
// Generate image based on a string like "stone.png" or "[crack:1:0".
|
// Generate image based on a string like "stone.png" or "[crack:1:0".
|
||||||
|
@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
#include "constants.h"
|
#include "constants.h"
|
||||||
#include "settings.h"
|
|
||||||
#include "lighting.h"
|
#include "lighting.h"
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
|
@ -20,12 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "texturesource.h"
|
#include "texturesource.h"
|
||||||
|
|
||||||
#include <IVideoDriver.h>
|
#include <IVideoDriver.h>
|
||||||
#include "util/thread.h"
|
|
||||||
#include "imagefilters.h"
|
|
||||||
#include "guiscalingfilter.h"
|
#include "guiscalingfilter.h"
|
||||||
#include "renderingengine.h"
|
#include "imagefilters.h"
|
||||||
#include "texturepaths.h"
|
|
||||||
#include "imagesource.h"
|
#include "imagesource.h"
|
||||||
|
#include "renderingengine.h"
|
||||||
|
#include "settings.h"
|
||||||
|
#include "texturepaths.h"
|
||||||
|
#include "util/thread.h"
|
||||||
|
|
||||||
|
|
||||||
// Stores internal information about a texture.
|
// Stores internal information about a texture.
|
||||||
|
Loading…
Reference in New Issue
Block a user