diff --git a/src/kiwano/2d/GifSprite.cpp b/src/kiwano/2d/GifSprite.cpp index 456a77c0..da1e4a02 100644 --- a/src/kiwano/2d/GifSprite.cpp +++ b/src/kiwano/2d/GifSprite.cpp @@ -54,13 +54,13 @@ GifSprite::GifSprite(GifImagePtr gif) bool GifSprite::Load(const String& file_path) { - GifImagePtr image = TextureCache::GetInstance().PreloadGif(file_path); + GifImagePtr image = new GifImage(file_path); return Load(image); } bool GifSprite::Load(const Resource& res) { - GifImagePtr image = TextureCache::GetInstance().PreloadGif(res); + GifImagePtr image = new GifImage(res); return Load(image); } diff --git a/src/kiwano/2d/SpriteFrame.cpp b/src/kiwano/2d/SpriteFrame.cpp index 951652f0..0ceb5354 100644 --- a/src/kiwano/2d/SpriteFrame.cpp +++ b/src/kiwano/2d/SpriteFrame.cpp @@ -61,7 +61,7 @@ SpriteFrame::SpriteFrame(TexturePtr texture, const Rect& crop_rect) bool SpriteFrame::Load(const String& file_path) { - TexturePtr texture = TextureCache::GetInstance().Preload(file_path); + TexturePtr texture = new Texture(file_path); if (texture->IsValid()) { SetTexture(texture); @@ -72,7 +72,7 @@ bool SpriteFrame::Load(const String& file_path) bool SpriteFrame::Load(const Resource& res) { - TexturePtr texture = TextureCache::GetInstance().Preload(res); + TexturePtr texture = new Texture(res); if (texture->IsValid()) { SetTexture(texture); diff --git a/src/kiwano/render/Renderer.cpp b/src/kiwano/render/Renderer.cpp index 111d3ab8..7225cafd 100644 --- a/src/kiwano/render/Renderer.cpp +++ b/src/kiwano/render/Renderer.cpp @@ -19,7 +19,6 @@ // THE SOFTWARE. #include -#include #include namespace kiwano @@ -49,7 +48,6 @@ void Renderer::ResetResolutionWhenWindowResized(bool enabled) void Renderer::Destroy() { - TextureCache::GetInstance().Clear(); FontCache::GetInstance().Clear(); } diff --git a/src/kiwano/render/TextureCache.h b/src/kiwano/render/TextureCache.h index d4a14f81..119246d5 100644 --- a/src/kiwano/render/TextureCache.h +++ b/src/kiwano/render/TextureCache.h @@ -21,7 +21,6 @@ #pragma once #include #include -#include namespace kiwano { @@ -34,10 +33,8 @@ namespace kiwano * \~chinese * @brief ÎÆÀí»º´æ */ -class KGE_API TextureCache final : public Singleton +class KGE_API TextureCache final { - friend Singleton; - public: /// \~chinese /// @brief Ô¤¼ÓÔØ±¾µØÍ¼Æ¬