Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-02 03:00:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename FrameBufferRegistry, ShaderProgramRegistry and VertexBufferRegistry file names.

Browse Source 
Rename class and file of PackManager to PackRegistry to follow the new naming convention.
This commit is contained in:
Martín Lucas Golini
2026-07-26 23:16:24 -03:00
parent 46d365f1b3
commit a113c0f6c9
41 changed files with 108 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eepp/audio/music.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
#include <eepp/system/lock.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
namespace EE { namespace Audio {
@@ -25,10 +25,10 @@ bool Music::openFromFile( const std::string& filename ) {
stop();
if ( !FileSystem::fileExists( filename ) ) {
if ( PackManager::instance()->isFallbackToPacksActive() ) {
if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string tPath( filename );
Pack* tPack = PackManager::instance()->exists( tPath );
Pack* tPack = PackRegistry::instance()->exists( tPath );
if ( NULL != tPack ) {
return openFromPack( tPack, tPath );
src/eepp/audio/soundbuffer.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/scopedbuffer.hpp>
namespace EE { namespace Audio {
@@ -49,10 +49,10 @@ SoundBuffer::~SoundBuffer() {
bool SoundBuffer::loadFromFile( const std::string& filename ) {
if ( !FileSystem::fileExists( filename ) ) {
if ( PackManager::instance()->isFallbackToPacksActive() ) {
if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string tPath( filename );
Pack* tPack = PackManager::instance()->exists( tPath );
Pack* tPack = PackRegistry::instance()->exists( tPath );
if ( NULL != tPack ) {
return loadFromPack( tPack, tPath );
src/eepp/graphics/fontbmfont.cpp
+3 -3
View File
@@ -7,7 +7,7 @@
#include <eepp/system/iostreammemory.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
namespace EE { namespace Graphics {
@@ -57,9 +57,9 @@ bool FontBMFont::loadFromFile( const std::string& filename ) {
mFilePath = FileSystem::fileRemoveFileName( filename );
IOStreamFile stream( filename );
return loadFromStream( stream );
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string path( filename );
Pack* pack = PackManager::instance()->exists( path );
Pack* pack = PackRegistry::instance()->exists( path );
if ( NULL != pack ) {
Log::info( "Loading font from pack: %s", path.c_str() );
src/eepp/graphics/fontsprite.cpp
+3 -3
View File
@@ -7,7 +7,7 @@
#include <eepp/system/iostreammemory.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
namespace EE { namespace Graphics {
@@ -58,9 +58,9 @@ bool FontSprite::loadFromFile( const std::string& filename, Color key, Uint32 fi
mFilePath = FileSystem::fileRemoveFileName( filename );
IOStreamFile stream( filename );
return loadFromStream( stream, key, firstChar, spacing );
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string path( filename );
Pack* pack = PackManager::instance()->exists( path );
Pack* pack = PackRegistry::instance()->exists( path );
if ( NULL != pack ) {
Log::info( "Loading font from pack: %s", path.c_str() );
src/eepp/graphics/fonttruetype.cpp
+3 -3
View File
@@ -11,7 +11,7 @@
#include <eepp/system/iostream.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/window/engine.hpp>
using namespace EE::Window;
@@ -374,9 +374,9 @@ static bool checkHasColrTable( const FT_Face& face ) {
bool FontTrueType::loadFromFile( const std::string& filename, Uint32 faceIndex ) {
if ( !FileSystem::fileExists( filename ) &&
PackManager::instance()->isFallbackToPacksActive() ) {
PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string path( filename );
Pack* pack = PackManager::instance()->exists( path );
Pack* pack = PackRegistry::instance()->exists( path );
if ( NULL != pack ) {
Log::info( "Loading font from pack: %s", path.c_str() );
src/eepp/graphics/framebuffer.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include <algorithm>
#include <eepp/graphics/framebuffer.hpp>
#include <eepp/graphics/framebufferfbo.hpp>
#include <eepp/graphics/framebuffermanager.hpp>
#include <eepp/graphics/framebufferregistry.hpp>
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/graphics/renderer/opengl.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
src/eepp/graphics/framebuffermanager.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include <eepp/graphics/framebuffermanager.hpp>
#include <eepp/graphics/framebufferregistry.hpp>
#include <eepp/graphics/renderer/openglext.hpp>
namespace EE { namespace Graphics { namespace Private {
src/eepp/graphics/image.cpp
+5 -5
View File
@@ -8,7 +8,7 @@
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <algorithm>
#include <memory>
@@ -532,9 +532,9 @@ bool Image::getInfo( const std::string& path, int* width, int* height, int* chan
*height = info->height;
*channels = info->channels;
res = true;
} else if ( !res && PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( !res && PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string npath( path );
Pack* tPack = PackManager::instance()->exists( npath );
Pack* tPack = PackRegistry::instance()->exists( npath );
if ( NULL != tPack ) {
ScopedBuffer buffer;
@@ -744,8 +744,8 @@ Image::Image( std::string Path, const unsigned int& forceChannels,
ScopedBuffer buf;
FileSystem::fileGet( Path, buf );
webpLoad( buf.get(), buf.size() );
} else if ( PackManager::instance()->isFallbackToPacksActive() &&
NULL != ( tPack = PackManager::instance()->exists( Path ) ) ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() &&
NULL != ( tPack = PackRegistry::instance()->exists( Path ) ) ) {
loadFromPack( tPack, Path );
} else {
Log::error( "Failed to load image %s. Reason: %s", Path.c_str(), stbi_failure_reason() );
src/eepp/graphics/shader.cpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include <eepp/graphics/shader.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
namespace EE { namespace Graphics {
@@ -39,8 +39,8 @@ Shader::Shader( const Uint32& Type, const std::string& Filename ) {
std::string tPath = Filename;
Pack* tPack = NULL;
if ( PackManager::instance()->isFallbackToPacksActive() &&
NULL != ( tPack = PackManager::instance()->exists( tPath ) ) ) {
if ( PackRegistry::instance()->isFallbackToPacksActive() &&
NULL != ( tPack = PackRegistry::instance()->exists( tPath ) ) ) {
ScopedBuffer buffer;
tPack->extractFileToMemory( tPath, buffer );
src/eepp/graphics/shaderprogram.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include <eepp/graphics/renderer/openglext.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/graphics/shaderprogram.hpp>
#include <eepp/graphics/shaderprogrammanager.hpp>
#include <eepp/graphics/shaderprogramregistry.hpp>
#include <eepp/system/log.hpp>
namespace EE { namespace Graphics {
src/eepp/graphics/shaderprogrammanager.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include <eepp/graphics/shaderprogrammanager.hpp>
#include <eepp/graphics/shaderprogramregistry.hpp>
namespace EE { namespace Graphics {
src/eepp/graphics/textureatlasloader.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
#include <eepp/system/iostreammemory.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/md5.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/window/engine.hpp>
#include <iterator>
@@ -208,10 +208,10 @@ void TextureAtlasLoader::loadFromFile( const std::string& TextureAtlasPath ) {
IOStreamFile IOS( mTextureAtlasPath );
loadFromStream( IOS );
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string tgPath( mTextureAtlasPath );
Pack* tPack = PackManager::instance()->exists( tgPath );
Pack* tPack = PackRegistry::instance()->exists( tgPath );
if ( NULL != tPack ) {
loadFromPack( tPack, tgPath );
src/eepp/graphics/textureloader.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include <eepp/graphics/textureloader.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/system/iostreamfile.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/thread.hpp>
#include <eepp/window/engine.hpp>
using namespace EE::Window;
@@ -169,8 +169,8 @@ void TextureLoader::loadFromFile() {
mImgHeight = image.getHeight();
mChannels = image.getChannels();
}
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
mPack = PackManager::instance()->exists( mFilepath );
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
mPack = PackRegistry::instance()->exists( mFilepath );
if ( NULL != mPack ) {
mLoadType = TEX_LT_PACK;
src/eepp/graphics/vertexbuffer.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/graphics/vertexbuffer.hpp>
#include <eepp/graphics/vertexbuffermanager.hpp>
#include <eepp/graphics/vertexbufferogl.hpp>
#include <eepp/graphics/vertexbufferregistry.hpp>
#include <eepp/graphics/vertexbuffervbo.hpp>
using namespace EE::Graphics::Private;
src/eepp/graphics/vertexbuffermanager.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include <eepp/graphics/vertexbuffermanager.hpp>
#include <eepp/graphics/vertexbufferregistry.hpp>
namespace EE { namespace Graphics { namespace Private {
src/eepp/network/ssl/backend/mbedtls/mbedtlssocket.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
#include <eepp/system/clock.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <mbedtls/error.h>
namespace EE { namespace Network { namespace SSL {
@@ -20,10 +20,10 @@ bool MbedTLSSocket::init() {
if ( FileSystem::fileExists( SSLSocket::CertificatesPath ) ) {
FileSystem::fileGet( SSLSocket::CertificatesPath, data );
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string tPath( SSLSocket::CertificatesPath );
Pack* tPack = PackManager::instance()->exists( tPath );
Pack* tPack = PackRegistry::instance()->exists( tPath );
if ( NULL != tPack ) {
tPack->extractFileToMemory( tPath, data );
src/eepp/network/ssl/backend/openssl/opensslsocket.cpp
+3 -3
View File
@@ -9,7 +9,7 @@
#include <eepp/network/ssl/backend/openssl/curl_hostcheck.h>
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
namespace EE { namespace Network { namespace SSL {
@@ -161,10 +161,10 @@ bool OpenSSLSocket::init() {
if ( FileSystem::fileExists( SSLSocket::CertificatesPath ) ) {
FileSystem::fileGet( SSLSocket::CertificatesPath, data );
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string tPath( SSLSocket::CertificatesPath );
Pack* tPack = PackManager::instance()->exists( tPath );
Pack* tPack = PackRegistry::instance()->exists( tPath );
if ( NULL != tPack ) {
tPack->extractFileToMemory( tPath, data );
src/eepp/system/inifile.cpp
+3 -3
View File
@@ -6,7 +6,7 @@
#include <eepp/system/iostreamfile.hpp>
#include <eepp/system/iostreammemory.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#define MAX_KEYNAME 128
#define MAX_VALUENAME 128
@@ -72,10 +72,10 @@ bool IniFile::loadFromFile( const std::string& iniPath ) {
if ( FileSystem::fileExists( iniPath ) ) {
IOStreamFile f( mPath );
return loadFromStream( f );
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string tPath( iniPath );
Pack* tPack = PackManager::instance()->exists( tPath );
Pack* tPack = PackRegistry::instance()->exists( tPath );
if ( NULL != tPack ) {
return loadFromPack( tPack, tPath );
src/eepp/system/pack.cpp
+3 -3
View File
@@ -1,15 +1,15 @@
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/virtualfilesystem.hpp>
namespace EE { namespace System {
Pack::Pack() : Mutex(), mIsOpen( false ) {
PackManager::instance()->add( this );
PackRegistry::instance()->add( this );
}
Pack::~Pack() {
PackManager::instance()->remove( this );
PackRegistry::instance()->remove( this );
}
bool Pack::isOpen() const {
src/eepp/system/packmanager.cpp
+8 -8
View File
@@ -1,16 +1,16 @@
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
namespace EE { namespace System {
SINGLETON_DECLARE_IMPLEMENTATION( PackManager )
SINGLETON_DECLARE_IMPLEMENTATION( PackRegistry )
PackManager::PackManager() : mFallback( true ) {}
PackRegistry::PackRegistry() : mFallback( true ) {}
PackManager::~PackManager() {}
PackRegistry::~PackRegistry() {}
Pack* PackManager::exists( std::string& path ) {
Pack* PackRegistry::exists( std::string& path ) {
std::string tpath( path );
FileSystem::filePathRemoveProcessPath( tpath );
@@ -28,7 +28,7 @@ Pack* PackManager::exists( std::string& path ) {
return NULL;
}
Pack* PackManager::getPackByPath( std::string path ) {
Pack* PackRegistry::getPackByPath( std::string path ) {
for ( auto& pack : mResources ) {
if ( path == pack->getPackPath() ) {
return pack;
@@ -38,11 +38,11 @@ Pack* PackManager::getPackByPath( std::string path ) {
return NULL;
}
const bool& PackManager::isFallbackToPacksActive() const {
const bool& PackRegistry::isFallbackToPacksActive() const {
return mFallback;
}
void PackManager::setFallbackToPacks( const bool& fallback ) {
void PackRegistry::setFallbackToPacks( const bool& fallback ) {
mFallback = fallback;
}
src/eepp/system/translator.cpp
+3 -3
View File
@@ -2,7 +2,7 @@
#include <eepp/system/iostream.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/translator.hpp>
#define PUGIXML_HEADER_ONLY
#include <pugixml/pugixml.hpp>
@@ -104,9 +104,9 @@ bool Translator::loadFromFile( const std::string& path, std::string lang ) {
Log::error( "Error description: %s", result.description() );
Log::error( "Error offset: %d", result.offset );
}
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string packPath( path );
Pack* pack = PackManager::instance()->exists( packPath );
Pack* pack = PackRegistry::instance()->exists( packPath );
if ( NULL != pack ) {
return loadFromPack( pack, packPath, lang );
src/eepp/ui/css/stylesheetparser.cpp
+5 -5
View File
@@ -8,7 +8,7 @@
#include <eepp/system/iostreammemory.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/pack.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/virtualfilesystem.hpp>
#include <eepp/ui/css/keyframesdefinition.hpp>
#include <eepp/ui/css/stylesheetparser.hpp>
@@ -44,9 +44,9 @@ bool StyleSheetParser::loadFromStream( IOStream& stream ) {
bool StyleSheetParser::loadFromFile( const std::string& filename ) {
if ( !FileSystem::fileExists( filename ) &&
PackManager::instance()->isFallbackToPacksActive() ) {
PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string path( filename );
Pack* pack = PackManager::instance()->exists( path );
Pack* pack = PackRegistry::instance()->exists( path );
if ( NULL != pack ) {
return loadFromPack( pack, path );
@@ -275,8 +275,8 @@ std::string StyleSheetParser::importCSS( std::string path,
importedList.push_back( path );
return std::string( reinterpret_cast<const char*>( buffer.get() ) );
} else {
if ( PackManager::instance()->isFallbackToPacksActive() ) {
Pack* pack = PackManager::instance()->exists( path );
if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
Pack* pack = PackRegistry::instance()->exists( path );
if ( std::find( importedList.begin(), importedList.end(), path ) ==
importedList.end() ) {
src/eepp/ui/doc/syntaxcolorscheme.cpp
+3 -3
View File
@@ -7,7 +7,7 @@
#include <eepp/system/iostreamfile.hpp>
#include <eepp/system/iostreammemory.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/ui/doc/syntaxcolorscheme.hpp>
#include <eepp/ui/doc/syntaxdefinition.hpp>
@@ -228,9 +228,9 @@ std::vector<SyntaxColorScheme> SyntaxColorScheme::loadFromStream( IOStream& stre
}
std::vector<SyntaxColorScheme> SyntaxColorScheme::loadFromFile( const std::string& path ) {
if ( !FileSystem::fileExists( path ) && PackManager::instance()->isFallbackToPacksActive() ) {
if ( !FileSystem::fileExists( path ) && PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string pathFix( path );
Pack* pack = PackManager::instance()->exists( pathFix );
Pack* pack = PackRegistry::instance()->exists( pathFix );
if ( NULL != pack ) {
return loadFromPack( pack, pathFix );
}
src/eepp/ui/doc/syntaxdefinitionmanager.cpp
+3 -3
View File
@@ -4,7 +4,7 @@
#include <eepp/system/lock.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/luapattern.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/ui/doc/languages/c.hpp>
#include <eepp/ui/doc/languages/configfile.hpp>
#include <eepp/ui/doc/languages/cpp.hpp>
@@ -1150,10 +1150,10 @@ bool SyntaxDefinitionManager::loadFromFile( const std::string& fpath ) {
IOStreamFile IOS( fpath );
return loadFromStream( IOS );
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string tgPath( fpath );
Pack* tPack = PackManager::instance()->exists( tgPath );
Pack* tPack = PackRegistry::instance()->exists( tgPath );
if ( NULL != tPack ) {
return loadFromPack( tPack, tgPath );
src/eepp/ui/doc/textdocument.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
#include <eepp/system/log.hpp>
#include <eepp/system/luapattern.hpp>
#include <eepp/system/md5.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/regex.hpp>
#include <eepp/system/scopedop.hpp>
#include <eepp/ui/doc/syntaxdefinitionmanager.hpp>
@@ -837,9 +837,9 @@ TextDocument::LoadStatus TextDocument::loadFromFile( const std::string& path ) {
mLoading = true;
bool fileExists = FileSystem::fileExists( path );
if ( !fileExists && PackManager::instance()->isFallbackToPacksActive() ) {
if ( !fileExists && PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string pathFix( path );
Pack* pack = PackManager::instance()->exists( pathFix );
Pack* pack = PackRegistry::instance()->exists( pathFix );
if ( NULL != pack ) {
changeFilePath( pathFix, false );
return loadFromPack( pack, pathFix );
src/eepp/ui/uiscenenode.cpp
+3 -3
View File
@@ -10,7 +10,7 @@
#include <eepp/system/base64.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/system/functionstring.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/regex.hpp>
#include <eepp/system/virtualfilesystem.hpp>
#include <eepp/ui/css/mediaquery.hpp>
@@ -892,9 +892,9 @@ UIWidget* UISceneNode::loadLayoutFromFile( const std::string& layoutPath, Node*
FileSystem::fileGet( layoutPath, data );
Log::error( "Error context: %s", getErrorContext( result.offset, data ) );
}
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string path( layoutPath );
Pack* pack = PackManager::instance()->exists( path );
Pack* pack = PackRegistry::instance()->exists( path );
if ( NULL != pack ) {
return loadLayoutFromPack( pack, path, parent );
src/eepp/window/backend/SDL2/windowsdl2.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/graphics/shaderprogrammanager.hpp>
#include <eepp/graphics/shaderprogramregistry.hpp>
#include <eepp/graphics/texturefactory.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
src/eepp/window/backend/SDL3/windowsdl3.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/graphics/shaderprogrammanager.hpp>
#include <eepp/graphics/shaderprogramregistry.hpp>
#include <eepp/graphics/texturefactory.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/system/log.hpp>
src/eepp/window/engine.cpp
+5 -5
View File
@@ -1,19 +1,19 @@
#include <eepp/graphics/framebuffermanager.hpp>
#include <eepp/graphics/framebufferregistry.hpp>
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/graphics/resourcescope.hpp>
#include <eepp/graphics/shaderprogrammanager.hpp>
#include <eepp/graphics/shaderprogramregistry.hpp>
#include <eepp/graphics/systemfontresolver.hpp>
#include <eepp/graphics/textlayout.hpp>
#include <eepp/graphics/texturefactory.hpp>
#include <eepp/graphics/vertexbuffermanager.hpp>
#include <eepp/graphics/vertexbufferregistry.hpp>
#include <eepp/network/http.hpp>
#include <eepp/network/ssl/sslsocket.hpp>
#include <eepp/scene/scenemanager.hpp>
#include <eepp/system/filesystem.hpp>
#include <eepp/system/inifile.hpp>
#include <eepp/system/luapattern.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/parsermatcher.hpp>
#include <eepp/system/regex.hpp>
#include <eepp/system/thread.hpp>
@@ -124,7 +124,7 @@ Engine::~Engine() {
Graphics::Renderer::destroySingleton();
PackManager::destroySingleton();
PackRegistry::destroySingleton();
#ifdef EE_SSL_SUPPORT
Network::SSL::SSLSocket::end();
src/modules/eterm/src/eterm/terminal/terminalcolorscheme.cpp
+3 -3
View File
@@ -4,7 +4,7 @@
#include <eepp/system/iostreamfile.hpp>
#include <eepp/system/iostreammemory.hpp>
#include <eepp/system/log.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eterm/terminal/terminalcolorscheme.hpp>
namespace eterm { namespace Terminal {
@@ -45,9 +45,9 @@ std::vector<TerminalColorScheme> TerminalColorScheme::loadFromStream( IOStream&
}
std::vector<TerminalColorScheme> TerminalColorScheme::loadFromFile( const std::string& path ) {
if ( !FileSystem::fileExists( path ) && PackManager::instance()->isFallbackToPacksActive() ) {
if ( !FileSystem::fileExists( path ) && PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string pathFix( path );
Pack* pack = PackManager::instance()->exists( pathFix );
Pack* pack = PackRegistry::instance()->exists( pathFix );
if ( NULL != pack ) {
return loadFromPack( pack, pathFix );
}
src/modules/maps/src/eepp/maps/tilemap.cpp
+3 -3
View File
@@ -16,7 +16,7 @@
#include <eepp/graphics/renderer/renderer.hpp>
#include <eepp/graphics/resourcescope.hpp>
#include <eepp/graphics/textureatlasloader.hpp>
#include <eepp/system/packmanager.hpp>
#include <eepp/system/packregistry.hpp>
#include <eepp/system/virtualfilesystem.hpp>
using namespace EE::Graphics;
@@ -1092,9 +1092,9 @@ bool TileMap::loadFromFile( const std::string& path ) {
IOStreamFile IOS( mPath );
return loadFromStream( IOS );
} else if ( PackManager::instance()->isFallbackToPacksActive() ) {
} else if ( PackRegistry::instance()->isFallbackToPacksActive() ) {
std::string tPath( path );
Pack* tPack = PackManager::instance()->exists( tPath );
Pack* tPack = PackRegistry::instance()->exists( tPath );
if ( NULL != tPack ) {
return loadFromPack( tPack, tPath );
src/tests/unit_tests/resource_prerequisite_tests.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
#include <eepp/graphics/fontbmfont.hpp>
#include <eepp/graphics/fontsprite.hpp>
#include <eepp/graphics/fonttruetype.hpp>
#include <eepp/graphics/framebuffermanager.hpp>
#include <eepp/graphics/framebufferregistry.hpp>
#include <eepp/graphics/globalbatchrenderer.hpp>
#include <eepp/graphics/ninepatch.hpp>
#include <eepp/graphics/rectangledrawable.hpp>
@@ -16,7 +16,7 @@
#include <eepp/graphics/resourcecatalog.hpp>
#include <eepp/graphics/resourcescope.hpp>
#include <eepp/graphics/scrollparallax.hpp>
#include <eepp/graphics/shaderprogrammanager.hpp>
#include <eepp/graphics/shaderprogramregistry.hpp>
#include <eepp/graphics/sprite.hpp>
#include <eepp/graphics/statelistdrawable.hpp>
#include <eepp/graphics/textlayout.hpp>
@@ -24,7 +24,7 @@
#include <eepp/graphics/textureatlasloader.hpp>
#include <eepp/graphics/texturedrawable.hpp>
#include <eepp/graphics/texturefactory.hpp>
#include <eepp/graphics/vertexbuffermanager.hpp>
#include <eepp/graphics/vertexbufferregistry.hpp>
#include <eepp/scene/scenemanager.hpp>
#include <eepp/system/resourceloader.hpp>
#include <eepp/system/sys.hpp>
src/tools/ecode/ecode.cpp
+2 -2
View File
@@ -4251,8 +4251,8 @@ FontTrueType* App::loadFont( const std::string& name, std::string fontPath,
if ( FileSystem::isRelativePath( fontPath ) )
fontPath = mResPath + fontPath;
#if EE_PLATFORM == EE_PLATFORM_ANDROID
if ( fontPath.empty() ||
( !FileSystem::fileExists( fontPath ) && !PackManager::instance()->exists( fontPath ) ) ) {
if ( fontPath.empty() || ( !FileSystem::fileExists( fontPath ) &&
!PackRegistry::instance()->exists( fontPath ) ) ) {
#else
if ( fontPath.empty() || !FileSystem::fileExists( fontPath ) ) {
#endif