Replace std::list to std::vector into tile.cpp (m_texture_trash) and move tile.hpp to src/client/

This commit is contained in:
Loic Blot 2015-03-05 11:52:57 +01:00
parent aa474e4501
commit 0d1eedcccc
27 changed files with 29 additions and 30 deletions

@ -196,7 +196,6 @@ LOCAL_SRC_FILES := \
jni/src/staticobject.cpp \ jni/src/staticobject.cpp \
jni/src/subgame.cpp \ jni/src/subgame.cpp \
jni/src/test.cpp \ jni/src/test.cpp \
jni/src/tile.cpp \
jni/src/tool.cpp \ jni/src/tool.cpp \
jni/src/treegen.cpp \ jni/src/treegen.cpp \
jni/src/version.cpp \ jni/src/version.cpp \
@ -214,7 +213,8 @@ LOCAL_SRC_FILES := \
jni/src/database-leveldb.cpp \ jni/src/database-leveldb.cpp \
jni/src/settings.cpp \ jni/src/settings.cpp \
jni/src/wieldmesh.cpp \ jni/src/wieldmesh.cpp \
jni/src/client/clientlauncher.cpp jni/src/client/clientlauncher.cpp \
jni/src/client/tile.cpp
# Network # Network
LOCAL_SRC_FILES += \ LOCAL_SRC_FILES += \

@ -499,7 +499,6 @@ set(minetest_SRCS
particles.cpp particles.cpp
shader.cpp shader.cpp
sky.cpp sky.cpp
tile.cpp
wieldmesh.cpp wieldmesh.cpp
${minetest_SCRIPT_SRCS} ${minetest_SCRIPT_SRCS}
) )

@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "irrlichttypes_extrabloated.h" #include "irrlichttypes_extrabloated.h"
#include "inventory.h" #include "inventory.h"
#include "mesh.h" #include "mesh.h"
#include "tile.h" #include "client/tile.h"
#include "util/numeric.h" #include "util/numeric.h"
#include <ICameraSceneNode.h> #include <ICameraSceneNode.h>

