Simplified TextureAsset constructors.

This avoids the most vexing parse problem.

Author: afritz1

OpenTESArena/src/Assets/TextureAsset.cpp

@@ -1,13 +1,5 @@
 #include "TextureAsset.h"
 
-TextureAsset::TextureAsset(std::string &&filename, const std::optional<int> &index)
-	: filename(std::move(filename)), index(index) { }
-
-TextureAsset::TextureAsset(std::string &&filename)
-	: filename(std::move(filename)), index(std::nullopt) { }
-
-TextureAsset::TextureAsset() { }
-
 bool TextureAsset::operator==(const TextureAsset &other) const
 {
 	return (this->filename == other.filename) && (this->index == other.index);

OpenTESArena/src/Assets/TextureAsset.h

@@ -3,16 +3,20 @@
 #include <optional>
 #include <string>
 
-// General-purpose reference for a single texture. The index is set if the filename points to a
-// sequence of individual textures.
+// Points to a single texture on the file system. If the texture is part of a sequence of images,
+// its position is stored in the index.
 struct TextureAsset
 {
 	std::string filename;
-	std::optional<int> index; // Points into sequential texture file.
+	std::optional<int> index;
 
-	TextureAsset(std::string &&filename, const std::optional<int> &index);
-	TextureAsset(std::string &&filename);
-	TextureAsset();
+	constexpr TextureAsset(const std::string &filename, const std::optional<int> &index)
+		: filename(filename), index(index) { }
+
+	constexpr TextureAsset(const std::string &filename)
+		: filename(filename) { }
+
+	constexpr TextureAsset() { }
 
 	bool operator==(const TextureAsset &other) const;
 	bool operator!=(const TextureAsset &other) const;

OpenTESArena/src/Assets/TextureUtils.cpp

@@ -278,7 +278,7 @@ Buffer<TextureAsset> TextureUtils::makeTextureAssets(const std::string &filename
 	Buffer<TextureAsset> textureAssets(textureCount);
 	for (int i = 0; i < textureCount; i++)
 	{
-		TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), i);
+		TextureAsset textureAsset(textureFileMetadata.getFilename(), i);
 		textureAssets.set(i, std::move(textureAsset));
 	}
 

OpenTESArena/src/Entities/ArenaAnimUtils.cpp

@@ -153,7 +153,7 @@ namespace ArenaAnimUtils
 		{
 			const double width = MakeStaticKeyframeDimension(textureFileMetadata.getWidth(i), dimensionModifier);
 			const double height = MakeStaticKeyframeDimension(textureFileMetadata.getHeight(i), dimensionModifier);
-			TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), i);
+			TextureAsset textureAsset(textureFileMetadata.getFilename(), i);
 			outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 		}
 
@@ -206,7 +206,7 @@ namespace ArenaAnimUtils
 				MakeCreatureKeyframeDimensions(creatureIndex, textureFileMetadata.getWidth(correctedFrameIndex),
 					textureFileMetadata.getHeight(correctedFrameIndex), exeData, &width, &height);
 
-				TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), correctedFrameIndex);
+				TextureAsset textureAsset(textureFileMetadata.getFilename(), correctedFrameIndex);
 				outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 			}
 
@@ -310,7 +310,7 @@ namespace ArenaAnimUtils
 				double width, height;
 				MakeHumanKeyframeDimensions(textureFileMetadata.getWidth(frameIndex), textureFileMetadata.getHeight(frameIndex), &width, &height);
 
-				TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), frameIndex);
+				TextureAsset textureAsset(textureFileMetadata.getFilename(), frameIndex);
 				outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 			}
 
@@ -385,7 +385,7 @@ namespace ArenaAnimUtils
 			MakeCreatureKeyframeDimensions(creatureIndex, textureFileMetadata.getWidth(frameIndex),
 				textureFileMetadata.getHeight(frameIndex), exeData, &width, &height);
 
-			TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), frameIndex);
+			TextureAsset textureAsset(textureFileMetadata.getFilename(), frameIndex);
 			outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 		}
 
@@ -456,7 +456,7 @@ namespace ArenaAnimUtils
 			double width, height;
 			MakeHumanKeyframeDimensions(textureFileMetadata.getWidth(i), textureFileMetadata.getHeight(i), &width, &height);
 
-			TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), i);
+			TextureAsset textureAsset(textureFileMetadata.getFilename(), i);
 			outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 		}
 
@@ -505,7 +505,7 @@ namespace ArenaAnimUtils
 			ArenaAnimUtils::MakeCreatureKeyframeDimensions(creatureIndex, textureFileMetadata.getWidth(i),
 				textureFileMetadata.getHeight(i), exeData, &width, &height);
 
-			TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), i);
+			TextureAsset textureAsset(textureFileMetadata.getFilename(), i);
 			outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 		}
 
