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

Move math namespace to fix #746.

Browse Source
This commit is contained in:
prideout
2019-02-06 10:52:16 -08:00
committed by Philip Rideout
parent 6089be6de6
commit 5ee359cf40
155 changed files with 746 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/filament-android/src/main/cpp/Camera.cpp
View File

@@ -48,7 +48,7 @@ Java_com_google_android_filament_Camera_nSetCustomProjection(JNIEnv *env, jclass
jlong nativeCamera, jdoubleArray inMatrix_, jdouble near, jdouble far) {
Camera *camera = (Camera *) nativeCamera;
jdouble *inMatrix = env->GetDoubleArrayElements(inMatrix_, NULL);
camera->setCustomProjection(*reinterpret_cast<const math::mat4 *>(inMatrix), near, far);
camera->setCustomProjection(*reinterpret_cast<const filament::math::mat4 *>(inMatrix), near, far);
env->ReleaseDoubleArrayElements(inMatrix_, inMatrix, JNI_ABORT);
}
@@ -78,7 +78,7 @@ Java_com_google_android_filament_Camera_nSetModelMatrix(JNIEnv *env, jclass,
jlong nativeCamera, jfloatArray in_) {
Camera* camera = (Camera *) nativeCamera;
jfloat *in = env->GetFloatArrayElements(in_, NULL);
camera->setModelMatrix(*reinterpret_cast<const math::mat4f*>(in));
camera->setModelMatrix(*reinterpret_cast<const filament::math::mat4f*>(in));
env->ReleaseFloatArrayElements(in_, in, JNI_ABORT);
}
@@ -87,7 +87,7 @@ Java_com_google_android_filament_Camera_nGetProjectionMatrix(JNIEnv *env, jclass
jlong nativeCamera, jdoubleArray out_) {
Camera *camera = (Camera *) nativeCamera;
jdouble *out = env->GetDoubleArrayElements(out_, NULL);
const math::mat4& m = camera->getProjectionMatrix();
const filament::math::mat4& m = camera->getProjectionMatrix();
std::copy_n(&m[0][0], 16, out);
env->ReleaseDoubleArrayElements(out_, out, 0);
}
@@ -97,7 +97,7 @@ Java_com_google_android_filament_Camera_nGetModelMatrix(JNIEnv *env, jclass,
jlong nativeCamera, jfloatArray out_) {
Camera *camera = (Camera *) nativeCamera;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
const math::mat4f& m = camera->getModelMatrix();
const filament::math::mat4f& m = camera->getModelMatrix();
std::copy_n(&m[0][0], 16, out);
env->ReleaseFloatArrayElements(out_, out, 0);
}
@@ -107,7 +107,7 @@ Java_com_google_android_filament_Camera_nGetViewMatrix(JNIEnv *env, jclass, jlon
jfloatArray out_) {
Camera *camera = (Camera *) nativeCamera;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
const math::mat4f& m = camera->getViewMatrix();
const filament::math::mat4f& m = camera->getViewMatrix();
std::copy_n(&m[0][0], 16, out);
env->ReleaseFloatArrayElements(out_, out, 0);
}
@@ -117,7 +117,7 @@ Java_com_google_android_filament_Camera_nGetPosition(JNIEnv *env, jclass, jlong
jfloatArray out_) {
Camera *camera = (Camera *) nativeCamera;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
reinterpret_cast<math::float3&>(*out) = camera->getPosition();
reinterpret_cast<filament::math::float3&>(*out) = camera->getPosition();
env->ReleaseFloatArrayElements(out_, out, 0);
}
@@ -126,7 +126,7 @@ Java_com_google_android_filament_Camera_nGetLeftVector(JNIEnv *env, jclass, jlon
jfloatArray out_) {
Camera *camera = (Camera *) nativeCamera;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
reinterpret_cast<math::float3&>(*out) = camera->getLeftVector();
reinterpret_cast<filament::math::float3&>(*out) = camera->getLeftVector();
env->ReleaseFloatArrayElements(out_, out, 0);
}
@@ -135,7 +135,7 @@ Java_com_google_android_filament_Camera_nGetUpVector(JNIEnv *env, jclass, jlong
jfloatArray out_) {
Camera *camera = (Camera *) nativeCamera;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
reinterpret_cast<math::float3&>(*out) = camera->getUpVector();
reinterpret_cast<filament::math::float3&>(*out) = camera->getUpVector();
env->ReleaseFloatArrayElements(out_, out, 0);
}
@@ -144,7 +144,7 @@ Java_com_google_android_filament_Camera_nGetForwardVector(JNIEnv *env, jclass,
jlong nativeCamera, jfloatArray out_) {
Camera *camera = (Camera *) nativeCamera;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
reinterpret_cast<math::float3&>(*out) = camera->getForwardVector();
reinterpret_cast<filament::math::float3&>(*out) = camera->getForwardVector();
env->ReleaseFloatArrayElements(out_, out, 0);
}

