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

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);
}