AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EditorSession is now responsible for creating its own ResourceLoader

Browse Source
This commit is contained in:
David Vierra 2015-08-30 07:46:33 -10:00
parent 3c3e0292cc
commit d011eb8ba6
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mcedit2/editorapp.py
View File

@ -667,9 +667,8 @@ class MCEditApp(QtGui.QApplication):
fileLoadingDialog.setLabelText(status)
try:
resourceLoader = minecraftinstall.getResourceLoaderForFilename(filename)
configuredBlocks = self.configureBlocksDialog.getConfiguredBlocks()
session = EditorSession(filename, resourceLoader, configuredBlocks, readonly=readonly, progressCallback=callback)
session = EditorSession(filename, configuredBlocks, readonly=readonly, progressCallback=callback)
self.undoGroup.addStack(session.undoStack)
self.tabWidget.addTab(session.editorTab, session.tabCaption())

7
src/mcedit2/editorsession.py
View File

@ -87,14 +87,12 @@ class PasteImportCommand(QtGui.QUndoCommand):
class EditorSession(QtCore.QObject):
def __init__(self, filename, resourceLoader, configuredBlocks, readonly=False,
def __init__(self, filename, configuredBlocks, readonly=False,
progressCallback=None):
"""
:param filename:
:type filename: str
:param resourceLoader:
:type resourceLoader: mcedit2.resourceloader.ResourceLoader
:param configuredBlocks:
:type configuredBlocks: dict???
:param readonly:
@ -121,6 +119,8 @@ class EditorSession(QtCore.QObject):
QtCore.QObject.__init__(self)
self.undoStack = MCEUndoStack()
self.resourceLoader = minecraftinstall.getResourceLoaderForFilename(filename)
self.loader = None
self.blockModels = None
self.textureAtlas = None
@ -303,7 +303,6 @@ class EditorSession(QtCore.QObject):
# --- Resources ---
self.resourceLoader = resourceLoader
self.geometryCache = GeometryCache()
progress("Loading textures and models...")