Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename MeshIO class to MeshReader.

Browse Source 
This makes the name symmetrical with MeshWriter.
This commit is contained in:
Philip Rideout
2018-12-05 16:26:00 -08:00
parent beaf751604
commit 8bb68b3c55
9 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/sample_normal_map.cpp
View File

@@ -42,7 +42,7 @@
#include <utils/EntityManager.h>
#include <filamat/MaterialBuilder.h>
#include <filameshio/MeshIO.h>
#include <filameshio/MeshReader.h>
using namespace math;
using namespace filament;
@@ -52,7 +52,7 @@ using namespace utils;
static std::vector<Path> g_filenames;
static std::map<std::string, MaterialInstance*> g_materialInstances;
static std::vector<MeshIO::Mesh> g_meshes;
static std::vector<MeshReader::Mesh> g_meshes;
static const Material* g_material;
static Entity g_light;
static Texture* g_normalMap = nullptr;
@@ -306,7 +306,7 @@ static void setup(Engine* engine, View*, Scene* scene) {
auto& tcm = engine->getTransformManager();
for (const auto& filename : g_filenames) {
MeshIO::Mesh mesh = MeshIO::loadMeshFromFile(engine, filename, g_materialInstances);
MeshReader::Mesh mesh = MeshReader::loadMeshFromFile(engine, filename, g_materialInstances);
if (mesh.renderable) {
auto ei = tcm.getInstance(mesh.renderable);
tcm.setTransform(ei, mat4f{ mat3f(g_config.scale), float3(0.0f, 0.0f, -4.0f) } *