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

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2020-01-22 11:20:24 +01:00
commit 26b86dfe5f
3 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
direct/src/actor/Actor.py
View File

@ -2281,7 +2281,7 @@ class Actor(DirectObject, NodePath):
# our handle on them go. This is especially
# important if the anim control was blending
# animations.
animDef.animControl.getPart().clearControlEffects()
animDef.animControl.getPart().setControlEffect(animDef.animControl, 0.0)
animDef.animControl = None

31
makepanda/makepanda.py
View File

@ -2720,14 +2720,28 @@ else:
# otherwise, disable it.
confautoprc = confautoprc.replace('#st#', '#')
if PkgSkip("ASSIMP"):
confautoprc = confautoprc.replace('\r\n', '\n')
if PkgSkip("ASSIMP") or GetLinkAllStatic():
confautoprc = confautoprc.replace("load-file-type p3assimp", "#load-file-type p3assimp")
if PkgSkip("EGG") or GetLinkAllStatic():
confautoprc = confautoprc.replace("load-file-type egg pandaegg", "#load-file-type egg pandaegg")
if PkgSkip("PANDATOOL") or PkgSkip("EGG") or GetLinkAllStatic():
confautoprc = confautoprc.replace("load-file-type p3ptloader", "#load-file-type p3ptloader")
if PkgSkip("FFMPEG") or GetLinkAllStatic():
confautoprc = confautoprc.replace("load-audio-type * p3ffmpeg", "#load-audio-type * p3ffmpeg")
confautoprc = confautoprc.replace("load-video-type * p3ffmpeg", "#load-video-type * p3ffmpeg")
if (os.path.isfile("makepanda/myconfig.in")):
configprc = ReadFile("makepanda/myconfig.in")
else:
configprc = ReadFile("makepanda/config.in")
configprc = configprc.replace('\r\n', '\n')
if (GetTarget() == 'windows'):
configprc = configprc.replace("$XDG_CACHE_HOME/panda3d", "$USER_APPDATA/Panda3D-%s" % MAJOR_VERSION)
else:
@ -2736,6 +2750,21 @@ else:
if (GetTarget() == 'darwin'):
configprc = configprc.replace("$XDG_CACHE_HOME/panda3d", "$HOME/Library/Caches/Panda3D-%s" % MAJOR_VERSION)
if PkgSkip("GL") or GetLinkAllStatic():
configprc = configprc.replace("\nload-display pandagl", "\n#load-display pandagl")
if PkgSkip("GLES") or GetLinkAllStatic():
configprc = configprc.replace("\n#load-display pandagles", "")
if PkgSkip("DX9") or GetLinkAllStatic():
configprc = configprc.replace("\n#load-display pandadx9", "")
if PkgSkip("TINYDISPLAY") or GetLinkAllStatic():
configprc = configprc.replace("\n#load-display p3tinydisplay", "")
if PkgSkip("OPENAL") or GetLinkAllStatic():
configprc = configprc.replace("audio-library-name p3openal_audio", "#audio-library-name p3openal_audio")
if GetTarget() == 'windows':
# Convert to Windows newlines.
ConditionalWriteFile(GetOutputDir()+"/etc/Config.prc", configprc, newline='\r\n')

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

@ -1335,17 +1335,17 @@ load_cursor(const Filename &filename) {
CGFloat hotspot_x = 0.0f;
CGFloat hotspot_y = 0.0f;
if (image_props[@"hotspotX"] != nil) {
hotspot_x = [(NSNumber *)image_props[@"hotspotX"] floatValue];
if (NSNumber *number = image_props[@"hotspotX"]) {
hotspot_x = [number floatValue];
}
if (image_props[@"hotspotY"] != nil) {
hotspot_y = [(NSNumber *)image_props[@"hotspotY"] floatValue];
if (NSNumber *number = image_props[@"hotspotY"]) {
hotspot_y = [number floatValue];
}
[image_props release];
NSImage *image = [[NSImage alloc] initWithData:image_data];
NSCursor *cursor;
NSCursor *cursor = nil;
if (image != nil) {
// Apple recognizes that hotspots are usually specified from a .cur
// file, whose origin is in the top-left, so there's no need to flip