6
android/filament-android/src/main/cpp/IndirectLight.cpp
View File

@@ -53,7 +53,7 @@ Java_com_google_android_filament_IndirectLight_nIrradiance(JNIEnv* env, jclass,
jlong nativeBuilder, jint bands, jfloatArray sh_) {
IndirectLight::Builder* builder = (IndirectLight::Builder*) nativeBuilder;
jfloat* sh = env->GetFloatArrayElements(sh_, NULL);
builder->irradiance((uint8_t) bands, (const math::float3*) sh);
builder->irradiance((uint8_t) bands, (const filament::math::float3*) sh);
env->ReleaseFloatArrayElements(sh_, sh, JNI_ABORT);
}
@@ -77,7 +77,7 @@ Java_com_google_android_filament_IndirectLight_nRotation(JNIEnv *, jclass, jlong
jfloat v0, jfloat v1, jfloat v2, jfloat v3, jfloat v4, jfloat v5, jfloat v6, jfloat v7,
jfloat v8) {
IndirectLight::Builder *builder = (IndirectLight::Builder *) nativeBuilder;
builder->rotation(math::mat3f{v0, v1, v2, v3, v4, v5, v6, v7, v8});
builder->rotation(filament::math::mat3f{v0, v1, v2, v3, v4, v5, v6, v7, v8});
}
@@ -101,5 +101,5 @@ Java_com_google_android_filament_IndirectLight_nSetRotation(JNIEnv *env, jclass
jlong nativeIndirectLight, jfloat v0, jfloat v1, jfloat v2, jfloat v3, jfloat v4, jfloat v5,
jfloat v6, jfloat v7, jfloat v8) {
IndirectLight *indirectLight = (IndirectLight *) nativeIndirectLight;
indirectLight->setRotation(math::mat3f{v0, v1, v2, v3, v4, v5, v6, v7, v8});
indirectLight->setRotation(filament::math::mat3f{v0, v1, v2, v3, v4, v5, v6, v7, v8});
}

6
android/filament-android/src/main/cpp/LightManager.cpp
View File

@@ -174,7 +174,7 @@ Java_com_google_android_filament_LightManager_nGetPosition(JNIEnv *env, jclass t
jlong nativeLightManager, jint i, jfloatArray out_) {
LightManager *lm = (LightManager *) nativeLightManager;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
*reinterpret_cast<math::float3 *>(out) = lm->getPosition((LightManager::Instance) i);
*reinterpret_cast<filament::math::float3 *>(out) = lm->getPosition((LightManager::Instance) i);
env->ReleaseFloatArrayElements(out_, out, 0);
}
@@ -190,7 +190,7 @@ Java_com_google_android_filament_LightManager_nGetDirection(JNIEnv *env, jclass
jlong nativeLightManager, jint i, jfloatArray out_) {
LightManager *lm = (LightManager *) nativeLightManager;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
*reinterpret_cast<math::float3 *>(out) = lm->getDirection((LightManager::Instance) i);
*reinterpret_cast<filament::math::float3 *>(out) = lm->getDirection((LightManager::Instance) i);
env->ReleaseFloatArrayElements(out_, out, 0);
}
@@ -206,7 +206,7 @@ Java_com_google_android_filament_LightManager_nGetColor(JNIEnv *env, jclass type
jlong nativeLightManager, jint i, jfloatArray out_) {
LightManager *lm = (LightManager *) nativeLightManager;
jfloat *out = env->GetFloatArrayElements(out_, NULL);
*reinterpret_cast<math::float3 *>(out) = lm->getColor((LightManager::Instance) i);
*reinterpret_cast<filament::math::float3 *>(out) = lm->getColor((LightManager::Instance) i);
env->ReleaseFloatArrayElements(out_, out, 0);
}

