mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated meshoptimizer.

Browse Source
This commit is contained in:
Бранимир Караџић 2019-12-07 21:41:54 -08:00
parent b75e69ae3f
commit 31b779529e
3 changed files with 109 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/meshoptimizer/demo/demo.html vendored
View File

@ -33,7 +33,6 @@
var canvas = document.getElementById("renderCanvas");
BABYLON.GLTF2.GLTFLoader.RegisterExtension("MESHOPT_compression", (loader) => new MESHOPT_compression(loader, MeshoptDecoder));
BABYLON.GLTF2.GLTFLoader.RegisterExtension("KHR_quantized_geometry", (loader) => ({ name: "KHR_quantized_geometry", enabled: true }));
var createScene = function () {
var scene = new BABYLON.Scene(engine);

18
3rdparty/meshoptimizer/tools/basistoktx.cpp vendored
View File

@ -34,9 +34,9 @@ struct Ktx2Header
struct Ktx2LevelIndex
{
uint64_t byteOffset;
uint64_t byteLength;
uint64_t uncompressedByteLength;
uint64_t byteOffset;
uint64_t byteLength;
uint64_t uncompressedByteLength;
};
enum
@ -46,7 +46,7 @@ enum
// KTX Specification: 3.1. identifier
static const uint8_t Ktx2FileIdentifier[12] = {
0xAB, 0x4B, 0x54, 0x58, 0x20, 0x32, 0x30, 0xBB, 0x0D, 0x0A, 0x1A, 0x0A,
0xAB, 0x4B, 0x54, 0x58, 0x20, 0x32, 0x30, 0xBB, 0x0D, 0x0A, 0x1A, 0x0A, //
};
// KTX Specification: 3.12.2. Basis Universal Global Data
@ -190,8 +190,7 @@ std::string basisToKtx(const std::string& basis, bool srgb)
kvp += value;
kvp += '\0';
if (i + 1 != kvp.size())
kvp.resize((kvp.size() + 3) & ~3);
kvp.resize((kvp.size() + 3) & ~3);
}
size_t kvp_size = kvp.size();
@ -294,12 +293,9 @@ std::string basisToKtx(const std::string& basis, bool srgb)
write(ktx, sgd_level_offset + level_index * sizeof(Ktx2BasisImageDesc), sgd_image);
if (i + 1 != levels)
ktx.resize((ktx.size() + 7) & ~7);
ktx.resize((ktx.size() + 7) & ~7);
}
ktx.resize((ktx.size() + 7) & ~7);
return ktx;
}
@ -355,4 +351,4 @@ int main(int argc, const char** argv)
return 0;
}
#endif
#endif

160
3rdparty/meshoptimizer/tools/gltfpack.cpp vendored
View File

