From bdd402e82c0821cb759ad27fbbe0fde689694d4f Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 10 Nov 2019 19:01:20 -0500
Subject: [PATCH] Transform count UI
---
ObjEditor.java | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 1627a33..a63209c 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -328,10 +328,11 @@
objEditor.ctrlPanel.remove(setupPanel2);
objEditor.ctrlPanel.remove(objectCommandsPanel);
objEditor.ctrlPanel.remove(pushPanel);
+ objEditor.ctrlPanel.remove(transformCountPanel);
if (versionPanel != null)
objEditor.ctrlPanel.remove(versionPanel);
- if (countPanel != null)
- objEditor.ctrlPanel.remove(countPanel);
+ if (loopCountPanel != null)
+ objEditor.ctrlPanel.remove(loopCountPanel);
//objEditor.ctrlPanel.remove(fillPanel);
//Remove(normalpushField);
@@ -1213,11 +1214,12 @@
cGridBag setupPanel2;
cGridBag objectCommandsPanel;
cGridBag pushPanel;
+ cGridBag transformCountPanel;
cGridBag versionPanel;
- cGridBag countPanel;
+ cGridBag loopCountPanel;
cGridBag fillPanel;
- cNumberSlider countField;
+ cNumberSlider loopCountField;
JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
{
@@ -1471,13 +1473,20 @@
oe.ctrlPanel.add(objectCommandsPanel);
oe.ctrlPanel.Return();
+ if (copy.maxcount == 0)
+ copy.maxcount = 128;
+
+ transformCountPanel = AddSlider(oe.ctrlPanel, "Transform", 0, 128, copy.transformcount * 128 / copy.maxcount);
+ transformCountField = (cNumberSlider)transformCountPanel.getComponent(1);
+
+ oe.ctrlPanel.Return();
pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
normalpushField = (cNumberSlider)pushPanel.getComponent(1);
if (copy instanceof Composite && !(copy instanceof cGroup))
{
oe.ctrlPanel.Return();
- countPanel = AddSlider(oe.ctrlPanel, "Count", 0, 50, copy.count);
- countField = (cNumberSlider)countPanel.getComponent(1);
+ loopCountPanel = AddSlider(oe.ctrlPanel, "Loop", 0, 50, copy.count);
+ loopCountField = (cNumberSlider)loopCountPanel.getComponent(1);
}
if (false && copy.versionlist != null && copy.versionindex != -1)
{
@@ -4426,19 +4435,19 @@
cameraPanel.add(cameraView);
centralPanel.add(cameraPanel);
frame.setJMenuBar(timelineMenubar);
- wasFullScreen = CameraPane.FULLSCREEN;
- if (!CameraPane.FULLSCREEN)
- ToggleFullScreen();
- toggleFullScreenItem.setEnabled(false);
+ //wasFullScreen = CameraPane.FULLSCREEN;
+ //if (!CameraPane.FULLSCREEN)
+ // ToggleFullScreen();
+ //toggleFullScreenItem.setEnabled(false);
}
else
{
centralPanel.remove(cameraPanel);
centralPanel.add(cameraView);
frame.setJMenuBar(null);
- if (!wasFullScreen)
- ToggleFullScreen();
- toggleFullScreenItem.setEnabled(true);
+ //if (!wasFullScreen)
+ // ToggleFullScreen();
+ //toggleFullScreenItem.setEnabled(true);
}
frame.validate();
@@ -5584,6 +5593,8 @@
//copy.Touch();
}
+ cNumberSlider transformCountField;
+
cNumberSlider versionSlider; // Main
cNumberSlider versionField; // selection (off)
@@ -5632,9 +5643,17 @@
return;
}
- if (e.getSource() == countField)
+ if (e.getSource() == loopCountField)
{
- copy.count = countField.getInteger();
+ copy.count = loopCountField.getInteger();
+ Globals.lighttouched = true;
+ objEditor.refreshContents();
+ return;
+ }
+
+ if (e.getSource() == transformCountField)
+ {
+ copy.transformcount = transformCountField.getInteger() * copy.maxcount / 256;
Globals.lighttouched = true;
objEditor.refreshContents();
return;
--
Gitblit v1.6.2