18
android/filament-android/src/main/cpp/MaterialInstance.cpp
View File

@@ -47,14 +47,14 @@ extern "C"
JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterBool2(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_, jboolean x, jboolean y) {
setParameter(env, nativeMaterialInstance, name_, math::bool2{x, y});
setParameter(env, nativeMaterialInstance, name_, filament::math::bool2{x, y});
}
extern "C"
JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterBool3(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_, jboolean x, jboolean y, jboolean z) {
setParameter(env, nativeMaterialInstance, name_, math::bool3{x, y, z});
setParameter(env, nativeMaterialInstance, name_, filament::math::bool3{x, y, z});
}
extern "C"
@@ -62,7 +62,7 @@ JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterBool4(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_,
jboolean x, jboolean y, jboolean z, jboolean w) {
setParameter(env, nativeMaterialInstance, name_, math::bool4{x, y, z, w});
setParameter(env, nativeMaterialInstance, name_, filament::math::bool4{x, y, z, w});
}
extern "C"
@@ -76,14 +76,14 @@ extern "C"
JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterInt2(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_, jint x, jint y) {
setParameter(env, nativeMaterialInstance, name_, math::int2{x, y});
setParameter(env, nativeMaterialInstance, name_, filament::math::int2{x, y});
}
extern "C"
JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterInt3(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_, jint x, jint y, jint z) {
setParameter(env, nativeMaterialInstance, name_, math::int3{x, y, z});
setParameter(env, nativeMaterialInstance, name_, filament::math::int3{x, y, z});
}
extern "C"
@@ -91,7 +91,7 @@ JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterInt4(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_,
jint x, jint y, jint z, jint w) {
setParameter(env, nativeMaterialInstance, name_, math::int4{x, y, z, w});
setParameter(env, nativeMaterialInstance, name_, filament::math::int4{x, y, z, w});
}
extern "C"
@@ -105,14 +105,14 @@ extern "C"
JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterFloat2(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_, jfloat x, jfloat y) {
setParameter(env, nativeMaterialInstance, name_, math::float2{x, y});
setParameter(env, nativeMaterialInstance, name_, filament::math::float2{x, y});
}
extern "C"
JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterFloat3(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_, jfloat x, jfloat y, jfloat z) {
setParameter(env, nativeMaterialInstance, name_, math::float3{x, y, z});
setParameter(env, nativeMaterialInstance, name_, filament::math::float3{x, y, z});
}
extern "C"
@@ -120,7 +120,7 @@ JNIEXPORT void JNICALL
Java_com_google_android_filament_MaterialInstance_nSetParameterFloat4(JNIEnv *env, jclass,
jlong nativeMaterialInstance, jstring name_,
jfloat x, jfloat y, jfloat z, jfloat w) {
setParameter(env, nativeMaterialInstance, name_, math::float4{x, y, z, w});
setParameter(env, nativeMaterialInstance, name_, filament::math::float4{x, y, z, w});
}
extern "C"

2
android/filament-android/src/main/cpp/MathUtils.cpp
View File

