From f1c718cce66e5651a0dae91375db6ebfaded1a92 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 27 Apr 2019 21:33:41 -0400
Subject: [PATCH] Test unfold UV
---
GroupEditor.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 7cc81e0..b72085f 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -438,10 +438,16 @@
oe.aConstraints.gridx = 0;
oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
+ liveCB.setToolTipText("Enabled animation");
liveCB.addItemListener(this);
oe.aConstraints.gridx += 1;
+ oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
+ fastCB.setToolTipText("Fast mode");
+ fastCB.addItemListener(this);
+ oe.aConstraints.gridx += 1;
oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
+ supportCB.setToolTipText("Enabled rigging");
supportCB.addItemListener(this);
// oe.aConstraints.gridx += 1;
@@ -450,21 +456,26 @@
oe.aConstraints.gridx += 1;
oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), oe.aConstraints);
+ crowdCB.setToolTipText("Used for crowds");
crowdCB.addItemListener(this);
oe.aConstraints.gridx += 1;
oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
+ smoothCB.setToolTipText("Snapping delay");
smoothCB.addItemListener(this);
oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
- fastCB.addItemListener(this);
- oe.aConstraints.gridx += 1;
oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
+ slowCB.setToolTipText("Smooth interpolation");
slowCB.addItemListener(this);
oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
+ oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), oe.aConstraints);
+ boxCB.setToolTipText("Display bounding boxes");
boxCB.addItemListener(this);
+ oe.aConstraints.gridx += 1;
+ oe.toolbarPanel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), oe.aConstraints);
+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
+ zoomBoxCB.addItemListener(this);
// oe.aConstraints.gridx += 1;
// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
@@ -491,19 +502,22 @@
// debugCB.addItemListener(this);
oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
+ oe.toolbarPanel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), oe.aConstraints);
oeilCB.addItemListener(this);
oe.aConstraints.gridx += 1;
- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
+ oe.toolbarPanel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), oe.aConstraints);
+ lookAtCB.setToolTipText("Look-at target");
lookAtCB.addItemListener(this);
oe.aConstraints.gridx += 1;
oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
+ trackCB.setToolTipText("Enable tracking");
trackCB.addItemListener(this);
oe.aConstraints.gridx += 1;
oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
+ screenfitButton.setToolTipText("Screen fit");
screenfitButton.addActionListener(this);
oe.aConstraints.gridx += 1;
// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
@@ -511,6 +525,7 @@
// oe.aConstraints.gridx += 1;
oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
snapobjectButton.addActionListener(this);
+ snapobjectButton.setToolTipText("Snap Object");
oe.aConstraints.gridx += 1;
//aConstraints.gridx = 0;
@@ -519,6 +534,7 @@
oe.aConstraints.gridwidth = 1;
oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
+ flashSelectionButton.setToolTipText("Show selection");
flashSelectionButton.addActionListener(this);
oe.toolbarPanel.add(new cButton(" ", false));
@@ -529,21 +545,28 @@
//
oe.toolbarPanel.add(twoButton = new cButton(" |+| ")); //, oe.aConstraints);
+ twoButton.setToolTipText("Show center view only");
twoButton.addActionListener(this);
oe.toolbarPanel.add(fourButton = new cButton("+|| ")); //, oe.aConstraints);
fourButton.addActionListener(this);
+ fourButton.setToolTipText("Show left panel only");
oe.toolbarPanel.add(sixButton = new cButton("+|+| ")); //, oe.aConstraints);
+ sixButton.setToolTipText("2-column layout left");
sixButton.addActionListener(this);
oe.toolbarPanel.add(threeButton = new cButton(" |+|+")); //, oe.aConstraints);
+ threeButton.setToolTipText("2-column layout right");
threeButton.addActionListener(this);
oe.toolbarPanel.add(sevenButton = new cButton("+|+|+")); //, oe.aConstraints);
+ sevenButton.setToolTipText("3-column layout");
sevenButton.addActionListener(this);
//
- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
+ oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
+ rootButton.setToolTipText("Edit object in new tab");
rootButton.addActionListener(this);
oe.aConstraints.gridx += 1;
oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
+ closeButton.setToolTipText("Close tab");
closeButton.addActionListener(this);
//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
//clearButton.addActionListener(this);
@@ -676,6 +699,7 @@
JCheckBox fastCB;
JCheckBox slowCB;
JCheckBox boxCB;
+ JCheckBox zoomBoxCB;
JCheckBox trackCB;
JCheckBox smoothfocusCB;
// JCheckBox speakerMocapCB;
@@ -755,6 +779,10 @@
Recompile();
cameraView.repaint();
// refreshContents();
+ }
+ else if(e.getSource() == zoomBoxCB)
+ {
+ cameraView.ToggleZoomBoxMode();
}
else if(e.getSource() == smoothfocusCB)
{
@@ -1783,7 +1811,7 @@
if (event.getSource() == computeAOItem)
{
Globals.drawMode = CameraPane.OCCLUSION;
- CameraPane.theRenderer.repaint();
+ Globals.theRenderer.repaint();
} else
if (event.getSource() == recompileItem)
{
@@ -2094,7 +2122,7 @@
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
for (int i=0; i<group.selection.size(); i++)
{
boolean random = CameraPane.RANDOM;
@@ -2103,7 +2131,7 @@
// group.selection.get(i).setMasterThis(content); // should be identity
CameraPane.RANDOM = random;
}
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
refreshContents();
}
} else
@@ -2911,7 +2939,7 @@
}
copy = group;
- //CameraPane.theRenderer.object = group;
+ //Globals.theRenderer.object = group;
if(!useclient)
{
cameraView.renderCamera = radio.camera;
@@ -3473,7 +3501,7 @@
String pigment = Object3D.GetPigment(tex);
//String bump = Object3D.GetBump(tex);
- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
+ com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
double s = v.s;
@@ -3774,7 +3802,7 @@
group.selection.RelinkToSupport(); // july 2014
System.out.println("DONE.");
refreshContents();
- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
}
void ReduceMesh(boolean reduction34)
@@ -4066,9 +4094,9 @@
// a camera
{
CameraPane.camerachangeframe = 0; // don't refuse it
- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
}
refreshContents();
--
Gitblit v1.6.2