RuiFPB/tyra-linux
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

mesh_texture -> texture

Browse Source
This commit is contained in:
h4570
2020-12-01 19:27:55 +01:00
parent ade89bbdd1
commit 389a5ee608
17 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/models/mesh.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "../include/loaders/md2_loader.hpp"
#include "../include/loaders/dff_loader.hpp"
#include "../include/loaders/bmp_loader.hpp"
#include "../include/models/mesh_texture.hpp"
#include "../include/models/texture.hpp"
#include "../include/utils/debug.hpp"
#include "../include/utils/string.hpp"
#include <cstdlib>
src/engine/models/mesh_texture.cpp → src/engine/models/texture.cpp
+11 -11
View File
@@ -8,7 +8,7 @@
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
#include "../include/models/mesh_texture.hpp"
#include "../include/models/texture.hpp"
#include "../include/utils/string.hpp"
#include <cstdlib>
#include <draw_sampling.h>
@@ -17,7 +17,7 @@
// Constructors/Destructors
// ----
MeshTexture::MeshTexture()
Texture::Texture()
{
id = rand() % 1000000;
_isSizeSet = false;
@@ -25,7 +25,7 @@ MeshTexture::MeshTexture()
setDefaultWrapSettings();
}
MeshTexture::~MeshTexture()
Texture::~Texture()
{
if (getTextureLinksCount() > 0)
texLinks.clear();
@@ -39,7 +39,7 @@ MeshTexture::~MeshTexture()
// Methods
// ----
void MeshTexture::setSize(const u8 &t_width, const u8 &t_height, const TextureType &t_type)
void Texture::setSize(const u8 &t_width, const u8 &t_height, const TextureType &t_type)
{
if (_isSizeSet)
{
@@ -55,7 +55,7 @@ void MeshTexture::setSize(const u8 &t_width, const u8 &t_height, const TextureTy
_isSizeSet = true;
}
void MeshTexture::setName(char *t_val)
void Texture::setName(char *t_val)
{
if (_isNameSet)
{
@@ -66,7 +66,7 @@ void MeshTexture::setName(char *t_val)
_isNameSet = true;
}
void MeshTexture::setDefaultWrapSettings()
void Texture::setDefaultWrapSettings()
{
wrapSettings.horizontal = WRAP_REPEAT;
wrapSettings.vertical = WRAP_REPEAT;
@@ -76,24 +76,24 @@ void MeshTexture::setDefaultWrapSettings()
wrapSettings.minv = 0;
}
void MeshTexture::setWrapSettings(const WrapSettings t_horizontal, const WrapSettings t_vertical)
void Texture::setWrapSettings(const WrapSettings t_horizontal, const WrapSettings t_vertical)
{
wrapSettings.horizontal = t_horizontal;
wrapSettings.vertical = t_vertical;
}
void MeshTexture::addLink(const u32 &t_meshId, const u32 &t_materialId)
void Texture::addLink(const u32 &t_meshId, const u32 &t_materialId)
{
TextureLink link;
link.materialId = t_materialId;
link.meshId = t_meshId;
link.meshOrSpriteId = t_meshId;
texLinks.push_back(link);
}
void MeshTexture::addLink(const u32 &t_spriteId)
void Texture::addLink(const u32 &t_spriteId)
{
TextureLink link;
link.materialId = 0;
link.meshId = t_spriteId;
link.meshOrSpriteId = t_spriteId;
texLinks.push_back(link);
}