From 3ae9b1de47e51e7c150412f2bb14383cb6a5f8f8 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 08 Jun 2019 23:57:12 -0400
Subject: [PATCH] Fix "+" issue
---
GroupEditor.java | 241 +++++++++++++++++++++++++++++------------------
1 files changed, 147 insertions(+), 94 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index a0702c4..7f0fb6a 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -98,14 +98,14 @@
void CloneClipboard(boolean supports)
{
- assert(GrafreeD.clipboard.parent == null);
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
+ assert(Grafreed.clipboard.parent == null);
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
else
- makeSomething(CloneObject(GrafreeD.clipboard, false));
- GrafreeD.clipboard.get(0).parent = keepparent;
+ makeSomething(CloneObject(Grafreed.clipboard, false));
+ Grafreed.clipboard.get(0).parent = keepparent;
}
static Object3D CloneObject(Object3D obj, boolean supports)
@@ -119,7 +119,7 @@
// obj.support = null;
if (!supports)
obj.SaveSupports();
- Object3D clone = (Object3D)GrafreeD.clone(obj);
+ Object3D clone = (Object3D)Grafreed.clone(obj);
obj.parent = parent;
// obj.support = support;
// clone.support = support; // aout 2013
@@ -210,10 +210,6 @@
oe.menuBar.add(menu = new Menu("Setting"));
if (Globals.ADVANCED)
{
- resetMeshItem = menu.add(new MenuItem("Reset All"));
- resetMeshItem.addActionListener(this);
- stepAllItem = menu.add(new MenuItem("Step All"));
- stepAllItem.addActionListener(this);
revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
revertMeshItem.addActionListener(this);
resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
@@ -318,8 +314,12 @@
resetTransformItem.addActionListener(this);
resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
resetCentroidItem.addActionListener(this);
- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
- transformgeometryItem.addActionListener(this);
+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
+ resetCentroidXZItem.addActionListener(this);
+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
+ transformGeometryItem.addActionListener(this);
+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
+ transformChildrenItem.addActionListener(this);
oe.menuBar.add(menu = new Menu("Geometry"));
genUVItem = menu.add(new MenuItem("Generate UV"));
@@ -368,6 +368,10 @@
oe.menuBar.add(menu = new Menu("Attributes"));
clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
clearMaterialsItem.addActionListener(this);
+ resetAllItem = menu.add(new MenuItem("Reset All"));
+ resetAllItem.addActionListener(this);
+ stepAllItem = menu.add(new MenuItem("Step All"));
+ stepAllItem.addActionListener(this);
menu.add("-");
liveleavesItem = menu.add(new MenuItem("Live Leaves"));
liveleavesItem.addActionListener(this);
@@ -422,17 +426,18 @@
sortbysizeItem.addActionListener(this);
sortbynameItem = menu.add(new MenuItem("Sort by name"));
sortbynameItem.addActionListener(this);
+ menu.add("-");
+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
+ shareGeometriesItem.addActionListener(this);
+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
+ mergeGeometriesItem.addActionListener(this);
if (Globals.ADVANCED)
{
- menu.add("-");
+ // Pretty much the same as duplicate and clone.
extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
extractGeometriesItem.addActionListener(this);
cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
cloneGeometriesItem.addActionListener(this);
- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
- shareGeometriesItem.addActionListener(this);
- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
- mergeGeometriesItem.addActionListener(this);
}
oe.menuBar.add(menu = new Menu("Insert"));
@@ -488,10 +493,10 @@
//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
- liveCB.setToolTipText("Enabled animation");
+ liveCB.setToolTipText("Enable animation");
liveCB.addItemListener(this);
- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
oneStepButton.setToolTipText("Animate one step forward");
oneStepButton.addActionListener(this);
@@ -503,7 +508,7 @@
trackCB.setToolTipText("Enable tracking");
trackCB.addItemListener(this);
- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
screenfitButton.setToolTipText("Screen fit");
screenfitButton.addActionListener(this);
@@ -512,39 +517,39 @@
if (Globals.ADVANCED)
{
- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
snapobjectButton.addActionListener(this);
snapobjectButton.setToolTipText("Snap Object");
}
- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
flashSelectionButton.setToolTipText("Show selection");
flashSelectionButton.addActionListener(this);
oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
- oe.toolbarPanel.add(twoButton = new cButton("|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(twoButton = new cButton("|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
twoButton.setToolTipText("Show center view only");
twoButton.addActionListener(this);
- oe.toolbarPanel.add(fourButton = new cButton("+||", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(fourButton = new cButton("+||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
fourButton.addActionListener(this);
fourButton.setToolTipText("Show left panel only");
- oe.toolbarPanel.add(sixButton = new cButton("+|+|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(sixButton = new cButton("+|+|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
sixButton.setToolTipText("2-column layout left");
sixButton.addActionListener(this);
- oe.toolbarPanel.add(threeButton = new cButton("|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(threeButton = new cButton("|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
threeButton.setToolTipText("2-column layout right");
threeButton.addActionListener(this);
- oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(sevenButton = new cButton("+|+|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
sevenButton.setToolTipText("3-column layout");
sevenButton.addActionListener(this);
//
- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
rootButton.setToolTipText("Edit selection in new tab");
rootButton.addActionListener(this);
- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
closeButton.setToolTipText("Close tab");
closeButton.addActionListener(this);
//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
@@ -552,11 +557,11 @@
cGridBag commandsPanel = new cGridBag();
- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
editButton.setToolTipText("Edit selection");
editButton.addActionListener(this);
- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
uneditButton.setToolTipText("Unedit selection");
uneditButton.addActionListener(this);
@@ -564,11 +569,11 @@
allParamsButton.setToolTipText("Edit all params");
allParamsButton.addActionListener(this);
- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
clearPanelButton.setToolTipText("Clear edit panel");
clearPanelButton.addActionListener(this);
- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
+ commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
unselectButton.setToolTipText("Unselect");
unselectButton.addActionListener(this);
@@ -651,7 +656,7 @@
zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
zoomBoxCB.addItemListener(this);
- if (Globals.ADVANCED)
+ if (true) // Globals.ADVANCED)
{
panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
supportCB.setToolTipText("Enable rigging");
@@ -724,6 +729,7 @@
buttonGroup.add(radioButton);
radioButton.doClick();
}
+
void SetupViews(ObjEditor oe)
{
oe.SetupViews();
@@ -1542,9 +1548,9 @@
void Overwrite(int mask)
{
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -1892,7 +1898,7 @@
if (source == invariantsItem)
{
System.out.println("Invariants:");
- GrafreeD.grafreeD.universe.invariants();
+ Grafreed.grafreeD.universe.invariants();
} else
if (source == memoryItem)
{
@@ -1967,10 +1973,10 @@
} else
if (source == duplicateItem)
{
- Object3D keep = GrafreeD.clipboard;
+ Object3D keep = Grafreed.clipboard;
loadClipboard(false);
paste(false);
- GrafreeD.clipboard = keep;
+ Grafreed.clipboard = keep;
} else
if (source == cloneItem)
{
@@ -2190,9 +2196,9 @@
// group.selection.get(0).setMasterThis(content); // should be identity
// refreshContents();
// }
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -2242,9 +2248,9 @@
} else
if (source == setMasterItem)
{
- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -2257,9 +2263,9 @@
{
if (group.selection.size() == 1)
{
- if (GrafreeD.clipboard.size() == 1)
+ if (Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -2276,7 +2282,7 @@
{
RevertMeshes();
} else
- if (source == resetMeshItem)
+ if (source == resetAllItem)
{
ResetAll();
} else
@@ -2614,9 +2620,13 @@
{
SmoothMesh();
} else
- if (source == transformgeometryItem)
+ if (source == transformGeometryItem)
{
TransformGeometry();
+ } else
+ if (source == transformChildrenItem)
+ {
+ TransformChildren();
} else
if (source == resetTransformItem)
{
@@ -2624,7 +2634,11 @@
} else
if (source == resetCentroidItem)
{
- ResetCentroid();
+ ResetCentroid(true);
+ } else
+ if (source == resetCentroidXZItem)
+ {
+ ResetCentroid(false);
} else
if (source == resetParentItem)
{
@@ -3066,7 +3080,9 @@
frontView.object = group;
sideView.object = group;
}
- group.editWindow = this;
+
+// fix "+" issue group.editWindow = this;
+
/*
currentLayout = radio.layout;
if (currentLayout == null)
@@ -3140,6 +3156,28 @@
refreshContents();
}
+ void TransformChildren()
+ {
+ Object3D obj;
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
+ {
+ obj = (Object3D)e.nextElement();
+ obj.KeepTextureMatrices();
+ obj.TransformChildren();
+ obj.RestoreTextureMatrices();
+
+// if (obj.parent == null)
+// {
+// System.out.println("NULL PARENT!");
+// new Exception().printStackTrace();
+// }
+// else
+// TouchTransform(obj);
+// //obj.parent.Touch();
+ }
+
+ refreshContents();
+ }
void ResetTransform()
{
@@ -3252,7 +3290,7 @@
refreshContents();
}
- void ResetCentroid()
+ void ResetCentroid(boolean full)
{
Object3D obj;
for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
@@ -3267,12 +3305,16 @@
LA.matIdentity(Object3D.mat);
obj.getBounds(minima, maxima, false);
Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
+ if (full)
+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
obj.TransformMesh(Object3D.mat);
+
Object3D.mat[3][0] = (minima.x + maxima.x)/2;
- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
+ if (full)
+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
Object3D.mat[3][2] = (minima.z + maxima.z)/2;
+
LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
//Object3D.mat[3][0] = -Object3D.mat[3][0];
//Object3D.mat[3][1] = -Object3D.mat[3][1];
@@ -3338,9 +3380,9 @@
obj = (Object3D)e.nextElement();
System.out.println("Object is: " + obj);
- GrafreeD.AnalyzeObject(obj);
+ Grafreed.AnalyzeObject(obj);
System.out.println("Boundary rep: " + obj.bRep);
- GrafreeD.AnalyzeObject(obj.bRep);
+ Grafreed.AnalyzeObject(obj.bRep);
// System.err.println((size/1024) + " KB is the size of " + obj);
}
@@ -3554,8 +3596,8 @@
void ParseVertices()
{
- boolean epsequal = GrafreeD.epsequal;
- GrafreeD.epsequal = true;
+ boolean epsequal = Grafreed.epsequal;
+ Grafreed.epsequal = true;
for (int i=0; i<group.selection.size(); i++)
{
@@ -3580,7 +3622,7 @@
LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
- g.add(GrafreeD.clipboard);
+ g.add(Grafreed.clipboard);
buffer.add(g);
}
@@ -3595,7 +3637,7 @@
makeSomething(buffer, i==group.selection.size()-1);
}
- GrafreeD.epsequal = epsequal;
+ Grafreed.epsequal = epsequal;
refreshContents();
}
@@ -3613,7 +3655,16 @@
String pigment = Object3D.GetPigment(tex);
//String bump = Object3D.GetBump(tex);
- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
+ com.sun.opengl.util.texture.TextureData texturedata = null;
+
+ try
+ {
+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
+ }
+ catch (Exception e)
+ {
+ System.err.println("FAIL: " + node);
+ }
double s = v.s;
@@ -3745,7 +3796,7 @@
return;
Object3D poses = group.selection.get(0);
- Object3D ref = GrafreeD.clipboard.get(0);
+ Object3D ref = Grafreed.clipboard.get(0);
Object3D newgroup = new Object3D("Po:" + poses.name);
@@ -3939,9 +3990,9 @@
void ClipMesh()
{
- if (/*group.selection.size() == 1 &&*/ GrafreeD.clipboard.size() == 1)
+ if (/*group.selection.size() == 1 &&*/ Grafreed.clipboard.size() == 1)
{
- Object3D content = GrafreeD.clipboard.get(0);
+ Object3D content = Grafreed.clipboard.get(0);
if (content instanceof cGroup && ((cGroup)content).transientlink )
content = ((cGroup)content).get(0);
@@ -3950,7 +4001,7 @@
// {
// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
// }
- group.selection.ClipMesh(GrafreeD.clipboard);
+ group.selection.ClipMesh(Grafreed.clipboard);
}
// group.selection.ClipMesh(GrafreeD.clipboard);
System.out.println("DONE.");
@@ -4085,7 +4136,7 @@
objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
Object3D elem = (Object3D)group.selection.elementAt(i);
- if(elem != group)
+ if(elem != group || !newWindow)
{
// if (!(elem instanceof Composite))
// newWindow = false;
@@ -4290,12 +4341,12 @@
{
if (group.selection.isEmpty())
return;
- GrafreeD.clipboardIsTempGroup = false;
+ Grafreed.clipboardIsTempGroup = false;
Composite tGroup = null;
if (group.selection.size() > 0) // 1)
{
tGroup = new cGroup();
- GrafreeD.clipboardIsTempGroup = true;
+ Grafreed.clipboardIsTempGroup = true;
}
if (cut)
@@ -4335,16 +4386,16 @@
//System.out.println("cut " + child);
//System.out.println("parent = " + child.parent);
// tmp.addChild(child);
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
tGroup.add/*Child*/(tmp);
else
- GrafreeD.clipboard = tmp;
+ Grafreed.clipboard = tmp;
}
else
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
tGroup.add/*Child*/(child);
else
- GrafreeD.clipboard = child;
+ Grafreed.clipboard = child;
}
//ResetModel();
@@ -4376,21 +4427,21 @@
//System.out.println("cut " + elem);
//System.out.println("parent = " + elem.parent);
// tmp.addChild(elem);
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
tGroup.add/*Child*/(tmp);
else
- GrafreeD.clipboard = tmp;
+ Grafreed.clipboard = tmp;
}
else
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
tGroup.add/*Child*/(child);
else
- GrafreeD.clipboard = child;
+ Grafreed.clipboard = child;
}
}
- if (GrafreeD.clipboardIsTempGroup)
- GrafreeD.clipboard = tGroup;
+ if (Grafreed.clipboardIsTempGroup)
+ Grafreed.clipboard = tGroup;
if (cut)
{
ResetModel();
@@ -4404,7 +4455,7 @@
// return;
boolean first = true;
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
{
Composite temp;
@@ -4415,7 +4466,7 @@
temp = (Composite)Applet3D.clipboard.deepCopy();
*/
Object3D elem;
- for (Enumeration e = /*temp.children*/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
+ for (Enumeration e = /*temp.children*/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
{
Object3D child = (Object3D)e.nextElement();
@@ -4449,14 +4500,14 @@
//Object3D cb = Applet3D.clipboard;
//temp.addChild(cb);
//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
- assert(GrafreeD.clipboard.parent == null);
- Object3D /*Composite*/ keepparent = GrafreeD.clipboard.get(0).parent;
- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
- if (LA.isIdentity(GrafreeD.clipboard.toParent))
- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
+ assert(Grafreed.clipboard.parent == null);
+ Object3D /*Composite*/ keepparent = Grafreed.clipboard.get(0).parent;
+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
+ if (LA.isIdentity(Grafreed.clipboard.toParent))
+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
else
- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
- GrafreeD.clipboard.get(0).parent = keepparent;
+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
+ Grafreed.clipboard.get(0).parent = keepparent;
}
ResetModel();
@@ -4505,9 +4556,9 @@
{
boolean first = true;
- if (GrafreeD.clipboardIsTempGroup)
+ if (Grafreed.clipboardIsTempGroup)
{
- Composite temp = (Composite)GrafreeD.clipboard;
+ Composite temp = (Composite)Grafreed.clipboard;
Object3D copy;
for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
{
@@ -4517,7 +4568,7 @@
}
} else
{
- linkSomething(GrafreeD.clipboard); //.get(0));
+ linkSomething(Grafreed.clipboard); //.get(0));
}
}
}
@@ -4962,7 +5013,7 @@
void ImportVRMLX3D()
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
/**/
FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
@@ -4979,7 +5030,7 @@
String GetFile(String dialogName)
{
- if (GrafreeD.standAlone)
+ if (Grafreed.standAlone)
{
FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
browser.show();
@@ -5092,7 +5143,7 @@
private MenuItem linkverticesItem;
private MenuItem relinkverticesItem;
private MenuItem setMasterItem;
- private MenuItem resetMeshItem;
+ private MenuItem resetAllItem;
private MenuItem stepAllItem;
private MenuItem revertMeshItem;
private MenuItem poseMeshItem;
@@ -5153,8 +5204,10 @@
private MenuItem panoTexturesItem;
private MenuItem resetCentroidItem;
- private MenuItem transformgeometryItem;
+ private MenuItem resetCentroidXZItem;
private MenuItem resetTransformItem;
+ private MenuItem transformGeometryItem;
+ private MenuItem transformChildrenItem;
private MenuItem hideItem;
private MenuItem grabItem;
private MenuItem backItem;
--
Gitblit v1.6.2