TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-18 20:53:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Forgot to check in this file

Browse Source
This commit is contained in:
rdb 2009-12-11 18:08:25 +00:00
parent 9a519539dd
commit 0f723e4cb8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
direct/src/p3d/AppRunner.py
View File

@ -570,7 +570,7 @@ class AppRunner(DirectObject):
initAppForGui() initAppForGui()
def setP3DFilename(self, p3dFilename, tokens, argv, instanceId, def setP3DFilename(self, p3dFilename, tokens, argv, instanceId,
interactiveConsole): interactiveConsole, p3dOffset = 0):
""" Called by the browser to specify the p3d file that """ Called by the browser to specify the p3d file that
contains the application itself, along with the web tokens contains the application itself, along with the web tokens
and/or command-line arguments. Once this method has been and/or command-line arguments. Once this method has been
@ -612,8 +612,12 @@ class AppRunner(DirectObject):
fname.makeAbsolute() fname.makeAbsolute()
mf = Multifile() mf = Multifile()
if not mf.openRead(fname): if p3dOffset == 0:
raise ArgumentError, "Not a Panda3D application: %s" % (p3dFilename) if not mf.openRead(fname):
raise ArgumentError, "Not a Panda3D application: %s" % (p3dFilename)
else:
if not mf.openRead(fname, p3dOffset):
raise ArgumentError, "Not a Panda3D application: %s at offset: %s" % (p3dFilename, p3dOffset)
# Now load the p3dInfo file. # Now load the p3dInfo file.
self.p3dInfo = None self.p3dInfo = None