From 65bdec7ae2c99ca2102c55f92bd62b48c9f14847 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 01 Oct 2019 17:30:29 -0400
Subject: [PATCH] Disable project on ground + adam/eve/tom
---
CSGEditor.java | 177 +++++++++++++++++++++++++++-------------------------------
1 files changed, 82 insertions(+), 95 deletions(-)
diff --git a/CSGEditor.java b/CSGEditor.java
index 4da2c35..f06dac2 100644
--- a/CSGEditor.java
+++ b/CSGEditor.java
@@ -10,6 +10,8 @@
import java.util.Vector;
+import grafeme.ui.*;
+
class CSGEditor extends ObjEditor implements ChangeListener, ActionListener, ObjectUI
{
@@ -44,19 +46,18 @@
super.SetupUI2(oe); // Shows composite UI !!
//super.SetupName(oe);
- oe.aConstraints.weighty = 0;
+ oe.ctrlPanel.add(refreshButton = new JButton("Refresh")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ oe.ctrlPanel.Return();
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridwidth = 1;
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.ctrlPanel.add(refreshButton = new JButton("Refresh"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridwidth = 1;
- oe.aConstraints.gridx /* = 0;
- oe.aConstraints.gridy */ += 1;
-
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridwidth = 1;
- //this.csg = (CSG) copy;
+ menuPane = new cGridBag();
+ oe.ctrlPanel.add(menuPane);
+ oe.ctrlPanel.Return();
+
+ menuPane2 = new cGridBag();
+ oe.ctrlPanel.add(menuPane2);
+ oe.ctrlPanel.Return();
+
+ //this.csg = (CSG) copy;
/*
oe.ctrlPanel.add(typeLabel = new JLabel("Type"), oe.aConstraints);
oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
@@ -67,33 +68,26 @@
list.add("Merge");
list.add("Intersection");
list.add("Difference");
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.ctrlPanel.add(typeMenu = new JComboBox(new ObjEditor.cListModel(list, csg.csgType - 1)), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ menuPane.add(typeMenu = new JComboBox(new ObjEditor.cListModel(list, csg.csgType - 1))); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
//typeMenu.select(csg.csgType - 1);
- oe.aConstraints.gridx += 1;
- //oe.aConstraints.gridy += 1;
- //oe.aConstraints.gridx = 0;
-
+ oe.ctrlPanel.Return();
+
list = new Vector();
list.add("Surface");
list.add("Volume");
list.add("Inner");
list.add("Outer");
list.add("Boundary");
+
/*
oe.aConstraints.fill = 0;
oe.ctrlPanel.add(genLabel = new JLabel("Generation"), oe.aConstraints);
oe.aConstraints.gridx += 1;
*/
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.ctrlPanel.add(genMenu = new JComboBox(new ObjEditor.cListModel(list, 0)), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ menuPane.add(genMenu = new JComboBox(new ObjEditor.cListModel(list, 0))); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
//typeMenu.select(csg.csgType - 1);
- //oe.aConstraints.gridy += 1;
- oe.aConstraints.gridx += 1;
- Return();
-
list = new Vector();
list.add("Smooth");
list.add("Flat");
@@ -102,11 +96,8 @@
oe.ctrlPanel.add(normalsLabel = new JLabel("Shading"), oe.aConstraints);
oe.aConstraints.gridx += 1;
*/
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.ctrlPanel.add(normalsMenu = new JComboBox(new ObjEditor.cListModel(list, 0)), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ menuPane2.add(normalsMenu = new JComboBox(new ObjEditor.cListModel(list, 0))); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
//typeMenu.select(csg.csgType - 1);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = 1;
list = new Vector();
list.add("Strip");
@@ -117,55 +108,39 @@
oe.ctrlPanel.add(normalsLabel = new JLabel("Shading"), oe.aConstraints);
oe.aConstraints.gridx += 1;
*/
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.ctrlPanel.add(stripifyMenu = new JComboBox(new ObjEditor.cListModel(list, 0)), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ menuPane2.add(stripifyMenu = new JComboBox(new ObjEditor.cListModel(list, 0))); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
//typeMenu.select(csg.csgType - 1);
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridwidth = 1;
- //oe.aConstraints.fill = 0;
- oe.ctrlPanel.add(sizeLabel = new JLabel("Depth"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.ctrlPanel.add(sizeField = new NumberSlider(0,10), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridx = 0;
+// oe.ctrlPanel.add(sizeLabel = new JLabel("Depth")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+// oe.ctrlPanel.add(sizeSlider = new NumberSlider(0,10)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ sizeSliderPane = AddSlider(oe.ctrlPanel, "Depth", 0, 10, 0);
+ sizeSlider = (cNumberSlider)sizeSliderPane.getComponent(1);
+ oe.ctrlPanel.Return();
- oe.aConstraints.fill = 0;
- oe.aConstraints.gridwidth = 1;
- oe.ctrlPanel.add(size2Label = new JLabel("Depth2"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.ctrlPanel.add(size2Field = new NumberSlider(0,10), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridx = 0;
+// oe.ctrlPanel.add(size2Label = new JLabel("Depth2")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+// oe.ctrlPanel.add(size2Slider = new NumberSlider(0,10)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ size2SliderPane = AddSlider(oe.ctrlPanel, "Depth2", 0, 10, 0);
+ size2Slider = (cNumberSlider)size2SliderPane.getComponent(1);
+ oe.ctrlPanel.Return();
- oe.aConstraints.gridwidth = 1;
- oe.aConstraints.fill = 0;
- oe.ctrlPanel.add(tolLabel = new JLabel("Tolerance"), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridx += 1;
- oe.aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
- oe.ctrlPanel.add(tolField = new NumberSlider(0,10,1), oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
- oe.aConstraints.gridy += 1;
- oe.aConstraints.gridx = 0;
- oe.aConstraints.gridwidth = 1;
+// oe.ctrlPanel.add(tolLabel = new JLabel("Tolerance")); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+// oe.ctrlPanel.add(toleranceSlider = new NumberSlider(0,10,1)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount()-2);
+ toleranceSliderPane = AddSlider(oe.ctrlPanel, "Tolerance", 0, 10, 1, 1);
+ toleranceSlider = (cNumberSlider)toleranceSliderPane.getComponent(1);
+ oe.ctrlPanel.Return();
- sizeField.setInteger(csg.cellSize);
- size2Field.setInteger(csg.cellSize2);
+ sizeSlider.setInteger(csg.cellSize);
+ size2Slider.setInteger(csg.cellSize2);
System.out.println("csg.tolerance = " + csg.tolerance);
- tolField.setFloat(csg.tolerance);
+ toleranceSlider.setFloat(csg.tolerance);
normalsMenu.setSelectedIndex(csg.normals?0:1);
typeMenu.setSelectedIndex(csg.csgType - 1);
genMenu.setSelectedIndex(csg.genType);
stripifyMenu.setSelectedIndex(csg.userType); // ==0?0:1);
- sizeField.addChangeListener(this);
- size2Field.addChangeListener(this);
- tolField.addChangeListener(this);
+ sizeSlider.addChangeListener(this);
+ size2Slider.addChangeListener(this);
+ toleranceSlider.addChangeListener(this);
typeMenu.addActionListener(this);
genMenu.addActionListener(this);
@@ -199,24 +174,29 @@
normalsMenu.removeActionListener(this);
refreshButton.removeActionListener(this);
- sizeField.removeChangeListener(this);
- size2Field.removeChangeListener(this);
- tolField.removeChangeListener(this);
- oe.ctrlPanel.remove(sizeField);
- oe.ctrlPanel.remove(size2Field);
- oe.ctrlPanel.remove(tolField);
- oe.ctrlPanel.remove(sizeLabel);
- oe.ctrlPanel.remove(size2Label);
- oe.ctrlPanel.remove(tolLabel);
- oe.ctrlPanel.remove(typeMenu);
- //oe.ctrlPanel.remove(typeLabel);
- oe.ctrlPanel.remove(genMenu);
- //oe.ctrlPanel.remove(genLabel);
- oe.ctrlPanel.remove(normalsMenu);
- oe.ctrlPanel.remove(stripifyMenu);
- //oe.ctrlPanel.remove(normalsLabel);
- oe.ctrlPanel.remove(refreshButton);
- //oe.ctrlPanel.repaint();
+ sizeSlider.removeChangeListener(this);
+ size2Slider.removeChangeListener(this);
+ toleranceSlider.removeChangeListener(this);
+
+ oe.ctrlPanel.remove(this.refreshButton);
+ oe.ctrlPanel.remove(menuPane);
+ oe.ctrlPanel.remove(menuPane2);
+ oe.ctrlPanel.remove(sizeSliderPane);
+ oe.ctrlPanel.remove(size2SliderPane);
+ oe.ctrlPanel.remove(toleranceSliderPane);
+
+// oe.ctrlPanel.remove(sizeLabel);
+// oe.ctrlPanel.remove(size2Label);
+// oe.ctrlPanel.remove(tolLabel);
+// oe.ctrlPanel.remove(typeMenu);
+// //oe.ctrlPanel.remove(typeLabel);
+// oe.ctrlPanel.remove(genMenu);
+// //oe.ctrlPanel.remove(genLabel);
+// oe.ctrlPanel.remove(normalsMenu);
+// oe.ctrlPanel.remove(stripifyMenu);
+// //oe.ctrlPanel.remove(normalsLabel);
+// oe.ctrlPanel.remove(refreshButton);
+// //oe.ctrlPanel.repaint();
super.closeUI();
}
@@ -226,7 +206,7 @@
{
super.doLayout();
labelAndField(typeLabel, typeMenu);
- labelAndField(sizeLabel, sizeField);
+ labelAndField(sizeLabel, sizeSlider);
widgetPos += 5;
}
*/
@@ -252,9 +232,9 @@
public void stateChanged(ChangeEvent e)
{
- if (e.getSource() == sizeField ||
- e.getSource() == size2Field ||
- e.getSource() == tolField)
+ if (e.getSource() == sizeSlider ||
+ e.getSource() == size2Slider ||
+ e.getSource() == toleranceSlider)
{
// Can't choose...
//applySelf();
@@ -272,15 +252,16 @@
csg.genType = genMenu.getSelectedIndex();
csg.normals = normalsMenu.getSelectedIndex() == 0;
csg.userType = stripifyMenu.getSelectedIndex();
- csg.cellSize = sizeField.getInteger();
- csg.cellSize2 = size2Field.getInteger();
- csg.tolerance = tolField.getFloat();
+ csg.cellSize = sizeSlider.getInteger();
+ csg.cellSize2 = size2Slider.getInteger();
+ csg.tolerance = toleranceSlider.getFloat();
- if (csg.link2master)
+ if (csg.Link2Support())
csg.retile();
}
CSG csg;
+
JLabel typeLabel;
JLabel genLabel;
JLabel normalsLabel;
@@ -291,10 +272,16 @@
JComboBox genMenu;
JComboBox normalsMenu;
JComboBox stripifyMenu;
- NumberSlider sizeField;
- NumberSlider size2Field;
- NumberSlider tolField;
+ cNumberSlider sizeSlider;
+ cNumberSlider size2Slider;
+ cNumberSlider toleranceSlider;
+ cGridBag menuPane;
+ cGridBag menuPane2;
+ cGridBag sizeSliderPane;
+ cGridBag size2SliderPane;
+ cGridBag toleranceSliderPane;
+
JButton refreshButton;
//GroupEditor objEditor;
--
Gitblit v1.6.2