@@ -537,7 +537,7 @@ namespace ArenaAnimUtils
 
 		const double width = MakeDefaultKeyframeDimension(textureFileMetadata.getWidth(0));
 		const double height = MakeDefaultKeyframeDimension(textureFileMetadata.getHeight(0));
-		TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()));
+		TextureAsset textureAsset(textureFileMetadata.getFilename());
 		outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 
 		EntityAnimationDefinitionState &animDefState = outAnimDef->states[stateIndex];
@@ -590,7 +590,7 @@ namespace ArenaAnimUtils
 				MakeCitizenKeyframeDimensions(textureFileMetadata.getWidth(correctedFrameIndex),
 					textureFileMetadata.getHeight(correctedFrameIndex), &width, &height);
 
-				TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), correctedFrameIndex);
+				TextureAsset textureAsset(textureFileMetadata.getFilename(), correctedFrameIndex);
 				outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 			}
 
@@ -1302,7 +1302,7 @@ bool ArenaAnimUtils::tryMakeVfxAnim(const std::string &animFilename, bool isLoop
 		double width, height;
 		MakeVfxKeyframeDimensions(textureFileMetadata.getWidth(i), textureFileMetadata.getHeight(i), &width, &height);
 
-		TextureAsset textureAsset(std::string(textureFileMetadata.getFilename()), i);
+		TextureAsset textureAsset(textureFileMetadata.getFilename(), i);
 		outAnimDef->addKeyframe(keyframeListIndex, std::move(textureAsset), width, height);
 	}
 

OpenTESArena/src/Interface/AutomapUiMVC.cpp

@@ -59,12 +59,12 @@ WorldInt2 AutomapUiModel::makeRelativeWildOrigin(const WorldInt2 &voxel, SNInt g
 
 TextureAsset AutomapUiView::getCursorTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::QuillCursor));
+	return TextureAsset(ArenaTextureName::QuillCursor);
 }
 
 TextureAsset AutomapUiView::getCursorPaletteTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::Automap));
+	return TextureAsset(ArenaTextureName::Automap);
 }
 
 const Color &AutomapUiView::getPixelColor(const VoxelTraitsDefinition &floorDef, const VoxelTraitsDefinition &wallDef,

OpenTESArena/src/Interface/CharacterCreationUiMVC.cpp

@@ -679,7 +679,7 @@ std::string ChooseAttributesUiModel::getAppearanceText(Game &game)
 
 TextureAsset CharacterCreationUiView::getNightSkyTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::CharacterCreation));
+	return TextureAsset(ArenaTextureName::CharacterCreation);
 }
 
 UiTextureID CharacterCreationUiView::allocNightSkyTexture(TextureManager &textureManager, Renderer &renderer)
@@ -764,7 +764,7 @@ UiListBoxInitInfo ChooseClassUiView::makeListBoxProperties(const FontLibrary &fo
 
 TextureAsset ChooseClassUiView::getListBoxTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::PopUp2));
+	return TextureAsset(ArenaTextureName::PopUp2);
 }
 
 UiTextureID ChooseClassUiView::allocPopUpTexture(TextureManager &textureManager, Renderer &renderer)
@@ -783,12 +783,12 @@ UiTextureID ChooseClassUiView::allocPopUpTexture(TextureManager &textureManager,
 
 TextureAsset ChooseRaceUiView::getBackgroundTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::RaceSelect));
+	return TextureAsset(ArenaTextureName::RaceSelect);
 }
 
 TextureAsset ChooseRaceUiView::getNoExitTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::NoExit));
+	return TextureAsset(ArenaTextureName::NoExit);
 }
 
 Rect ChooseRaceUiView::getProvinceConfirmTitleTextBoxRect(const std::string_view text, const FontLibrary &fontLibrary)
@@ -1049,8 +1049,8 @@ TextureAsset ChooseAttributesUiView::getBodyTextureAsset(Game &game)
 	const bool isMale = charCreationState.male;
 	const int raceID = charCreationState.raceIndex;
 
-	std::string bodyFilename = ArenaPortraitUtils::getBody(isMale, raceID);
-	return TextureAsset(std::move(bodyFilename));
+	const std::string bodyFilename = ArenaPortraitUtils::getBody(isMale, raceID);
+	return TextureAsset(bodyFilename);
 }
 
 Buffer<TextureAsset> ChooseAttributesUiView::getHeadTextureAssets(Game &game)
@@ -1076,17 +1076,17 @@ TextureAsset ChooseAttributesUiView::getShirtTextureAsset(Game &game)
 	const CharacterClassDefinition &charClassDef = charClassLibrary.getDefinition(charClassDefID);
 	const bool isMagic = charClassDef.castsMagic;
 
