Rename texture table to texture source

Include/RmlUi/Core/CallbackTexture.h

@@ -45,7 +45,7 @@ class Texture;
     Callback function for generating textures on demand.
     /// @param[in] texture_interface The interface used to specify the texture.
     /// @return True on success.
-*/
+ */
 using CallbackTextureFunction = Function<bool(const CallbackTextureInterface& texture_interface)>;
 
 /**
@@ -86,17 +86,17 @@ class RMLUICORE_API CallbackTextureInterface {
 	Vector2i& dimensions;
 };
 
-class RMLUICORE_API CallbackTextureTable {
+class RMLUICORE_API CallbackTextureSource {
 public:
-	CallbackTextureTable() = default;
-	CallbackTextureTable(CallbackTextureFunction&& callback);
-	~CallbackTextureTable() = default;
+	CallbackTextureSource() = default;
+	CallbackTextureSource(CallbackTextureFunction&& callback);
+	~CallbackTextureSource() = default;
 
-	CallbackTextureTable(const CallbackTextureTable&) = delete;
-	CallbackTextureTable& operator=(const CallbackTextureTable&) = delete;
+	CallbackTextureSource(const CallbackTextureSource&) = delete;
+	CallbackTextureSource& operator=(const CallbackTextureSource&) = delete;
 
-	CallbackTextureTable(CallbackTextureTable&& other) noexcept;
-	CallbackTextureTable& operator=(CallbackTextureTable&& other) noexcept;
+	CallbackTextureSource(CallbackTextureSource&& other) noexcept;
+	CallbackTextureSource& operator=(CallbackTextureSource&& other) noexcept;
 
 	Texture GetTexture(RenderManager& render_manager) const;
 

Include/RmlUi/Core/Spritesheet.h

@@ -48,7 +48,7 @@ struct Spritesheet {
 	String name;
 	int definition_line_number;
 	float display_scale; // The inverse of the 'resolution' spritesheet property.
-	TextureTable texture_table;
+	TextureSource texture_source;
 
 	Spritesheet(const String& name, const String& source, const String& document_path, int definition_line_number, float display_scale);
 };

Include/RmlUi/Core/Texture.h

@@ -41,7 +41,7 @@ class RenderManager;
 
     It is constructed through the render manager. It can be freely copied, and does not own or release the underlying
     resource. The user is responsible for ensuring that the lifetime of the texture is valid.
-*/
+ */
 class RMLUICORE_API Texture final {
 public:
 	Texture() = default;
@@ -61,10 +61,10 @@ class RMLUICORE_API Texture final {
 	friend class RenderManager;
 };
 
-class RMLUICORE_API TextureTable : NonCopyMoveable {
+class RMLUICORE_API TextureSource : NonCopyMoveable {
 public:
-	TextureTable() = default;
-	TextureTable(String source, String document_path);
+	TextureSource() = default;
+	TextureSource(String source, String document_path);
 
 	Texture GetTexture(RenderManager& render_manager) const;
 

Samples/basic/bitmapfont/src/FontEngineBitmap.cpp

@@ -125,7 +125,7 @@ FontFaceBitmap* GetFontFaceHandle(const String& family, FontStyle style, FontWei
 FontFaceBitmap::FontFaceBitmap(String family, FontStyle style, FontWeight weight, FontMetrics metrics, String texture_name, String texture_path,
 	Vector2f texture_dimensions, FontGlyphs&& glyphs, FontKerning&& kerning) :
 	family(family),
-	style(style), weight(weight), metrics(metrics), texture_table(texture_name, texture_path), texture_dimensions(texture_dimensions),
+	style(style), weight(weight), metrics(metrics), texture_source(texture_name, texture_path), texture_dimensions(texture_dimensions),
 	glyphs(std::move(glyphs)), kerning(std::move(kerning))
 {}
 
@@ -159,7 +159,7 @@ int FontFaceBitmap::GenerateString(RenderManager& render_manager, const String&
 
 	mesh_list.resize(1);
 
-	mesh_list[0].texture = texture_table.GetTexture(render_manager);
+	mesh_list[0].texture = texture_source.GetTexture(render_manager);
 
 	Rml::Mesh& mesh = mesh_list[0].mesh;
 	auto& vertices = mesh.vertices;

Samples/basic/bitmapfont/src/FontEngineBitmap.h

@@ -35,7 +35,7 @@
 #include <RmlUi/Core/Types.h>
 
 class FontFaceBitmap;
-using Rml::TextureTable;
+using Rml::TextureSource;
 
 namespace FontProviderBitmap {
 void Initialise();
@@ -83,7 +83,7 @@ class FontFaceBitmap {
 
 	FontMetrics metrics;
 
-	TextureTable texture_table;
+	TextureSource texture_source;
 	Vector2f texture_dimensions;
 
 	FontGlyphs glyphs;

Source/Core/CallbackTexture.cpp

@@ -80,20 +80,20 @@ RenderManager& CallbackTextureInterface::GetRenderManager() const
 	return render_manager;
 }
 
-CallbackTextureTable::CallbackTextureTable(CallbackTextureFunction&& callback) : callback(std::move(callback)) {}
+CallbackTextureSource::CallbackTextureSource(CallbackTextureFunction&& callback) : callback(std::move(callback)) {}
 
-CallbackTextureTable::CallbackTextureTable(CallbackTextureTable&& other) noexcept :
+CallbackTextureSource::CallbackTextureSource(CallbackTextureSource&& other) noexcept :
 	callback(std::move(other.callback)), textures(std::move(other.textures))
 {}
 
-CallbackTextureTable& CallbackTextureTable::operator=(CallbackTextureTable&& other) noexcept
+CallbackTextureSource& CallbackTextureSource::operator=(CallbackTextureSource&& other) noexcept
 {
 	callback = std::move(other.callback);
 	textures = std::move(other.textures);
 	return *this;
 }
 
-Texture CallbackTextureTable::GetTexture(RenderManager& render_manager) const
+Texture CallbackTextureSource::GetTexture(RenderManager& render_manager) const
 {
 	CallbackTexture& texture = textures[&render_manager];
 	if (!texture)

Source/Core/DecoratorNinePatch.cpp

@@ -243,7 +243,7 @@ SharedPtr<Decorator> DecoratorNinePatchInstancer::InstanceDecorator(const String
 	auto decorator = MakeShared<DecoratorNinePatch>();
 
 	if (!decorator->Initialise(sprite_outer->rectangle, sprite_inner->rectangle, (edges_set ? &edges : nullptr),
-			sprite_outer->sprite_sheet->texture_table.GetTexture(instancer_interface.GetRenderManager()), sprite_outer->sprite_sheet->display_scale))
+			sprite_outer->sprite_sheet->texture_source.GetTexture(instancer_interface.GetRenderManager()), sprite_outer->sprite_sheet->display_scale))
 	{
 		return nullptr;
 	}

Source/Core/DecoratorTiled.cpp

@@ -296,7 +296,7 @@ bool DecoratorTiledInstancer::GetTileProperties(DecoratorTiled::Tile* tiles, Tex
 			tile.size = sprite->rectangle.Size();
 			tile.display_scale = sprite->sprite_sheet->display_scale;
 
-			texture = sprite->sprite_sheet->texture_table.GetTexture(instancer_interface.GetRenderManager());
+			texture = sprite->sprite_sheet->texture_source.GetTexture(instancer_interface.GetRenderManager());
 		}
 		else
 		{

Source/Core/Elements/ElementImage.cpp

@@ -226,7 +226,7 @@ bool ElementImage::LoadTexture()
 				{
 					rect = sprite->rectangle;
 					rect_source = RectSource::Sprite;
-					texture = sprite->sprite_sheet->texture_table.GetTexture(*render_manager);
+					texture = sprite->sprite_sheet->texture_source.GetTexture(*render_manager);
 					dimensions_scale = sprite->sprite_sheet->display_scale * dp_ratio;
 					valid_sprite = true;
 				}

Source/Core/Elements/ElementProgress.cpp

@@ -363,7 +363,7 @@ bool ElementProgress::LoadTexture()
 			{
 				rect = sprite->rectangle;
 				rect_set = true;
-				texture = sprite->sprite_sheet->texture_table.GetTexture(*render_manager);
+				texture = sprite->sprite_sheet->texture_source.GetTexture(*render_manager);
 				texture_set = true;
 			}
 		}

Source/Core/FontEngineDefault/FontFaceLayer.cpp

@@ -173,8 +173,8 @@ bool FontFaceLayer::Generate(const FontFaceHandleDefault* handle, const FontFace
 				return true;
 			};
 
-			static_assert(std::is_nothrow_move_constructible<CallbackTextureTable>::value,
-				"CallbackTextureTable must be nothrow move constructible so that it can be placed in the vector below.");
+			static_assert(std::is_nothrow_move_constructible<CallbackTextureSource>::value,
+				"CallbackTextureSource must be nothrow move constructible so that it can be placed in the vector below.");
 
 			textures_owned.emplace_back(std::move(texture_callback));
 		}

Source/Core/FontEngineDefault/FontFaceLayer.h

@@ -113,7 +113,7 @@ class FontFaceLayer {
 	};
 
 	using CharacterMap = UnorderedMap<Character, TextureBox>;
-	using TextureList = Vector<CallbackTextureTable>;
+	using TextureList = Vector<CallbackTextureSource>;
 
 	SharedPtr<const FontEffect> effect;
 

Source/Core/Spritesheet.cpp

@@ -35,7 +35,7 @@
 namespace Rml {
 
 Spritesheet::Spritesheet(const String& name, const String& source, const String& document_path, int definition_line_number, float display_scale) :
-	name(name), definition_line_number(definition_line_number), display_scale(display_scale), texture_table(source, document_path)
+	name(name), definition_line_number(definition_line_number), display_scale(display_scale), texture_source(source, document_path)
 {}
 
 bool SpritesheetList::AddSpriteSheet(const String& name, const String& image_source, const String& definition_source, int definition_line_number,
@@ -57,7 +57,7 @@ bool SpritesheetList::AddSpriteSheet(const String& name, const String& image_sou
 		if (new_sprite.sprite_sheet)
 		{
 			Log::Message(Log::LT_WARNING, "Sprite '%s' was overwritten due to duplicate names at the same block scope. Declared at %s:%d and %s:%d",
-				sprite_name.c_str(), new_sprite.sprite_sheet->texture_table.GetDefinitionSource().c_str(),
+				sprite_name.c_str(), new_sprite.sprite_sheet->texture_source.GetDefinitionSource().c_str(),
 				new_sprite.sprite_sheet->definition_line_number, definition_source.c_str(), definition_line_number);
 		}
 

Source/Core/Texture.cpp

@@ -55,17 +55,17 @@ bool Texture::operator==(const Texture& other) const
 	return render_manager == other.render_manager && file_index == other.file_index && callback_handle == other.callback_handle;
 }
 
-TextureTable::TextureTable(String source, String document_path) : source(std::move(source)), document_path(std::move(document_path)) {}
+TextureSource::TextureSource(String source, String document_path) : source(std::move(source)), document_path(std::move(document_path)) {}
 
-Texture TextureTable::GetTexture(RenderManager& render_manager) const
+Texture TextureSource::GetTexture(RenderManager& render_manager) const
 {
 	Texture& texture = textures[&render_manager];
 	if (!texture)
 		texture = render_manager.LoadTexture(source, document_path);
 	return texture;
 }
 
-const String& TextureTable::GetDefinitionSource() const
+const String& TextureSource::GetDefinitionSource() const
 {
 	return document_path;
 }