From de0d8d87447fea5faea469ccf8072a7aead35b6d Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 04 Aug 2019 20:56:22 -0400
Subject: [PATCH] Delete version.
---
ObjEditor.java | 129 +++++++++++++++++++++++--------
icons/shadericons/shadericon00013.png | 0
icons/shadericons/shadericon00017.jpg | 0
icons/shadericons/shadericon00005.png | 0
icons/shadericons/shadericon00012.png | 0
icons/trash.png | 0
icons/shadericons/shadericon00008.jpg | 0
icons/shadericons/shadericon00014.png | 0
icons/shadericons/shadericon00006.png | 0
icons/shaderskin.gfd | 0
icons/shadericons/shadericon00016.jpg | 0
icons/shadericons/shadericon00007.jpg | 0
gfd/materials.gfd | 0
icons/shadericons/shadericon00011.png | 0
icons/shadericons/shadericon00015.png | 0
icons/shadericons/shadericon00015.jpg | 0
icons/shadericons/shadericon00001.jpg | 0
icons/shadericons/shadericon00002.jpg | 0
icons/shadericons/shadericon00014.jpg | 0
icons/shadericons/shadericon00010.png | 0
icons/shadericons/shadericon00003.png | 0
icons/shadericons/shadericon00016.png | 0
icons/shadericons/shadericon00000.jpg | 0
icons/shadericons/shadericon00004.png | 0
icons/sphererender6.gfd | 0
icons/shadericons/shadericon00013.jpg | 0
icons/shadericons/shadericon00009.jpg | 0
icons/shadericons/shadericon00017.png | 0
icons/shadericons/shadericon00004.jpg | 0
icons/sphererender4.gfd | 0
icons/shadericons/shadericon00012.jpg | 0
icons/shadericons/shadericon00009.png | 0
icons/sphererender5.gfd | 0
icons/sphererender3.gfd | 0
icons/shadericons/shadericon00011.jpg | 0
icons/shadericons/shadericon00003.jpg | 0
GroupEditor.java | 48 +++++++-----
icons/shadericons/shadericon00002.png | 0
icons/shadericons/shadericon00007.png | 0
icons/shadericons/shadericon00010.jpg | 0
icons/sphererender2.gfd | 0
icons/shadericons/shadericon00006.jpg | 0
icons/shadericons/shadericon00001.png | 0
Grafreed.java | 56 ++++++++++++--
/dev/null | 0
icons/shadericons/shadericon00005.jpg | 0
Globals.java | 2
icons/shadericons/shadericon00008.png | 0
icons/shadericons/shadericon00000.png | 0
49 files changed, 171 insertions(+), 64 deletions(-)
diff --git a/Globals.java b/Globals.java
index 70488f3..0b4407e 100644
--- a/Globals.java
+++ b/Globals.java
@@ -12,7 +12,7 @@
public static boolean COMPUTESHADOWWHENLIVE = true;
public static boolean RENDERSHADOW = true;
- public static boolean REPLACEONMAKE = true; // problems when auto-save (works with manual save)
+ public static boolean REPLACEONMAKE = false;
public static boolean MOUSEDRAGGED = false;
public static boolean TIMERRUNNING = false;
diff --git a/Grafreed.java b/Grafreed.java
index 7007edf..a463511 100644
--- a/Grafreed.java
+++ b/Grafreed.java
@@ -58,7 +58,7 @@
universe.material = new cMaterial();
//god.addChild(universe);
universe.name = "Applet";
- grafreeD = this;
+ grafreed = this;
}
/**/
@@ -849,19 +849,59 @@
//Monitor mon=MonitorFactory.start("myFirstMonitor");
standAlone = true;
- grafreeD = new Grafreed();
- grafreeD.universe = new cGroup();
- grafreeD.universe.name = "Grafreed";
- grafreeD.universe.material = new cMaterial();
+ grafreed = new Grafreed();
+ grafreed.materials = ReadGFD(grafreed.getClass().getClassLoader().getResourceAsStream("gfd/materials.gfd"));
+
+ grafreed.universe = new cGroup();
+ grafreed.universe.name = "Grafreed";
+ grafreed.universe.material = new cMaterial();
// theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
- grafreeD.universe.root = true;
- grafreeD.universe.openEditWindow(null, true); //, true);
+ grafreed.universe.root = true;
+ grafreed.universe.openEditWindow(null, true); //, true);
//mon.stop();
//System.out.println(mon);
//timeflow.app.TimeflowAppLauncher.GetTimeFlow();
}
+ static Object3D materials;
+
+ static Object3D ReadGFD(java.io.InputStream istream)
+ {
+ Object3D readobj = null;
+
+ try
+ {
+ // Try compressed version first.
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
+
+ readobj = (Object3D) p.readObject();
+ istream.close();
+
+ readobj.ResetDisplayList();
+ } catch (Exception e)
+ {
+ if (!e.toString().contains("GZIP"))
+ e.printStackTrace();
+
+ try
+ {
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
+
+ readobj = (Object3D) p.readObject();
+ istream.close();
+
+ readobj.ResetDisplayList();
+ } catch (Exception e2)
+ {
+ e2.printStackTrace();
+ }
+ }
+
+ return readobj;
+ }
+
// Timer callback
public void actionPerformed(ActionEvent e)
{
@@ -1085,7 +1125,7 @@
} while (avail > 0 && numRead >= 0);
return new String(data, 0, pos, "US-ASCII");
}
- public static Grafreed grafreeD;
+ public static Grafreed grafreed;
public static boolean standAlone = true;
public Composite universe;
public static Object3D clipboard = new Object3D();
diff --git a/GroupEditor.java b/GroupEditor.java
index 0efe0b9..d8844d1 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -931,14 +931,18 @@
restoreCameraButton.setToolTipText("Restore viewpoint");
restoreCameraButton.addActionListener(this);
- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- saveButton.setToolTipText("Duplicate current 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);
@@ -953,10 +957,10 @@
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");
@@ -2571,7 +2575,7 @@
if (source == invariantsItem)
{
System.out.println("Invariants:");
- Grafreed.grafreeD.universe.invariants();
+ Grafreed.grafreed.universe.invariants();
} else
if (source == memoryItem)
{
@@ -2602,12 +2606,12 @@
{
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)
{
@@ -2621,16 +2625,21 @@
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)
{
@@ -2685,11 +2694,11 @@
} else
if (source == undoItem)
{
- Undo();
+ PreviousVersion();
} else
if (source == redoItem)
{
- Redo();
+ NextVersion();
} else
if (source == duplicateItem)
{
@@ -6004,7 +6013,6 @@
cButton restoreCameraButton;
- cButton saveButton;
cButton oneStepButton;
cButton groupButton;
diff --git a/ObjEditor.java b/ObjEditor.java
index 4f2f437..996442d 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -848,6 +848,8 @@
//frame.setVisible(true);
}
frame.validate();
+
+ cameraView.requestFocusInWindow();
}
private Object3D CompressCopy()
@@ -1738,20 +1740,52 @@
void SetupMaterial(cGridBag materialpanel)
{
cGridBag presetpanel = new cGridBag().setVertical(true);
- cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
- label.addMouseListener(new MouseAdapter()
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
+ skin.addMouseListener(new MouseAdapter()
{
public void mouseClicked(MouseEvent e)
{
- colorField.setFloat(0);
- saturationField.setFloat(1);
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
+ cMaterial material = object.material;
+
+ // Skin
+ colorField.setFloat(material.color);
+ saturationField.setFloat(material.modulation);
+ subsurfaceField.setFloat(material.subsurface);
+ selfshadowField.setFloat(material.diffuseness);
+ diffusenessField.setFloat(material.factor);
+ shininessField.setFloat(material.shininess);
+ shadowbiasField.setFloat(material.shadowbias);
+ diffuseField.setFloat(material.diffuse);
+ specularField.setFloat(material.specular);
+
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
+
materialtouched = true;
applySelf();
}
});
- presetpanel.add(label);
+ presetpanel.add(skin);
- presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
+ rough2.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
+ cMaterial material = object.material;
+
+ shininessField.setFloat(material.shininess);
+ velvetField.setFloat(material.velvet);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(rough2);
+
presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
@@ -1768,9 +1802,6 @@
presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
cGridBag panel = new cGridBag().setVertical(true);
@@ -1821,9 +1852,9 @@
cGridBag huepanel = new cGridBag();
cGridBag huelabel = new cGridBag();
- label = GetLabel("icons/hue.png", false);
- label.fit = true;
- huelabel.add(label);
+ skin = GetLabel("icons/hue.png", false);
+ skin.fit = true;
+ huelabel.add(skin);
huelabel.preferredWidth = 20;
huepanel.add(new cGridBag()); // Label
huepanel.add(huelabel); // Field/slider
@@ -3737,14 +3768,26 @@
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++)
+ {
+ copy.versionlist[i] = copy.versionlist[i+1];
+ }
+
+ CopyChanged();
+
+ SetUndoStates();
+ }
+
public boolean Save(boolean user)
{
System.err.println("Save");
- Replace();
+ //Replace();
cRadio tab = GetCurrentTab();
- Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
boolean thesame = false;
@@ -3756,6 +3799,11 @@
//EditorFrame.m_MainFrame.requestFocusInWindow();
if (!thesame)
{
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
+ {
+ copy.versionlist[i] = copy.versionlist[i-1];
+ }
+
//tab.user[tab.versionindex] = user;
//boolean increment = true; // tab.graphs[tab.versionindex] == null;
@@ -3769,11 +3817,11 @@
//assert(hashtable.isEmpty());
- for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
- {
- //tab.user[i] = false;
- copy.versionlist[i] = null;
- }
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
+// {
+// //tab.user[i] = false;
+// copy.versionlist[i] = null;
+// }
SetUndoStates();
@@ -3828,11 +3876,13 @@
GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
flashIt = true;
- refreshContents(false);
+ //refreshContents(false);
}
- void CopyChanged(Object3D obj)
+ void CopyChanged()
{
+ Object3D obj = copy.versionlist[copy.versionindex];
+
SetUndoStates();
boolean temp = CameraPane.SWITCH;
@@ -3875,13 +3925,15 @@
}
}
- refreshContents();
+ refreshContents(true);
}
- cButton undoButton;
+ cButton previousVersionButton;
cButton restoreButton;
cButton replaceButton;
- cButton redoButton;
+ cButton nextVersionButton;
+ cButton saveVersionButton;
+ cButton deleteVersionButton;
boolean muteSlider;
@@ -3902,11 +3954,14 @@
{
cRadio tab = GetCurrentTab();
- restoreButton.setEnabled(copy.versionindex != -1);
- replaceButton.setEnabled(copy.versionindex != -1);
+ restoreButton.setEnabled(true); // copy.versionindex != -1);
+ replaceButton.setEnabled(true); // copy.versionindex != -1);
- undoButton.setEnabled(copy.versionindex > 0);
- redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
+ previousVersionButton.setEnabled(copy.versionindex > 0);
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
+
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
+ copy.versionlist[copy.versionindex + 1] != null);
muteSlider = true;
versionSlider.setMaximum(VersionCount() - 1);
@@ -3914,7 +3969,7 @@
muteSlider = false;
}
- public boolean Undo()
+ public boolean PreviousVersion()
{
// Option?
Replace();
@@ -3944,7 +3999,7 @@
copy.versionindex -= 1;
- CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
+ CopyChanged();
return true;
}
@@ -3962,7 +4017,7 @@
}
//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
- CopyChanged(copy.versionlist[copy.versionindex]);
+ CopyChanged();
return true;
}
@@ -3984,7 +4039,7 @@
return true;
}
- public void Redo()
+ public void NextVersion()
{
// Option?
Replace();
@@ -3999,7 +4054,7 @@
copy.versionindex += 1;
- CopyChanged(copy.versionlist[copy.versionindex]);
+ CopyChanged();
//if (!tab.user[tab.versionindex])
// tab.graphs[tab.versionindex] = null;
@@ -4312,7 +4367,8 @@
if (copy.versionlist[version] != null)
{
- CopyChanged(copy.versionlist[copy.versionindex = version]);
+ copy.versionindex = version;
+ CopyChanged();
}
return;
@@ -4666,6 +4722,9 @@
ctrlPanel.validate(); // ? new
ctrlPanel.repaint();
}
+
+ if (previousVersionButton != null && copy.versionlist != null)
+ SetUndoStates();
}
static TweenManager tweenManager = new TweenManager();
@@ -5070,7 +5129,7 @@
{
if (Grafreed.standAlone)
{
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
browser.show();
String filename = browser.getFile();
if (filename != null && filename.length() > 0)
diff --git a/gfd/materials.gfd b/gfd/materials.gfd
new file mode 100644
index 0000000..35d0e08
--- /dev/null
+++ b/gfd/materials.gfd
Binary files differ
diff --git a/icons/shadericons/shadericon00000.jpg b/icons/shadericons/shadericon00000.jpg
index 803fd8e..8c7594a 100644
--- a/icons/shadericons/shadericon00000.jpg
+++ b/icons/shadericons/shadericon00000.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00000.png b/icons/shadericons/shadericon00000.png
index 428b515..64f015a 100644
--- a/icons/shadericons/shadericon00000.png
+++ b/icons/shadericons/shadericon00000.png
Binary files differ
diff --git a/icons/shadericons/shadericon00001.jpg b/icons/shadericons/shadericon00001.jpg
index 98b651f..0c15a0d 100644
--- a/icons/shadericons/shadericon00001.jpg
+++ b/icons/shadericons/shadericon00001.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00001.png b/icons/shadericons/shadericon00001.png
index 1767678..28ce45d 100644
--- a/icons/shadericons/shadericon00001.png
+++ b/icons/shadericons/shadericon00001.png
Binary files differ
diff --git a/icons/shadericons/shadericon00002.jpg b/icons/shadericons/shadericon00002.jpg
index bcf8723..721199d 100644
--- a/icons/shadericons/shadericon00002.jpg
+++ b/icons/shadericons/shadericon00002.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00002.png b/icons/shadericons/shadericon00002.png
index 7710607..49a5f40 100644
--- a/icons/shadericons/shadericon00002.png
+++ b/icons/shadericons/shadericon00002.png
Binary files differ
diff --git a/icons/shadericons/shadericon00003.jpg b/icons/shadericons/shadericon00003.jpg
index 8939bba..0c36e6a 100644
--- a/icons/shadericons/shadericon00003.jpg
+++ b/icons/shadericons/shadericon00003.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00003.png b/icons/shadericons/shadericon00003.png
index 7739235..c3e6258 100644
--- a/icons/shadericons/shadericon00003.png
+++ b/icons/shadericons/shadericon00003.png
Binary files differ
diff --git a/icons/shadericons/shadericon00004.jpg b/icons/shadericons/shadericon00004.jpg
index 3c76c21..8d7bd73 100644
--- a/icons/shadericons/shadericon00004.jpg
+++ b/icons/shadericons/shadericon00004.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00004.png b/icons/shadericons/shadericon00004.png
index 6b1f65a..2f39fa3 100644
--- a/icons/shadericons/shadericon00004.png
+++ b/icons/shadericons/shadericon00004.png
Binary files differ
diff --git a/icons/shadericons/shadericon00005.jpg b/icons/shadericons/shadericon00005.jpg
index f3c3c51..f7d2d2e 100644
--- a/icons/shadericons/shadericon00005.jpg
+++ b/icons/shadericons/shadericon00005.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00005.png b/icons/shadericons/shadericon00005.png
index 1a65208..8415e84 100644
--- a/icons/shadericons/shadericon00005.png
+++ b/icons/shadericons/shadericon00005.png
Binary files differ
diff --git a/icons/shadericons/shadericon00006.jpg b/icons/shadericons/shadericon00006.jpg
index 465bf57..3434048 100644
--- a/icons/shadericons/shadericon00006.jpg
+++ b/icons/shadericons/shadericon00006.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00006.png b/icons/shadericons/shadericon00006.png
index f1e1c2b..9f71b34 100644
--- a/icons/shadericons/shadericon00006.png
+++ b/icons/shadericons/shadericon00006.png
Binary files differ
diff --git a/icons/shadericons/shadericon00007.jpg b/icons/shadericons/shadericon00007.jpg
index 721e23e..4b11bcf 100644
--- a/icons/shadericons/shadericon00007.jpg
+++ b/icons/shadericons/shadericon00007.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00007.png b/icons/shadericons/shadericon00007.png
index 792bfd1..12cd8e4 100644
--- a/icons/shadericons/shadericon00007.png
+++ b/icons/shadericons/shadericon00007.png
Binary files differ
diff --git a/icons/shadericons/shadericon00008.jpg b/icons/shadericons/shadericon00008.jpg
index caa4bc2..af09727 100644
--- a/icons/shadericons/shadericon00008.jpg
+++ b/icons/shadericons/shadericon00008.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00008.png b/icons/shadericons/shadericon00008.png
index c54c9c1..8b9540c 100644
--- a/icons/shadericons/shadericon00008.png
+++ b/icons/shadericons/shadericon00008.png
Binary files differ
diff --git a/icons/shadericons/shadericon00009.jpg b/icons/shadericons/shadericon00009.jpg
index 1eff465..f440261 100644
--- a/icons/shadericons/shadericon00009.jpg
+++ b/icons/shadericons/shadericon00009.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00009.png b/icons/shadericons/shadericon00009.png
index b0f7371..7d2a943 100644
--- a/icons/shadericons/shadericon00009.png
+++ b/icons/shadericons/shadericon00009.png
Binary files differ
diff --git a/icons/shadericons/shadericon00010.jpg b/icons/shadericons/shadericon00010.jpg
index b165323..7bbdfa6 100644
--- a/icons/shadericons/shadericon00010.jpg
+++ b/icons/shadericons/shadericon00010.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00010.png b/icons/shadericons/shadericon00010.png
index 2f3d483..02bdc3c 100644
--- a/icons/shadericons/shadericon00010.png
+++ b/icons/shadericons/shadericon00010.png
Binary files differ
diff --git a/icons/shadericons/shadericon00011.jpg b/icons/shadericons/shadericon00011.jpg
index cc3337f..0831456 100644
--- a/icons/shadericons/shadericon00011.jpg
+++ b/icons/shadericons/shadericon00011.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00011.png b/icons/shadericons/shadericon00011.png
index 7c5531c..fc8a505 100644
--- a/icons/shadericons/shadericon00011.png
+++ b/icons/shadericons/shadericon00011.png
Binary files differ
diff --git a/icons/shadericons/shadericon00012.jpg b/icons/shadericons/shadericon00012.jpg
index 062d22b..84a93d7 100644
--- a/icons/shadericons/shadericon00012.jpg
+++ b/icons/shadericons/shadericon00012.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00012.png b/icons/shadericons/shadericon00012.png
index 8562556..f6851bb 100644
--- a/icons/shadericons/shadericon00012.png
+++ b/icons/shadericons/shadericon00012.png
Binary files differ
diff --git a/icons/shadericons/shadericon00013.jpg b/icons/shadericons/shadericon00013.jpg
index 58e5e7a..b9b52a9 100644
--- a/icons/shadericons/shadericon00013.jpg
+++ b/icons/shadericons/shadericon00013.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00013.png b/icons/shadericons/shadericon00013.png
index f50dd1c..532ce8e 100644
--- a/icons/shadericons/shadericon00013.png
+++ b/icons/shadericons/shadericon00013.png
Binary files differ
diff --git a/icons/shadericons/shadericon00014.jpg b/icons/shadericons/shadericon00014.jpg
index c732ddb..783514b 100644
--- a/icons/shadericons/shadericon00014.jpg
+++ b/icons/shadericons/shadericon00014.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00014.png b/icons/shadericons/shadericon00014.png
index 9e5556b..1de6b24 100644
--- a/icons/shadericons/shadericon00014.png
+++ b/icons/shadericons/shadericon00014.png
Binary files differ
diff --git a/icons/shadericons/shadericon00015.jpg b/icons/shadericons/shadericon00015.jpg
index 660d2ad..4dbee4d 100644
--- a/icons/shadericons/shadericon00015.jpg
+++ b/icons/shadericons/shadericon00015.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00015.png b/icons/shadericons/shadericon00015.png
index e8f4741..724816b 100644
--- a/icons/shadericons/shadericon00015.png
+++ b/icons/shadericons/shadericon00015.png
Binary files differ
diff --git a/icons/shadericons/shadericon00016.jpg b/icons/shadericons/shadericon00016.jpg
index e9d092c..9291f08 100644
--- a/icons/shadericons/shadericon00016.jpg
+++ b/icons/shadericons/shadericon00016.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00016.png b/icons/shadericons/shadericon00016.png
index adf6078..7200594 100644
--- a/icons/shadericons/shadericon00016.png
+++ b/icons/shadericons/shadericon00016.png
Binary files differ
diff --git a/icons/shadericons/shadericon00017.jpg b/icons/shadericons/shadericon00017.jpg
index 4b5123d..c57b9b3 100644
--- a/icons/shadericons/shadericon00017.jpg
+++ b/icons/shadericons/shadericon00017.jpg
Binary files differ
diff --git a/icons/shadericons/shadericon00017.png b/icons/shadericons/shadericon00017.png
index e4b8629..fc2fd80 100644
--- a/icons/shadericons/shadericon00017.png
+++ b/icons/shadericons/shadericon00017.png
Binary files differ
diff --git a/icons/shadericons/shadericon00018.jpg b/icons/shadericons/shadericon00018.jpg
deleted file mode 100644
index 5c50bba..0000000
--- a/icons/shadericons/shadericon00018.jpg
+++ /dev/null
Binary files differ
diff --git a/icons/shadericons/shadericon00018.png b/icons/shadericons/shadericon00018.png
deleted file mode 100644
index 768adf8..0000000
--- a/icons/shadericons/shadericon00018.png
+++ /dev/null
Binary files differ
diff --git a/icons/shadericons/shadericon00019.jpg b/icons/shadericons/shadericon00019.jpg
deleted file mode 100644
index 41fe4d6..0000000
--- a/icons/shadericons/shadericon00019.jpg
+++ /dev/null
Binary files differ
diff --git a/icons/shadericons/shadericon00019.png b/icons/shadericons/shadericon00019.png
deleted file mode 100644
index e24efbf..0000000
--- a/icons/shadericons/shadericon00019.png
+++ /dev/null
Binary files differ
diff --git a/icons/shadericons/shadericon00020.jpg b/icons/shadericons/shadericon00020.jpg
deleted file mode 100644
index e60f200..0000000
--- a/icons/shadericons/shadericon00020.jpg
+++ /dev/null
Binary files differ
diff --git a/icons/shadericons/shadericon00020.png b/icons/shadericons/shadericon00020.png
deleted file mode 100644
index 6405163..0000000
--- a/icons/shadericons/shadericon00020.png
+++ /dev/null
Binary files differ
diff --git a/icons/shaderskin.gfd b/icons/shaderskin.gfd
new file mode 100644
index 0000000..b919aa5
--- /dev/null
+++ b/icons/shaderskin.gfd
Binary files differ
diff --git a/icons/sphererender2.gfd b/icons/sphererender2.gfd
new file mode 100644
index 0000000..bda9b60
--- /dev/null
+++ b/icons/sphererender2.gfd
Binary files differ
diff --git a/icons/sphererender3.gfd b/icons/sphererender3.gfd
new file mode 100644
index 0000000..de27a35
--- /dev/null
+++ b/icons/sphererender3.gfd
Binary files differ
diff --git a/icons/sphererender4.gfd b/icons/sphererender4.gfd
new file mode 100644
index 0000000..de27a35
--- /dev/null
+++ b/icons/sphererender4.gfd
Binary files differ
diff --git a/icons/sphererender5.gfd b/icons/sphererender5.gfd
new file mode 100644
index 0000000..57ab378
--- /dev/null
+++ b/icons/sphererender5.gfd
Binary files differ
diff --git a/icons/sphererender6.gfd b/icons/sphererender6.gfd
new file mode 100644
index 0000000..2efcd1b
--- /dev/null
+++ b/icons/sphererender6.gfd
Binary files differ
diff --git a/icons/trash.png b/icons/trash.png
new file mode 100644
index 0000000..5918dbe
--- /dev/null
+++ b/icons/trash.png
Binary files differ
--
Gitblit v1.6.2