@ -356,6 +356,12 @@ void parseMeshesGltf(cgltf_data* data, std::vector<Mesh>& meshes)
Stream s = {attr.type, attr.index};
readAccessor(s.data, attr.data);
if (attr.type == cgltf_attribute_type_color && attr.data->type == cgltf_type_vec3)
{
for (size_t i = 0; i < s.data.size(); ++i)
s.data[i].f[3] = 1.0f;
}
result.streams.push_back(s);
}
@ -669,6 +675,42 @@ bool areMaterialsEqual(const cgltf_material& lhs, const cgltf_material& rhs)
return true;
}
bool usesTextureSet(const cgltf_material& material, int set)
{
if (material.has_pbr_metallic_roughness)
{
const cgltf_pbr_metallic_roughness& pbr = material.pbr_metallic_roughness;
if (pbr.base_color_texture.texture && pbr.base_color_texture.texcoord == set)
return true;
if (pbr.metallic_roughness_texture.texture && pbr.metallic_roughness_texture.texcoord == set)
return true;
}
if (material.has_pbr_specular_glossiness)
{
const cgltf_pbr_specular_glossiness& pbr = material.pbr_specular_glossiness;
if (pbr.diffuse_texture.texture && pbr.diffuse_texture.texcoord == set)
return true;
if (pbr.specular_glossiness_texture.texture && pbr.specular_glossiness_texture.texcoord == set)
return true;
}
if (material.normal_texture.texture && material.normal_texture.texcoord == set)
return true;
if (material.occlusion_texture.texture && material.occlusion_texture.texcoord == set)
return true;
if (material.emissive_texture.texture && material.emissive_texture.texcoord == set)
return true;
return false;
}
void mergeMeshMaterials(cgltf_data* data, std::vector<Mesh>& meshes)
{
for (size_t i = 0; i < meshes.size(); ++i)
@ -849,19 +891,16 @@ void filterEmptyMeshes(std::vector<Mesh>& meshes)
if (mesh.type == cgltf_primitive_type_triangles && mesh.indices.empty())
continue;
if (i != write)
{
// the following code is roughly equivalent to meshes[write] = std::move(mesh)
std::vector<Stream> streams;
streams.swap(mesh.streams);
// the following code is roughly equivalent to meshes[write] = std::move(mesh)
std::vector<Stream> streams;
streams.swap(mesh.streams);
std::vector<unsigned int> indices;
indices.swap(mesh.indices);
std::vector<unsigned int> indices;
indices.swap(mesh.indices);
meshes[write] = mesh;
meshes[write].streams.swap(streams);
meshes[write].indices.swap(indices);
}
meshes[write] = mesh;
meshes[write].streams.swap(streams);
meshes[write].indices.swap(indices);
write++;
}
@ -869,6 +908,54 @@ void filterEmptyMeshes(std::vector<Mesh>& meshes)
meshes.resize(write);
}
bool hasColorData(const std::vector<Attr>& data)
{
const float threshold = 0.99f;
for (size_t i = 0; i < data.size(); ++i)
{
const Attr& a = data[i];
if (a.f[0] < threshold || a.f[1] < threshold || a.f[2] < threshold || a.f[3] < threshold)
return true;
}
return false;
}
void filterStreams(Mesh& mesh)
{
size_t write = 0;
for (size_t i = 0; i < mesh.streams.size(); ++i)
{
Stream& stream = mesh.streams[i];
if (stream.type == cgltf_attribute_type_texcoord && (!mesh.material || !usesTextureSet(*mesh.material, stream.index)))
continue;
if (stream.type == cgltf_attribute_type_tangent && (!mesh.material || !mesh.material->normal_texture.texture))
continue;
if ((stream.type == cgltf_attribute_type_joints || stream.type == cgltf_attribute_type_weights) && !mesh.skin)
continue;
if (stream.type == cgltf_attribute_type_color && !hasColorData(stream.data))
continue;
// the following code is roughly equivalent to streams[write] = std::move(stream)
std::vector<Attr> data;
data.swap(stream.data);
mesh.streams[write] = stream;
mesh.streams[write].data.swap(data);
write++;
}
mesh.streams.resize(write);
}
void reindexMesh(Mesh& mesh)
{
size_t total_vertices = mesh.streams[0].data.size();
@ -901,7 +988,7 @@ void reindexMesh(Mesh& mesh)
}
}
void filterMesh(Mesh& mesh)
void filterTriangles(Mesh& mesh)
{
unsigned int* indices = &mesh.indices[0];
size_t total_indices = mesh.indices.size();
@ -1148,6 +1235,8 @@ void sortPointMesh(Mesh& mesh)
void processMesh(Mesh& mesh, const Settings& settings)
{
filterStreams(mesh);
switch (mesh.type)
{
case cgltf_primitive_type_points:
@ -1159,7 +1248,7 @@ void processMesh(Mesh& mesh, const Settings& settings)
case cgltf_primitive_type_triangles:
filterBones(mesh);
reindexMesh(mesh);
filterMesh(mesh);
filterTriangles(mesh);
simplifyMesh(mesh, settings.simplify_threshold, settings.simplify_aggressive);
optimizeMesh(mesh);
break;
@ -2109,42 +2198,6 @@ void writeMaterialInfo(std::string& json, const cgltf_data* data, const cgltf_ma
}
}
bool usesTextureSet(const cgltf_material& material, int set)
{
if (material.has_pbr_metallic_roughness)
{
const cgltf_pbr_metallic_roughness& pbr = material.pbr_metallic_roughness;
if (pbr.base_color_texture.texture && pbr.base_color_texture.texcoord == set)
return true;
if (pbr.metallic_roughness_texture.texture && pbr.metallic_roughness_texture.texcoord == set)
return true;
}
if (material.has_pbr_specular_glossiness)
{
const cgltf_pbr_specular_glossiness& pbr = material.pbr_specular_glossiness;
if (pbr.diffuse_texture.texture && pbr.diffuse_texture.texcoord == set)
return true;
if (pbr.specular_glossiness_texture.texture && pbr.specular_glossiness_texture.texcoord == set)
return true;
}
if (material.normal_texture.texture && material.normal_texture.texcoord == set)
return true;
if (material.occlusion_texture.texture && material.occlusion_texture.texcoord == set)
return true;
if (material.emissive_texture.texture && material.emissive_texture.texcoord == set)
return true;
return false;
}
size_t getBufferView(std::vector<BufferView>& views, BufferView::Kind kind, int variant, size_t stride, bool compressed)
{
if (variant >= 0)
@ -3047,15 +3100,6 @@ void writeMeshAttributes(std::string& json, std::vector<BufferView>& views, std:
if (stream.target != target)
continue;
if (stream.type == cgltf_attribute_type_texcoord && (!mesh.material || !usesTextureSet(*mesh.material, stream.index)))
continue;
if (stream.type == cgltf_attribute_type_tangent && (!mesh.material || !mesh.material->normal_texture.texture))
continue;
if ((stream.type == cgltf_attribute_type_joints || stream.type == cgltf_attribute_type_weights) && !mesh.skin)
continue;
scratch.clear();
StreamFormat format = writeVertexStream(scratch, stream, qp, settings, mesh.targets > 0);