From 6cbc7ac22f79163ace11303373da540a3583fd44 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 16 Mar 2019 23:57:23 +0100 Subject: [PATCH 1/3] makepanda: fix missing Python link when building on Android [skip ci] --- makepanda/makepanda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 5d140f939c..b15e78151f 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -5218,7 +5218,7 @@ if (not RUNTIME and GetTarget() == 'android'): TargetAdd('libppython.dll', input='libp3framework.dll') TargetAdd('libppython.dll', input='libp3android.dll') TargetAdd('libppython.dll', input=COMMON_PANDA_LIBS) - TargetAdd('libppython.dll', opts=['MODULE', 'ANDROID']) + TargetAdd('libppython.dll', opts=['MODULE', 'ANDROID', 'PYTHON']) # # DIRECTORY: panda/src/androiddisplay/ From 9a26b5fd08d3b39eda5aa398cfb62be93649e3c3 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 17 Mar 2019 00:06:53 +0100 Subject: [PATCH 2/3] readme: suggest --no-tiff for Android build command This is because building with tiff seems to have an issue on termux, and it's not actually necessary to build any of the image loaders on Android as we can use the built-in Android APIs. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a897f87ec..7002275d13 100644 --- a/README.md +++ b/README.md @@ -192,7 +192,7 @@ pkg install python-dev termux-tools ndk-stl ndk-sysroot clang libvorbis-dev libo Then, you can build and install the .apk right away using these commands: ```bash -python makepanda/makepanda.py --everything --target android-21 --installer +python makepanda/makepanda.py --everything --target android-21 --no-tiff --installer xdg-open panda3d.apk ``` From 029d7363cd61af37e6521b36b6a82e11554c0570 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 17 Mar 2019 00:17:11 +0100 Subject: [PATCH 3/3] distort: fix use of cylindrical_k in oSphereLens.cxx --- panda/src/distort/oSphereLens.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/distort/oSphereLens.cxx b/panda/src/distort/oSphereLens.cxx index 7b8bd35591..9175453fd9 100644 --- a/panda/src/distort/oSphereLens.cxx +++ b/panda/src/distort/oSphereLens.cxx @@ -48,7 +48,7 @@ do_extrude(const Lens::CData *lens_cdata, LPoint3 f = point2d * do_get_film_mat_inv(lens_cdata); PN_stdfloat focal_length = do_get_focal_length(lens_cdata); - PN_stdfloat angle = f[0] * cylindrical_k / focal_length; + PN_stdfloat angle = f[0] * ospherical_k / focal_length; PN_stdfloat sinAngle, cosAngle; csincos(deg_2_rad(angle), &sinAngle, &cosAngle);