-	std::string shirtFilename = ArenaPortraitUtils::getShirt(isMale, isMagic);
-	return TextureAsset(std::move(shirtFilename));
+	const std::string shirtFilename = ArenaPortraitUtils::getShirt(isMale, isMagic);
+	return TextureAsset(shirtFilename);
 }
 
 TextureAsset ChooseAttributesUiView::getPantsTextureAsset(Game &game)
 {
 	const CharacterCreationState &charCreationState = game.getCharacterCreationState();
 	const bool isMale = charCreationState.male;
 
-	std::string pantsFilename = ArenaPortraitUtils::getPants(isMale);
-	return TextureAsset(std::move(pantsFilename));
+	const std::string pantsFilename = ArenaPortraitUtils::getPants(isMale);
+	return TextureAsset(pantsFilename);
 }
 
 UiTextureID ChooseAttributesUiView::allocBodyTexture(Game &game)

OpenTESArena/src/Interface/CharacterSheetUiMVC.cpp

@@ -160,7 +160,7 @@ Int2 CharacterSheetUiView::getPantsOffset(Game &game)
 
 TextureAsset CharacterSheetUiView::getPaletteTextureAsset()
 {
-	return TextureAsset(std::string(ArenaPaletteName::CharSheet));
+	return TextureAsset(ArenaPaletteName::CharSheet);
 }
 
 TextureAsset CharacterSheetUiView::getBodyTextureAsset(Game &game)
@@ -188,11 +188,11 @@ TextureAsset CharacterSheetUiView::getHeadTextureAsset(Game &game)
 
 	if (player.male)
 	{
-		return TextureAsset(std::string(characterRaceDefinition.maleCharSheetHeadsFilename), headIndex);
+		return TextureAsset(characterRaceDefinition.maleCharSheetHeadsFilename, headIndex);
 	}
 	else
 	{
-		return TextureAsset(std::string(characterRaceDefinition.femaleCharSheetHeadsFilename), headIndex);
+		return TextureAsset(characterRaceDefinition.femaleCharSheetHeadsFilename, headIndex);
 	}
 }
 
@@ -206,17 +206,17 @@ TextureAsset CharacterSheetUiView::getShirtTextureAsset(Game &game)
 	const CharacterClassDefinition &charClassDef = charClassLibrary.getDefinition(charClassDefID);
 	const bool isMagic = charClassDef.castsMagic;
 
-	std::string shirtFilename = ArenaPortraitUtils::getShirt(isMale, isMagic);
-	return TextureAsset(std::move(shirtFilename));
+	const std::string shirtFilename = ArenaPortraitUtils::getShirt(isMale, isMagic);
+	return TextureAsset(shirtFilename);
 }
 
 TextureAsset CharacterSheetUiView::getPantsTextureAsset(Game &game)
 {
 	const Player &player = game.player;
 	const bool isMale = player.male;
 
-	std::string pantsFilename = ArenaPortraitUtils::getPants(isMale);
-	return TextureAsset(std::move(pantsFilename));
+	const std::string pantsFilename = ArenaPortraitUtils::getPants(isMale);
+	return TextureAsset(pantsFilename);
 }
 
 UiTextureID CharacterSheetUiView::allocBodyTexture(Game &game)
@@ -289,7 +289,7 @@ UiTextureID CharacterSheetUiView::allocHeadTexture(Game &game)
 
 UiTextureID CharacterEquipmentUiView::allocUpDownButtonTexture(TextureManager &textureManager, Renderer &renderer)
 {
-	const TextureAsset upDownTextureAsset = TextureAsset(std::string(ArenaTextureName::UpDown));
+	const TextureAsset upDownTextureAsset(ArenaTextureName::UpDown);
 	const TextureAsset paletteTextureAsset = CharacterSheetUiView::getPaletteTextureAsset();
 
 	UiTextureID textureID;

OpenTESArena/src/Interface/CinematicUiState.cpp

@@ -48,13 +48,13 @@ void CinematicUiState::init(Game &game)
 	}
 
 	const TextureFileMetadata &textureFileMetadata = textureManager.getMetadataHandle(*metadataID);
