From 0c1f740dd6ddd6432dc29266e42ef851e26027bb Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 13 Aug 2019 21:21:38 -0400
Subject: [PATCH] Random node + optimizations.
---
GroupEditor.java | 48 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 34 insertions(+), 14 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index e09d28f..9f3c422 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -31,7 +31,7 @@
final String path = "cubemaps/" + f + "-skyboxes/" + s;
row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
- skyboxButton.setToolTipText(s);
+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
skyboxButton.addActionListener(new ActionListener()
{
@Override
@@ -73,7 +73,7 @@
cGridBag row5 = new cGridBag();
cGridBag row6 = new cGridBag();
- AddSkyboxButton("default", "rgb", row0);
+ AddSkyboxButton("default", "", row0);
//AddSkyboxButton("default", "cornell", row0);
AddSkyboxButton("penguins", "dust", row0);
AddSkyboxButton("penguins", "tropic", row0);
@@ -330,10 +330,19 @@
public void ChangeSkybox(String skybox)
{
- //cameraView.envyoff = false;
- group.skyboxname = skybox;
- group.skyboxext = "jpg";
- cameraView.repaint();
+ if (skybox.endsWith("/"))
+ {
+ group.skyboxname = null;
+ group.skyboxext = null;
+ cameraView.repaint();
+ }
+ else
+ {
+ //cameraView.envyoff = false;
+ group.skyboxname = skybox;
+ group.skyboxext = "jpg";
+ cameraView.repaint();
+ }
}
public void CreateSkyboxPanel(cGridBag skyboxPanel)
@@ -1034,8 +1043,8 @@
// maxButton.addActionListener(this);
}
-// cButton gcButton;
-//
+ cButton gcButton;
+
// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
// gcButton.setToolTipText("Garbage collect");
// gcButton.addActionListener(new ActionListener()
@@ -1459,11 +1468,11 @@
{
assert(obj instanceof Composite);
- if (obj.versionlist == null)
- {
- obj.versionlist = new Object3D[100];
- obj.versionindex = -1;
- }
+// if (obj.versionlist == null)
+// {
+// obj.versionlist = new Object3D[100];
+// obj.versionindex = -1;
+// }
cRadio radioButton = new cRadio(obj.name);
@@ -4067,7 +4076,17 @@
*/
radio.layout.doClick();
- SetUndoStates();
+ assert(copy instanceof Composite);
+
+ if (copy.versionlist == null)
+ {
+ copy.versionlist = new Object3D[100];
+ copy.versionindex = -1;
+
+ Save(true);
+ }
+
+ SetVersionStates();
ClearUnpinned();
@@ -5306,6 +5325,7 @@
boolean allComposites = true;
+ if (group.selection != null)
for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
{
if (!(e.nextElement() instanceof Composite))
--
Gitblit v1.6.2