images: Allow finding an image from its name.

Warzone2100 · Jan 19, 2013 · 1e50a3a · 1e50a3a
1 parent 0d4e4fa
commit 1e50a3a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/lib/ivis_opengl/bitimage.cpp b/lib/ivis_opengl/bitimage.cpp
@@ -147,6 +147,7 @@ IMAGEFILE *iV_LoadImageFile(const char *fileName)
 	}
 	IMAGEFILE *imageFile = new IMAGEFILE;
 	imageFile->imageDefs.resize(numImages);
+	imageFile->imageNames.resize(numImages);
 	ImageMerge pageLayout;
 	pageLayout.images.resize(numImages);
 	ptr = pFileData;
@@ -163,6 +164,8 @@ IMAGEFILE *iV_LoadImageFile(const char *fileName)
 			debug(LOG_ERROR, "Bad line in \"%s\".", fileName);
 			return NULL;
 		}
+		imageFile->imageNames[numImages].first = tmpName;
+		imageFile->imageNames[numImages].second = numImages;
 		std::string spriteName = imageDir + tmpName;
 
 		ImageMergeRectangle *imageRect = &pageLayout.images[numImages];
@@ -180,6 +183,8 @@ IMAGEFILE *iV_LoadImageFile(const char *fileName)
 	}
 	free(pFileData);
 
+	std::sort(imageFile->imageNames.begin(), imageFile->imageNames.end());
+
 	pageLayout.arrange();  // Arrange all the images onto texture pages (attempt to do so with as few pages as possible).
 	imageFile->pages.resize(pageLayout.pages.size());
 
@@ -259,3 +264,17 @@ void iV_FreeImageFile(IMAGEFILE *imageFile)
 {
 	delete imageFile;
 }
+
+Image IMAGEFILE::find(std::string const &name)
+{
+	Image img;
+	img.images = this;
+	img.id = 0;
+	std::pair<std::string, int> val(name, 0);
+	std::vector<std::pair<std::string, int> >::const_iterator i = std::lower_bound(imageNames.begin(), imageNames.end(), val);
+	if (i != imageNames.end() && i->first == name)
+	{
+		img.id = i->second;
+	}
+	return img;
+}
diff --git a/lib/ivis_opengl/ivisdef.h b/lib/ivis_opengl/ivisdef.h
@@ -35,6 +35,8 @@
 
 #include <vector>
 #include <QtCore/QVector>
+#include <string>
+
 
 //*************************************************************************
 //
@@ -139,6 +141,8 @@ struct ImageDef
 	int YOffset;            /**< Y offset into source position */
 };
 
+struct Image;
+
 struct IMAGEFILE
 {
 	struct Page
@@ -147,8 +151,17 @@ struct IMAGEFILE
 		int size;  /// Size of texture in pixels. (Should be square.)
 	};
 
+	Image find(std::string const &name);  // Defined in bitimage.cpp.
+
 	std::vector<Page> pages;          /// Texture pages.
 	std::vector<ImageDef> imageDefs;  /// Stored images.
+	std::vector<std::pair<std::string, int> > imageNames;  ///< Names of images, sorted by name. Can lookup indices from name.
+};
+
+struct Image
+{
+	IMAGEFILE *images;
+	unsigned id;
 };
 
 #endif // _ivisdef_h