-	const TextureAsset paletteTextureAsset = TextureAsset(std::string(paletteName));
+	const TextureAsset paletteTextureAsset(paletteName);
 
 	const int videoFrameCount = textureFileMetadata.getTextureCount();
 	this->videoTextureIDs.init(videoFrameCount);
 	for (int i = 0; i < videoFrameCount; i++)
 	{
-		const TextureAsset textureAsset = TextureAsset(std::string(sequenceName), i);
+		const TextureAsset textureAsset(sequenceName, i);
 
 		UiTextureID textureID;
 		if (!TextureUtils::tryAllocUiTexture(textureAsset, paletteTextureAsset, textureManager, renderer, &textureID))

OpenTESArena/src/Interface/CommonUiMVC.cpp

@@ -9,8 +9,8 @@
 
 UiTextureID CommonUiView::allocDefaultCursorTexture(TextureManager &textureManager, Renderer &renderer)
 {
-	const TextureAsset paletteTextureAsset = TextureAsset(std::string(ArenaPaletteName::Default));
-	const TextureAsset textureAsset = TextureAsset(std::string(ArenaTextureName::SwordCursor));
+	const TextureAsset paletteTextureAsset(ArenaPaletteName::Default);
+	const TextureAsset textureAsset(ArenaTextureName::SwordCursor);
 
 	UiTextureID textureID;
 	if (!TextureUtils::tryAllocUiTexture(textureAsset, paletteTextureAsset, textureManager, renderer, &textureID))

OpenTESArena/src/Interface/GameWorldUiMVC.cpp

@@ -630,7 +630,7 @@ Int2 GameWorldUiView::getNoMagicTexturePosition()
 
 int GameWorldUiView::getKeyTextureCount(TextureManager &textureManager)
 {
-	const TextureAsset &textureAsset = GameWorldUiView::getKeyTextureAsset(0);
+	const TextureAsset textureAsset = GameWorldUiView::getKeyTextureAsset(0);
 	std::optional<TextureFileMetadataID> textureFileMetadataID = textureManager.tryGetMetadataID(textureAsset.filename.c_str());
 	if (!textureFileMetadataID.has_value())
 	{
@@ -799,18 +799,18 @@ Int2 GameWorldUiView::getNativeWindowCenter(const Window &window)
 
 TextureAsset GameWorldUiView::getPaletteTextureAsset()
 {
-	return TextureAsset(std::string(ArenaPaletteName::Default));
+	return TextureAsset(ArenaPaletteName::Default);
 }
 
 TextureAsset GameWorldUiView::getGameWorldInterfaceTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::GameWorldInterface));
+	return TextureAsset(ArenaTextureName::GameWorldInterface);
 }
 
 TextureAsset GameWorldUiView::getStatusGradientTextureAsset(StatusGradientType gradientType)
 {
 	const int gradientID = static_cast<int>(gradientType);
-	return TextureAsset(std::string(ArenaTextureName::StatusGradients), gradientID);
+	return TextureAsset(ArenaTextureName::StatusGradients, gradientID);
 }
 
 TextureAsset GameWorldUiView::getPlayerPortraitTextureAsset(bool isMale, int raceID, int portraitID)
@@ -820,48 +820,48 @@ TextureAsset GameWorldUiView::getPlayerPortraitTextureAsset(bool isMale, int rac
 
 	if (isMale)
 	{
-		return TextureAsset(std::string(characterRaceDefinition.maleGameUiHeadsFilename), portraitID);
+		return TextureAsset(characterRaceDefinition.maleGameUiHeadsFilename, portraitID);
 	}
 	else
 	{
-		return TextureAsset(std::string(characterRaceDefinition.femaleGameUiHeadsFilename), portraitID);
+		return TextureAsset(characterRaceDefinition.femaleGameUiHeadsFilename, portraitID);
 	}
 }
 
 TextureAsset GameWorldUiView::getNoMagicTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::NoSpell));
+	return TextureAsset(ArenaTextureName::NoSpell);
 }
 
 TextureAsset GameWorldUiView::getWeaponAnimTextureAsset(const std::string &weaponFilename, int index)
 {
 	// @todo: this is obsoleted by WeaponAnimationDefinition
-	return TextureAsset(std::string(weaponFilename), index);
+	return TextureAsset(weaponFilename, index);
 }
 
 TextureAsset GameWorldUiView::getCompassFrameTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::CompassFrame));
+	return TextureAsset(ArenaTextureName::CompassFrame);
 }
 
 TextureAsset GameWorldUiView::getCompassSliderTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::CompassSlider));
+	return TextureAsset(ArenaTextureName::CompassSlider);
 }
 
 TextureAsset GameWorldUiView::getArrowCursorTextureAsset(int cursorIndex)
 {
-	return TextureAsset(std::string(ArenaTextureName::ArrowCursors), cursorIndex);
+	return TextureAsset(ArenaTextureName::ArrowCursors, cursorIndex);
 }
 
 TextureAsset GameWorldUiView::getKeyTextureAsset(int keyIndex)
 {
-	return TextureAsset(std::string(ArenaTextureName::DoorKeys), keyIndex);
+	return TextureAsset(ArenaTextureName::DoorKeys, keyIndex);
 }
 
 TextureAsset GameWorldUiView::getContainerInventoryTextureAsset()
 {
-	return TextureAsset(std::string(ArenaTextureName::ContainerInventory));
+	return TextureAsset(ArenaTextureName::ContainerInventory);
 }
 
 UiTextureID GameWorldUiView::allocStatusBarsTexture(TextureManager &textureManager, Renderer &renderer)