implemented vector in tex repo

This commit is contained in:
Sandro Sobczyński
2020-10-31 22:51:46 +01:00
parent f9dc79caf1
commit d4be8e94e7
5 changed files with 70 additions and 67 deletions
@@ -11,6 +11,7 @@
#ifndef _TYRA_TEXTURE_REPOSITORY_
#define _TYRA_TEXTURE_REPOSITORY_
#include <vector>
#include <tamtypes.h>
#include <draw_buffers.h>
#include "../models/mesh.hpp"
@@ -30,9 +31,9 @@ public:
// ----
/** Returns all repository textures. */
MeshTexture **getAll() const { return textures; }
std::vector<MeshTexture *> *getAll() { return &textures; }
const u32 &getTexturesCount() const { return texturesCount; };
u32 getTexturesCount() const { return static_cast<u32>(textures.size()); };
/**
* Returns single texture.
@@ -40,7 +41,7 @@ public:
*/
MeshTexture *getByMesh(const u32 &t_meshId, const u32 &t_materialId)
{
for (u32 i = 0; i < texturesCount; i++)
for (u32 i = 0; i < textures.size(); i++)
if (textures[i]->isLinkedWith(t_meshId, t_materialId))
return textures[i];
return NULL;
@@ -52,12 +53,24 @@ public:
*/
MeshTexture *getByTextureId(const u32 &t_id) const
{
for (u32 i = 0; i < texturesCount; i++)
for (u32 i = 0; i < textures.size(); i++)
if (t_id == textures[i]->getId())
return textures[i];
return NULL;
}
/**
* Returns index of link.
* -1 if not found.
*/
const s32 getIndexOf(const u32 &t_texId) const
{
for (u32 i = 0; i < textures.size(); i++)
if (textures[i]->getId() == t_texId)
return i;
return -1;
};
// ----
// Setters
// ----
@@ -66,22 +79,39 @@ public:
// Other
// ----
/** Add single unlinked texture to repository. */
/** Add unlinked texture.
* @param t_subfolder Relative path. Ex.: "textures/"
* @param t_name Filename without extension. Ex.: "water"
*/
MeshTexture *add(char *t_subfolder, char *t_name);
/** Add linked textures in given subpath for mesh material names. */
/**
* Add linked textures in given subpath for mesh material names.
* @param t_path Relative path where textures should be searched
*/
void addByMesh(char *t_path, Mesh &mesh);
/**
* Remove texture from repository.
* Texture is NOT destructed.
*/
void remove(u32 textureId);
void removeByIndex(const u32 &t_index) { textures.erase(textures.begin() + t_index); }
/**
* Remove texture from repository.
* Texture is NOT destructed.
*/
const void removeById(const u32 &t_texId)
{
s32 index = getIndexOf(t_texId);
if (index != -1)
removeByIndex(index);
else
PRINT_ERR("Cant remove texture, because it was not found!");
}
private:
void increaseArray(u32 newLength);
u32 texturesCount;
MeshTexture **textures;
std::vector<MeshTexture *> textures;
BmpLoader loader;
};