@ -1,4 +1,5 @@
set(client_SRCS set(client_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp ${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
PARENT_SCOPE PARENT_SCOPE
) )

@ -407,7 +407,7 @@ private:
// Textures that have been overwritten with other ones // Textures that have been overwritten with other ones
// but can't be deleted because the ITexture* might still be used // but can't be deleted because the ITexture* might still be used
std::list<video::ITexture*> m_texture_trash; std::vector<video::ITexture*> m_texture_trash;
// Cached settings needed for making textures from meshes // Cached settings needed for making textures from meshes
bool m_setting_trilinear_filter; bool m_setting_trilinear_filter;
@ -455,10 +455,9 @@ TextureSource::~TextureSource()
} }
m_textureinfo_cache.clear(); m_textureinfo_cache.clear();
for (std::list<video::ITexture*>::iterator iter = for (std::vector<video::ITexture*>::iterator iter =
m_texture_trash.begin(); iter != m_texture_trash.end(); m_texture_trash.begin(); iter != m_texture_trash.end();
iter++) iter++) {
{
video::ITexture *t = *iter; video::ITexture *t = *iter;
//cleanup trashed texture //cleanup trashed texture

@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "util/numeric.h" // For IntervalLimiter #include "util/numeric.h" // For IntervalLimiter
#include "util/serialize.h" #include "util/serialize.h"
#include "util/mathconstants.h" #include "util/mathconstants.h"
#include "tile.h" #include "client/tile.h"
#include "environment.h" #include "environment.h"
#include "collision.h" #include "collision.h"
#include "settings.h" #include "settings.h"

@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_cso.h" #include "content_cso.h"
#include <IBillboardSceneNode.h> #include <IBillboardSceneNode.h>
#include "tile.h" #include "client/tile.h"
#include "environment.h" #include "environment.h"
#include "gamedef.h" #include "gamedef.h"
#include "log.h" #include "log.h"

@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapblock_mesh.h" // For MapBlock_LightColor() and MeshCollector #include "mapblock_mesh.h" // For MapBlock_LightColor() and MeshCollector
#include "settings.h" #include "settings.h"
#include "nodedef.h" #include "nodedef.h"
#include "tile.h" #include "client/tile.h"
#include "mesh.h" #include "mesh.h"
#include <IMeshManipulator.h> #include <IMeshManipulator.h>
#include "gamedef.h" #include "gamedef.h"

@ -51,7 +51,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodemetadata.h" #include "nodemetadata.h"
#include "main.h" // For g_settings #include "main.h" // For g_settings
#include "itemdef.h" #include "itemdef.h"
#include "tile.h" // For TextureSource #include "client/tile.h" // For TextureSource
#include "shader.h" // For ShaderSource #include "shader.h" // For ShaderSource
#include "logoutputbuffer.h" #include "logoutputbuffer.h"
#include "subgame.h" #include "subgame.h"

@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h" #include "settings.h"
#include "main.h" // for g_settings #include "main.h" // for g_settings
#include "porting.h" #include "porting.h"
#include "tile.h" #include "client/tile.h"
#include "fontengine.h" #include "fontengine.h"
#include "log.h" #include "log.h"
#include "gettext.h" #include "gettext.h"

@ -38,7 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "fontengine.h" #include "fontengine.h"
#ifdef __ANDROID__ #ifdef __ANDROID__
#include "tile.h" #include "client/tile.h"
#include <GLES/gl.h> #include <GLES/gl.h>
#endif #endif

@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "modalMenu.h" #include "modalMenu.h"
#include "guiFormSpecMenu.h" #include "guiFormSpecMenu.h"
#include "sound.h" #include "sound.h"
#include "tile.h" #include "client/tile.h"
/******************************************************************************/ /******************************************************************************/
/* Typedefs and macros */ /* Typedefs and macros */

@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <IGUITabControl.h> #include <IGUITabControl.h>
#include <IGUIComboBox.h> #include <IGUIComboBox.h>
#include "log.h" #include "log.h"
#include "tile.h" // ITextureSource #include "client/tile.h" // ITextureSource
#include "hud.h" // drawItemStack #include "hud.h" // drawItemStack
#include "filesys.h" #include "filesys.h"
#include "gettime.h" #include "gettime.h"

@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <IGUIScrollBar.h> #include <IGUIScrollBar.h>
#include "debug.h" #include "debug.h"
#include "log.h" #include "log.h"
#include "tile.h" #include "client/tile.h"
#include "gettime.h" #include "gettime.h"
#include "util/string.h" #include "util/string.h"
#include "util/numeric.h" #include "util/numeric.h"

@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "gamedef.h" #include "gamedef.h"
#include "itemdef.h" #include "itemdef.h"
#include "inventory.h" #include "inventory.h"
#include "tile.h" #include "client/tile.h"
#include "localplayer.h" #include "localplayer.h"
#include "camera.h" #include "camera.h"
#include "porting.h" #include "porting.h"

@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapblock_mesh.h" #include "mapblock_mesh.h"
#include "mesh.h" #include "mesh.h"
#include "wieldmesh.h" #include "wieldmesh.h"
#include "tile.h" #include "client/tile.h"
#endif #endif
#include "log.h" #include "log.h"
#include "main.h" // g_settings #include "main.h" // g_settings

@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define MAPBLOCK_MESH_HEADER #define MAPBLOCK_MESH_HEADER
#include "irrlichttypes_extrabloated.h" #include "irrlichttypes_extrabloated.h"
#include "tile.h" #include "client/tile.h"
#include "voxel.h" #include "voxel.h"
#include <map> #include <map>

@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "main.h" // For g_settings #include "main.h" // For g_settings
#include "itemdef.h" #include "itemdef.h"
#ifndef SERVER #ifndef SERVER
#include "tile.h" #include "client/tile.h"
#include "mesh.h" #include "mesh.h"
#include <IMeshManipulator.h> #include <IMeshManipulator.h>
#endif #endif

@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <list> #include <list>
#include "mapnode.h" #include "mapnode.h"
#ifndef SERVER #ifndef SERVER
#include "tile.h" #include "client/tile.h"
#include "shader.h" #include "shader.h"
#endif #endif
#include "itemgroup.h" #include "itemgroup.h"

@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "debug.h" #include "debug.h"
#include "main.h" // For g_profiler and g_settings #include "main.h" // For g_profiler and g_settings
#include "settings.h" #include "settings.h"
#include "tile.h" #include "client/tile.h"
#include "gamedef.h" #include "gamedef.h"
#include "collision.h" #include "collision.h"
#include <stdlib.h> #include <stdlib.h>

@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <iostream> #include <iostream>
#include "irrlichttypes_extrabloated.h" #include "irrlichttypes_extrabloated.h"
#include "tile.h" #include "client/tile.h"
#include "localplayer.h" #include "localplayer.h"
#include "environment.h" #include "environment.h"

@ -36,7 +36,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h" #include "log.h"
#include "gamedef.h" #include "gamedef.h"
#include "strfnd.h" // trim() #include "strfnd.h" // trim()
#include "tile.h" #include "client/tile.h"
/* /*
A cache from shader name to shader path A cache from shader name to shader path

@ -3,7 +3,7 @@
#include "ISceneManager.h" #include "ISceneManager.h"
#include "ICameraSceneNode.h" #include "ICameraSceneNode.h"
#include "S3DVertex.h" #include "S3DVertex.h"
#include "tile.h" #include "client/tile.h"
#include "noise.h" // easeCurve #include "noise.h" // easeCurve
#include "main.h" // g_profiler #include "main.h" // g_profiler
#include "profiler.h" #include "profiler.h"

@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h" #include "log.h"
#include "strfnd.h" #include "strfnd.h"
#ifndef SERVER #ifndef SERVER
#include "tile.h" // getImagePath #include "client/tile.h" // getImagePath
#endif #endif
#include "util/string.h" #include "util/string.h"

@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <map> #include <map>
#include "game.h" #include "game.h"
#include "tile.h" #include "client/tile.h"
using namespace irr; using namespace irr;
using namespace irr::core; using namespace irr::core;

@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h" #include "nodedef.h"
#include "mesh.h" #include "mesh.h"
#include "mapblock_mesh.h" #include "mapblock_mesh.h"
#include "tile.h" #include "client/tile.h"
#include "log.h" #include "log.h"
#include "util/numeric.h" #include "util/numeric.h"
#include <map> #include <map>