From 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Fri, 16 Aug 2019 18:22:19 -0400
Subject: [PATCH] Save version table.
---
ObjEditor.java | 214 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 153 insertions(+), 61 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 35727f1..16de211 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -43,6 +43,35 @@
static ObjEditor theFrame;
+ public void AllocProjectedVertices(Object3D object)
+ {
+ assert (object.projectedVertices != null);
+
+ if (object.projectedVertices.length <= 2)
+ {
+ // Side effect...
+ Object3D.cVector2[] keep = object.projectedVertices;
+ object.projectedVertices = new Object3D.cVector2[3];
+ for (int i = 0; i < 3; i++)
+ {
+ if (i < keep.length)
+ {
+ object.projectedVertices[i] = keep[i];
+ } else
+ {
+ object.projectedVertices[i] = new Object3D.cVector2();
+ }
+ /*
+ if(keep.length == 0)
+ object.projectedVertices[0] = new Object3D.cVector2();
+ else
+ object.projectedVertices[0] = keep[0];
+ object.projectedVertices[1] = new Object3D.cVector2();
+ */
+ }
+ }
+ }
+
public cGridBag GetSeparator()
{
cGridBag separator = new cGridBag();
@@ -75,8 +104,16 @@
return new cCheckBox(icon, border);
}
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
+
ImageIcon GetIcon(String name)
{
+ javax.swing.ImageIcon iconCache = icons.get(name);
+ if (iconCache != null)
+ {
+ return iconCache;
+ }
+
try
{
BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
@@ -94,10 +131,14 @@
// }
javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
+
+ icons.put(name, icon);
+
return icon;
}
catch (Exception e)
{
+ //icons.put(name, null);
return null;
}
}
@@ -347,7 +388,8 @@
//parent = p;
GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
+ if (Globals.DEBUG)
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
//gd.setFullScreenWindow(this);
//setResizable(false);
//if (!isDisplayable())
@@ -433,6 +475,8 @@
ChangeListener changeListener = new ChangeListener()
{
+ //String name;
+
public void stateChanged(ChangeEvent changeEvent)
{
// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
@@ -451,7 +495,37 @@
// EditSelection(false);
// }
+// if (objectPanel.getSelectedIndex() == 4)
+// {
+// name = copy.skyboxname;
+//
+// if (name == null)
+// {
+// name = "";
+// }
+//
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
+// copy.skyboxext = "jpg";
+// }
+// else
+// {
+// if (name != null)
+// {
+// if (name.equals(""))
+// {
+// copy.skyboxname = null;
+// copy.skyboxext = null;
+// }
+// else
+// {
+// copy.skyboxname = name;
+// }
+// }
+// }
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
+
// refreshContents(false); // To refresh Info tab
+ cameraView.repaint();
}
};
objectPanel.addChangeListener(changeListener);
@@ -877,18 +951,24 @@
boolean temp = CameraPane.SWITCH;
CameraPane.SWITCH = false;
- object.ExtractBigData(versiontable);
+ if (Grafreed.grafreed.universe.versiontable == null)
+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
+
+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
// if (copy == client)
Object3D versions[] = object.versionlist;
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
object.versionlist = null;
+ object.versiontable = null;
//byte[] compress = Compress(copy);
Object3D compress = (Object3D)Grafreed.clone(object);
object.versionlist = versions;
+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
- object.RestoreBigData(versiontable);
+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
CameraPane.SWITCH = temp;
@@ -1250,14 +1330,14 @@
liveCB = AddCheckBox(setupPanel, "Live", copy.live);
liveCB.setToolTipText("Animate object");
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
+ markCB.setToolTipText("Set target transform");
selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
selectableCB.setToolTipText("Make object selectable");
// Return();
hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
hideCB.setToolTipText("Hide object");
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
- markCB.setToolTipText("As animation target transform");
ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
@@ -1459,6 +1539,7 @@
if (cam == null || !(copy.get(0) instanceof cGroup))
{
+ if (Globals.DEBUG)
System.out.println("CREATE CAMERAS");
cams = new cTemplate();
cams.name = "Cameras";
@@ -1584,14 +1665,14 @@
//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
//tmp.setName("Edit");
- objectPanel.add(materialPanel);
- objectPanel.setIconAt(0, GetIcon("icons/material.png"));
- objectPanel.setToolTipTextAt(0, "Material");
-
objectPanel.add(toolboxPanel);
- objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
- objectPanel.setToolTipTextAt(1, "Objects & textures");
+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
+ objectPanel.setToolTipTextAt(0, "Objects & textures");
+ objectPanel.add(materialPanel);
+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
+ objectPanel.setToolTipTextAt(1, "Material");
+
objectPanel.add(skyboxPanel);
objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
objectPanel.setToolTipTextAt(2, "Backgrounds");
@@ -1645,9 +1726,9 @@
scenePanel.add(tabbedPane);
//if (Globals.ADVANCED)
- tabbedPane.add(infoPanel);
- tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
- tabbedPane.setToolTipTextAt(3, "Information");
+// tabbedPane.add(infoPanel);
+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
+// tabbedPane.setToolTipTextAt(3, "Information");
/*
cTree jTree = new cTree(null);
@@ -1745,7 +1826,7 @@
frame.getContentPane().setLayout(new BorderLayout());
/**/
- JTabbedPane worldPane = new JTabbedPane();
+ //JTabbedPane worldPane = new JTabbedPane();
//worldPane.add(bigPanel);
//worldPane.add(worldPanel);
/**/
@@ -2116,6 +2197,21 @@
});
presetpanel.add(bump0);
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
+ borderShader.setToolTipText("Border fade");
+ borderShader.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ borderfadeField.setFloat(0.5);
+ opacityField.setFloat(0.75);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(borderShader);
+
cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
halo.setToolTipText("Halo");
halo.addMouseListener(new MouseAdapter()
@@ -2223,9 +2319,20 @@
cGridBag huepanel = new cGridBag();
cGridBag huelabel = new cGridBag();
- skin = GetLabel("icons/hue.png", false);
- skin.fit = true;
- huelabel.add(skin);
+ cLabel hue = GetLabel("icons/hue.png", false);
+ hue.fit = true;
+
+ hue.addMouseListener(new MouseAdapter()
+ {
+ public void mousePressed(MouseEvent e)
+ {
+ int x = e.getX();
+
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
+ }
+ });
+
+ huelabel.add(hue);
huelabel.preferredWidth = 20;
huepanel.add(new cGridBag()); // Label
huepanel.add(huelabel); // Field/slider
@@ -3501,32 +3608,8 @@
if (multiplyToggle != null)
multiplyToggle.setSelected(mat.multiply);
-
- assert (object.projectedVertices != null);
-
- if (object.projectedVertices.length <= 2)
- {
- // Side effect...
- Object3D.cVector2[] keep = object.projectedVertices;
- object.projectedVertices = new Object3D.cVector2[3];
- for (int i = 0; i < 3; i++)
- {
- if (i < keep.length)
- {
- object.projectedVertices[i] = keep[i];
- } else
- {
- object.projectedVertices[i] = new Object3D.cVector2();
- }
- /*
- if(keep.length == 0)
- object.projectedVertices[0] = new Object3D.cVector2();
- else
- object.projectedVertices[0] = keep[0];
- object.projectedVertices[1] = new Object3D.cVector2();
- */
- }
- }
+
+ AllocProjectedVertices(object);
SetMaterial(mat, object.projectedVertices);
}
@@ -3836,7 +3919,7 @@
//System.out.println("ObjEditor " + event);
applySelf0(true);
//parent.applySelf();
- objEditor.refreshContents();
+ // conflicts with requestFocus objEditor.refreshContents();
} else if (source == resetButton)
{
CameraPane.fullreset = true;
@@ -4129,7 +4212,7 @@
{
//Save(true);
Replace();
- SetUndoStates();
+ SetVersionStates();
}
private boolean Equal(byte[] compress, byte[] name)
@@ -4148,8 +4231,6 @@
return true;
}
- java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
-
void DeleteVersion()
{
for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
@@ -4157,9 +4238,13 @@
copy.versionlist[i] = copy.versionlist[i+1];
}
- CopyChanged();
+ if (copy.versionlist[copy.versionindex] == null)
+ copy.versionindex -= 1;
- SetUndoStates();
+ if (copy.versionindex != -1)
+ CopyChanged();
+
+ SetVersionStates();
}
public boolean Save(boolean user)
@@ -4205,7 +4290,7 @@
// copy.versionlist[i] = null;
// }
- SetUndoStates();
+ SetVersionStates();
// test save
if (false)
@@ -4265,12 +4350,12 @@
{
Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
- SetUndoStates();
+ SetVersionStates();
boolean temp = CameraPane.SWITCH;
CameraPane.SWITCH = false;
- copy.ExtractBigData(versiontable);
+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
copy.clear();
@@ -4282,7 +4367,7 @@
copy.add(obj.get(i));
}
- copy.RestoreBigData(versiontable);
+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
CameraPane.SWITCH = temp;
@@ -4332,7 +4417,7 @@
return count;
}
- void SetUndoStates()
+ void SetVersionStates()
{
//if (true)
// return;
@@ -4345,8 +4430,8 @@
previousVersionButton.setEnabled(copy.versionindex > 0);
nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
- deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
- copy.versionlist[copy.versionindex + 1] != null);
+ deleteVersionButton.setEnabled(copy.versionindex != -1);
+ //copy.versionlist[copy.versionindex + 1] != null);
muteSlider = true;
versionSlider.setMinimum(0);
@@ -4411,7 +4496,7 @@
public boolean Replace()
{
- System.err.println("Replace");
+ //System.err.println("Replace");
//cRadio tab = GetCurrentTab();
@@ -4749,6 +4834,8 @@
{
if (muteSlider)
return;
+
+ Replace();
int version = versionSlider.getInteger();
@@ -5111,7 +5198,9 @@
}
if (previousVersionButton != null && copy.versionlist != null)
- SetUndoStates();
+ SetVersionStates();
+
+ cameraView.requestFocusInWindow();
}
static TweenManager tweenManager = new TweenManager();
@@ -5143,7 +5232,7 @@
// group = (Composite) group.get(0);
// }
- System.out.println("makeSomething of " + thing);
+ //System.out.println("makeSomething of " + thing);
/*
if (deselect && jList != null)
@@ -5497,6 +5586,7 @@
copy.versionlist = readobj.versionlist;
copy.versionindex = readobj.versionindex;
+ copy.versiontable = readobj.versiontable;
if (copy.versionlist == null)
{
@@ -5504,7 +5594,7 @@
copy.versionlist = new Object3D[100];
copy.versionindex = -1;
- Save(true);
+ //Save(true);
}
//? SetUndoStates();
@@ -5596,6 +5686,8 @@
void save()
{
+ Replace();
+
if (lastname == null)
{
return;
--
Gitblit v1.6.2