Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Reduces the number of possible allocations for models with multiple UV sets during loading.

Browse Source 
Tested By: Stan
Differential Revision: https://code.wildfiregames.com/D4247
This was SVN commit r25890.
This commit is contained in:
Vladislav Belov 2021-09-03 20:11:52 +00:00
parent 18d9cadf7d
commit 3b417062bb
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/graphics/ModelDef.cpp
View File

@ -338,7 +338,8 @@ CModelDef* CModelDef::Load(const VfsPath& filename, const VfsPath& name)
mdef->m_NumUVsPerVertex = unpacker.UnpackSize();
}
mdef->m_pVertices=new SModelVertex[mdef->m_NumVertices];
mdef->m_pVertices = new SModelVertex[mdef->m_NumVertices];
mdef->m_UVCoordinates.reserve(mdef->m_NumVertices * mdef->m_NumUVsPerVertex);
for (size_t i = 0; i < mdef->m_NumVertices; ++i)
{
@ -349,8 +350,7 @@ CModelDef* CModelDef::Load(const VfsPath& filename, const VfsPath& name)
{
float uv[2];
unpacker.UnpackRaw(&uv[0], 8);
mdef->m_pVertices[i].m_UVs.push_back(uv[0]);
mdef->m_pVertices[i].m_UVs.push_back(uv[1]);
mdef->m_UVCoordinates.emplace_back(uv[0], uv[1]);
}
unpacker.UnpackRaw(&mdef->m_pVertices[i].m_Blend, sizeof(SVertexBlend));

7
source/graphics/ModelDef.h
View File

@ -25,6 +25,7 @@
#include "maths/BoundingBoxAligned.h"
#include "maths/Matrix3D.h"
#include "maths/Quaternion.h"
#include "maths/Vector2D.h"
#include "maths/Vector3D.h"
#include "lib/file/vfs/vfs_path.h"
#include "ps/CStr.h"
@ -33,6 +34,7 @@
#include <cstring>
#include <map>
#include <unordered_map>
#include <vector>
class CBoneState;
class CSkeletonAnimDef;
@ -108,8 +110,6 @@ struct SModelVertex
CVector3D m_Coords;
// vertex normal
CVector3D m_Norm;
// vertex UVs
std::vector<float> m_UVs;
// vertex blend data
SVertexBlend m_Blend;
};
@ -173,6 +173,8 @@ public:
// accessor: get number of UV sets
size_t GetNumUVsPerVertex() const { return m_NumUVsPerVertex; }
const std::vector<CVector2D>& GetUVCoordinates() const { return m_UVCoordinates; }
// accessor: get face data
size_t GetNumFaces() const { return m_NumFaces; }
SModelFace* GetFaces() const { return m_pFaces; }
@ -256,6 +258,7 @@ public:
// vertex data
size_t m_NumVertices;
SModelVertex* m_pVertices;
std::vector<CVector2D> m_UVCoordinates;
size_t m_NumUVsPerVertex; // number of UV pairs per vertex
// face data
size_t m_NumFaces;

18
source/renderer/MikktspaceWrap.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2019 Wildfire Games.
/* Copyright (C) 2021 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -81,11 +81,12 @@ void MikkTSpace::GetTexCoord(const SMikkTSpaceContext* pContext,
{
const MikkTSpace* userData = GetUserDataFromContext(pContext);
const SModelFace& face = userData->m_Model->GetFaces()[iFace];
const SModelVertex& v = userData->m_Model->GetVertices()[face.m_Verts[iVert]];
const size_t numberOfUVPerVertex = userData->m_Model->GetNumUVsPerVertex();
// The tangents are calculated according to the 'default' UV set
fvTexcOut[0] = v.m_UVs[0];
fvTexcOut[1] = 1.0 - v.m_UVs[1];
const CVector2D& uv = userData->m_Model->GetUVCoordinates()[face.m_Verts[iVert] * numberOfUVPerVertex];
fvTexcOut[0] = uv.X;
fvTexcOut[1] = 1.0 - uv.Y;
}
@ -121,11 +122,12 @@ void MikkTSpace::SetTSpace(const SMikkTSpaceContext* pContext, const float* fvTa
}
}
size_t numUVsPerVertex = userData->m_Model->GetNumUVsPerVertex();
for (size_t UVset = 0; UVset < numUVsPerVertex; ++UVset)
const size_t numberOfUVPerVertex = userData->m_Model->GetNumUVsPerVertex();
for (size_t UVset = 0; UVset < numberOfUVPerVertex; ++UVset)
{
userData->m_NewVertices.push_back(vertex.m_UVs[UVset * 2]);
userData->m_NewVertices.push_back(1.f - vertex.m_UVs[UVset * 2 + 1]);
const CVector2D& uv = userData->m_Model->GetUVCoordinates()[face.m_Verts[iVert] * numberOfUVPerVertex + UVset];
userData->m_NewVertices.push_back(uv.X);
userData->m_NewVertices.push_back(1.f - uv.Y);
}
}

9
source/renderer/ModelRenderer.cpp
View File

@ -141,13 +141,14 @@ void ModelRenderer::BuildUV(
const VertexArrayIterator<float[2]>& UV,
int UVset)
{
size_t numVertices = mdef->GetNumVertices();
SModelVertex* vertices = mdef->GetVertices();
const size_t numVertices = mdef->GetNumVertices();
const size_t numberOfUVPerVertex = mdef->GetNumUVsPerVertex();
for (size_t j = 0; j < numVertices; ++j)
{
UV[j][0] = vertices[j].m_UVs[UVset * 2];
UV[j][1] = 1.0 - vertices[j].m_UVs[UVset * 2 + 1];
const CVector2D& uv = mdef->GetUVCoordinates()[j * numberOfUVPerVertex + UVset];
UV[j][0] = uv.X;
UV[j][1] = 1.0 - uv.Y;
}
}