From 4ec7130da08861dc4aff0232dbce38f3471696a4 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 05 Aug 2019 20:41:17 -0400
Subject: [PATCH] Materials working.
---
ObjEditor.java | 462 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 410 insertions(+), 52 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index 4f2f437..b86325c 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -848,6 +848,8 @@
//frame.setVisible(true);
}
frame.validate();
+
+ cameraView.requestFocusInWindow();
}
private Object3D CompressCopy()
@@ -1738,46 +1740,374 @@
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.setToolTipText("Skin");
+ 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));
- 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));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
- presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
- 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));
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
+ lambert.setToolTipText("Diffuse");
+ lambert.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
+ cMaterial material = object.material;
+
+ diffusenessField.setFloat(material.factor);
+ selfshadowField.setFloat(material.diffuseness);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(lambert);
+
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
+ diffuse2.setToolTipText("Diffuse2");
+ diffuse2.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
+ cMaterial material = object.material;
+
+ diffusenessField.setFloat(material.factor);
+ selfshadowField.setFloat(material.diffuseness);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(diffuse2);
+
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
+ diffusemoon.setToolTipText("Moon");
+ diffusemoon.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
+ cMaterial material = object.material;
+
+ diffusenessField.setFloat(material.factor);
+ selfshadowField.setFloat(material.diffuseness);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(diffusemoon);
+
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
+ diffusemoon2.setToolTipText("Moon2");
+ diffusemoon2.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
+ cMaterial material = object.material;
+
+ diffusenessField.setFloat(material.factor);
+ selfshadowField.setFloat(material.diffuseness);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(diffusemoon2);
+
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
+ diffusemoon3.setToolTipText("Moon3");
+ diffusemoon3.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
+ cMaterial material = object.material;
+
+ diffusenessField.setFloat(material.factor);
+ selfshadowField.setFloat(material.diffuseness);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(diffusemoon3);
+
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
+ diffusesheen.setToolTipText("Sheen");
+ diffusesheen.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
+ cMaterial material = object.material;
+
+ sheenField.setFloat(material.sheen);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(diffusesheen);
+
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
+ rough.setToolTipText("Rough metal");
+ rough.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(rough);
+
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
+ rough2.setToolTipText("Medium metal");
+ rough2.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
+ cMaterial material = object.material;
+
+ shininessField.setFloat(material.shininess);
+ lightareaField.setFloat(material.lightarea);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(rough2);
+
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
+ shini0.setToolTipText("Shiny");
+ shini0.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
+ cMaterial material = object.material;
+
+ shininessField.setFloat(material.shininess);
+ lightareaField.setFloat(material.lightarea);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(shini0);
+
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
+ shini1.setToolTipText("Shiny2");
+ shini1.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
+ cMaterial material = object.material;
+
+ shininessField.setFloat(material.shininess);
+ lightareaField.setFloat(material.lightarea);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(shini1);
+
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
+ shini2.setToolTipText("Shiny3");
+ shini2.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
+ cMaterial material = object.material;
+
+ shininessField.setFloat(material.shininess);
+ lightareaField.setFloat(material.lightarea);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(shini2);
+
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
+ aniso.setToolTipText("AnisoU");
+ aniso.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
+ cMaterial material = object.material;
+
+ anisoField.setFloat(material.aniso);
+ anisoVField.setFloat(material.anisoV);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(aniso);
+
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
+ aniso2.setToolTipText("AnisoV");
+ aniso2.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
+ cMaterial material = object.material;
+
+ anisoField.setFloat(material.aniso);
+ anisoVField.setFloat(material.anisoV);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(aniso2);
+
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
+ aniso3.setToolTipText("AnisoUV");
+ aniso3.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
+ cMaterial material = object.material;
+
+ anisoField.setFloat(material.aniso);
+ anisoVField.setFloat(material.anisoV);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(aniso3);
+
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
+ velvet0.setToolTipText("Velvet");
+ velvet0.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
+ cMaterial material = object.material;
+
+ diffusenessField.setFloat(material.factor);
+ selfshadowField.setFloat(material.diffuseness);
+ sheenField.setFloat(material.sheen);
+ shininessField.setFloat(material.shininess);
+ velvetField.setFloat(material.velvet);
+ shiftField.setFloat(material.shift);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(velvet0);
+
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
+ bump0.setToolTipText("Bump texture");
+ bump0.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
+ cMaterial material = object.material;
+
+ 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(bump0);
+
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
+ halo.setToolTipText("Halo");
+ halo.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
+ cMaterial material = object.material;
+
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(halo);
+
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
+ candle.setToolTipText("Candle");
+ candle.addMouseListener(new MouseAdapter()
+ {
+ public void mouseClicked(MouseEvent e)
+ {
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
+ cMaterial material = object.material;
+
+ subsurfaceField.setFloat(material.subsurface);
+ shadowbiasField.setFloat(material.shadowbias);
+ ambientField.setFloat(material.ambient);
+ specularField.setFloat(material.specular);
+ lightareaField.setFloat(material.lightarea);
+ shininessField.setFloat(material.shininess);
+
+ materialtouched = true;
+ applySelf();
+ }
+ });
+ presetpanel.add(candle);
cGridBag panel = new cGridBag().setVertical(true);
presetpanel.preferredWidth = 1;
- materialpanel.add(panel);
materialpanel.add(presetpanel);
+ materialpanel.add(panel);
panel.preferredWidth = 8;
@@ -1821,9 +2151,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 +4067,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 +4098,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 +4116,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 +4175,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 +4224,15 @@
}
}
- refreshContents();
+ refreshContents(true);
}
- cButton undoButton;
+ cButton previousVersionButton;
cButton restoreButton;
cButton replaceButton;
- cButton redoButton;
+ cButton nextVersionButton;
+ cButton saveVersionButton;
+ cButton deleteVersionButton;
boolean muteSlider;
@@ -3902,11 +4253,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 +4268,7 @@
muteSlider = false;
}
- public boolean Undo()
+ public boolean PreviousVersion()
{
// Option?
Replace();
@@ -3944,7 +4298,7 @@
copy.versionindex -= 1;
- CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
+ CopyChanged();
return true;
}
@@ -3962,7 +4316,7 @@
}
//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
- CopyChanged(copy.versionlist[copy.versionindex]);
+ CopyChanged();
return true;
}
@@ -3984,7 +4338,7 @@
return true;
}
- public void Redo()
+ public void NextVersion()
{
// Option?
Replace();
@@ -3999,7 +4353,7 @@
copy.versionindex += 1;
- CopyChanged(copy.versionlist[copy.versionindex]);
+ CopyChanged();
//if (!tab.user[tab.versionindex])
// tab.graphs[tab.versionindex] = null;
@@ -4312,7 +4666,8 @@
if (copy.versionlist[version] != null)
{
- CopyChanged(copy.versionlist[copy.versionindex = version]);
+ copy.versionindex = version;
+ CopyChanged();
}
return;
@@ -4666,6 +5021,9 @@
ctrlPanel.validate(); // ? new
ctrlPanel.repaint();
}
+
+ if (previousVersionButton != null && copy.versionlist != null)
+ SetUndoStates();
}
static TweenManager tweenManager = new TweenManager();
@@ -5070,7 +5428,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)
--
Gitblit v1.6.2