diff --git a/Core/Settings.py b/Core/Settings.py index e03d5656..f3e5d19a 100644 --- a/Core/Settings.py +++ b/Core/Settings.py @@ -17,12 +17,19 @@ def __init__(self, parameters): self.parameters = parameters self.sizeX.setValue(self.parameters["sizeX"]) self.sizeY.setValue(self.parameters["sizeY"]) + + self.og_width = self.parameters["sizeX"] + self.og_height = self.parameters["sizeY"] + self.posX.setValue(self.parameters["posX"]) self.posY.setValue(self.parameters["posY"]) self.posZ.setValue(self.parameters["posZ"]) self.rotation.setValue(self.parameters["rotation"]) self.check_hotkeys() + self.sizeX.valueChanged.connect(self.maintain_aspect_ratio_w) + self.sizeY.valueChanged.connect(self.maintain_aspect_ratio_h) + self.sizeX.valueChanged.connect(self.save_current) self.sizeY.valueChanged.connect(self.save_current) self.posX.valueChanged.connect(self.save_current) @@ -149,6 +156,24 @@ def css_finished_edit(self): self.parameters["css"] = self.css.toPlainText() self.save_current() + def maintain_aspect_ratio_w(self): + if self.aspectRatio.isChecked(): + ratio = self.sizeX.value() / self.og_width + self.sizeY.blockSignals(True) + self.sizeY.setValue(int(self.sizeY.value() * ratio)) + self.sizeY.blockSignals(False) + self.og_width = self.sizeX.value() + self.save_current() + + def maintain_aspect_ratio_h(self): + if self.aspectRatio.isChecked(): + ratio = self.sizeY.value() / self.og_height + self.sizeX.blockSignals(True) + self.sizeX.setValue(int(self.sizeX.value() * ratio)) + self.sizeX.blockSignals(False) + self.og_height = self.sizeY.value() + self.save_current() + class SettingsToolBox(QToolBox): settings_changed = pyqtSignal(dict) diff --git a/Data/current.json b/Data/current.json index 31d8dcda..16061b51 100644 --- a/Data/current.json +++ b/Data/current.json @@ -10,21 +10,20 @@ "Assets/mouth/[mouth]_004.PNG", "Assets/blush/blush_029.png", "Assets/blush/blush_030.png", - "Assets/hairbows/hairbows_168.png", - "Assets/hairbows/hairbows_242.png", - "Assets/hairbows/hairbows_260.png", + "Assets/hairbows/hairbows_119.png", "Assets/ahoge/ahoge_026.png", "Assets/bangs/bangs_154.png", "Assets/side pieces/side pieces_159.png", "Assets/side pieces/side pieces_160.png", - "Assets/ponytails/ponytails_249.png", - "Assets/ponytails/ponytails_250.png", + "Assets/ponytails/ponytails_141.png", + "Assets/ponytails/ponytails_142.png", "Assets/glasses/glasses_044.png", "Assets/face assc/face assc_087.png", "Assets/face assc/face assc_088.png", "Assets/nose/[nose]_001.PNG", - "Assets/overshirts/overshirts_134.png", - "Assets/undershirts/undershirts_099.png", + "Assets/overshirts/overshirts_115.png", + "Assets/undershirt style/undershirt style_040.png", + "Assets/undershirts/undershirts_027.png", "Assets/body/body_049.png", "Assets/hairback/hairback_172.png" ] \ No newline at end of file diff --git a/Data/current_model.json b/Data/current_model.json index befd4b51..27a83a6a 100644 --- a/Data/current_model.json +++ b/Data/current_model.json @@ -1,4 +1,4 @@ { - "name": "Hoodie", + "name": "Academic", "type": "Avatars" } \ No newline at end of file diff --git a/Viewer/viewer.html b/Viewer/viewer.html index 8e6719a5..7dce392a 100644 --- a/Viewer/viewer.html +++ b/Viewer/viewer.html @@ -198,7 +198,7 @@ ; "/> - - - - - - - - - - -