From 59de607850161a26863f92961d53caae7a2dabc8 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 06 Aug 2019 21:37:03 -0400
Subject: [PATCH] Pin button.
---
GroupEditor.java | 298 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 201 insertions(+), 97 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index ee4f34c..00a0f61 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -16,6 +16,7 @@
//import buoy.widget.BFileChooser;
class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
+ Grafreed.iResourceCallBack,
ObjectUI,
Runnable,
ActionListener,
@@ -28,8 +29,8 @@
{
cButton skyboxButton;
final String path = "cubemaps/" + f + "-skyboxes/" + s;
- //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
- row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
+ //row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
skyboxButton.setToolTipText(s);
skyboxButton.addActionListener(new ActionListener()
{
@@ -57,11 +58,12 @@
cGridBag row6 = new cGridBag();
AddSkyboxButton("default", "rgb", row0);
- AddSkyboxButton("default", "cornell", row0);
- AddSkyboxButton("default", "uffizi", row0);
- AddSkyboxButton("default", "CloudyHills", row0);
-
- AddSkyboxButton("default", "skycube", row1);
+ //AddSkyboxButton("default", "cornell", row0);
+ AddSkyboxButton("penguins", "dust", row0);
+ AddSkyboxButton("penguins", "tropic", row0);
+ AddSkyboxButton("penguins", "yonder", row0);
+
+ AddSkyboxButton("default", "uffizi", row1);
AddSkyboxButton("bridge", "Bridge", row1);
AddSkyboxButton("bridge", "Bridge2", row1);
AddSkyboxButton("urban", "GamlaStan2", row1);
@@ -73,23 +75,23 @@
AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
AddSkyboxButton("urban", "UnionSquare", row3);
+ AddSkyboxButton("urban", "Medborgarplatsen", row3);
AddSkyboxButton("park", "BerzeliiPark", row3);
- AddSkyboxButton("park", "Buddha", row3);
+ AddSkyboxButton("park", "Buddha", row4);
AddSkyboxButton("park", "CNTower2", row4);
AddSkyboxButton("park", "NiagaraFalls1", row4);
AddSkyboxButton("park", "NiagaraFalls3", row4);
- AddSkyboxButton("park", "Park", row4);
+ AddSkyboxButton("park", "Park", row5);
AddSkyboxButton("park", "Pond", row5);
AddSkyboxButton("park", "Skansen", row5);
AddSkyboxButton("park", "Skansen2", row5);
- AddSkyboxButton("park", "Skansen3", row5);
+ AddSkyboxButton("park", "Skansen3", row6);
AddSkyboxButton("park", "Skansen4", row6);
AddSkyboxButton("park", "Skansen5", row6);
- AddSkyboxButton("park", "Stairs", row6);
- AddSkyboxButton("park", "Tantolunden4", row6);
+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
tab0.add(row0);
tab0.add(row1);
@@ -140,24 +142,29 @@
AddSkyboxButton("forest", "Langholmen2", row3);
AddSkyboxButton("forest", "Plants", row3);
AddSkyboxButton("mountain", "Maskonaive", row3);
+
AddSkyboxButton("mountain", "Maskonaive2", row4);
-
AddSkyboxButton("mountain", "Maskonaive3", row4);
- AddSkyboxButton("mountain", "Ryfjallet", row4);
- AddSkyboxButton("mountain", "Teide", row4);
+ AddSkyboxButton("mountain", "Teide", row4);
+ AddSkyboxButton("park", "Tantolunden4", row4);
+ AddSkyboxButton("park", "Stairs", row5);
+ AddSkyboxButton("default", "skycube", row6);
AddSkyboxButton("rocky", "Langholmen", row5);
- AddSkyboxButton("rocky", "Riddarfjarden", row5);
AddSkyboxButton("rocky", "Skinnarviksberget", row5);
+
AddSkyboxButton("rocky", "Tantolunden6", row5);
+ AddSkyboxButton("default", "CloudyHills", row6);
+ AddSkyboxButton("daz", "Autumn", row6);
+ AddSkyboxButton("daz", "MountainTrail", row6);
/*
-Kastellholmen
-Langholmen
-Riddarfjarden
-Skinnarviksberget
-Tanto
-Tantolunden2
-Tantolunden6
+Autumn
+Greenlands
+MountainTrail
+Oasis
+TheRock
+TopOfTheWorld
+Winter
*/
tab0.add(row0);
@@ -197,39 +204,33 @@
AddSkyboxButton("urban", "CNTower", row1);
AddSkyboxButton("bridge", "ArstaBridge", row1);
- AddSkyboxButton("indoors", "DallasW", row1);
- AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
+ AddSkyboxButton("rocky", "Riddarfjarden", row1);
+ AddSkyboxButton("penguins", "sleepyhollow", row1);
+ AddSkyboxButton("penguins", "kenon_star", row2);
+ AddSkyboxButton("persson", "corona", row2);
+ AddSkyboxButton("persson", "spaceskybox", row2);
AddSkyboxButton("indoors", "Vasa", row2);
- AddSkyboxButton("winter", "Backyard", row2);
- AddSkyboxButton("winter", "Creek", row2);
- AddSkyboxButton("winter", "FootballField3", row2);
+ AddSkyboxButton("winter", "Backyard", row3);
+ AddSkyboxButton("winter", "Creek", row3);
+ AddSkyboxButton("winter", "FootballField3", row3);
AddSkyboxButton("winter", "Forest", row3);
- AddSkyboxButton("winter", "HornstullsStrand2", row3);
- AddSkyboxButton("winter", "House", row3);
- AddSkyboxButton("winter", "IceLake", row3);
+ AddSkyboxButton("winter", "HornstullsStrand2", row4);
+ AddSkyboxButton("winter", "House", row4);
+ AddSkyboxButton("winter", "IceLake", row4);
AddSkyboxButton("winter", "IceRiver", row4);
- AddSkyboxButton("winter", "Park3", row4);
- AddSkyboxButton("winter", "PondWinter", row4);
+ AddSkyboxButton("winter", "Park3", row5);
+ AddSkyboxButton("winter", "PondWinter", row5);
AddSkyboxButton("winter", "Tantolunden5", row5);
AddSkyboxButton("winter", "Vindelalven", row5);
- /*
-Backyard
-Creek
-FootballField3
-Forest
-HornstullsStrand2
-House
-IceLake
-IceRiver
-Park3
-PondWinter
-Tantolunden5
-Vindelalven *
- */
+
+ AddSkyboxButton("daz", "TheRock", row6);
+ AddSkyboxButton("daz", "TopOfTheWorld", row6);
+ AddSkyboxButton("daz", "Winter", row6);
+ AddSkyboxButton("mountain", "Ryfjallet", row6);
tab0.add(row0);
tab0.add(row1);
@@ -245,13 +246,90 @@
//tab0.add(new cGridBag());
}
}
-
- public void ChangeSkybox(String name)
+
+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
{
- cameraView.envyoff = false;
- cameraView.skyboxname = name;
- cameraView.skyboxext = "jpg";
+ cGridBag tab0 = new cGridBag().setVertical(true);
+
+ tab0.setName("Others");
+ skyboxpanel.add(tab0);
+
+ cGridBag row0 = new cGridBag();
+ cGridBag row1 = new cGridBag();
+ cGridBag row2 = new cGridBag();
+ cGridBag row3 = new cGridBag();
+ cGridBag row4 = new cGridBag();
+ cGridBag row5 = new cGridBag();
+ cGridBag row6 = new cGridBag();
+
+ AddSkyboxButton("mayhem", "afterrain", row0);
+ AddSkyboxButton("mayhem", "aqua4", row0);
+ AddSkyboxButton("mayhem", "aqua9", row0);
+ AddSkyboxButton("mayhem", "flame", row0);
+
+ AddSkyboxButton("mayhem", "h2s", row1);
+ AddSkyboxButton("mayhem", "prehistoric", row1);
+ AddSkyboxButton("mayhem", "scorched", row1);
+ AddSkyboxButton("penguins", "desertdawn", row1);
+
+ AddSkyboxButton("persson", "Citadella", row2);
+ AddSkyboxButton("persson", "Citadella2", row2);
+ AddSkyboxButton("persson", "clouds1", row2);
+ AddSkyboxButton("penguins", "wrath", row2);
+
+ AddSkyboxButton("persson", "FishermansBastion", row3);
+ AddSkyboxButton("persson", "HeroesSquare", row3);
+ AddSkyboxButton("indoors", "DallasW", row3);
+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
+
+ AddSkyboxButton("persson", "LancellottiChapel", row4);
+ AddSkyboxButton("persson", "PereaBeach1", row4);
+ AddSkyboxButton("persson", "PereaBeach2", row4);
+ AddSkyboxButton("persson", "redeclipse", row4);
+
+ AddSkyboxButton("daz", "Greenlands", row5);
+ AddSkyboxButton("daz", "Oasis", row5);
+ AddSkyboxButton("elyvisions", "arch3", row5);
+ AddSkyboxButton("elyvisions", "calm_sea", row5);
+
+ AddSkyboxButton("elyvisions", "rainbow", row6);
+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
+ AddSkyboxButton("elyvisions", "heaven", row6);
+ AddSkyboxButton("elyvisions", "hot", row6);
+
+ tab0.add(row0);
+ tab0.add(row1);
+ tab0.add(row2);
+ tab0.add(row3);
+ tab0.add(row4);
+ tab0.add(row5);
+ tab0.add(row6);
+
+ for (int i=5; --i>=0;)
+ {
+ //oe.toolboxPanel.Return();
+ //tab0.add(new cGridBag());
+ }
+ }
+
+ public void CallBack(String[] path)
+ {
+ for (int i = 0; i < path.length; i++)
+ {
+ System.out.print(path[i] + "/");
+ }
+
+ System.out.println();
+ }
+
+ public void ChangeSkybox(String skybox)
+ {
+ //cameraView.envyoff = false;
+ group.skyboxname = skybox;
+ group.skyboxext = "jpg";
cameraView.repaint();
+
+ Grafreed.ParseResources("textures", this);
}
//ObjEditor objEditor;
@@ -291,9 +369,9 @@
this.copy = this.group = group;
//selectees = this.group.selectees;
- if (copy.versions == null)
+ if (copy.versionlist == null)
{
- copy.versions = new byte[100][];
+ copy.versionlist = new Object3D[100];
copy.versionindex = -1;
}
@@ -318,9 +396,9 @@
((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
- if (copy.versions == null)
+ if (copy.versionlist == null)
{
- copy.versions = new byte[100][];
+ copy.versionlist = new Object3D[100];
copy.versionindex = -1;
Save(true);
@@ -866,32 +944,36 @@
restoreCameraButton.setToolTipText("Restore viewpoint");
restoreCameraButton.addActionListener(this);
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- saveButton.setToolTipText("New version");
- saveButton.addActionListener(this);
+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ saveVersionButton.setToolTipText("Duplicate current version");
+ saveVersionButton.addActionListener(this);
- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- undoButton.setToolTipText("Previous version");
- undoButton.addActionListener(this);
- undoButton.setEnabled(false);
+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ deleteVersionButton.setToolTipText("Delete current version");
+ deleteVersionButton.addActionListener(this);
+
+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ previousVersionButton.setToolTipText("Previous version");
+ previousVersionButton.addActionListener(this);
+ previousVersionButton.setEnabled(false);
cGridBag updown = new cGridBag().setVertical(true);
updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- restoreButton.setToolTipText("Restore current");
+ restoreButton.setToolTipText("Undo (restore current version)");
restoreButton.addActionListener(this);
- restoreButton.setEnabled(false);
+ //restoreButton.setEnabled(false);
updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- replaceButton.setToolTipText("Replace current");
+ replaceButton.setToolTipText("Save (replace current version)");
replaceButton.addActionListener(this);
- replaceButton.setEnabled(false);
+ //replaceButton.setEnabled(false);
copyOptionsPanel.add(updown);
- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- redoButton.setToolTipText("Next version");
- redoButton.addActionListener(this);
- redoButton.setEnabled(false);
+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ nextVersionButton.setToolTipText("Next version");
+ nextVersionButton.addActionListener(this);
+ nextVersionButton.setEnabled(false);
oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
liveCB.setToolTipText("Enable animation");
@@ -1029,7 +1111,7 @@
cGridBag skyboxpane = new cGridBag();
skyboxpane.preferredHeight = 100;
- oe.toolboxPanel.add(skyboxpane);
+ oe.skyboxPanel.add(skyboxpane);
JTabbedPane skyboxpanel = new JTabbedPane();
skyboxpane.add(skyboxpanel);
@@ -1037,6 +1119,7 @@
AddSkyboxTab0(skyboxpanel);
AddSkyboxTab1(skyboxpanel);
AddSkyboxTab2(skyboxpanel);
+ AddSkyboxTab3(skyboxpanel);
// EDIT panel
editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
@@ -1044,20 +1127,20 @@
editButton.addActionListener(this);
editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- uneditButton.setToolTipText("Remove selection controls");
+ uneditButton.setToolTipText("Unpin and remove selection controls");
uneditButton.addActionListener(this);
editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
allParamsButton.setToolTipText("Show all controle");
allParamsButton.addActionListener(this);
- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
clearPanelButton.setToolTipText("Clear edit panel");
clearPanelButton.addActionListener(this);
- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- unselectButton.setToolTipText("Unselect");
- unselectButton.addActionListener(this);
+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ //unselectButton.setToolTipText("Unselect");
+ //unselectButton.addActionListener(this);
editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
flashSelectionButton.setToolTipText("Highlight selection");
@@ -1117,7 +1200,7 @@
dgr.addDragGestureListener(this);
}catch(Exception e) {}
*/
- radio.layout = sixButton; // sevenButton;
+ radio.layout = threeButton; // sixButton;
oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
}
@@ -1168,9 +1251,12 @@
smoothCB.setToolTipText("Snapping delay");
smoothCB.addItemListener(this);
- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
- slowCB.setToolTipText("Smooth interpolation");
- slowCB.addItemListener(this);
+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
+// slowCB.setToolTipText("Smooth interpolation");
+// slowCB.addItemListener(this);
+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
+ minshaderCB.setToolTipText("Minimal fast shader");
+ minshaderCB.addItemListener(this);
// constraints.gridy += 1;
// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
@@ -1259,7 +1345,7 @@
}
radioButton.SetObject(obj);
- radioButton.layout = sixButton; // sevenButton;
+ radioButton.layout = threeButton; // sixButton;
radioButton.SetCamera(cameraView.renderCamera, false);
radioButton.addActionListener(this);
radioPanel.add(radioButton);
@@ -1284,6 +1370,8 @@
cCheckBox localCB;
cCheckBox crowdCB;
cCheckBox smoothCB;
+ cCheckBox minshaderCB;
+
cToggleButton fastCB;
cCheckBox slowCB;
cCheckBox boxCB;
@@ -1354,6 +1442,12 @@
{
cameraView.ToggleInertia();
cameraView.repaint();
+ }
+ else if(e.getSource() == minshaderCB)
+ {
+ Globals.MINSHADER ^= true;
+ cameraView.programInitialized = false;
+ cameraView.repaint();
}
else if(e.getSource() == localCB)
{
@@ -2494,7 +2588,7 @@
if (source == invariantsItem)
{
System.out.println("Invariants:");
- Grafreed.grafreeD.universe.invariants();
+ Grafreed.grafreed.universe.invariants();
} else
if (source == memoryItem)
{
@@ -2525,33 +2619,40 @@
{
ToggleFullScreen();
} else
- if (source == undoButton)
+ if (source == previousVersionButton)
{
// Go to previous version
//if (!Undo())
//java.awt.Toolkit.getDefaultToolkit().beep();
- Undo();
+ PreviousVersion();
} else
if (source == restoreButton)
{
// Restore current version
Restore();
+ //restoreButton.setEnabled(false);
} else
if (source == replaceButton)
{
// Overwrite current version
Replace();
+ //replaceButton.setEnabled(false);
} else
- if (source == redoButton)
+ if (source == nextVersionButton)
{
// Go to next version
- Redo();
+ NextVersion();
} else
- if (source == saveButton)
+ if (source == saveVersionButton)
{
// Save a new version
if (!Save(true))
java.awt.Toolkit.getDefaultToolkit().beep();
+ } else
+ if (source == deleteVersionButton)
+ {
+ // Delete a new version
+ DeleteVersion();
} else
if (source == oneStepButton)
{
@@ -2606,11 +2707,11 @@
} else
if (source == undoItem)
{
- Undo();
+ PreviousVersion();
} else
if (source == redoItem)
{
- Redo();
+ NextVersion();
} else
if (source == duplicateItem)
{
@@ -3743,10 +3844,10 @@
{
Object3D child = (Object3D)e.nextElement();
if(child.editWindow != null)
- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
child.pinned = false;
child.CloseUI();
listUI.remove(child);
+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
//child.editWindow = null; // ???????????
}
@@ -3765,6 +3866,7 @@
obj.CloseUI();
}
listUI.clear();
+ SetPinStates(group.selection.size() > 0);
refreshContents(true);
} else
if (source == allParamsButton)
@@ -3851,6 +3953,7 @@
radio.layout.doClick();
ClearUnpinned();
+
//Grafreed.Assert(group != null);
//Grafreed.Assert(group.selection != null);
SetPinStates(group.selection == null || group.selection.size() > 0);
@@ -3867,11 +3970,13 @@
} else if (event.getSource() == editCameraItem)
{
cameraView.ProtectCamera();
+ cameraView.requestFocusInWindow();
cameraView.repaint();
return;
} else if (event.getSource() == restoreCameraItem || event.getSource() == restoreCameraButton)
{
cameraView.RevertCamera();
+ cameraView.requestFocusInWindow();
cameraView.repaint();
return;
// } else if (event.getSource() == textureButton)
@@ -5004,9 +5109,7 @@
freezemodel = false;
}
-
- boolean flashIt = true;
-
+
public void valueChanged(TreeSelectionEvent e)
//public boolean handleEvent(Event event)
{
@@ -5079,13 +5182,15 @@
{
editButton.setEnabled(enabled);
uneditButton.setEnabled(enabled);
- unselectButton.setEnabled(enabled);
+ //unselectButton.setEnabled(enabled);
flashSelectionButton.setEnabled(enabled);
+
+ clearPanelButton.setEnabled(!listUI.isEmpty());
}
void refreshContents(boolean cp)
{
- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
{
objEditor.ClearInfo(); // .GetMaterial());
@@ -5921,7 +6026,6 @@
cButton restoreCameraButton;
- cButton saveButton;
cButton oneStepButton;
cButton groupButton;
--
Gitblit v1.6.2