From f924d3e00db476c06f55f3d5aaef307e17575340 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 13 May 2019 07:29:08 -0400
Subject: [PATCH] Transform children
---
ObjEditor.java | 205 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 137 insertions(+), 68 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 565390e..cfefeab 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -143,6 +143,8 @@
//nameField.removeActionListener(this);
// objEditor.ctrlPanel.remove(nameField);
+ objEditor.ctrlPanel.remove(namePanel);
+
if (!GroupEditor.allparams)
return;
@@ -165,7 +167,6 @@
// objEditor.ctrlPanel.remove(fasterButton);
// objEditor.ctrlPanel.remove(remarkButton);
- objEditor.ctrlPanel.remove(namePanel);
objEditor.ctrlPanel.remove(setupPanel);
objEditor.ctrlPanel.remove(commandsPanel);
objEditor.ctrlPanel.remove(pushPanel);
@@ -308,44 +309,61 @@
//normalLensItem.addActionListener(this);
cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
revertCameraItem.addActionListener(this);
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
- toggleTimelineItem.addItemListener(this);
+
cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
toggleFullScreenItem.addItemListener(this);
toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
cameraMenu.add("-");
+
cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
toggleTextureItem.addItemListener(this);
toggleTextureItem.setState(CameraPane.textureon);
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
- toggleLiveItem.addItemListener(this);
- toggleLiveItem.setState(Globals.isLIVE());
- cameraMenu.add(stepItem = new MenuItem("Step"));
- stepItem.addActionListener(this);
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
-// toggleDLItem.addItemListener(this);
-// toggleDLItem.setState(false);
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
- toggleRenderItem.addItemListener(this);
- toggleRenderItem.setState(!CameraPane.frozen);
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
- toggleDebugItem.addItemListener(this);
- toggleDebugItem.setState(CameraPane.DEBUG);
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
- toggleFrustumItem.addItemListener(this);
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
- toggleFootContactItem.addItemListener(this);
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
- toggleRandomItem.addItemListener(this);
- toggleRandomItem.setState(CameraPane.RANDOM);
+
+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
+ toggleSwitchItem.addItemListener(this);
+ toggleSwitchItem.setState(CameraPane.SWITCH);
+
cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
toggleHandleItem.addItemListener(this);
toggleHandleItem.setState(CameraPane.HANDLES);
+
cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
togglePaintItem.addItemListener(this);
togglePaintItem.setState(CameraPane.PAINTMODE);
+
+ if (Globals.ADVANCED)
+ {
+ cameraMenu.add("-");
+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
+ toggleLiveItem.addItemListener(this);
+ toggleLiveItem.setState(Globals.isLIVE());
+
+ cameraMenu.add(stepItem = new MenuItem("Step"));
+ stepItem.addActionListener(this);
+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
+ // toggleDLItem.addItemListener(this);
+ // toggleDLItem.setState(false);
+
+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
+ toggleRenderItem.addItemListener(this);
+ toggleRenderItem.setState(!CameraPane.frozen);
+
+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
+ toggleDebugItem.addItemListener(this);
+ toggleDebugItem.setState(CameraPane.DEBUG);
+
+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
+ toggleFrustumItem.addItemListener(this);
+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
+
+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
+ toggleFootContactItem.addItemListener(this);
+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
+
+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
+ toggleTimelineItem.addItemListener(this);
+ }
+
// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
// toggleRootItem.addItemListener(this);
// toggleRootItem.setState(false);
@@ -483,13 +501,13 @@
//SendInfo("Name:", "bold");
if (sel.GetTextures() != null || debug)
{
- si.SendInfo(sel.toString(), "bold");
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
if (sel.Size() > 0)
{
si.SendInfo("#children = " + sel.Size(), "regular");
}
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
if (debug)
{
try
@@ -531,7 +549,7 @@
}
if (sel.support != null)
{
- si.SendInfo(" support: " + sel.support, "regular");
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
}
if (sel.scriptnode != null)
{
@@ -734,7 +752,7 @@
protected static ImageIcon createImageIcon(String path,
String description)
{
- java.net.URL imgURL = GrafreeD.class.getResource(path);
+ java.net.URL imgURL = Grafreed.class.getResource(path);
if (imgURL != null)
{
return new ImageIcon(imgURL, description);
@@ -951,10 +969,6 @@
void SetupUI2(ObjEditor oe)
{
-// oe.aConstraints.weightx = 0;
-// oe.aConstraints.weighty = 0;
-// oe.aConstraints.gridx = 0;
-// oe.aConstraints.gridy = 0;
//SetupName(oe);
namePanel = new cGridBag();
@@ -971,27 +985,45 @@
setupPanel = new cGridBag().setVertical(false);
liveCB = AddCheckBox(setupPanel, "Live", copy.live);
- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
+ liveCB.setToolTipText("Animate object");
hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
+ hideCB.setToolTipText("Hide object");
// Return();
markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
+ markCB.setToolTipText("Set the animation target transform");
+
+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
+ rewindCB.setToolTipText("Rewind animation");
+
+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
+ randomCB.setToolTipText("Option for switch node");
+ if (Globals.ADVANCED)
+ {
+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
+ link2masterCB.setToolTipText("Attach to support");
+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
+ speedupCB.setToolTipText("Option motion capture");
+ }
+
oe.ctrlPanel.add(setupPanel);
oe.ctrlPanel.Return();
commandsPanel = new cGridBag().setVertical(false);
resetButton = AddButton(commandsPanel, "Reset");
+ resetButton.setToolTipText("Jump to frame zero");
stepButton = AddButton(commandsPanel, "Step");
+ stepButton.setToolTipText("Step one frame");
// resetAllButton = AddButton(oe, "Reset All");
// stepAllButton = AddButton(oe, "Step All");
- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
// Return();
slowerButton = AddButton(commandsPanel, "Slow");
+ slowerButton.setToolTipText("Decrease animation speed");
fasterButton = AddButton(commandsPanel, "Fast");
+ fasterButton.setToolTipText("Increase animation speed");
remarkButton = AddButton(commandsPanel, "Remark");
+ remarkButton.setToolTipText("Set the current transform as the target");
oe.ctrlPanel.add(commandsPanel);
oe.ctrlPanel.Return();
@@ -1298,7 +1330,7 @@
scrollpane.addMouseWheelListener(this); // Default not fast enough
/*JTabbedPane*/ scenePanel = new cGridBag();
- scenePanel.preferredWidth = 7;
+ scenePanel.preferredWidth = 6;
JTabbedPane tabbedPane = new JTabbedPane();
tabbedPane.add(scrollpane);
@@ -1404,8 +1436,8 @@
// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
- frame.setSize(1024, 768);
- frame.show();
+ frame.setSize(1280, 860);
+ frame.setVisible(true);
gridPanel.setDividerLocation(1.0);
@@ -1444,19 +1476,22 @@
cGridBag editBar = new cGridBag().setVertical(false);
- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
createMaterialButton.setToolTipText("Create material");
/*
ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
*/
- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
clearMaterialButton.setToolTipText("Clear material");
- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
+ if (Globals.ADVANCED)
+ {
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
+ }
editBar.preferredHeight = 15;
@@ -1725,12 +1760,15 @@
opacityPowerField.addChangeListener(this);
/**/
- resetSlidersButton.addActionListener(this);
clearMaterialButton.addActionListener(this);
createMaterialButton.addActionListener(this);
-
- propagateToggle.addItemListener(this);
- multiplyToggle.addItemListener(this);
+
+ if (Globals.ADVANCED)
+ {
+ resetSlidersButton.addActionListener(this);
+ propagateToggle.addItemListener(this);
+ multiplyToggle.addItemListener(this);
+ }
}
void DropFile(java.io.File[] files, boolean textures)
@@ -1901,7 +1939,7 @@
//? flashIt = false;
CameraPane pane = (CameraPane) cameraView;
- pane.clickStart(location.x, location.y, 0);
+ pane.clickStart(location.x, location.y, 0, 0);
pane.clickEnd(location.x, location.y, 0, true);
if (group.selection.size() == 1)
@@ -2358,11 +2396,11 @@
void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
/**/
FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
- browser.show();
+ browser.setVisible(true);
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
{
@@ -2722,7 +2760,8 @@
return;
}
- multiplyToggle.setSelected(mat.multiply);
+ if (multiplyToggle != null)
+ multiplyToggle.setSelected(mat.multiply);
assert (object.projectedVertices != null);
@@ -2937,7 +2976,7 @@
frame.validate();
return;
- } else if (event.getSource() == toggleRandomItem)
+ } else if (event.getSource() == toggleSwitchItem)
{
cameraView.ToggleRandom();
cameraView.repaint();
@@ -2982,6 +3021,7 @@
if (event.getSource() == randomCB)
{
copy.random ^= true;
+ objEditor.refreshContents();
return;
}
if (event.getSource() == speedupCB)
@@ -3205,7 +3245,7 @@
if (!Globals.ANIMATION)
{
FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
- browser.show();
+ browser.setVisible(true);
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
{
@@ -3215,8 +3255,8 @@
Globals.ANIMATION ^= true;
- GrafreeD.wav.cursor = 0;
- GrafreeD.wav.loop = 0;
+ Grafreed.wav.cursor = 0;
+ Grafreed.wav.loop = 0;
}
} else
{
@@ -3237,7 +3277,6 @@
callee.refreshContents();
} else
{
- new Exception().printStackTrace();
System.exit(0);
}
}
@@ -3267,7 +3306,7 @@
void CreateMaterial()
{
//copy.ClearMaterial(); // PATCH
- copy.CreateMaterialS(multiplyToggle.isSelected());
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
if (copy.selection.size() > 0)
//SetMaterial(copy);
{
@@ -3326,11 +3365,11 @@
{
copy.ResetBlockLoop(); // temporary problem
- boolean random = CameraPane.RANDOM;
- CameraPane.RANDOM = false; // parse everything
+ boolean random = CameraPane.SWITCH;
+ CameraPane.SWITCH = false; // parse everything
copy.ResetDisplayList();
copy.HardTouch();
- CameraPane.RANDOM = random;
+ CameraPane.SWITCH = random;
}
// public void applySelf()
@@ -3404,6 +3443,36 @@
{
//System.out.println("Propagate = " + propagate);
copy.UpdateMaterial(anchor, current, propagate);
+
+ if (copy.material != null)
+ {
+ cMaterial mat = copy.material;
+
+ colorField.SetToolTipValue((mat.color));
+ modulationField.SetToolTipValue((mat.modulation));
+ metalnessField.SetToolTipValue((mat.metalness));
+ diffuseField.SetToolTipValue((mat.diffuse));
+ specularField.SetToolTipValue((mat.specular));
+ shininessField.SetToolTipValue((mat.shininess));
+ shiftField.SetToolTipValue((mat.shift));
+ ambientField.SetToolTipValue((mat.ambient));
+ lightareaField.SetToolTipValue((mat.lightarea));
+ diffusenessField.SetToolTipValue((mat.factor));
+ velvetField.SetToolTipValue((mat.velvet));
+ sheenField.SetToolTipValue((mat.sheen));
+ subsurfaceField.SetToolTipValue((mat.subsurface));
+ backlitField.SetToolTipValue((mat.bump));
+ anisoField.SetToolTipValue((mat.aniso));
+ anisoVField.SetToolTipValue((mat.anisoV));
+ cameraField.SetToolTipValue((mat.cameralight));
+ selfshadowField.SetToolTipValue((mat.diffuseness));
+ shadowField.SetToolTipValue((mat.shadow));
+ textureField.SetToolTipValue((mat.texture));
+ opacityField.SetToolTipValue((mat.opacity));
+ fakedepthField.SetToolTipValue((mat.fakedepth));
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
+ }
+
if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
{
copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
@@ -4131,7 +4200,7 @@
void load() // throws ClassNotFoundException
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
browser.show();
@@ -4236,7 +4305,7 @@
void saveAs()
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
browser.setVisible(true);
@@ -4347,7 +4416,7 @@
Object3D objectparent = obj.parent;
obj.parent = null;
- Object3D object = (Object3D) GrafreeD.clone(obj);
+ Object3D object = (Object3D) Grafreed.clone(obj);
obj.parent = objectparent;
@@ -4381,7 +4450,7 @@
buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
copy.generatePOV(buffer);
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
FileDialog browser = new FileDialog(frame, "Export POV", 1);
browser.show();
@@ -4430,7 +4499,7 @@
CheckboxMenuItem toggleFootContactItem;
CheckboxMenuItem toggleDLItem;
CheckboxMenuItem toggleTextureItem;
- CheckboxMenuItem toggleRandomItem;
+ CheckboxMenuItem toggleSwitchItem;
CheckboxMenuItem toggleRootItem;
CheckboxMenuItem animationItem;
CheckboxMenuItem toggleHandleItem;
--
Gitblit v1.6.2