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

found fopen() bug, implemented workaroung

Browse Source
This commit is contained in:
Sandro Sobczyński
2020-11-02 15:57:36 +01:00
parent 138ab762ba
commit 06a440243a
9 changed files with 366 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/loaders/dff_loader.cpp
+4 -2
View File
@@ -54,11 +54,11 @@ void DffLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
PRINT_LOG("Dff file loaded!");
}
void DffLoader::convert(MeshFrame *frames, RwClump &t_clump, u8 t_invertT)
void DffLoader::convert(MeshFrame *o_result, RwClump &t_clump, u8 t_invertT)
{
#define GEOMETRY t_clump.geometryList.geometries[0]
MeshFrame *frame = &frames[0];
MeshFrame *frame = &o_result[0];
u32 vertNormalStCount = GEOMETRY.data.dataHeader.vertexCount;
frame->allocateVertices(vertNormalStCount);
frame->allocateNormals(vertNormalStCount); // can be optimized
@@ -103,6 +103,8 @@ void DffLoader::convert(MeshFrame *frames, RwClump &t_clump, u8 t_invertT)
frame->getMaterial(i).setSTFace(j, CURR_SPLIT.vertexInformation[j].vertex1);
}
}
frame->calculateBoundingBox();
}
void DffLoader::serialize(RwClump &t_clump, u8 *t_data, float t_scale)
src/engine/loaders/md2_loader.cpp
+52 -50
View File
@@ -16,7 +16,6 @@
#include "../include/models/math/vector3.hpp"
#include "../include/models/math/point.hpp"
#include <string.h>
#include <iosfwd>
// ----
// Constructors/Destructors
@@ -30,25 +29,33 @@ MD2Loader::~MD2Loader() {}
// Methods
// ----
/** Load, parse .obj file and load data into given MeshSpec */
u32 MD2Loader::load(MeshFrame *o_result, char *t_subpath, char *t_nameWithoutExtension, float t_scale, u8 t_invertT)
int MEM_fread(char *buf, size_t size, size_t n, const FILE *f)
{
memcpy(buf, f, size * n);
f += size * n;
return n;
}
/**
* Sandro: Possible PS2SDK bug here?
* When I wanted to fopen() -> fread() -> allocate frames memory (vertices etc) -> fclose() = I had in about 10x errors in console
* When I did fopen() -> fread() -> fclose() -> allocate frames memory = I had no errors 🤨
* It looks like memory allocation during fopen()-fread()-fclose() is broken.
*/
MeshFrame *MD2Loader::load(u32 &o_framesCount, char *t_subpath, char *t_nameWithoutExtension, float t_scale, u8 t_invertT)
{
PRINT_LOG("Loading new MD2 file");
char *part1 = String::createConcatenated(t_subpath, t_nameWithoutExtension);
char *finalPath = String::createConcatenated(part1, ".md2"); // "folder/object.md2"
delete[] part1;
PRINT_LOG("Loading new MD2 file");
md2_t header; // md2 header
char *buffer; // buffer storing frame data
md2_t header;
FILE *file = fopen(finalPath, "rb");
if (file == NULL)
{
PRINT_ERR("Failed to load .md2 file!");
return 0;
return NULL;
}
fread((char *)&header, sizeof(md2_t), 1, file);
@@ -56,7 +63,7 @@ u32 MD2Loader::load(MeshFrame *o_result, char *t_subpath, char *t_nameWithoutExt
if ((header.ident != MD2_IDENT) && (header.version != MD2_VERSION))
{
PRINT_ERR("This MD2 file was not in correct format!");
return 0;
return NULL;
}
u32 framesCount = header.num_frames;
@@ -64,87 +71,82 @@ u32 MD2Loader::load(MeshFrame *o_result, char *t_subpath, char *t_nameWithoutExt
u32 stsCount = header.num_st;
u32 trianglesCount = header.num_tris;
// o_result = new MeshFrame[framesCount];
buffer = new char[framesCount * header.framesize];
char framesBuffer[framesCount * header.framesize];
fseek(file, header.ofs_frames, SEEK_SET);
fread((char *)buffer, framesCount * header.framesize, 1, file);
fread(&framesBuffer, framesCount * header.framesize, 1, file);
frame_t *frame; // temporary vars
char stsBuffer[stsCount * sizeof(texCoord_t)];
fseek(file, header.ofs_st, SEEK_SET);
fread(&stsBuffer, stsCount * sizeof(texCoord_t), 1, file);
char trianglesBuffer[trianglesCount * sizeof(triangle_t)];
fseek(file, header.ofs_tris, SEEK_SET);
fread(&trianglesBuffer, trianglesCount * sizeof(triangle_t), 1, file);
fclose(file);
MeshFrame *resultFrames = new MeshFrame[26];
frame_t *frame;
Vector3 tempVec = Vector3();
for (u32 j = 0; j < framesCount; j++)
{
o_result[j].allocateVertices(vertexCount);
o_result[j].allocateNormals(vertexCount); // can be optimized
o_result[j].allocateSTs(stsCount);
o_result[j].allocateMaterials(1);
printf("Materials count:%d\n", o_result[j].getMaterialsCount());
o_result[j].getMaterial(0).allocateFaces(trianglesCount * 3);
o_result[j].getMaterial(0).setName(t_nameWithoutExtension);
frame = (frame_t *)&buffer[header.framesize * j];
resultFrames[j].allocateVertices(vertexCount);
resultFrames[j].allocateNormals(vertexCount); // can be optimized
resultFrames[j].allocateSTs(stsCount);
resultFrames[j].allocateMaterials(1);
resultFrames[j].getMaterial(0).allocateFaces(trianglesCount * 3);
resultFrames[j].getMaterial(0).setName(t_nameWithoutExtension);
frame = (frame_t *)&framesBuffer[header.framesize * j];
for (u32 i = 0; i < vertexCount; i++)
{
tempVec.set(
((frame->verts[i].v[0] * frame->scale[0]) + frame->translate[0]) * t_scale,
((frame->verts[i].v[1] * frame->scale[1]) + frame->translate[1]) * t_scale,
((frame->verts[i].v[2] * frame->scale[2]) + frame->translate[2]) * t_scale);
o_result[j].setVertex(i, tempVec);
resultFrames[j].setVertex(i, tempVec);
tempVec.set(
ANORMS[frame->verts[i].lightnormalindex][0],
ANORMS[frame->verts[i].lightnormalindex][1],
ANORMS[frame->verts[i].lightnormalindex][2]);
o_result[j].setNormal(i, tempVec);
resultFrames[j].setNormal(i, tempVec);
}
}
delete[] buffer;
buffer = new char[stsCount * sizeof(texCoord_t)];
fseek(file, header.ofs_st, SEEK_SET);
fread((char *)buffer, stsCount * sizeof(texCoord_t), 1, file);
Point tempPoint = Point();
texCoord_t *texCoord;
for (u32 i = 0; i < stsCount; i++)
{
texCoord = (texCoord_t *)&buffer[sizeof(texCoord_t) * i];
texCoord = (texCoord_t *)&stsBuffer[sizeof(texCoord_t) * i];
tempPoint.set(
(float)texCoord->s / header.skinwidth,
(float)texCoord->t / header.skinheight);
if (t_invertT)
tempPoint.y = 1.0F - tempPoint.y;
for (u32 j = 0; j < framesCount; j++)
o_result[j].setST(i, tempPoint);
resultFrames[j].setST(i, tempPoint);
}
delete[] buffer;
buffer = new char[trianglesCount * sizeof(triangle_t)];
fseek(file, header.ofs_tris, SEEK_SET);
fread((char *)buffer, trianglesCount * sizeof(triangle_t), 1, file);
triangle_t *triangle; // temporary var
// vertex array initialization
triangle_t *triangle;
for (u32 i = 0; i < trianglesCount; i++)
{
triangle = (triangle_t *)&buffer[sizeof(triangle_t) * i];
triangle = (triangle_t *)&trianglesBuffer[sizeof(triangle_t) * i];
for (u8 j = 0; j < 3; j++)
{
for (u32 x = 0; x < framesCount; x++)
{
o_result[x].getMaterial(0).setVertexFace((i * 3) + j, triangle->index_xyz[j]);
o_result[x].getMaterial(0).setSTFace((i * 3) + j, triangle->index_st[j]);
o_result[x].getMaterial(0).setNormalFace((i * 3) + j, triangle->index_xyz[j]);
resultFrames[x].getMaterial(0).setVertexFace((i * 3) + j, triangle->index_xyz[j]);
resultFrames[x].getMaterial(0).setSTFace((i * 3) + j, triangle->index_st[j]);
resultFrames[x].getMaterial(0).setNormalFace((i * 3) + j, triangle->index_xyz[j]);
}
}
}
delete[] buffer;
fclose(file);
PRINT_LOG("MD2 file loaded!");
delete[] finalPath;
return framesCount;
o_framesCount = framesCount;
for (u32 i = 0; i < framesCount; i++)
resultFrames[i].calculateBoundingBox();
return resultFrames;
}