@@ -19,7 +19,7 @@
#include <math/mat3.h>
#include <math/quat.h>
using namespace math;
using namespace filament::math;
extern "C" JNIEXPORT void JNICALL
Java_com_google_android_filament_MathUtils_nPackTangentFrame(JNIEnv *env, jclass,

6
android/filament-android/src/main/cpp/RenderableManager.cpp
View File

@@ -197,7 +197,7 @@ Java_com_google_android_filament_RenderableManager_nSetBonesAsMatrices(JNIEnv* e
return -1;
}
rm->setBones((RenderableManager::Instance)i,
static_cast<math::mat4f const *>(data), (size_t)boneCount, (size_t)offset);
static_cast<filament::math::mat4f const *>(data), (size_t)boneCount, (size_t)offset);
return 0;
}
@@ -277,8 +277,8 @@ Java_com_google_android_filament_RenderableManager_nGetAxisAlignedBoundingBox(JN
jfloat *center = env->GetFloatArrayElements(center_, NULL);
jfloat *halfExtent = env->GetFloatArrayElements(halfExtent_, NULL);
Box const &aabb = rm->getAxisAlignedBoundingBox((RenderableManager::Instance) i);
*reinterpret_cast<math::float3 *>(center) = aabb.center;
*reinterpret_cast<math::float3 *>(halfExtent) = aabb.halfExtent;
*reinterpret_cast<filament::math::float3 *>(center) = aabb.center;
*reinterpret_cast<filament::math::float3 *>(halfExtent) = aabb.halfExtent;
env->ReleaseFloatArrayElements(center_, center, 0);
env->ReleaseFloatArrayElements(halfExtent_, halfExtent, 0);
}

8
android/filament-android/src/main/cpp/TransformManager.cpp
View File

@@ -59,7 +59,7 @@ Java_com_google_android_filament_TransformManager_nCreateArray(JNIEnv* env,
if (localTransform_) {
jfloat *localTransform = env->GetFloatArrayElements(localTransform_, NULL);
tm->create(entity, (TransformManager::Instance) parent,
*reinterpret_cast<const math::mat4f *>(localTransform));
*reinterpret_cast<const filament::math::mat4f *>(localTransform));
env->ReleaseFloatArrayElements(localTransform_, localTransform, JNI_ABORT);
} else {
tm->create(entity, (TransformManager::Instance) parent);
@@ -90,7 +90,7 @@ Java_com_google_android_filament_TransformManager_nSetTransform(JNIEnv* env,
TransformManager* tm = (TransformManager*) nativeTransformManager;
jfloat *localTransform = env->GetFloatArrayElements(localTransform_, NULL);
tm->setTransform((TransformManager::Instance) i,
*reinterpret_cast<const math::mat4f *>(localTransform));
*reinterpret_cast<const filament::math::mat4f *>(localTransform));
env->ReleaseFloatArrayElements(localTransform_, localTransform, JNI_ABORT);
}
@@ -100,7 +100,7 @@ Java_com_google_android_filament_TransformManager_nGetTransform(JNIEnv* env,
jfloatArray outLocalTransform_) {
TransformManager* tm = (TransformManager*) nativeTransformManager;
jfloat *outLocalTransform = env->GetFloatArrayElements(outLocalTransform_, NULL);
*reinterpret_cast<math::mat4f *>(outLocalTransform) = tm->getTransform(
*reinterpret_cast<filament::math::mat4f *>(outLocalTransform) = tm->getTransform(
(TransformManager::Instance) i);
env->ReleaseFloatArrayElements(outLocalTransform_, outLocalTransform, 0);
}
@@ -111,7 +111,7 @@ Java_com_google_android_filament_TransformManager_nGetWorldTransform(JNIEnv* env
jfloatArray outWorldTransform_) {
TransformManager* tm = (TransformManager*) nativeTransformManager;
jfloat *outWorldTransform = env->GetFloatArrayElements(outWorldTransform_, NULL);
*reinterpret_cast<math::mat4f *>(outWorldTransform) = tm->getWorldTransform(
*reinterpret_cast<filament::math::mat4f *>(outWorldTransform) = tm->getWorldTransform(
(TransformManager::Instance) i);
env->ReleaseFloatArrayElements(outWorldTransform_, outWorldTransform, 0);
}

4
android/filament-android/src/main/cpp/View.cpp
View File

@@ -134,8 +134,8 @@ Java_com_google_android_filament_View_nSetDynamicResolutionOptions(JNIEnv*,
options.targetFrameTimeMilli = targetFrameTimeMilli;
options.headRoomRatio = headRoomRatio;
options.scaleRate = scaleRate;
options.minScale = math::float2{minScale};
options.maxScale = math::float2{maxScale};
options.minScale = filament::math::float2{minScale};
options.maxScale = filament::math::float2{maxScale};
options.history = (uint8_t) history;
view->setDynamicResolutionOptions(options);
}