RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from panda3d/master 

Merge from upstream
This commit is contained in:
John Cote 2020-01-05 23:35:28 -05:00 committed by GitHub
parent eaba17d095 aad8b45df4
commit 10d41311a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 287 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
README.md
View File

@ -52,11 +52,11 @@ Building Panda3D
Windows
-------
You can build Panda3D with the Microsoft Visual C++ 2015 or 2017 compiler,
You can build Panda3D with the Microsoft Visual C++ 2015, 2017 or 2019 compiler,
which can be downloaded for free from the [Visual Studio site](https://visualstudio.microsoft.com/downloads/).
You will also need to install the [Windows 10 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk),
and if you intend to target Windows XP, you will also need the
[Windows 7.1 SDK](https://www.microsoft.com/en-us/download/details.aspx?id=8279).
and if you intend to target Windows XP, you will also need the Windows 7.1A
SDK (which can be installed from the Visual Studio Installer).
You will also need to have the third-party dependency libraries available for
the build scripts to use. These are available from one of these two URLs,
@ -64,16 +64,17 @@ depending on whether you are on a 32-bit or 64-bit system, or you can
[click here](https://github.com/rdb/panda3d-thirdparty) for instructions on
building them from source.
https://www.panda3d.org/download/panda3d-1.10.4.1/panda3d-1.10.4.1-tools-win64.zip
https://www.panda3d.org/download/panda3d-1.10.4.1/panda3d-1.10.4.1-tools-win32.zip
- https://www.panda3d.org/download/panda3d-1.10.5/panda3d-1.10.5-tools-win64.zip
- https://www.panda3d.org/download/panda3d-1.10.5/panda3d-1.10.5-tools-win32.zip
After acquiring these dependencies, you may simply build Panda3D from the
command prompt using the following command. (Change `14.1` to `14` if you are
using Visual C++ 2015 instead of 2017. Add the `--windows-sdk=10` option if
you don't need to support Windows XP and did not install the Windows 7.1 SDK.)
After acquiring these dependencies, you can build Panda3D from the command
prompt using the following command. Change the `--msvc-version` option based
on your version of Visual C++; 2019 is 14.2, 2017 is 14.1, and 2015 is 14.
Remove the `--windows-sdk=10` option if you need to support Windows XP, which
requires the Windows 7.1A SDK.
```bash
makepanda\makepanda.bat --everything --installer --msvc-version=14.1 --no-eigen --threads=2
makepanda\makepanda.bat --everything --installer --msvc-version=14.2 --windows-sdk=10 --no-eigen --threads=2
```
When the build succeeds, it will produce an .exe file that you can use to

5
direct/src/dist/commands.py vendored
View File

@ -41,9 +41,8 @@ if sys.version_info < (3, 0):
# Warn the user. They might be using Python 2 by accident.
print("=================================================================")
print("WARNING: You are using Python 2, which will soon be discontinued.")
print("WARNING: Please use Python 3 for best results and continued")
print("WARNING: support after the EOL date of December 31st, 2019.")
print("WARNING: You are using Python 2, which has reached the end of its")
print("WARNING: life as of January 1, 2020. Please upgrade to Python 3.")
print("=================================================================")
sys.stdout.flush()
time.sleep(4.0)

2
direct/src/tkpanels/AnimPanel.py
View File

@ -276,7 +276,7 @@ class AnimPanel(AppShell):
title = 'Load Animation',
parent = self.component('hull')
)
if not animFilename:
if not animFilename or animFilename == 'None':
# no file selected, canceled
return

2
direct/src/tkpanels/MopathRecorder.py
View File

@ -1638,7 +1638,7 @@ class MopathRecorder(AppShell, DirectObject):
initialdir = path,
title = 'Load Nurbs Curve',
parent = self.parent)
if mopathFilename:
if mopathFilename and mopathFilename != 'None':
self.reset()
nodePath = loader.loadModel(
Filename.fromOsSpecific(mopathFilename))

2
direct/src/tkpanels/ParticlePanel.py
View File

@ -1272,7 +1272,7 @@ class ParticlePanel(AppShell):
initialdir = path,
title = 'Load Particle Effect',
parent = self.parent)
if particleFilename:
if particleFilename and particleFilename != 'None':
# Delete existing particles and forces
self.particleEffect.loadConfig(
Filename.fromOsSpecific(particleFilename))

61
doc/ReleaseNotes
View File

@ -1,3 +1,64 @@
------------------------ RELEASE 1.10.5 -----------------------
This is a recommended bugfix release, especially for macOS users.
* Fix DPI scaling issue in macOS 10.15 "Catalina" (#794)
* Fix crash on macOS Catalina without "Input Monitoring" permission (#795)
* macOS installer now installs to /Library/Developer/Panda3D (#760)
* macOS thirdparty packages are now linked with libc++ (#584)
* Homebrew Python should now locate Panda libraries correctly (#755)
* Work around Tk bug cancelling Load Params in Particle Panel on macOS (#811)
* Fix NaN assertions when particles get very large positions (#822)
* Add support for Autodesk Maya 2020
* Fix maya2egg erroring when running from a pip installation (#709)
* Support .pz and .gz compressed models in deployment system
* Support implicit namespace packages in deployment system (#778)
* Fix error with distutils package when deploying in a "virtualenv" env (#747)
* Fix "NameError: name 'mdef' is not defined" error when deploying (#721)
* Deployment system now strips weird -psn_* argument passed to macOS GUI apps
* Fix custom loader hooks sometimes not working with Actor (#750)
* Fix defaults for package_data_dirs in deployment system (#779)
* Fix issues with adding icons to deployed executable (#718)
* Add PNMImage.quantize() that palettizes using median cut algorithm
* Fix stereo and MRT FBO rendering in OpenGL ES (#815)
* RTM_copy_ram mode is now fixed for multiview textures in OpenGL
* Fix OpenGL multisample FBO issue with 16-bit float buffer (#756)
* Fix DirectX 9 crash when resizing vertex buffer in certain ways (#824)
* Workaround for infinite loop in Triangulator for certain polygons (#737)
* Fix dcparser issue with unpacking uint64 and int64 (#751)
* Fix ability to compile dcparser outside of the Panda3D codebase (#759)
* Fix all direct.stdpy.threading2 threads behaving daemonically (#758)
* direct.stdpy.threading2.Thread instances provide daemon and name properties
* Workaround for Tkinter crash on Windows when resizing window (#586)
* Fix possible stack overflow when reading many bytes from a stream (#754)
* Fix mouse confinement region on Windows not updating on window resize (#727)
* Fix mouse confinement being lost on Windows when window loses focus (#729)
* Support adjusting particle birth offset time (#769)
* Support building against OpenEXR 2.4 on Windows (#799)
* Fix ability to pass a tuple to loader.loadModel
* Fix an issue in interrogate with generating C bindings (#722)
* Fix a variety of ABI compatibility issues with NDEBUG builds
* Fix static linking of harfbuzz and freetype in makepanda
* Fix ability to specify --python-incdir and -libdir to makepanda on macOS
* `ls()` and `bam-info -ls` now list included animations
* Fix white ambient color when loading PBR materials from .bam/cache (#828)
* Fix inconsistent behavior when passing small values to shader inputs (#827)
* Fix very rare NVIDIA driver crash when mixing GLSL and Cg shaders
* Fix issue passing unicode to DirectScrolledList (#752)
* Fix interrogate parser issue with function-like macro expansion
* Interrogate now finds types nested in explicitly specialized template class
* Improve performance reading all data from a file with direct.stdpy.file
* PandaSystem now records whether libc++ or libstdc++ was used on macOS
* makepanda.bat now builds against Python 3.7 by default
* Many improvements to API documentation
* pandac/input/*.in interrogatedb files are now included in .whl builds
* Fix division exception in ServerRepository (#762)
* Fix ShaderBuffer contexts not being cleared at GSG destruction
* Fix DirectOptionMenu item text scale reset on item unhighlight (#768)
* Python particle classes now have snake-case aliases
* Fix crash printing out cached buffer contexts
* Rudimentary, experimental, low-level handling of digitizer input devices
------------------------ RELEASE 1.10.4.1 ---------------------
This release fixes only one critical regression: calling destroy()

10
makepanda/installer.nsi
View File

@ -136,12 +136,8 @@ var MANPAGE
!if "${PYVER}" == "${INCLUDE_PYVER}"
SectionIn 1 2 3
!else
!if "${PYVER}" == "2.7"
SectionIn 1 2
!else
; See .onInit function where this is dynamically enabled.
SectionIn 2
!endif
; See .onInit function where this is dynamically enabled.
SectionIn 2
!endif
SetDetailsPrint both
@ -528,7 +524,7 @@ Function .onInit
SetRegView ${REGVIEW}
!endif
; We never check for 2.7; it is always enabled in Auto mode
; We never check for 2.7; it is always disabled in Auto mode
!if "${REGVIEW}" == "32"
!insertmacro MaybeEnablePyBindingSection 3.5-32
!insertmacro MaybeEnablePyBindingSection 3.6-32

190
makepanda/makepackage.py
View File

@ -112,6 +112,18 @@ flatsize: INSTSIZEMB
deps: {DEPENDS}
"""
# Since we're adding a bunch of install scripts to the macOS intaller, we'll
# put the platform-checking code in some variables to reduce repetition.
MACOS_SCRIPT_PREFIX = \
"""#!/bin/bash
IFS=.
read -a version_info <<< "`sw_vers -productVersion`'"
if (( ${version_info[1]} < 15 )); then
"""
MACOS_SCRIPT_POSTFIX = \
"""fi
"""
def MakeInstallerNSIS(version, file, title, installdir, compressor="lzma", **kwargs):
outputdir = GetOutputDir()
@ -364,9 +376,12 @@ def MakeInstallerLinux(version, debversion=None, rpmrelease=1,
exit("To build an installer, either rpmbuild or dpkg-deb must be present on your system!")
def MakeInstallerOSX(version, python_versions=[], **kwargs):
def MakeInstallerOSX(version, python_versions=[], installdir=None, **kwargs):
outputdir = GetOutputDir()
if installdir is None:
installdir = "/Library/Developer/Panda3D"
dmg_name = "Panda3D-" + version
if len(python_versions) == 1 and not python_versions[0]["version"].startswith("2."):
dmg_name += "-py" + python_versions[0]["version"]
@ -376,40 +391,38 @@ def MakeInstallerOSX(version, python_versions=[], **kwargs):
if (os.path.exists("dstroot")): oscmd("rm -rf dstroot")
if (os.path.exists("Panda3D-rw.dmg")): oscmd('rm -f Panda3D-rw.dmg')
oscmd("mkdir -p dstroot/base/Developer/Panda3D/lib")
oscmd("mkdir -p dstroot/base/Developer/Panda3D/etc")
oscmd("cp %s/etc/Config.prc dstroot/base/Developer/Panda3D/etc/Config.prc" % outputdir)
oscmd("cp %s/etc/Confauto.prc dstroot/base/Developer/Panda3D/etc/Confauto.prc" % outputdir)
oscmd("cp -R %s/models dstroot/base/Developer/Panda3D/models" % outputdir)
oscmd("cp -R doc/LICENSE dstroot/base/Developer/Panda3D/LICENSE")
oscmd("cp -R doc/ReleaseNotes dstroot/base/Developer/Panda3D/ReleaseNotes")
oscmd("cp -R %s/Frameworks dstroot/base/Developer/Panda3D/Frameworks" % outputdir)
oscmd("mkdir -p dstroot/base/%s/lib" % installdir)
oscmd("mkdir -p dstroot/base/%s/etc" % installdir)
oscmd("cp %s/etc/Config.prc dstroot/base/%s/etc/Config.prc" % (outputdir, installdir))
oscmd("cp %s/etc/Confauto.prc dstroot/base/%s/etc/Confauto.prc" % (outputdir, installdir))
oscmd("cp -R %s/models dstroot/base/%s/models" % (outputdir, installdir))
oscmd("cp -R doc/LICENSE dstroot/base/%s/LICENSE" % installdir)
oscmd("cp -R doc/ReleaseNotes dstroot/base/%s/ReleaseNotes" % installdir)
oscmd("cp -R %s/Frameworks dstroot/base/%s/Frameworks" % (outputdir, installdir))
if os.path.isdir(outputdir+"/plugins"):
oscmd("cp -R %s/plugins dstroot/base/Developer/Panda3D/plugins" % outputdir)
oscmd("cp -R %s/plugins dstroot/base/%s/plugins" % (outputdir, installdir))
# Libraries that shouldn't be in base, but are instead in other modules.
no_base_libs = ['libp3ffmpeg', 'libp3fmod_audio', 'libfmodex', 'libfmodexL']
for base in os.listdir(outputdir+"/lib"):
if not base.endswith(".a") and base.split('.')[0] not in no_base_libs:
libname = "dstroot/base/Developer/Panda3D/lib/" + base
libname = ("dstroot/base/%s/lib/" % installdir) + base
# We really need to specify -R in order not to follow symlinks
# On OSX, just specifying -P is not enough to do that.
oscmd("cp -R -P " + outputdir + "/lib/" + base + " " + libname)
oscmd("mkdir -p dstroot/tools/Developer/Panda3D/bin")
oscmd("mkdir -p dstroot/tools/Developer/Tools")
oscmd("ln -s ../Panda3D/bin dstroot/tools/Developer/Tools/Panda3D")
oscmd("mkdir -p dstroot/tools/%s/bin" % installdir)
oscmd("mkdir -p dstroot/tools/etc/paths.d")
# Trailing newline is important, works around a bug in OSX
WriteFile("dstroot/tools/etc/paths.d/Panda3D", "/Developer/Panda3D/bin\n")
WriteFile("dstroot/tools/etc/paths.d/Panda3D", "/%s/bin\n" % installdir)
oscmd("mkdir -m 0755 -p dstroot/tools/usr/local/share/man/man1")
oscmd("install -m 0644 doc/man/*.1 dstroot/tools/usr/local/share/man/man1/")
for base in os.listdir(outputdir+"/bin"):
if not base.startswith("deploy-stub"):
binname = "dstroot/tools/Developer/Panda3D/bin/" + base
binname = ("dstroot/tools/%s/bin/" % installdir) + base
# OSX needs the -R argument to copy symbolic links correctly, it doesn't have -d. How weird.
oscmd("cp -R " + outputdir + "/bin/" + base + " " + binname)
@ -419,72 +432,72 @@ def MakeInstallerOSX(version, python_versions=[], **kwargs):
oscmd("mkdir -p dstroot/pythoncode/usr/local/bin")
oscmd("ln -s %s dstroot/pythoncode/usr/local/bin/ppython" % (python_versions[0]["executable"]))
oscmd("mkdir -p dstroot/pythoncode/Developer/Panda3D/panda3d")
oscmd("cp -R %s/pandac dstroot/pythoncode/Developer/Panda3D/pandac" % outputdir)
oscmd("cp -R %s/direct dstroot/pythoncode/Developer/Panda3D/direct" % outputdir)
oscmd("cp -R %s/*.so dstroot/pythoncode/Developer/Panda3D/" % outputdir, True)
oscmd("cp -R %s/*.py dstroot/pythoncode/Developer/Panda3D/" % outputdir, True)
oscmd("mkdir -p dstroot/pythoncode/%s/panda3d" % installdir)
oscmd("cp -R %s/pandac dstroot/pythoncode/%s/pandac" % (outputdir, installdir))
oscmd("cp -R %s/direct dstroot/pythoncode/%s/direct" % (outputdir, installdir))
oscmd("cp -R %s/*.so dstroot/pythoncode/%s/" % (outputdir, installdir), True)
oscmd("cp -R %s/*.py dstroot/pythoncode/%s/" % (outputdir, installdir), True)
if os.path.isdir(outputdir+"/Pmw"):
oscmd("cp -R %s/Pmw dstroot/pythoncode/Developer/Panda3D/Pmw" % outputdir)
oscmd("cp -R %s/Pmw dstroot/pythoncode/%s/Pmw" % (outputdir, installdir))
# Copy over panda3d.dist-info directory.
if os.path.isdir(outputdir + "/panda3d.dist-info"):
oscmd("cp -R %s/panda3d.dist-info dstroot/pythoncode/Developer/Panda3D/panda3d.dist-info" % (outputdir))
oscmd("cp -R %s/panda3d.dist-info dstroot/pythoncode/%s/panda3d.dist-info" % (outputdir, installdir))
for base in os.listdir(outputdir+"/panda3d"):
if base.endswith('.py'):
libname = "dstroot/pythoncode/Developer/Panda3D/panda3d/" + base
libname = ("dstroot/pythoncode/%s/panda3d/" % installdir) + base
oscmd("cp -R " + outputdir + "/panda3d/" + base + " " + libname)
for version_info in python_versions:
pyver = version_info["version"]
oscmd("mkdir -p dstroot/pybindings%s/Library/Python/%s/site-packages" % (pyver, pyver))
oscmd("mkdir -p dstroot/pybindings%s/Developer/Panda3D/panda3d" % (pyver))
oscmd("mkdir -p dstroot/pybindings%s/%s/panda3d" % (pyver, installdir))
# Copy over extension modules.
suffix = version_info["ext_suffix"]
for base in os.listdir(outputdir+"/panda3d"):
if base.endswith(suffix) and '.' not in base[:-len(suffix)]:
libname = "dstroot/pybindings%s/Developer/Panda3D/panda3d/%s" % (pyver, base)
libname = "dstroot/pybindings%s/%s/panda3d/%s" % (pyver, installdir, base)
# We really need to specify -R in order not to follow symlinks
# On OSX, just specifying -P is not enough to do that.
oscmd("cp -R -P " + outputdir + "/panda3d/" + base + " " + libname)
# Write a .pth file.
oscmd("mkdir -p dstroot/pybindings%s/Library/Python/%s/site-packages" % (pyver, pyver))
WriteFile("dstroot/pybindings%s/Library/Python/%s/site-packages/Panda3D.pth" % (pyver, pyver), "/Developer/Panda3D")
WriteFile("dstroot/pybindings%s/Library/Python/%s/site-packages/Panda3D.pth" % (pyver, pyver), installdir)
# Somewhere in Python 2.7.13 and 3.7, the above path was removed from
# sys.path of the python.org distribution. See bpo-28440 and GH #502.
if pyver not in ("3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6"):
dir = "dstroot/pybindings%s/Library/Frameworks/Python.framework/Versions/%s/lib/python%s/site-packages" % (pyver, pyver, pyver)
oscmd("mkdir -p %s" % (dir))
WriteFile("%s/Panda3D.pth" % (dir), "/Developer/Panda3D")
WriteFile("%s/Panda3D.pth" % (dir), installdir)
# Also place it somewhere the Homebrew version of Python can find it.
dir = "dstroot/pybindings%s/usr/local/lib/python%s/site-packages" % (pyver, pyver)
oscmd("mkdir -p %s" % (dir))
WriteFile("%s/Panda3D.pth" % (dir), "/Developer/Panda3D")
WriteFile("%s/Panda3D.pth" % (dir), installdir)
if not PkgSkip("FFMPEG"):
oscmd("mkdir -p dstroot/ffmpeg/Developer/Panda3D/lib")
oscmd("cp -R %s/lib/libp3ffmpeg.* dstroot/ffmpeg/Developer/Panda3D/lib/" % outputdir)
oscmd("mkdir -p dstroot/ffmpeg/%s/lib" % installdir)
oscmd("cp -R %s/lib/libp3ffmpeg.* dstroot/ffmpeg/%s/lib/" % (outputdir, installdir))
#if not PkgSkip("OPENAL"):
# oscmd("mkdir -p dstroot/openal/Developer/Panda3D/lib")
# oscmd("cp -R %s/lib/libp3openal_audio.* dstroot/openal/Developer/Panda3D/lib/" % outputdir)
if not PkgSkip("FMODEX"):
oscmd("mkdir -p dstroot/fmodex/Developer/Panda3D/lib")
oscmd("cp -R %s/lib/libp3fmod_audio.* dstroot/fmodex/Developer/Panda3D/lib/" % outputdir)
oscmd("cp -R %s/lib/libfmodex* dstroot/fmodex/Developer/Panda3D/lib/" % outputdir)
oscmd("mkdir -p dstroot/fmodex/%s/lib" % installdir)
oscmd("cp -R %s/lib/libp3fmod_audio.* dstroot/fmodex/%s/lib/" % (outputdir, installdir))
oscmd("cp -R %s/lib/libfmodex* dstroot/fmodex/%s/lib/" % (outputdir, installdir))
oscmd("mkdir -p dstroot/headers/Developer/Panda3D/lib")
oscmd("cp -R %s/include dstroot/headers/Developer/Panda3D/include" % outputdir)
oscmd("mkdir -p dstroot/headers/%s/lib" % installdir)
oscmd("cp -R %s/include dstroot/headers/%s/include" % (outputdir, installdir))
if os.path.isdir("samples"):
oscmd("mkdir -p dstroot/samples/Developer/Examples/Panda3D")
oscmd("cp -R samples/* dstroot/samples/Developer/Examples/Panda3D/")
oscmd("mkdir -p dstroot/samples/%s/samples" % installdir)
oscmd("cp -R samples/* dstroot/samples/%s/samples" % installdir)
DeleteVCS("dstroot")
DeleteBuildFiles("dstroot")
@ -492,11 +505,11 @@ def MakeInstallerOSX(version, python_versions=[], **kwargs):
# Compile Python files. Do this *after* the DeleteVCS step, above, which
# deletes __pycache__ directories.
for version_info in python_versions:
if os.path.isdir("dstroot/pythoncode/Developer/Panda3D/Pmw"):
oscmd("%s -m compileall -q -f -d /Developer/Panda3D/Pmw dstroot/pythoncode/Developer/Panda3D/Pmw" % (version_info["executable"]), True)
oscmd("%s -m compileall -q -f -d /Developer/Panda3D/direct dstroot/pythoncode/Developer/Panda3D/direct" % (version_info["executable"]))
oscmd("%s -m compileall -q -f -d /Developer/Panda3D/pandac dstroot/pythoncode/Developer/Panda3D/pandac" % (version_info["executable"]))
oscmd("%s -m compileall -q -f -d /Developer/Panda3D/panda3d dstroot/pythoncode/Developer/Panda3D/panda3d" % (version_info["executable"]))
if os.path.isdir("dstroot/pythoncode/%s/Pmw" % installdir):
oscmd("%s -m compileall -q -f -d %s/Pmw dstroot/pythoncode/%s/Pmw" % (version_info["executable"], installdir, installdir), True)
oscmd("%s -m compileall -q -f -d %s/direct dstroot/pythoncode/%s/direct" % (version_info["executable"], installdir, installdir))
oscmd("%s -m compileall -q -f -d %s/pandac dstroot/pythoncode/%s/pandac" % (version_info["executable"], installdir, installdir))
oscmd("%s -m compileall -q -f -d %s/panda3d dstroot/pythoncode/%s/panda3d" % (version_info["executable"], installdir, installdir))
oscmd("chmod -R 0775 dstroot/*")
# We need to be root to perform a chown. Bleh.
@ -507,6 +520,55 @@ def MakeInstallerOSX(version, python_versions=[], **kwargs):
oscmd("mkdir -p dstroot/Panda3D/Panda3D.mpkg/Contents/Resources/en.lproj/")
pkgs = ["base", "tools", "headers"]
# Starting with 1.10.5, Panda3D is installed by default in
# /Library/Developer/Panda3D instead of /Developer/Panda3D. To keep
# compatibility for those who rely on the old location, we add a symlink
# if they're running macOS 10.14 or less. We also remove the old
# installation.
script_components = set()
def write_script(component, phase, contents):
if installdir == "/Developer/Panda3D": return
script_components.add(component)
oscmd("mkdir -p dstroot/scripts/%s" % component)
ln_script = open("dstroot/scripts/%s/%s" % (component, phase), "w")
ln_script.write(MACOS_SCRIPT_PREFIX)
ln_script.write(contents)
ln_script.write(MACOS_SCRIPT_POSTFIX)
ln_script.close()
oscmd("chmod +x dstroot/scripts/%s/%s" % (component, phase))
write_script('base', 'postinstall', """
pkgutil --pkg-info org.panda3d.panda3d.base.pkg
if [ $? = 0 ]; then
rm -rf /Developer/Panda3D
fi
mkdir -p /Developer
ln -s %s /Developer/Panda3D
""" % installdir)
# We don't specify rm -r since /Developer/Panda3D/Tools is a symlink
write_script('tools', 'postinstall', """
pkgutil --pkg-info org.panda3d.panda3d.tools.pkg
if [ $? = 0 ]; then
rm -f /Developer/Tools/Panda3D
fi
mkdir -p /Developer/Tools
ln -s %s/bin /Developer/Tools/Panda3D
""" % installdir)
if os.path.isdir("samples"):
pkgs.append("samples")
write_script('samples', 'postinstall', """
pkgutil --pkg-info org.panda3d.panda3d.samples.pkg
if [ $? = 0 ]; then
rm -f /Developer/Examples/Panda3D
fi
mkdir -p /Developer/Examples
ln -s %s/samples /Developer/Examples/Panda3D
""" % installdir)
if python_versions:
pkgs.append("pythoncode")
for version_info in python_versions:
@ -514,17 +576,23 @@ def MakeInstallerOSX(version, python_versions=[], **kwargs):
if not PkgSkip("FFMPEG"): pkgs.append("ffmpeg")
#if not PkgSkip("OPENAL"): pkgs.append("openal")
if not PkgSkip("FMODEX"): pkgs.append("fmodex")
if os.path.isdir("samples"): pkgs.append("samples")
for pkg in pkgs:
identifier = "org.panda3d.panda3d.%s.pkg" % pkg
scripts_path = "dstroot/scripts/%s" % pkg
plist = open("/tmp/Info_plist", "w")
plist.write(Info_plist.format(package_id=identifier, version=version))
plist.close()
if not os.path.isdir("dstroot/" + pkg):
os.makedirs("dstroot/" + pkg)
if pkg in script_components:
pkg_scripts = ' --scripts ' + scripts_path
else:
pkg_scripts = ''
if os.path.exists("/usr/bin/pkgbuild"):
cmd = '/usr/bin/pkgbuild --identifier ' + identifier + ' --version ' + version + ' --root dstroot/' + pkg + '/ dstroot/Panda3D/Panda3D.mpkg/Contents/Packages/' + pkg + '.pkg'
cmd = '/usr/bin/pkgbuild --identifier ' + identifier + ' --version ' + version + ' --root dstroot/' + pkg + '/ dstroot/Panda3D/Panda3D.mpkg/Contents/Packages/' + pkg + '.pkg' + pkg_scripts
else:
exit("pkgbuild could not be found!")
oscmd(cmd)
@ -568,23 +636,23 @@ def MakeInstallerOSX(version, python_versions=[], **kwargs):
dist.write(' <line choice="fmodex"/>\n')
dist.write(' <line choice="headers"/>\n')
dist.write(' </choices-outline>\n')
dist.write(' <choice id="base" title="Panda3D Base Installation" description="This package contains the Panda3D libraries, configuration files and models/textures that are needed to use Panda3D.&#10;&#10;Location: /Developer/Panda3D/" start_enabled="false">\n')
dist.write(' <choice id="base" title="Panda3D Base Installation" description="This package contains the Panda3D libraries, configuration files and models/textures that are needed to use Panda3D.&#10;&#10;Location: %s/" start_enabled="false">\n' % installdir)
dist.write(' <pkg-ref id="org.panda3d.panda3d.base.pkg"/>\n')
dist.write(' </choice>\n')
dist.write(' <choice id="tools" title="Tools" tooltip="Useful tools and model converters to help with Panda3D development" description="This package contains the various utilities that ship with Panda3D, including packaging tools, model converters, and many more.&#10;&#10;Location: /Developer/Panda3D/bin/">\n')
dist.write(' <choice id="tools" title="Tools" tooltip="Useful tools and model converters to help with Panda3D development" description="This package contains the various utilities that ship with Panda3D, including packaging tools, model converters, and many more.&#10;&#10;Location: %s/bin/">\n' % installdir)
dist.write(' <pkg-ref id="org.panda3d.panda3d.tools.pkg"/>\n')
dist.write(' </choice>\n')
if python_versions:
dist.write(' <choice id="pythoncode" title="Python Support" tooltip="Python bindings for the Panda3D libraries" description="This package contains the \'direct\', \'pandac\' and \'panda3d\' python packages that are needed to do Python development with Panda3D.&#10;&#10;Location: /Developer/Panda3D/">\n')
dist.write(' <choice id="pythoncode" title="Python Support" tooltip="Python bindings for the Panda3D libraries" description="This package contains the \'direct\', \'pandac\' and \'panda3d\' python packages that are needed to do Python development with Panda3D.&#10;&#10;Location: %s/">\n' % installdir)
dist.write(' <pkg-ref id="org.panda3d.panda3d.pythoncode.pkg"/>\n')
dist.write(' </choice>\n')
for version_info in python_versions:
pyver = version_info["version"]
if pyver == "2.7":
# Always install Python 2.7 by default; it's included on macOS.
cond = "true"
if pyver in ("2.7", "3.4"):
# Don't install these EOL versions of Python by default.
cond = "false"
else:
cond = "isPythonVersionInstalled('%s')" % (pyver)
dist.write(' <choice id="pybindings%s" start_selected="%s" title="Python %s Bindings" tooltip="Python bindings for the Panda3D libraries" description="Support for Python %s.">\n' % (pyver, cond, pyver, pyver))
@ -615,11 +683,11 @@ def MakeInstallerOSX(version, python_versions=[], **kwargs):
dist.write(' </choice>\n')
if os.path.isdir("samples"):
dist.write(' <choice id="samples" title="Sample Programs" tooltip="Python sample programs that use Panda3D" description="This package contains the Python sample programs that can help you with learning how to use Panda3D.&#10;&#10;Location: /Developer/Examples/Panda3D/">\n')
dist.write(' <choice id="samples" title="Sample Programs" tooltip="Python sample programs that use Panda3D" description="This package contains the Python sample programs that can help you with learning how to use Panda3D.&#10;&#10;Location: %s/samples">\n' % installdir)
dist.write(' <pkg-ref id="org.panda3d.panda3d.samples.pkg"/>\n')
dist.write(' </choice>\n')
dist.write(' <choice id="headers" title="C++ Header Files" tooltip="Header files for C++ development with Panda3D" description="This package contains the C++ header files that are needed in order to do C++ development with Panda3D. You don\'t need this if you want to develop in Python.&#10;&#10;Location: /Developer/Panda3D/include/" start_selected="false">\n')
dist.write(' <choice id="headers" title="C++ Header Files" tooltip="Header files for C++ development with Panda3D" description="This package contains the C++ header files that are needed in order to do C++ development with Panda3D. You don\'t need this if you want to develop in Python.&#10;&#10;Location: %s/include/" start_selected="false">\n' % installdir)
dist.write(' <pkg-ref id="org.panda3d.panda3d.headers.pkg"/>\n')
dist.write(' </choice>\n')
for pkg in pkgs:
@ -882,24 +950,28 @@ def MakeInstallerAndroid(version, **kwargs):
def MakeInstaller(version, **kwargs):
target = GetTarget()
if target == 'windows':
dir = kwargs.pop('installdir', None)
if dir is None:
dir = "C:\\Panda3D-" + version
if GetTargetArch() == 'x64':
dir += '-x64'
fn = "Panda3D-"
dir = "Panda3D-" + version
title = "Panda3D SDK " + version
fn += version
python_versions = kwargs.get('python_versions', [])
if len(python_versions) == 1 and python_versions[0]["version"] != "2.7":
if len(python_versions) == 1:
fn += '-py' + python_versions[0]["version"]
if GetOptimize() <= 2:
fn += "-dbg"
if GetTargetArch() == 'x64':
fn += '-x64'
dir += '-x64'
MakeInstallerNSIS(version, fn + '.exe', title, 'C:\\' + dir, **kwargs)
MakeInstallerNSIS(version, fn + '.exe', title, dir, **kwargs)
MakeDebugSymbolArchive(fn + '-pdb.zip', dir)
elif target == 'linux':
MakeInstallerLinux(version, **kwargs)
@ -923,6 +995,7 @@ if __name__ == "__main__":
parser.add_option('', '--outputdir', dest='outputdir', help='Makepanda\'s output directory (default: built)', default='built')
parser.add_option('', '--verbose', dest='verbose', help='Enable verbose output', action='store_true', default=False)
parser.add_option('', '--lzma', dest='compressor', help='Use LZMA compression', action='store_const', const='lzma', default='zlib')
parser.add_option('', '--installdir', dest='installdir', help='Where on the system the installer should put the SDK (Windows, macOS)')
(options, args) = parser.parse_args()
SetVerbose(options.verbose)
@ -955,4 +1028,5 @@ if __name__ == "__main__":
compressor=options.compressor,
debversion=options.debversion,
rpmrelease=options.rpmrelease,
python_versions=ReadPythonVersionInfoFile())
python_versions=ReadPythonVersionInfoFile(),
installdir=options.installdir)

6
makepanda/makepanda.bat
View File

@ -16,10 +16,10 @@ if %PROCESSOR_ARCHITECTURE% == AMD64 (
set thirdparty=thirdparty
if defined MAKEPANDA_THIRDPARTY set thirdparty=%MAKEPANDA_THIRDPARTY%
if exist %thirdparty%\win-python3.7%suffix%\python.exe (
set pythondir=win-python3.7%suffix%
if exist %thirdparty%\win-python3.8%suffix%\python.exe (
set pythondir=win-python3.8%suffix%
) else (
set pythondir=win-python%suffix%
set pythondir=win-python3.7%suffix%
)
if not exist makepanda\makepanda.py goto :missing1

12
makepanda/makepanda.py
View File

@ -477,11 +477,11 @@ SdkAutoDisableSpeedTree()
if not PkgSkip("PYTHON") and SDK["PYTHONVERSION"] == "python2.7":
warn_prefix = "%sWARNING:%s " % (GetColor("red"), GetColor())
print("=========================================================================")
print(warn_prefix + "Python 2.7 will reach EOL after December 31, 2019, and will not")
print(warn_prefix + "be supported after that date. Please ensure you are prepared")
print(warn_prefix + "by planning your upgrade to Python 3 now.")
print("=========================================================================")
print("==========================================================================")
print(warn_prefix + "Python 2.7 has reached EOL as of January 1, 2020 and is no longer")
print(warn_prefix + "maintained. Panda3D will soon cease to work with this version.")
print(warn_prefix + "Please upgrade to Python 3 now.")
print("==========================================================================")
sys.stdout.flush()
# Give the user some time to contemplate their sins
time.sleep(6.0)
@ -2588,7 +2588,7 @@ __version__ = '%s'
if __debug__:
import sys
if sys.version_info < (3, 0):
sys.stderr.write("WARNING: Python 2.7 will reach EOL after December 31, 2019.\\n")
sys.stderr.write("WARNING: Python 2.7 has reached EOL as of January 1, 2020.\\n")
sys.stderr.write("To suppress this warning, upgrade to Python 3.\\n")
sys.stderr.flush()
del sys

8
panda/src/cocoadisplay/cocoaGraphicsWindow.mm
View File

@ -1116,7 +1116,9 @@ find_display_mode(int width, int height) {
}
#endif
CFArrayRef modes = CGDisplayCopyAllDisplayModes(_display, options);
CFRelease(options);
if (options != NULL) {
CFRelease(options);
}
size_t num_modes = CFArrayGetCount(modes);
CGDisplayModeRef mode;
@ -1151,12 +1153,12 @@ find_display_mode(int width, int height) {
// As explained above, we want to select the fullscreen display mode using
// the same scaling factor, but only for MacOS 10.15+ To do this we check
// the mode width and heightbut also actual pixel widh and height.
// the mode width and height but also actual pixel widh and height.
if (CGDisplayModeGetWidth(mode) == width &&
CGDisplayModeGetHeight(mode) == height &&
CGDisplayModeGetRefreshRate(mode) == refresh_rate &&
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
(floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_14 ||
(floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_14 ||
(CGDisplayModeGetPixelWidth(mode) == expected_pixel_width &&
CGDisplayModeGetPixelHeight(mode) == expected_pixel_height)) &&
#endif

6
panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx
View File

@ -615,8 +615,10 @@ release_vertex_buffer(VertexBufferContext *vbc) {
}
#endif
dvbc->_vbuffer->Release();
dvbc->_vbuffer = nullptr;
if (dvbc->_vbuffer != nullptr) {
dvbc->_vbuffer->Release();
dvbc->_vbuffer = nullptr;
}
delete dvbc;
}

5
panda/src/gobj/material.cxx
View File

@ -544,6 +544,11 @@ fillin(DatagramIterator &scan, BamReader *manager) {
}
_refractive_index = scan.get_stdfloat();
if ((_flags & (F_base_color | F_metallic)) == (F_base_color | F_metallic)) {
// Compute the ambient, diffuse and specular settings.
set_base_color(_base_color);
}
} else {
_ambient.read_datagram(scan);
_diffuse.read_datagram(scan);

2
panda/src/grutil/lineSegs.I
View File

@ -99,7 +99,7 @@ draw_to(PN_stdfloat x, PN_stdfloat y, PN_stdfloat z) {
* Creates a new GeomNode that will render the series of line segments and
* points described via calls to move_to() and draw_to(). The lines and
* points are created with the color and thickness established by calls to
* set_color() and set_thick().
* set_color() and set_thickness().
*
* If dynamic is true, the line segments will be created with the dynamic Geom
* setting, optimizing them for runtime vertex animation.

2
panda/src/grutil/lineSegs.cxx
View File

@ -164,7 +164,7 @@ get_current_position() {
* Appends to an existing GeomNode a new Geom that will render the series of
* line segments and points described via calls to move_to() and draw_to().
* The lines and points are created with the color and thickness established
* by calls to set_color() and set_thick().
* by calls to set_color() and set_thickness().
*
* If dynamic is true, the line segments will be created with the dynamic Geom
* setting, optimizing them for runtime vertex animation.

14
panda/src/pgraph/shaderInput.I
View File

@ -490,7 +490,19 @@ operator < (const ShaderInput &other) const {
return false;
case M_vector:
return _stored_vector < other._stored_vector;
if (_stored_vector[0] != other._stored_vector[0]) {
return _stored_vector[0] < other._stored_vector[0];
}
if (_stored_vector[1] != other._stored_vector[1]) {
return _stored_vector[1] < other._stored_vector[1];
}
if (_stored_vector[2] != other._stored_vector[2]) {
return _stored_vector[2] < other._stored_vector[2];
}
if (_stored_vector[3] != other._stored_vector[3]) {
return _stored_vector[3] < other._stored_vector[3];
}
return false;
case M_numeric:
return _stored_ptr._ptr < other._stored_ptr._ptr;

3
panda/src/physics/linearFrictionForce.cxx
View File

@ -61,8 +61,7 @@ get_child_vector(const PhysicsObject* po) {
physics_debug(" v "<<v<<" len "<<v.length()
<<" friction "<<friction<<" len "<<friction.length()
<<" dot "<<(normalize(v).dot(normalize(friction))));
assert(friction.almost_equal(LVector3::zero())
|| IS_NEARLY_EQUAL(normalize(v).dot(normalize(friction)), -1.0f));
assert(friction.almost_equal(LVector3::zero()) || v.dot(friction) < 0.0f);
// cary said to cap this at zero so that friction can't reverse your
// direction, but it seems to me that if you're computing: v + (-v * _coef),
// _coef in [0, 1] that this will always be greater than or equal to zero.

13
panda/src/physics/linearNoiseForce.cxx
View File

@ -89,17 +89,12 @@ get_child_vector(const PhysicsObject *po) {
LPoint3 p = po->get_position();
// get all of the components
int int_x, int_y, int_z;
PN_stdfloat int_x, int_y, int_z;
PN_stdfloat frac_x, frac_y, frac_z;
int_x = (int) p[0];
frac_x = p[0] - int_x;
int_y = (int) p[1];
frac_y = p[1] - int_y;
int_z = (int) p[2];
frac_z = p[2] - int_z;
frac_x = std::modf(p[0], &int_x);
frac_y = std::modf(p[1], &int_y);
frac_z = std::modf(p[2], &int_z);
// apply the cubic smoother to the fractional values
PN_stdfloat cubic_x, cubic_y, cubic_z;

32
tests/pgraph/test_shaderinput.py Normal file
View File

@ -0,0 +1,32 @@
from panda3d.core import ShaderInput, Vec4
def test_shaderinput_vector_compare():
i0 = ShaderInput('a', Vec4(0, 0, 0, 0))
i1 = ShaderInput('a', Vec4(1e-9, 0, 0, 0))
i2 = ShaderInput('a', Vec4(1e-8, 0, 0, 0))
i3 = ShaderInput('a', Vec4(2, 0, 0, 0))
assert i0 == i0
assert i1 == i1
assert i2 == i2
assert i3 == i3
assert i0 != i1
assert i0 != i2
assert i0 != i3
assert i1 != i2
assert i2 != i3
assert i1 != i3
assert not i0 < i0
assert not i1 < i1
assert not i2 < i2
assert not i3 < i3
assert i0 < i1
assert i0 < i2
assert i0 < i3
assert i1 < i2
assert i2 < i3
assert i1 < i3