TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Made LE data can be loaded outside of LE

Browse Source
This commit is contained in:
Gyedo Jeon 2010-01-26 01:42:59 +00:00
parent e36c303ce7
commit 64c08313bd
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
direct/src/leveleditor/FileMgr.py
View File

@ -1,9 +1,10 @@
import os import os
import imp import imp
import ObjectMgr from ObjectMgr import ObjectMgr
import ObjectHandler from ObjectHandler import ObjectHandler
import ObjectPalette from ObjectPalette import ObjectPalette
from ProtoPalette import ProtoPalette
import ObjectGlobals as OG import ObjectGlobals as OG
class FileMgr: class FileMgr:
@ -45,9 +46,10 @@ class FileMgr:
file, pathname, description = imp.find_module(moduleName, [dirname]) file, pathname, description = imp.find_module(moduleName, [dirname])
try: try:
if self.editor is None: # when loaded outside of LE if self.editor is None: # when loaded outside of LE
base.objectPalette = ObjectPalette.ObjectPalette() base.objectPalette = ObjectPalette()
base.objectHandler = ObjectHandler.ObjectHandler(None) base.protoPalette = ProtoPalette()
base.objectMgr = ObjectMgr.ObjectMgr(None) base.objectHandler = ObjectHandler(None)
base.objectMgr = ObjectMgr(None)
module = imp.load_module(moduleName, file, pathname, description) module = imp.load_module(moduleName, file, pathname, description)
except: except:

8
direct/src/leveleditor/ObjectMgr.py
View File

@ -67,8 +67,10 @@ class ObjectMgr:
objDef = self.editor.objectPalette.findItem(typeName) objDef = self.editor.objectPalette.findItem(typeName)
if objDef is None: if objDef is None:
objDef = self.editor.protoPalette.findItem(typeName) objDef = self.editor.protoPalette.findItem(typeName)
else: else: # when loaded outside of LE
objDef = base.objectPalette.findItem(typeName) objDef = base.objectPalette.findItem(typeName)
if objDef is None:
objDef = base.protoPalette.findItem(typeName)
newobj = None newobj = None
if objDef and type(objDef) != dict: if objDef and type(objDef) != dict:
if objDef.createFunction: if objDef.createFunction:
@ -78,7 +80,7 @@ class ObjectMgr:
# when it's using default objectHandler # when it's using default objectHandler
if self.editor: if self.editor:
func = Functor(eval("base.le.objectHandler%s"%funcName)) func = Functor(eval("base.le.objectHandler%s"%funcName))
else: else: # when loaded outside of LE
func = Functor(eval("base.objectHandler%s"%funcName)) func = Functor(eval("base.objectHandler%s"%funcName))
else: else:
# when it's not using default objectHandler, whole name of the handling obj # when it's not using default objectHandler, whole name of the handling obj
@ -405,7 +407,7 @@ class ObjectMgr:
if funcName.startswith('.'): if funcName.startswith('.'):
if self.editor: if self.editor:
func = Functor(eval("base.le.objectHandler%s"%funcName)) func = Functor(eval("base.le.objectHandler%s"%funcName))
else: else: # when loaded outside of LE
func = Functor(eval("base.objectHandler%s"%funcName)) func = Functor(eval("base.objectHandler%s"%funcName))
else: else:
func = Functor(eval(funcName)) func = Functor(eval(funcName))