UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

REVIEWED LoadVOX() -WIP-

Browse source 
It seems vox loader is not working properly...
This commit is contained in:
raysan5 2021-10-13 20:28:58 +02:00
parent 1350361f58
commit 32c9d411b2
1 changed files with 20 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/rmodels.c
View file

@ -5740,22 +5740,23 @@ static void GetGLTFPrimitiveCount(cgltf_node *node, int *outCount)
static Model LoadVOX(const char *fileName) static Model LoadVOX(const char *fileName)
{ {
Model model = { 0 }; Model model = { 0 };
int nbvertices = 0; int nbvertices = 0;
int meshescount = 0; int meshescount = 0;
unsigned int readed = 0; unsigned int fileSize = 0;
unsigned char* fileData; unsigned char *fileData = NULL;
//Read vox file into buffer // Read vox file into buffer
fileData = LoadFileData(fileName, &readed); fileData = LoadFileData(fileName, &fileSize);
if (fileData == 0) if (fileData == 0)
{ {
TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to load VOX file", fileName); TRACELOG(LOG_WARNING, "MODEL: [%s] Failed to load VOX file", fileName);
return model; return model;
} }
//Read and build voxarray description // Read and build voxarray description
VoxArray3D voxarray = { 0 }; VoxArray3D voxarray = { 0 };
int ret = Vox_LoadFromMemory(fileData, readed, &voxarray); int ret = Vox_LoadFromMemory(fileData, fileSize, &voxarray);
if (ret != VOX_SUCCESS) if (ret != VOX_SUCCESS)
{ {
@ -5778,12 +5779,12 @@ static Model LoadVOX(const char *fileName)
model.transform = MatrixIdentity(); model.transform = MatrixIdentity();
model.meshCount = meshescount; model.meshCount = meshescount;
model.meshes = (Mesh *)MemAlloc(model.meshCount*sizeof(Mesh)); model.meshes = (Mesh *)RL_CALLOC(model.meshCount, sizeof(Mesh));
model.meshMaterial = (int *)MemAlloc(model.meshCount*sizeof(int)); model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int));
model.materialCount = 1; model.materialCount = 1;
model.materials = (Material *)MemAlloc(model.materialCount*sizeof(Material)); model.materials = (Material *)RL_CALLOC(model.materialCount, sizeof(Material));
model.materials[0] = LoadMaterialDefault(); model.materials[0] = LoadMaterialDefault();
// Init model meshes // Init model meshes
@ -5791,58 +5792,47 @@ static Model LoadVOX(const char *fileName)
int verticesMax = 65532; // 5461 voxels x 12 vertices per voxel -> 65532 (must be inf 65536) int verticesMax = 65532; // 5461 voxels x 12 vertices per voxel -> 65532 (must be inf 65536)
// 6*4 = 12 vertices per voxel // 6*4 = 12 vertices per voxel
Vector3 *pvertices = { 0 }; Vector3 *pvertices = (Vector3 *)voxarray.vertices.array;
pvertices->x = voxarray.vertices.array->x; Color *pcolors = (Color *)voxarray.colors.array;
pvertices->y = voxarray.vertices.array->y;
pvertices->z = voxarray.vertices.array->z;
Color *pcolors = { 0 };
pcolors->r = voxarray.colors.array->r;
pcolors->g = voxarray.colors.array->g;
pcolors->b = voxarray.colors.array->b;
pcolors->a = voxarray.colors.array->a;
unsigned short *pindices = voxarray.indices.array; // 5461*6*6 = 196596 indices max per mesh unsigned short *pindices = voxarray.indices.array; // 5461*6*6 = 196596 indices max per mesh
int size = 0; int size = 0;
for (int idxMesh = 0; idxMesh < meshescount; idxMesh++) for (int i = 0; i < meshescount; i++)
{ {
Mesh *pmesh = &model.meshes[idxMesh]; Mesh *pmesh = &model.meshes[i];
memset(pmesh, 0, sizeof(Mesh)); memset(pmesh, 0, sizeof(Mesh));
// Copy vertices // Copy vertices
pmesh->vertexCount = (int)fmin(verticesMax, verticesRemain); pmesh->vertexCount = (int)fmin(verticesMax, verticesRemain);
size = pmesh->vertexCount*sizeof(float)*3; size = pmesh->vertexCount*sizeof(float)*3;
pmesh->vertices = MemAlloc(size); pmesh->vertices = RL_MALLOC(size);
memcpy(pmesh->vertices, pvertices, size); memcpy(pmesh->vertices, pvertices, size);
// Copy indices // Copy indices
// TODO: Compute globals indices array // TODO: Compute globals indices array
size = voxarray.indices.used * sizeof(unsigned short); size = voxarray.indices.used*sizeof(unsigned short);
pmesh->indices = MemAlloc(size); pmesh->indices = RL_MALLOC(size);
memcpy(pmesh->indices, pindices, size); memcpy(pmesh->indices, pindices, size);
pmesh->triangleCount = (pmesh->vertexCount/4)*2; pmesh->triangleCount = (pmesh->vertexCount/4)*2;
// Copy colors // Copy colors
size = pmesh->vertexCount*sizeof(Color); size = pmesh->vertexCount*sizeof(Color);
pmesh->colors = MemAlloc(size); pmesh->colors = RL_MALLOC(size);
memcpy(pmesh->colors, pcolors, size); memcpy(pmesh->colors, pcolors, size);
// First material index // First material index
model.meshMaterial[idxMesh] = 0; model.meshMaterial[i] = 0;
// Upload mesh data to GPU
UploadMesh(pmesh, false);
verticesRemain -= verticesMax; verticesRemain -= verticesMax;
pvertices += verticesMax; pvertices += verticesMax;
pcolors += verticesMax; pcolors += verticesMax;
} }
//Free buffers // Free buffers
Vox_FreeArrays(&voxarray); Vox_FreeArrays(&voxarray);
UnloadFileData(fileData); UnloadFileData(fileData);