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 10:06:55 -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

2
android/gltfio-android/src/main/cpp/Animator.cpp
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

2
android/gltfio-android/src/main/cpp/AssetLoader.cpp
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 {

2
android/gltfio-android/src/main/cpp/FilamentAsset.cpp
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

2
android/gltfio-android/src/main/cpp/FilamentInstance.cpp
View File

@@ -20,7 +20,7 @@
#include <algorithm>
using namespace gltfio;
using namespace filament::gltfio;
using namespace utils;
extern "C" JNIEXPORT jint JNICALL

2
android/gltfio-android/src/main/cpp/MaterialKey.cpp
View File

@@ -20,7 +20,7 @@
#include "MaterialKey.h"
using namespace gltfio;
using namespace filament::gltfio;
MaterialKeyHelper& MaterialKeyHelper::get() {
static MaterialKeyHelper helper;

6
android/gltfio-android/src/main/cpp/MaterialKey.h
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

2
android/gltfio-android/src/main/cpp/ResourceLoader.cpp
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) {

2
android/gltfio-android/src/main/cpp/UbershaderProvider.cpp
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,