From f9325048496d7cdbcad233f8a6b84c88e79adcc2 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 17 Sep 2019 20:11:47 -0400
Subject: [PATCH] Rename link2master to link2support.
---
GroupEditor.java | 76 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index ae9ebf2..d328971 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -483,11 +483,16 @@
Object3D parent = obj.parent;
obj.parent = null;
+
// Object3D support = obj.support;
// obj.support = null;
if (!supports)
obj.SaveSupports();
+
Object3D clone = (Object3D)Grafreed.clone(obj);
+
+ clone.ResetUUIDs();
+
obj.parent = parent;
// obj.support = support;
// clone.support = support; // aout 2013
@@ -557,8 +562,10 @@
pasteLinkItem.addActionListener(this);
pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
pasteCloneItem.addActionListener(this);
-// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
-// pasteExpandItem.addActionListener(this);
+// CRASH
+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
+//
+ pasteExpandItem.addActionListener(this);
//menu.add("-");
oe.jTree.popup.addSeparator();
@@ -796,7 +803,7 @@
genNormalsCADItem.addActionListener(this);
genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
genNormalsMESHItem.addActionListener(this);
- if (Globals.ADVANCED)
+ //if (Globals.ADVANCED)
{
genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
genNormalsMINEItem.addActionListener(this);
@@ -959,7 +966,7 @@
currenttab.setName(tabname);
//added = false;
resourcecontainer.add(currenttab);
- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
rowcount = 1;
colcount = 0;
texturecount = 0;
@@ -974,6 +981,11 @@
currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
}
+ columns = 5;
+
+ if (path[0].contains("D&R") || path[0].contains("Paint"))
+ columns = 4;
+
AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
totalcount++;
@@ -1188,6 +1200,7 @@
//clearButton.addActionListener(this);
cGridBag row1 = new cGridBag();
+ row1.preferredHeight = 8;
// INSERT
row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
@@ -1228,6 +1241,7 @@
oe.toolboxPanel.add(row1);
cGridBag row2 = new cGridBag();
+ row2.preferredHeight = 8;
row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
groupButton.setToolTipText("Create group");
@@ -1330,6 +1344,7 @@
oe.treePanel.add(versionManagerPanel);
oe.treePanel.Return();
+
versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
versionSliderPane.preferredHeight = 3;
@@ -1389,7 +1404,7 @@
// supportCB.setToolTipText("Enable rigging");
// supportCB.addItemListener(this);
- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
freezeCB.setToolTipText("Fast moving camera");
freezeCB.addItemListener(this);
@@ -1398,9 +1413,12 @@
panel.Return();
+ if (Globals.ADVANCED)
+ {
panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
crowdCB.setToolTipText("Used for crowds");
crowdCB.addItemListener(this);
+ }
panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
smoothCB.setToolTipText("Snapping delay");
@@ -1413,30 +1431,26 @@
minshaderCB.setToolTipText("Minimal fast shader");
minshaderCB.addItemListener(this);
-// constraints.gridy += 1;
// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
// speakerMocapCB.addItemListener(this);
- panel.Return();
-
if (false)
{
// handled in scripts
- //constraints.gridy += 1;
panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
speakerCameraCB.addItemListener(this);
- //constraints.gridy += 1;
panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
speakerFocusCB.addItemListener(this);
- //constraints.gridy += 1;
- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
- smoothfocusCB.addItemListener(this);
panel.Return();
}
-//constraints.gridx += 1;
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
+ smoothfocusCB.addItemListener(this);
+
+ panel.Return();
+
//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
// debugCB.addItemListener(this);
@@ -2075,7 +2089,7 @@
Object3D obj = (Object3D)group.selection.elementAt(0);
objEditor.ScreenFit(obj, false);
- cameraView.pingthread.StepToTarget(true);
+ cameraView.pingthread.StepToTarget(); //true);
refreshContents();
}
@@ -2112,7 +2126,7 @@
obj.parent.TransformToWorld(maxima); //, maxima);
}
- Object3D shadow = new Object3D("Shadow " + obj.name);
+ Object3D shadow = new Object3D("Shadow" + obj.name);
shadow.toParent = LA.newMatrix();
shadow.fromParent = LA.newMatrix();
@@ -2840,7 +2854,7 @@
if (source == saveVersionButton)
{
// Save a new version
- if (!Save(true))
+ if (!DuplicateVersion()) //true))
java.awt.Toolkit.getDefaultToolkit().beep();
} else
if (source == deleteVersionButton)
@@ -4304,6 +4318,31 @@
ResetTransform(-1);
}
+ void ScaleSelection(int scale)
+ {
+ Object3D obj;
+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
+ {
+ obj = (Object3D)e.nextElement();
+
+ if (obj.toParent == null)
+ continue;
+
+ obj.Scale(scale);
+
+ if (obj.parent == null)
+ {
+ System.out.println("NULL PARENT!");
+ // new Exception().printStackTrace();
+ }
+ else
+ TouchTransform(obj);
+ //obj.parent.Touch();
+ }
+
+ refreshContents();
+ }
+
void ResetTransform(int mask)
{
Object3D obj;
@@ -4834,6 +4873,7 @@
LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
}
+ Globals.lighttouched = true;
refreshContents();
}
@@ -5368,7 +5408,7 @@
if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
{
CameraPane.camerachangeframe = 0; // don't refuse it
- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
}
// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
--
Gitblit v1.6.2