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

View switching toolbar now has sliders for time-of-day and minimum brightness

Browse Source 
These will modify the texture image for the block and sky lighting
This commit is contained in:
David Vierra 2015-09-05 10:44:28 -10:00
parent 31b411b75a
commit b586f5b6e2
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mcedit2/editorsession.py
View File

@ -20,6 +20,7 @@ from mcedit2.util import minecraftinstall
from mcedit2.util.dialogs import NotImplementedYet from mcedit2.util.dialogs import NotImplementedYet
from mcedit2.util.directories import getUserSchematicsDirectory from mcedit2.util.directories import getUserSchematicsDirectory
from mcedit2.util.mimeformats import MimeFormats from mcedit2.util.mimeformats import MimeFormats
from mcedit2.widgets.spinslider import SpinSlider
from mceditlib.util import exhaust from mceditlib.util import exhaust
from mceditlib.util.lazyprop import weakrefprop from mceditlib.util.lazyprop import weakrefprop
from mcedit2.util.raycast import rayCastInBounds from mcedit2.util.raycast import rayCastInBounds
@ -433,7 +434,9 @@ class EditorSession(QtCore.QObject):
self.mcVersionMenu.clear() self.mcVersionMenu.clear()
self.resourcePackMenu.clear() self.resourcePackMenu.clear()
defaultAction = self.resourcePackMenu.addAction(self.tr("(No resource pack)")) defaultAction = self.resourcePackMenu.addAction(self.tr("(No resource pack)"))
defaultAction.triggered.connect(self.resourcePackMapper.map)
self.resourcePackMapper.setMapping(defaultAction, "") self.resourcePackMapper.setMapping(defaultAction, "")
install = minecraftinstall.GetInstalls().getCurrentInstall() install = minecraftinstall.GetInstalls().getCurrentInstall()
@ -449,6 +452,7 @@ class EditorSession(QtCore.QObject):
resourcePackAction.triggered.connect(self.resourcePackMapper.map) resourcePackAction.triggered.connect(self.resourcePackMapper.map)
def changeResourcePack(self, packName): def changeResourcePack(self, packName):
log.info("Changing to resource pack %s", packName)
minecraftinstall.currentResourcePackOption.setValue(packName or "") minecraftinstall.currentResourcePackOption.setValue(packName or "")
self.resourceLoader = minecraftinstall.getResourceLoaderForFilename(self.filename) self.resourceLoader = minecraftinstall.getResourceLoaderForFilename(self.filename)
self.changeResourcePackButton.setText(self.resourcePackLabel()) self.changeResourcePackButton.setText(self.resourcePackLabel())
@ -1119,6 +1123,26 @@ class EditorTab(QtGui.QWidget):
currentViewName = "Cam" currentViewName = "Cam"
self.viewButtons[currentViewName].click() self.viewButtons[currentViewName].click()
self.dayTimeInput = SpinSlider(double=True,
minimum=0.0, maximum=1.0, value=1.0)
self.minBrightnessInput = SpinSlider(double=True,
minimum=0.0, maximum=1.0, value=0.0)
self.dayTimeInput.valueChanged.connect(self.setDayTime)
self.minBrightnessInput.valueChanged.connect(self.setMinBrightness)
self.viewButtonToolbar.addSeparator()
self.viewButtonToolbar.addWidget(QtGui.QLabel("Time of day:"))
self.viewButtonToolbar.addWidget(self.dayTimeInput)
self.viewButtonToolbar.addSeparator()
self.viewButtonToolbar.addWidget(QtGui.QLabel("Minimum brightness:"))
self.viewButtonToolbar.addWidget(self.minBrightnessInput)
spacer = QtGui.QWidget()
spacer.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
self.viewButtonToolbar.addWidget(spacer)
def destroy(self): def destroy(self):
self.editorSession = None self.editorSession = None
for view in self.views: for view in self.views:
@ -1126,6 +1150,14 @@ class EditorTab(QtGui.QWidget):
super(EditorTab, self).destroy() super(EditorTab, self).destroy()
def setDayTime(self, value):
if self.editorSession.textureAtlas:
self.editorSession.textureAtlas.dayTime = value
def setMinBrightness(self, value):
if self.editorSession.textureAtlas:
self.editorSession.textureAtlas.minBrightness = value
editorSession = weakrefprop() editorSession = weakrefprop()
urlsDropped = QtCore.Signal(QtCore.QMimeData, Vector, faces.Face) urlsDropped = QtCore.Signal(QtCore.QMimeData, Vector, faces.Face)