TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2019-03-17 00:20:43 +01:00
commit 8194f53206
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -191,7 +191,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
```

2
makepanda/makepanda.py
View File

@ -5156,7 +5156,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/

2
panda/src/distort/oSphereLens.cxx
View File

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