Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 08:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use std::map instead of core::map (#12301)

Browse Source
This commit is contained in:
paradust7 2022-05-18 03:31:49 -07:00 committed by GitHub
parent af37f9dc54
commit 273bfee9a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/mesh.cpp
View File

@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mesh.h" #include "mesh.h"
#include "debug.h" #include "debug.h"
#include "log.h" #include "log.h"
#include "irrMap.h"
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
#include <IAnimatedMesh.h> #include <IAnimatedMesh.h>

42
src/irrlicht_changes/CGUITTFont.cpp
View File

@ -59,7 +59,7 @@ struct SGUITTFace : public virtual irr::IReferenceCounted
// Static variables. // Static variables.
FT_Library CGUITTFont::c_library; FT_Library CGUITTFont::c_library;
core::map<io::path, SGUITTFace*> CGUITTFont::c_faces; std::map<io::path, SGUITTFace*> CGUITTFont::c_faces;
bool CGUITTFont::c_libraryLoaded = false; bool CGUITTFont::c_libraryLoaded = false;
scene::IMesh* CGUITTFont::shared_plane_ptr_ = 0; scene::IMesh* CGUITTFont::shared_plane_ptr_ = 0;
scene::SMesh CGUITTFont::shared_plane_; scene::SMesh CGUITTFont::shared_plane_;
@ -320,11 +320,11 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
// Grab the face. // Grab the face.
SGUITTFace* face = 0; SGUITTFace* face = 0;
core::map<io::path, SGUITTFace*>::Node* node = c_faces.find(filename); auto node = c_faces.find(filename);
if (node == 0) if (node == c_faces.end())
{ {
face = new SGUITTFace(); face = new SGUITTFace();
c_faces.set(filename, face); c_faces.emplace(filename, face);
if (filesystem) if (filesystem)
{ {
@ -334,7 +334,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
{ {
if (logger) logger->log(L"CGUITTFont", L"Failed to open the file.", irr::ELL_INFORMATION); if (logger) logger->log(L"CGUITTFont", L"Failed to open the file.", irr::ELL_INFORMATION);
c_faces.remove(filename); c_faces.erase(filename);
delete face; delete face;
face = 0; face = 0;
return false; return false;
@ -349,7 +349,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
{ {
if (logger) logger->log(L"CGUITTFont", L"FT_New_Memory_Face failed.", irr::ELL_INFORMATION); if (logger) logger->log(L"CGUITTFont", L"FT_New_Memory_Face failed.", irr::ELL_INFORMATION);
c_faces.remove(filename); c_faces.erase(filename);
delete face; delete face;
face = 0; face = 0;
return false; return false;
@ -362,7 +362,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
{ {
if (logger) logger->log(L"CGUITTFont", L"FT_New_Face failed.", irr::ELL_INFORMATION); if (logger) logger->log(L"CGUITTFont", L"FT_New_Face failed.", irr::ELL_INFORMATION);
c_faces.remove(filename); c_faces.erase(filename);
delete face; delete face;
face = 0; face = 0;
return false; return false;
@ -372,7 +372,7 @@ bool CGUITTFont::load(const io::path& filename, const u32 size, const bool antia
else else
{ {
// Using another instance of this face. // Using another instance of this face.
face = node->getValue(); face = node->second;
face->grab(); face->grab();
} }
@ -415,17 +415,17 @@ CGUITTFont::~CGUITTFont()
//Glyphs.clear(); //Glyphs.clear();
// We aren't using this face anymore. // We aren't using this face anymore.
core::map<io::path, SGUITTFace*>::Node* n = c_faces.find(filename); auto n = c_faces.find(filename);
if (n) if (n != c_faces.end())
{ {
SGUITTFace* f = n->getValue(); SGUITTFace* f = n->second;
// Drop our face. If this was the last face, the destructor will clean up. // Drop our face. If this was the last face, the destructor will clean up.
if (f->drop()) if (f->drop())
c_faces.remove(filename); c_faces.erase(filename);
// If there are no more faces referenced by FreeType, clean up. // If there are no more faces referenced by FreeType, clean up.
if (c_faces.size() == 0) if (c_faces.empty())
{ {
FT_Done_FreeType(c_library); FT_Done_FreeType(c_library);
c_libraryLoaded = false; c_libraryLoaded = false;
@ -585,7 +585,7 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
core::ustring utext = text.getString(); core::ustring utext = text.getString();
// Set up our render map. // Set up our render map.
core::map<u32, CGUITTGlyphPage*> Render_Map; std::map<u32, CGUITTGlyphPage*> Render_Map;
// Start parsing characters. // Start parsing characters.
u32 n; u32 n;
@ -640,7 +640,7 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
page->render_colors.push_back(colors[iter.getPos()]); page->render_colors.push_back(colors[iter.getPos()]);
else else
page->render_colors.push_back(video::SColor(255,255,255,255)); page->render_colors.push_back(video::SColor(255,255,255,255));
Render_Map.set(glyph.glyph_page, page); Render_Map[glyph.glyph_page] = page;
} }
if (n > 0) if (n > 0)
{ {
@ -673,14 +673,12 @@ void CGUITTFont::draw(const EnrichedString &text, const core::rect<s32>& positio
// Draw now. // Draw now.
update_glyph_pages(); update_glyph_pages();
core::map<u32, CGUITTGlyphPage*>::Iterator j = Render_Map.getIterator(); auto it = Render_Map.begin();
while (!j.atEnd()) auto ie = Render_Map.end();
while (it != ie)
{ {
core::map<u32, CGUITTGlyphPage*>::Node* n = j.getNode(); CGUITTGlyphPage* page = it->second;
j++; ++it;
if (n == 0) continue;
CGUITTGlyphPage* page = n->getValue();
if (shadow_offset) { if (shadow_offset) {
for (size_t i = 0; i < page->render_positions.size(); ++i) for (size_t i = 0; i < page->render_positions.size(); ++i)

3
src/irrlicht_changes/CGUITTFont.h
View File

@ -34,6 +34,7 @@
#include <irrlicht.h> #include <irrlicht.h>
#include <ft2build.h> #include <ft2build.h>
#include <vector> #include <vector>
#include <map>
#include <irrUString.h> #include <irrUString.h>
#include "util/enriched_string.h" #include "util/enriched_string.h"
#include FT_FREETYPE_H #include FT_FREETYPE_H
@ -345,7 +346,7 @@ namespace gui
private: private:
// Manages the FreeType library. // Manages the FreeType library.
static FT_Library c_library; static FT_Library c_library;
static core::map<io::path, SGUITTFace*> c_faces; static std::map<io::path, SGUITTFace*> c_faces;
static bool c_libraryLoaded; static bool c_libraryLoaded;
static scene::IMesh* shared_plane_ptr_; static scene::IMesh* shared_plane_ptr_;
static scene::SMesh shared_plane_; static scene::SMesh shared_plane_;

6
src/unittest/test.cpp
View File

@ -533,7 +533,7 @@ struct TestMapBlock: public TestBase
parent.node.setContent(CONTENT_AIR); parent.node.setContent(CONTENT_AIR);
parent.node.setLight(LIGHTBANK_DAY, LIGHT_SUN); parent.node.setLight(LIGHTBANK_DAY, LIGHT_SUN);
parent.node.setLight(LIGHTBANK_NIGHT, 0); parent.node.setLight(LIGHTBANK_NIGHT, 0);
core::map<v3s16, bool> light_sources; std::map<v3s16, bool> light_sources;
// The bottom block is invalid, because we have a shadowing node // The bottom block is invalid, because we have a shadowing node
UASSERT(b.propagateSunlight(light_sources) == false); UASSERT(b.propagateSunlight(light_sources) == false);
UASSERT(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN); UASSERT(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
@ -560,7 +560,7 @@ struct TestMapBlock: public TestBase
parent.position_valid = true; parent.position_valid = true;
b.setIsUnderground(true); b.setIsUnderground(true);
parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2); parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
core::map<v3s16, bool> light_sources; std::map<v3s16, bool> light_sources;
// The block below should be valid because there shouldn't be // The block below should be valid because there shouldn't be
// sunlight in there either // sunlight in there either
UASSERT(b.propagateSunlight(light_sources, true) == true); UASSERT(b.propagateSunlight(light_sources, true) == true);
@ -601,7 +601,7 @@ struct TestMapBlock: public TestBase
} }
// Lighting value for the valid nodes // Lighting value for the valid nodes
parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2); parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
core::map<v3s16, bool> light_sources; std::map<v3s16, bool> light_sources;
// Bottom block is not valid // Bottom block is not valid
UASSERT(b.propagateSunlight(light_sources) == false); UASSERT(b.propagateSunlight(light_sources) == false);
} }