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/modules/gif_sender.cpp
+1 -1
View File
@@ -53,7 +53,7 @@ GifSender::~GifSender()
#include <gs_gp.h>
/** Send texture via GIF */
void GifSender::sendTexture(MeshTexture &texture, texbuffer_t *t_texBuffer)
void GifSender::sendTexture(Texture &texture, texbuffer_t *t_texBuffer)
{
packet2_t *packet2 = packet2_create(15, P2_TYPE_NORMAL, P2_MODE_CHAIN, false);
packet2_update(
src/engine/modules/renderer.cpp
+4 -4
View File
@@ -59,7 +59,7 @@ Renderer::~Renderer() {}
// ----
/** Configure and allocate vRAM for texture buffer */
void Renderer::allocateTextureBuffer(MeshTexture *t_texture)
void Renderer::allocateTextureBuffer(Texture *t_texture)
{
textureBuffer.width = t_texture->getWidth();
textureBuffer.psm = t_texture->getType();
@@ -83,7 +83,7 @@ void Renderer::deallocateTextureBuffer()
}
}
void Renderer::changeTexture(MeshTexture *t_tex)
void Renderer::changeTexture(Texture *t_tex)
{
if (t_tex != NULL)
{
@@ -211,7 +211,7 @@ void Renderer::drawByPath3(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount)
{
if (t_mesh.shouldBeFrustumCulled && !t_mesh.getMaterial(i).isInFrustum(renderData.frustumPlanes, t_mesh.position))
return;
MeshTexture *tex = textureRepo.getByMesh(t_mesh.getId(), t_mesh.getMaterial(i).getId());
Texture *tex = textureRepo.getByMesh(t_mesh.getId(), t_mesh.getMaterial(i).getId());
changeTexture(tex);
gifSender->initPacket(context);
u32 vertCount = t_mesh.getMaterial(i).getFacesCount();
@@ -259,7 +259,7 @@ void Renderer::draw(Mesh &t_mesh, LightBulb *t_bulbs, u16 t_bulbsCount)
VECTOR __attribute__((aligned(16))) vertices[vertCount];
VECTOR __attribute__((aligned(16))) normals[vertCount];
VECTOR __attribute__((aligned(16))) coordinates[vertCount];
MeshTexture *tex = textureRepo.getByMesh(t_mesh.getId(), t_mesh.getMaterial(i).getId());
Texture *tex = textureRepo.getByMesh(t_mesh.getId(), t_mesh.getMaterial(i).getId());
changeTexture(tex);
vertCount = t_mesh.getDrawData(i, vertices, normals, coordinates, rotatedCamera);
vifSender->drawMesh(&renderData, perspective, vertCount, vertices, normals, coordinates, t_mesh, t_bulbs, t_bulbsCount, &textureBuffer);
src/engine/modules/texture_repository.cpp
+3 -3
View File
@@ -35,9 +35,9 @@ TextureRepository::~TextureRepository()
// Methods
// ----
MeshTexture *TextureRepository::add(char *t_subfolder, char *t_name, TextureFormat t_format)
Texture *TextureRepository::add(char *t_subfolder, char *t_name, TextureFormat t_format)
{
MeshTexture *texture = new MeshTexture();
Texture *texture = new Texture();
if (t_format == BMP)
bmpLoader.load(*texture, t_subfolder, t_name, ".bmp");
else
@@ -51,7 +51,7 @@ void TextureRepository::addByMesh(char *t_path, Mesh &mesh, TextureFormat t_form
{
for (u32 i = 0; i < mesh.getMaterialsCount(); i++)
{
MeshTexture *texture = new MeshTexture();
Texture *texture = new Texture();
if (t_format == BMP)
bmpLoader.load(*texture, t_path, mesh.getMaterial(i).getName(), ".bmp");
else