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

Rename gltfio to filament::gltfio.

Browse Source
This commit is contained in:
Philip Rideout
2022-06-06 16:25:02 -07:00
parent 0ae83a6c97
commit 30dbd3ac4f
47 changed files with 90 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RELEASE_NOTES.md
+3
View File
@@ -9,6 +9,9 @@ A new header is inserted each time a *tag* is created.
- gltfio: fix morphing for un-packed accessors
- gltfio: ubershaders are now packaged into flexible archives [⚠️ **API Change**]
- gltfio: namespace now lives under Filament [⚠️ **API Change**]
- gltfio: UbershaderLoader renamed to UbershaderProvider [⚠️ **API Change**]
- gltfio: MaterialGenerator renamed to JitShaderProvider [⚠️ **API Change**]
- gltfio: remove poorly maintained lite flavor
- engine: disable user scissor while rendering the Shadow Maps (#5607)
- engine: merge identical backend RenderPrimitives together
android/gltfio-android/src/main/cpp/Animator.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
using namespace filament;
using namespace filament::math;
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
extern "C" JNIEXPORT void JNICALL
android/gltfio-android/src/main/cpp/AssetLoader.cpp
+1 -1
View File
@@ -30,7 +30,7 @@
#include "MaterialKey.h"
using namespace filament;
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
class JavaMaterialProvider : public MaterialProvider {
android/gltfio-android/src/main/cpp/FilamentAsset.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
using namespace filament;
using namespace filament::math;
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
extern "C" JNIEXPORT jint JNICALL
android/gltfio-android/src/main/cpp/FilamentInstance.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <algorithm>
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
extern "C" JNIEXPORT jint JNICALL
android/gltfio-android/src/main/cpp/MaterialKey.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include "MaterialKey.h"
using namespace gltfio;
using namespace filament::gltfio;
MaterialKeyHelper& MaterialKeyHelper::get() {
static MaterialKeyHelper helper;
android/gltfio-android/src/main/cpp/MaterialKey.h
+4 -2
View File
@@ -22,10 +22,12 @@
class MaterialKeyHelper {
public:
using MaterialKey = filament::gltfio::MaterialKey;
static MaterialKeyHelper& get();
void copy(JNIEnv* env, gltfio::MaterialKey& dst, jobject src);
void copy(JNIEnv* env, jobject dst, const gltfio::MaterialKey& src);
void copy(JNIEnv* env, MaterialKey& dst, jobject src);
void copy(JNIEnv* env, jobject dst, const MaterialKey& src);
void init(JNIEnv* env); // called only from the Java static class constructor
android/gltfio-android/src/main/cpp/ResourceLoader.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include "common/NioUtils.h"
using namespace filament;
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
static void destroy(void*, size_t, void *userData) {
android/gltfio-android/src/main/cpp/UbershaderProvider.cpp
+1 -1
View File
@@ -23,7 +23,7 @@
#include "MaterialKey.h"
using namespace filament;
using namespace gltfio;
using namespace filament::gltfio;
extern "C" JNIEXPORT jlong JNICALL
Java_com_google_android_filament_gltfio_UbershaderProvider_nCreateUbershaderProvider(JNIEnv*, jclass,
ios/samples/gltf-viewer/gltf-viewer/FILModelView.h
+3 -3
View File
@@ -23,7 +23,7 @@ class View;
class Renderer;
};
namespace gltfio {
namespace filament::gltfio {
class Animator;
class FilamentAsset;
};
@@ -56,8 +56,8 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) filament::View* view;
@property(nonatomic, readonly) filament::Renderer* renderer;
@property(nonatomic, readonly) gltfio::FilamentAsset* _Nullable asset;
@property(nonatomic, readonly) gltfio::Animator* _Nullable animator;
@property(nonatomic, readonly) filament::gltfio::FilamentAsset* _Nullable asset;
@property(nonatomic, readonly) filament::gltfio::Animator* _Nullable animator;
@property(nonatomic, readwrite) float cameraFocalLength;
ios/samples/gltf-viewer/gltf-viewer/FILModelView.mm
+1 -1
View File
@@ -47,7 +47,7 @@
using namespace filament;
using namespace utils;
using namespace gltfio;
using namespace filament::gltfio;
using namespace camutils;
const double kNearPlane = 0.05; // 5 cm
ios/samples/hello-gltf/hello-gltf/FilamentView/App.cpp
+4 -4
View File
@@ -61,7 +61,7 @@ App::~App() {
app.assetLoader->destroyAsset(app.asset);
app.materialProvider->destroyMaterials();
delete app.materialProvider;
gltfio::AssetLoader::destroy(&app.assetLoader);
filament::gltfio::AssetLoader::destroy(&app.assetLoader);
engine->destroy(renderer);
engine->destroy(scene);
@@ -122,8 +122,8 @@ void App::setupIbl() {
}
void App::setupMesh() {
app.materialProvider = gltfio::createUbershaderProvider(engine);
app.assetLoader = gltfio::AssetLoader::create({engine, app.materialProvider, nullptr});
app.materialProvider = filament::gltfio::createUbershaderProvider(engine);
app.assetLoader = filament::gltfio::AssetLoader::create({engine, app.materialProvider, nullptr});
// Load the glTF file.
std::ifstream in(resourcePath.concat(utils::Path("DamagedHelmet.glb")), std::ifstream::in);
@@ -137,7 +137,7 @@ void App::setupMesh() {
}
app.asset = app.assetLoader->createAssetFromBinary(buffer.data(), static_cast<uint32_t>(size));
gltfio::ResourceLoader({
filament::gltfio::ResourceLoader({
.engine = engine,
.normalizeSkinningWeights = true,
.recomputeBoundingBoxes = false
ios/samples/hello-gltf/hello-gltf/FilamentView/App.h
+4 -4
View File
@@ -36,7 +36,7 @@ using namespace filament::math;
using utils::Entity;
using utils::EntityManager;
namespace gltfio {
namespace filament::gltfio {
class AssetLoader;
class MaterialProvider;
class FilamentAsset;
@@ -80,9 +80,9 @@ private:
Skybox* skybox = nullptr;
Entity sun;
gltfio::AssetLoader* assetLoader;
gltfio::MaterialProvider* materialProvider;
gltfio::FilamentAsset* asset;
filament::gltfio::AssetLoader* assetLoader;
filament::gltfio::MaterialProvider* materialProvider;
filament::gltfio::FilamentAsset* asset;
} app;
CameraManipulator cameraManipulator;
libs/gltfio/include/gltfio/Animator.h
+2 -2
View File
@@ -20,7 +20,7 @@
#include <gltfio/FilamentAsset.h>
#include <gltfio/FilamentInstance.h>
namespace gltfio {
namespace filament::gltfio {
struct FFilamentAsset;
struct FFilamentInstance;
@@ -114,6 +114,6 @@ private:
AnimatorImpl* mImpl;
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_ANIMATOR_H
libs/gltfio/include/gltfio/AssetLoader.h
+2 -2
View File
@@ -34,7 +34,7 @@ namespace utils {
/**
* Loader and pipeline for glTF 2.0 assets.
*/
namespace gltfio {
namespace filament::gltfio {
class NodeManager;
@@ -246,6 +246,6 @@ public:
/*! \endcond */
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_ASSETLOADER_H
libs/gltfio/include/gltfio/FilamentAsset.h
+2 -2
View File
@@ -32,7 +32,7 @@ namespace filament {
class Scene;
}
namespace gltfio {
namespace filament::gltfio {
class Animator;
class FilamentInstance;
@@ -351,6 +351,6 @@ public:
/*! \endcond */
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_FILAMENTASSET_H
libs/gltfio/include/gltfio/FilamentInstance.h
+2 -2
View File
@@ -20,7 +20,7 @@
#include <utils/compiler.h>
#include <utils/Entity.h>
namespace gltfio {
namespace filament::gltfio {
class Animator;
class FilamentAsset;
@@ -76,6 +76,6 @@ public:
Animator* getAnimator() noexcept;
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_FILAMENTINSTANCE_H
libs/gltfio/include/gltfio/MaterialProvider.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include <array>
#include <string>
namespace gltfio {
namespace filament::gltfio {
enum class AlphaMode : uint8_t {
OPAQUE,
@@ -203,6 +203,6 @@ MaterialProvider* createJitShaderProvider(filament::Engine* engine, bool optimiz
UTILS_PUBLIC
MaterialProvider* createUbershaderProvider(filament::Engine* engine);
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_MATERIALPROVIDER_H
libs/gltfio/include/gltfio/NodeManager.h
+2 -2
View File
@@ -29,7 +29,7 @@ namespace utils {
class Entity;
} // namespace utils
namespace gltfio {
namespace filament::gltfio {
class FNodeManager;
@@ -104,7 +104,7 @@ public:
NodeManager& operator=(NodeManager&&) = delete;
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_NODEMANAGER_H
libs/gltfio/include/gltfio/ResourceLoader.h
+2 -2
View File
@@ -27,7 +27,7 @@ namespace filament {
class Engine;
}
namespace gltfio {
namespace filament::gltfio {
struct FFilamentAsset;
class AssetPool;
@@ -169,7 +169,7 @@ private:
Impl* pImpl;
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_RESOURCELOADER_H
libs/gltfio/include/gltfio/TextureProvider.h
+2 -2
View File
@@ -27,7 +27,7 @@ namespace filament {
class Texture;
}
namespace gltfio {
namespace filament::gltfio {
/**
* TextureProvider is an interface that allows clients to implement their own texture decoding
@@ -175,6 +175,6 @@ TextureProvider* createStbProvider(filament::Engine* engine);
*/
TextureProvider* createKtx2Provider(filament::Engine* engine);
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_TEXTUREPROVIDER_H
libs/gltfio/include/gltfio/math.h
+2 -2
View File
@@ -23,7 +23,7 @@
#include <math/mat4.h>
#include <math/TVecHelpers.h>
namespace gltfio {
namespace filament::gltfio {
template <typename T>
UTILS_PUBLIC T cubicSpline(const T& vert0, const T& tang0, const T& vert1, const T& tang1, float t) {
@@ -121,6 +121,6 @@ inline filament::math::mat3f matrixFromUvTransform(const float offset[2], float
return filament::math::mat3f(sx * c, sx * s, tx, -sy * s, sy * c, ty, 0.0f, 0.0f, 1.0f);
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_MATH_H
libs/gltfio/src/Animator.cpp
+2 -2
View File
@@ -42,7 +42,7 @@ using namespace filament::math;
using namespace std;
using namespace utils;
namespace gltfio {
namespace filament::gltfio {
using TimeValues = map<float, size_t>;
using SourceValues = vector<float>;
@@ -558,4 +558,4 @@ void AnimatorImpl::applyAnimation(const Channel& channel, float t, size_t prevIn
transformManager->setTransform(node, xform);
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/AssetLoader.cpp
+2 -2
View File
@@ -59,7 +59,7 @@ using namespace filament;
using namespace filament::math;
using namespace utils;
namespace gltfio {
namespace filament::gltfio {
using SceneMask = NodeManager::SceneMask;
@@ -1456,4 +1456,4 @@ MaterialProvider& AssetLoader::getMaterialProvider() noexcept {
return upcast(this)->mMaterials;
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/DependencyGraph.cpp
+2 -2
View File
@@ -19,7 +19,7 @@
using namespace filament;
using namespace utils;
namespace gltfio {
namespace filament::gltfio {
size_t DependencyGraph::popRenderables(Entity* result, size_t count) noexcept {
if (result == nullptr) {
@@ -136,4 +136,4 @@ DependencyGraph::TextureNode* DependencyGraph::getStatus(Texture* texture) {
return iter->second.get();
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/DependencyGraph.h
+2 -2
View File
@@ -30,7 +30,7 @@ namespace filament {
class Texture;
}
namespace gltfio {
namespace filament::gltfio {
/**
* Internal graph that enables FilamentAsset to discover "ready-to-render" entities by tracking
@@ -132,6 +132,6 @@ private:
bool mFinalized = false;
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_DEPENDENCY_GRAPH_H
libs/gltfio/src/DracoCache.cpp
+2 -2
View File
@@ -30,7 +30,7 @@ using std::vector;
using namespace utils;
namespace gltfio {
namespace filament::gltfio {
DracoMesh* DracoCache::findOrCreateMesh(const cgltf_buffer_view* key) {
auto iter = mCache.find(key);
@@ -222,4 +222,4 @@ bool DracoMesh::getVertexAttributes(uint32_t attributeId, cgltf_accessor* target
#endif
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/DracoCache.h
+2 -2
View File
@@ -27,7 +27,7 @@
#define GLTFIO_DRACO_SUPPORTED 0
#endif
namespace gltfio {
namespace filament::gltfio {
class DracoMesh;
@@ -66,6 +66,6 @@ private:
std::unique_ptr<struct DracoMeshDetails> mDetails;
};
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_DRACO_CACHE_H
libs/gltfio/src/FFilamentAsset.h
+2 -2
View File
@@ -62,7 +62,7 @@ namespace utils {
class EntityManager;
}
namespace gltfio {
namespace filament::gltfio {
class Animator;
class Wireframe;
@@ -331,6 +331,6 @@ struct FFilamentAsset : public FilamentAsset {
FILAMENT_UPCAST(FilamentAsset)
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_FFILAMENTASSET_H
libs/gltfio/src/FFilamentInstance.h
+2 -2
View File
@@ -38,7 +38,7 @@ namespace filament {
class MaterialInstance;
}
namespace gltfio {
namespace filament::gltfio {
struct FFilamentAsset;
class Animator;
@@ -91,6 +91,6 @@ struct FFilamentInstance : public FilamentInstance {
FILAMENT_UPCAST(FilamentInstance)
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_FFILAMENTINSTANCE_H
libs/gltfio/src/FNodeManager.h
+2 -2
View File
@@ -26,7 +26,7 @@
#include <utils/Entity.h>
#include <utils/Slice.h>
namespace gltfio {
namespace filament::gltfio {
class UTILS_PRIVATE FNodeManager : public NodeManager {
public:
@@ -134,6 +134,6 @@ private:
FILAMENT_UPCAST(NodeManager)
} // namespace gltfio
} // namespace filament::gltfio
#endif // GLTFIO_FNODEMANAGER_H
libs/gltfio/src/FilamentAsset.cpp
+2 -2
View File
@@ -30,7 +30,7 @@
using namespace filament;
using namespace utils;
namespace gltfio {
namespace filament::gltfio {
FFilamentAsset::~FFilamentAsset() {
releaseSourceData();
@@ -461,4 +461,4 @@ void FilamentAsset::addEntitiesToScene(Scene& targetScene, const Entity* entitie
upcast(this)->addEntitiesToScene(targetScene, entities, count, sceneFilter);
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/FilamentInstance.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
using namespace filament;
using namespace utils;
namespace gltfio {
namespace filament::gltfio {
Animator* FFilamentInstance::getAnimator() const noexcept {
assert_invariant(animator);
@@ -98,4 +98,4 @@ Animator* FilamentInstance::getAnimator() noexcept {
return upcast(this)->getAnimator();
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/JitShaderProvider.cpp
+3 -3
View File
@@ -26,7 +26,7 @@
using namespace filamat;
using namespace filament;
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
namespace {
@@ -557,10 +557,10 @@ MaterialInstance* JitShaderProvider::createMaterialInstance(MaterialKey* config,
} // anonymous namespace
namespace gltfio {
namespace filament::gltfio {
MaterialProvider* createJitShaderProvider(filament::Engine* engine, bool optimizeShaders) {
return new JitShaderProvider(engine, optimizeShaders);
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/Ktx2Provider.cpp
+2 -2
View File
@@ -33,7 +33,7 @@ using std::atomic;
using std::vector;
using std::unique_ptr;
namespace gltfio {
namespace filament::gltfio {
class Ktx2Provider final : public TextureProvider {
public:
@@ -250,4 +250,4 @@ TextureProvider* createKtx2Provider(Engine* engine) {
return new Ktx2Provider(engine);
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/MaterialProvider.cpp
+2 -2
View File
@@ -18,7 +18,7 @@
#include <string>
namespace gltfio {
namespace filament::gltfio {
bool operator==(const MaterialKey& k1, const MaterialKey& k2) {
return
@@ -182,4 +182,4 @@ void processShaderString(std::string* shader, const UvMap& uvmap, const Material
replaceAll("${volumeThickness}", volumeThicknessUV);
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/NodeManager.cpp
+2 -2
View File
@@ -22,7 +22,7 @@
using namespace utils;
namespace gltfio {
namespace filament::gltfio {
using Instance = NodeManager::Instance;
@@ -80,4 +80,4 @@ bitset32 NodeManager::getSceneMembership(Instance ci) const noexcept {
return upcast(this)->getSceneMembership(ci);
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/ResourceLoader.cpp
+2 -2
View File
@@ -63,7 +63,7 @@ using filament::geometry::ComponentType;
static const auto FREE_CALLBACK = [](void* mem, size_t, void*) { free(mem); };
namespace gltfio {
namespace filament::gltfio {
using BufferTextureCache = tsl::robin_map<const void*, Texture*>;
using FilepathTextureCache = tsl::robin_map<std::string, Texture*>;
@@ -1075,4 +1075,4 @@ void ResourceLoader::updateBoundingBoxes(FFilamentAsset* asset) const {
asset->mBoundingBox = assetBounds;
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/StbProvider.cpp
+2 -2
View File
@@ -33,7 +33,7 @@ using std::atomic;
using std::vector;
using std::unique_ptr;
namespace gltfio {
namespace filament::gltfio {
class StbProvider final : public TextureProvider {
public:
@@ -258,4 +258,4 @@ TextureProvider* createStbProvider(Engine* engine) {
return new StbProvider(engine);
}
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/TangentsJob.cpp
+1 -1
View File
@@ -20,7 +20,7 @@
#include <geometry/SurfaceOrientation.h>
using namespace gltfio;
using namespace filament::gltfio;
using namespace filament;
using namespace filament::math;
libs/gltfio/src/TangentsJob.h
+2 -2
View File
@@ -25,7 +25,7 @@ class MorphTargetBuffer;
}
namespace gltfio {
namespace filament::gltfio {
/**
* Internal helper that examines a cgltf primitive and generates data suitable for Filament's
@@ -69,4 +69,4 @@ struct TangentsJob {
static void run(Params* params);
};
} // namespace gltfio
} // namespace filament::gltfio
libs/gltfio/src/UbershaderProvider.cpp
+3 -3
View File
@@ -31,7 +31,7 @@
using namespace filament;
using namespace filament::math;
using namespace filament::uberz;
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
#if !defined(NDEBUG)
@@ -284,13 +284,13 @@ MaterialInstance* UbershaderProvider::createMaterialInstance(MaterialKey* config
} // anonymous namespace
namespace gltfio {
namespace filament::gltfio {
MaterialProvider* createUbershaderProvider(filament::Engine* engine) {
return new UbershaderProvider(engine);
}
} // namespace gltfio
} // namespace filament::gltfio
#if !defined(NDEBUG)
libs/gltfio/src/Wireframe.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ using namespace utils;
static const auto FREE_CALLBACK = [](void* mem, size_t, void*) { free(mem); };
namespace gltfio {
namespace filament::gltfio {
struct FFilamentAsset;
libs/gltfio/src/Wireframe.h
+1 -1
View File
@@ -22,7 +22,7 @@
#include <utils/Entity.h>
namespace gltfio {
namespace filament::gltfio {
struct FFilamentAsset;
samples/gltf_instances.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ using namespace filament;
using namespace filament::math;
using namespace filament::viewer;
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
enum MaterialSource {
samples/gltf_viewer.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ using namespace filament;
using namespace filament::math;
using namespace filament::viewer;
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
enum MaterialSource {
web/filament-js/jsbindings.cpp
+1 -1
View File
@@ -93,7 +93,7 @@ using namespace emscripten;
using namespace filament;
using namespace filamesh;
using namespace geometry;
using namespace gltfio;
using namespace filament::gltfio;
using namespace image;
using namespace ktxreader;