~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -22,6 +23,237 @@
22	23	DragGestureListener, DragSourceListener, DropTargetListener,
23	24	ItemListener // ListSelectionListener
24	25	{
	26	+
	27	+ public void AddSkyboxButton(String f, String s, cGridBag row)
	28	+ {
	29	+ cButton skyboxButton;
	30	+ final String path = "cubemaps/" + f + "-skyboxes/" + s;
	31	+ //row.add(skyboxButton = GetButton(path + "/" + s + ".jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
	33	+ skyboxButton.setToolTipText(s);
	34	+ skyboxButton.addActionListener(new ActionListener()
	35	+ {
	36	+ @Override
	37	+ public void actionPerformed(ActionEvent e)
	38	+ {
	39	+ ChangeSkybox(path);
	40	+ }
	41	+ });
	42	+ }
	43	+
	44	+ public void AddSkyboxTab0(JTabbedPane skyboxpanel)
	45	+ {
	46	+ cGridBag tab0 = new cGridBag().setVertical(true);
	47	+
	48	+ tab0.setName("Urban");
	49	+ skyboxpanel.add(tab0);
	50	+
	51	+ cGridBag row0 = new cGridBag();
	52	+ cGridBag row1 = new cGridBag();
	53	+ cGridBag row2 = new cGridBag();
	54	+ cGridBag row3 = new cGridBag();
	55	+ cGridBag row4 = new cGridBag();
	56	+ cGridBag row5 = new cGridBag();
	57	+ cGridBag row6 = new cGridBag();
	58	+
	59	+ AddSkyboxButton("default", "rgb", row0);
	60	+ AddSkyboxButton("default", "cornell", row0);
	61	+ AddSkyboxButton("default", "uffizi", row0);
	62	+ AddSkyboxButton("default", "CloudyHills", row0);
	63	+
	64	+ AddSkyboxButton("default", "skycube", row1);
	65	+ AddSkyboxButton("bridge", "Bridge", row1);
	66	+ AddSkyboxButton("bridge", "Bridge2", row1);
	67	+ AddSkyboxButton("urban", "GamlaStan2", row1);
	68	+
	69	+ AddSkyboxButton("urban", "Parliament", row2);
	70	+ AddSkyboxButton("urban", "Roundabout", row2);
	71	+ AddSkyboxButton("urban", "SaintLazarusChurch", row2);
	72	+ AddSkyboxButton("urban", "SaintLazarusChurch2", row2);
	73	+
	74	+ AddSkyboxButton("urban", "SaintLazarusChurch3", row3);
	75	+ AddSkyboxButton("urban", "UnionSquare", row3);
	76	+ AddSkyboxButton("park", "BerzeliiPark", row3);
	77	+ AddSkyboxButton("park", "Buddha", row3);
	78	+
	79	+ AddSkyboxButton("park", "CNTower2", row4);
	80	+ AddSkyboxButton("park", "NiagaraFalls1", row4);
	81	+ AddSkyboxButton("park", "NiagaraFalls3", row4);
	82	+ AddSkyboxButton("park", "Park", row4);
	83	+
	84	+ AddSkyboxButton("park", "Pond", row5);
	85	+ AddSkyboxButton("park", "Skansen", row5);
	86	+ AddSkyboxButton("park", "Skansen2", row5);
	87	+ AddSkyboxButton("park", "Skansen3", row5);
	88	+
	89	+ AddSkyboxButton("park", "Skansen4", row6);
	90	+ AddSkyboxButton("park", "Skansen5", row6);
	91	+ AddSkyboxButton("park", "Stairs", row6);
	92	+ AddSkyboxButton("park", "Tantolunden4", row6);
	93	+
	94	+ tab0.add(row0);
	95	+ tab0.add(row1);
	96	+ tab0.add(row2);
	97	+ tab0.add(row3);
	98	+ tab0.add(row4);
	99	+ tab0.add(row5);
	100	+ tab0.add(row6);
	101	+
	102	+ for (int i=5; --i>=0;)
	103	+ {
	104	+ //oe.toolboxPanel.Return();
	105	+ //tab0.add(new cGridBag());
	106	+ }
	107	+ }
	108	+
	109	+ public void AddSkyboxTab1(JTabbedPane skyboxpanel)
	110	+ {
	111	+ cGridBag tab0 = new cGridBag().setVertical(true);
	112	+
	113	+ tab0.setName("Nature");
	114	+ skyboxpanel.add(tab0);
	115	+
	116	+ cGridBag row0 = new cGridBag();
	117	+ cGridBag row1 = new cGridBag();
	118	+ cGridBag row2 = new cGridBag();
	119	+ cGridBag row3 = new cGridBag();
	120	+ cGridBag row4 = new cGridBag();
	121	+ cGridBag row5 = new cGridBag();
	122	+ cGridBag row6 = new cGridBag();
	123	+
	124	+ AddSkyboxButton("beach", "HeartInTheSand", row0);
	125	+ AddSkyboxButton("beach", "LarnacaBeach", row0);
	126	+ AddSkyboxButton("beach", "PalmTrees", row0);
	127	+ AddSkyboxButton("beach", "Tenerife", row0);
	128	+
	129	+ AddSkyboxButton("beach", "Tenerife2", row1);
	130	+ AddSkyboxButton("beach", "Tenerife3", row1);
	131	+ AddSkyboxButton("field", "FishPond", row1);
	132	+ AddSkyboxButton("field", "Footballfield", row1);
	133	+
	134	+ AddSkyboxButton("field", "Meadow", row2);
	135	+ AddSkyboxButton("field", "Sorsele", row2);
	136	+ AddSkyboxButton("field", "Sorsele2", row2);
	137	+ AddSkyboxButton("field", "Sorsele3", row2);
	138	+
	139	+ AddSkyboxButton("forest", "Brudslojan", row3);
	140	+ AddSkyboxButton("forest", "Langholmen2", row3);
	141	+ AddSkyboxButton("forest", "Plants", row3);
	142	+ AddSkyboxButton("mountain", "Maskonaive", row3);
	143	+ AddSkyboxButton("mountain", "Maskonaive2", row4);
	144	+
	145	+ AddSkyboxButton("mountain", "Maskonaive3", row4);
	146	+ AddSkyboxButton("mountain", "Ryfjallet", row4);
	147	+ AddSkyboxButton("mountain", "Teide", row4);
	148	+
	149	+ AddSkyboxButton("rocky", "Langholmen", row5);
	150	+ AddSkyboxButton("rocky", "Riddarfjarden", row5);
	151	+ AddSkyboxButton("rocky", "Skinnarviksberget", row5);
	152	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
	153	+ /*
	154	+Kastellholmen
	155	+Langholmen
	156	+Riddarfjarden
	157	+Skinnarviksberget
	158	+Tanto
	159	+Tantolunden2
	160	+Tantolunden6
	161	+ */
	162	+
	163	+ tab0.add(row0);
	164	+ tab0.add(row1);
	165	+ tab0.add(row2);
	166	+ tab0.add(row3);
	167	+ tab0.add(row4);
	168	+ tab0.add(row5);
	169	+ tab0.add(row6);
	170	+
	171	+ for (int i=5; --i>=0;)
	172	+ {
	173	+ //oe.toolboxPanel.Return();
	174	+ //tab0.add(new cGridBag());
	175	+ }
	176	+ }
	177	+
	178	+ public void AddSkyboxTab2(JTabbedPane skyboxpanel)
	179	+ {
	180	+ cGridBag tab0 = new cGridBag().setVertical(true);
	181	+
	182	+ tab0.setName("Night");
	183	+ skyboxpanel.add(tab0);
	184	+
	185	+ cGridBag row0 = new cGridBag();
	186	+ cGridBag row1 = new cGridBag();
	187	+ cGridBag row2 = new cGridBag();
	188	+ cGridBag row3 = new cGridBag();
	189	+ cGridBag row4 = new cGridBag();
	190	+ cGridBag row5 = new cGridBag();
	191	+ cGridBag row6 = new cGridBag();
	192	+
	193	+ AddSkyboxButton("night", "NightPath", row0);
	194	+ AddSkyboxButton("night", "PondNight", row0);
	195	+ AddSkyboxButton("night", "Powerlines", row0);
	196	+ AddSkyboxButton("night", "SwedishRoyalCastle", row0);
	197	+
	198	+ AddSkyboxButton("urban", "CNTower", row1);
	199	+ AddSkyboxButton("bridge", "ArstaBridge", row1);
	200	+ AddSkyboxButton("indoors", "DallasW", row1);
	201	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row1);
	202	+
	203	+ AddSkyboxButton("indoors", "Vasa", row2);
	204	+ AddSkyboxButton("winter", "Backyard", row2);
	205	+ AddSkyboxButton("winter", "Creek", row2);
	206	+ AddSkyboxButton("winter", "FootballField3", row2);
	207	+
	208	+ AddSkyboxButton("winter", "Forest", row3);
	209	+ AddSkyboxButton("winter", "HornstullsStrand2", row3);
	210	+ AddSkyboxButton("winter", "House", row3);
	211	+ AddSkyboxButton("winter", "IceLake", row3);
	212	+
	213	+ AddSkyboxButton("winter", "IceRiver", row4);
	214	+ AddSkyboxButton("winter", "Park3", row4);
	215	+ AddSkyboxButton("winter", "PondWinter", row4);
	216	+
	217	+ AddSkyboxButton("winter", "Tantolunden5", row5);
	218	+ AddSkyboxButton("winter", "Vindelalven", row5);
	219	+ /*
	220	+Backyard
	221	+Creek
	222	+FootballField3
	223	+Forest
	224	+HornstullsStrand2
	225	+House
	226	+IceLake
	227	+IceRiver
	228	+Park3
	229	+PondWinter
	230	+Tantolunden5
	231	+Vindelalven *
	232	+ */
	233	+
	234	+ tab0.add(row0);
	235	+ tab0.add(row1);
	236	+ tab0.add(row2);
	237	+ tab0.add(row3);
	238	+ tab0.add(row4);
	239	+ tab0.add(row5);
	240	+ tab0.add(row6);
	241	+
	242	+ for (int i=5; --i>=0;)
	243	+ {
	244	+ //oe.toolboxPanel.Return();
	245	+ //tab0.add(new cGridBag());
	246	+ }
	247	+ }
	248	+
	249	+ public void ChangeSkybox(String name)
	250	+ {
	251	+ cameraView.envyoff = false;
	252	+ cameraView.skyboxname = name;
	253	+ cameraView.skyboxext = "jpg";
	254	+ cameraView.repaint();
	255	+ }
	256	+
25	257	//ObjEditor objEditor;
26	258	public void closeUI2()
27	259	{
..	..	@@ -59,6 +291,12 @@
59	291	this.copy = this.group = group;
60	292	//selectees = this.group.selectees;
61	293
	294	+ if (copy.versions == null)
	295	+ {
	296	+ copy.versions = new byte[100][];
	297	+ copy.versionindex = -1;
	298	+ }
	299	+
62	300	if(ui)
63	301	SetupUI(objEditor);
64	302	}
..	..	@@ -73,16 +311,28 @@
73	311	this.copy = this.group = copy;
74	312	//selectees = this.group.selectees;
75	313
76		- SetupMenu2(objEditor);
	314	+ SetupMenu2(this); //objEditor);
77	315	SetupUI2(objEditor);
78	316	objEditor.SetupUI(true);
79	317	SetupViews(objEditor);
80	318
81	319	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	320	+
	321	+ if (copy.versions == null)
	322	+ {
	323	+ copy.versions = new byte[100][];
	324	+ copy.versionindex = -1;
	325	+
	326	+ Save(true);
	327	+ }
82	328	}
83	329
84	330	void CloneSelection(boolean supports)
85	331	{
	332	+ if (Globals.REPLACEONMAKE)
	333	+ Save();
	334	+ boolean keep = Globals.REPLACEONMAKE;
	335	+ Globals.REPLACEONMAKE = false;
86	336	// Object3D keep = GrafreeD.clipboard;
87	337	//Object3D obj;
88	338	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +343,19 @@
93	343
94	344	makeSomething(clone, i==group.selection.size()-1);
95	345	}
	346	+ Globals.REPLACEONMAKE = keep;
96	347	}
97	348
98	349	void CloneClipboard(boolean supports)
99	350	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	351	+ assert(Grafreed.clipboard.parent == null);
	352	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	353	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	354	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	355	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	356	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	357	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	358	+ Grafreed.clipboard.get(0).parent = keepparent;
108	359	}
109	360
110	361	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +369,7 @@
118	369	// obj.support = null;
119	370	if (!supports)
120	371	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	372	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	373	obj.parent = parent;
123	374	// obj.support = support;
124	375	// clone.support = support; // aout 2013
..	..	@@ -147,30 +398,29 @@
147	398
148	399	//JTextField nameField;
149	400
150		- void SetupMenu2(ObjEditor oe)
	401	+ void SetupMenu2(GroupEditor oe)
151	402	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	403	+ oe.jTree = new cTree();
	404	+
163	405	Menu menu;
164	406	oe.menuBar.add(menu = new Menu("Edit"));
165	407	//editItem = menu.add(new MenuItem("Edit"));
166	408	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	409	+
	410	+// undoItem = menu.add(new MenuItem("Undo"));
	411	+// undoItem.addActionListener(this);
	412	+// redoItem = menu.add(new MenuItem("Redo"));
	413	+// redoItem.addActionListener(this);
	414	+// menu.add("-");
	415	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	416	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	417	cloneItem = menu.add(new MenuItem("Clone"));
171	418	cloneItem.addActionListener(this);
	419	+ if (Globals.ADVANCED)
	420	+ {
172	421	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	422	cloneSupportItem.addActionListener(this);
	423	+ }
174	424	menu.add("-");
175	425	cutItem = menu.add(new MenuItem("Cut"));
176	426	cutItem.addActionListener(this);
..	..	@@ -178,27 +428,123 @@
178	428	copyItem.addActionListener(this);
179	429	pasteItem = menu.add(new MenuItem("Paste"));
180	430	pasteItem.addActionListener(this);
	431	+
	432	+ menu.add("-");
	433	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	434	+ pasteIntoItem.addActionListener(this);
181	435	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	436	pasteLinkItem.addActionListener(this);
183	437	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	438	pasteCloneItem.addActionListener(this);
185	439	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	440	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- clearItem.addActionListener(this);
	441	+ menu.add("-");
	442	+ deleteItem = menu.add(new MenuItem("Delete"));
	443	+ deleteItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ // Deletes the cameras...
189	448	clearAllItem = menu.add(new MenuItem("Clear All"));
190	449	clearAllItem.addActionListener(this);
	450	+ }
	451	+
	452	+ menuBar.add(cameraMenu = new Menu("View"));
	453	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	454	+ //zBufferItem.addActionListener(this);
	455	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	456	+ //normalLensItem.addActionListener(this);
	457	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	458	+ restoreCameraItem.addActionListener(this);
	459	+
	460	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	461	+// toggleFullScreenItem.addItemListener(this);
	462	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	463	+// cameraMenu.add("-");
	464	+//
	465	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	466	+// toggleTextureItem.addItemListener(this);
	467	+// toggleTextureItem.setState(CameraPane.textureon);
	468	+//
	469	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	470	+// toggleSwitchItem.addItemListener(this);
	471	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	472	+
	473	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	474	+ toggleHandleItem.addItemListener(this);
	475	+ toggleHandleItem.setState(CameraPane.HANDLES);
	476	+
	477	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	478	+ togglePaintItem.addItemListener(this);
	479	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	480	+
	481	+ if (Globals.ADVANCED)
	482	+ {
	483	+ cameraMenu.add("-");
	484	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	485	+ toggleLiveItem.addItemListener(this);
	486	+ toggleLiveItem.setState(Globals.isLIVE());
191	487
	488	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	489	+ stepItem.addActionListener(this);
	490	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	491	+ // toggleDLItem.addItemListener(this);
	492	+ // toggleDLItem.setState(false);
	493	+
	494	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	495	+ toggleRenderItem.addItemListener(this);
	496	+ toggleRenderItem.setState(!CameraPane.frozen);
	497	+
	498	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	499	+ toggleDebugItem.addItemListener(this);
	500	+ toggleDebugItem.setState(Globals.DEBUG);
	501	+
	502	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	503	+ toggleFrustumItem.addItemListener(this);
	504	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	505	+
	506	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	507	+ toggleFootContactItem.addItemListener(this);
	508	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	509	+
	510	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	511	+ toggleTimelineItem.addItemListener(this);
	512	+ }
	513	+
	514	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	515	+// toggleRootItem.addItemListener(this);
	516	+// toggleRootItem.setState(false);
	517	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	518	+// animationItem.addItemListener(this);
	519	+// animationItem.setState(CameraPane.ANIMATION);
	520	+ cameraMenu.add("-");
	521	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	522	+ editCameraItem.addActionListener(this);
	523	+
	524	+ if (Globals.ADVANCED)
	525	+ {
	526	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	527	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	528	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	529	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	530	+ oe.cameraMenu.add("-");
	531	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	532	+ openWindowItem.addActionListener(this);
	533	+ editLeafItem.addActionListener(this);
	534	+ lookAtItem.addActionListener(this);
	535	+ //lookFromItem.addActinoListener(this);
	536	+ //switchViewItem.addActionListener(this);
	537	+ }
	538	+
192	539	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	540	+ if (Globals.ADVANCED)
	541	+ {
197	542	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	543	revertMeshItem.addActionListener(this);
199	544	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	545	resetreferencesItem.addActionListener(this);
201	546	menu.add("-");
	547	+ }
202	548	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	549	overwriteGeoItem.addActionListener(this);
204	550	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +556,104 @@
210	556	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	557	overwriteUVItem.addActionListener(this);
212	558	menu.add("-");
	559	+ if (Globals.ADVANCED)
	560	+ {
213	561	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	562	generateMeshItem.addActionListener(this);
215	563	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	564	poseMeshItem.addActionListener(this);
217	565	menu.add("-");
	566	+ }
218	567	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	568	resetsupportItem.addActionListener(this);
220	569	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	570	linkverticesItem.addActionListener(this);
222	571	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	572	relinkverticesItem.addActionListener(this);
	573	+
	574	+ if (Globals.ADVANCED)
	575	+ {
224	576	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	577	setMasterItem.addActionListener(this);
	578	+ }
226	579
227	580	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	581	+// grabItem = menu.add(new MenuItem("Grab"));
	582	+// grabItem.addActionListener(this);
230	583	backItem = menu.add(new MenuItem("Back"));
231	584	backItem.addActionListener(this);
232	585	frontItem = menu.add(new MenuItem("Front"));
233	586	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	587	+// compositeItem = menu.add(new MenuItem("Composite"));
	588	+// compositeItem.addActionListener(this);
	589	+
	590	+ if (Globals.ADVANCED)
	591	+ {
	592	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	593	hideItem.addActionListener(this);
	594	+ }
238	595	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	596	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	597	+
	598	+// menu.add("-");
	599	+//
	600	+// switchItem = menu.add(new MenuItem("Switch node"));
	601	+// switchItem.addActionListener(this);
	602	+ if (Globals.ADVANCED)
	603	+ {
247	604	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	605	switchGeoItem.addActionListener(this);
249	606	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	607	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	608	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	609	morphItem.addActionListener(this);
	610	+
	611	+ menu.add("-");
	612	+ physicsItem = menu.add(new MenuItem("Physics"));
	613	+ physicsItem.addActionListener(this);
	614	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	615	+ frameselectorItem.addActionListener(this);
253	616	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	617	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	618	+ }
257	619
258	620	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	621	+// textureItem = menu.add(new MenuItem("Texture"));
	622	+// textureItem.addActionListener(this);
261	623	billboardItem = menu.add(new MenuItem("Billboard"));
262	624	billboardItem.addActionListener(this);
263	625	csgItem = menu.add(new MenuItem("CSG"));
264	626	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	627	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	628	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	629	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	630	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	631	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	632	shadowZItem.addActionListener(this);
	633	+ attributeItem = menu.add(new MenuItem("Attribute"));
	634	+ attributeItem.addActionListener(this);
	635	+
	636	+ if (Globals.ADVANCED)
	637	+ {
	638	+ menu.add("-");
271	639	linkerItem = menu.add(new MenuItem("Linker"));
272	640	linkerItem.addActionListener(this);
273	641	templateItem = menu.add(new MenuItem("Template"));
274	642	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	643	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	644	pointflowItem.addActionListener(this);
	645	+ }
279	646	menu.add("-");
280	647	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	648	resetTransformItem.addActionListener(this);
282	649	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	650	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	651	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	652	+ resetCentroidXZItem.addActionListener(this);
	653	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	654	+ transformGeometryItem.addActionListener(this);
	655	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	656	+ transformChildrenItem.addActionListener(this);
286	657
287	658	oe.menuBar.add(menu = new Menu("Geometry"));
288	659	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +664,11 @@
293	664	genNormalsCADItem.addActionListener(this);
294	665	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	666	genNormalsMESHItem.addActionListener(this);
296		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	667	+ if (Globals.ADVANCED)
	668	+ {
	669	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
297	670	genNormalsMINEItem.addActionListener(this);
	671	+ }
298	672	stripifyItem = menu.add(new MenuItem("Stripify"));
299	673	stripifyItem.addActionListener(this);
300	674	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +690,34 @@
316	690	reduce34MeshItem.addActionListener(this);
317	691	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	692	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	693	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	694	clipMeshItem.addActionListener(this);
	695	+
	696	+ if (Globals.ADVANCED)
	697	+ {
	698	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	699	+ smoothMeshItem.addActionListener(this);
	700	+ }
323	701
324	702	oe.menuBar.add(menu = new Menu("Attributes"));
325	703	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	704	clearMaterialsItem.addActionListener(this);
	705	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	706	+ resetAllItem.addActionListener(this);
	707	+ stepAllItem = menu.add(new MenuItem("Step All"));
	708	+ stepAllItem.addActionListener(this);
327	709	menu.add("-");
328	710	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	711	liveleavesItem.addActionListener(this);
330	712	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	713	unliveleavesItem.addActionListener(this);
	714	+ if (Globals.ADVANCED)
	715	+ {
332	716	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	717	supportleavesItem.addActionListener(this);
334	718	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	719	unsupportleavesItem.addActionListener(this);
	720	+ }
336	721	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	722	hideleavesItem.addActionListener(this);
338	723	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +726,14 @@
341	726	markleavesItem.addActionListener(this);
342	727	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	728	unmarkleavesItem.addActionListener(this);
	729	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	730	+ rewindleavesItem.addActionListener(this);
	731	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	732	+ unrewindleavesItem.addActionListener(this);
	733	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	734	+ randomleavesItem.addActionListener(this);
	735	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	736	+ unrandomleavesItem.addActionListener(this);
344	737	menu.add("-");
345	738	flipVItem = menu.add(new MenuItem("Flip V"));
346	739	flipVItem.addActionListener(this);
..	..	@@ -366,45 +759,56 @@
366	759	attachBumpItem.addActionListener(this);
367	760	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
368	761	pigmentBumpItem.addActionListener(this);
	762	+ //embedTexturesItem
369	763	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
370	764	detachPigmentItem.addActionListener(this);
371	765	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
372	766	detachBumpItem.addActionListener(this);
	767	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	768	+ embedTexturesItem.addActionListener(this);
	769	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	770	+ deEmbedTexturesItem.addActionListener(this);
373	771	menu.add("-");
374	772	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
375	773	sortbysizeItem.addActionListener(this);
376	774	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	775	sortbynameItem.addActionListener(this);
378	776	menu.add("-");
	777	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	778	+ shareGeometriesItem.addActionListener(this);
	779	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	780	+ mergeGeometriesItem.addActionListener(this);
	781	+ if (Globals.ADVANCED)
	782	+ {
	783	+ // Pretty much the same as duplicate and clone.
379	784	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	785	extractGeometriesItem.addActionListener(this);
381	786	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	787	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	788	+ }
387	789
388	790	oe.menuBar.add(menu = new Menu("Insert"));
389	791	buildCreateMenu(menu);
390	792
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	793	oe.menuBar.add(menu = new Menu("Tools"));
403	794	buildToolsMenu(menu);
404	795	}
405	796
	797	+
406	798	void SetupUI2(ObjEditor oe)
407	799	{
	800	+ // June 2019
	801	+ if (oe == null)
	802	+ {
	803	+ //super.SetupUI2(this);
	804	+ //return;
	805	+ }
	806	+
	807	+ if (copy != group)
	808	+ {
	809	+ //super.SetupUI2(this);
	810	+ }
	811	+
408	812	//new Exception().printStackTrace();
409	813
410	814	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +837,238 @@
433	837	oe.radioPanel.add(dummyButton);
434	838	oe.buttonGroup.add(dummyButton);
435	839	*/
436		- aConstraints.gridy += 1;
	840	+ cGridBag copyOptionsPanel = new cGridBag();
	841	+
	842	+ copyOptionsPanel.preferredHeight = 2;
437	843
438	844	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	845
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	846	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	847	+ //minButton.setToolTipText("Minimize window");
	848	+ //minButton.addActionListener(this);
442	849
443		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
444		- liveCB.setToolTipText("Enabled animation");
445		- liveCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
449		- trackCB.setToolTipText("Enable tracking");
450		- trackCB.addItemListener(this);
451		-
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	850	+ if (Globals.ADVANCED)
	851	+ {
	852	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	853	+ maxButton.setToolTipText("Maximize window");
	854	+ maxButton.addActionListener(this);
	855	+ }
	856	+
	857	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	858	+ fullButton.setToolTipText("Full-screen window");
	859	+ fullButton.addActionListener(this);
	860	+
	861	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	862	screenfitButton.setToolTipText("Screen fit");
455	863	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	864	+
	865	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	866	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	867	+ restoreCameraButton.addActionListener(this);
	868	+
	869	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	870	+ saveButton.setToolTipText("New version");
	871	+ saveButton.addActionListener(this);
	872	+
	873	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	874	+ undoButton.setToolTipText("Previous version");
	875	+ undoButton.addActionListener(this);
	876	+ undoButton.setEnabled(false);
	877	+
	878	+ cGridBag updown = new cGridBag().setVertical(true);
	879	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	880	+ restoreButton.setToolTipText("Restore current");
	881	+ restoreButton.addActionListener(this);
	882	+ restoreButton.setEnabled(false);
	883	+
	884	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	885	+ replaceButton.setToolTipText("Replace current");
	886	+ replaceButton.addActionListener(this);
	887	+ replaceButton.setEnabled(false);
	888	+
	889	+ copyOptionsPanel.add(updown);
	890	+
	891	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	892	+ redoButton.setToolTipText("Next version");
	893	+ redoButton.addActionListener(this);
	894	+ redoButton.setEnabled(false);
	895	+
	896	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	897	+ liveCB.setToolTipText("Enable animation");
	898	+ liveCB.addItemListener(this);
	899	+
	900	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	901	+ oneStepButton.setToolTipText("Animate one step forward");
	902	+ oneStepButton.addActionListener(this);
	903	+
	904	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	905	+ fastCB.setToolTipText("Fast mode");
	906	+ fastCB.addItemListener(this);
	907	+
	908	+ //oe.toolboxPanel.Return();
	909	+
	910	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	911	+// trackCB.setToolTipText("Enable tracking");
	912	+// trackCB.addItemListener(this);
	913	+
457	914	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	915	// screenfitpointButton.addActionListener(this);
459		-// oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
461		- snapobjectButton.addActionListener(this);
462		- snapobjectButton.setToolTipText("Snap Object");
463		- oe.aConstraints.gridx += 1;
464	916
465		- //aConstraints.gridx = 0;
466		- //aConstraints.gridy += 1;
467		- oe.aConstraints.weighty = 0;
468		- oe.aConstraints.gridwidth = 1;
469		-
470		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
471		- flashSelectionButton.setToolTipText("Show selection");
472		- flashSelectionButton.addActionListener(this);
473		-
474		- oe.toolbarPanel.add(new cButton(" ", false));
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.aConstraints.weighty = 0;
478		- oe.aConstraints.gridwidth = 1;
479		-
480		- //
481		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
482		- twoButton.setToolTipText("Show center view only");
483		- twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	917	+ if (Globals.ADVANCED)
	918	+ {
	919	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	920	+ snapobjectButton.addActionListener(this);
	921	+ snapobjectButton.setToolTipText("Snap Object");
	922	+
	923	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	924	fourButton.addActionListener(this);
486		- fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
488		- sixButton.setToolTipText("2-column layout left");
489		- sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
491		- threeButton.setToolTipText("2-column layout right");
	925	+ fourButton.setToolTipText("Show control panel only");
	926	+ }
	927	+
	928	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
	929	+
	930	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	931	+ twoButton.setToolTipText("Show 3D view only");
	932	+ twoButton.addActionListener(this);
	933	+ this.fullscreenLayout = twoButton;
	934	+
	935	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	936	+ threeButton.setToolTipText("Show controls and 3D view");
492	937	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
494		- sevenButton.setToolTipText("3-column layout");
495		- sevenButton.addActionListener(this);
	938	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ sixButton.setToolTipText("Show 3D view and controls");
	940	+ sixButton.addActionListener(this);
	941	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	942	+// sevenButton.setToolTipText("3-column layout");
	943	+// sevenButton.addActionListener(this);
496	944	//
497	945
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	946	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	947	+ rootButton.setToolTipText("Open selection in new tab");
500	948	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	949	+
	950	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	951	closeButton.setToolTipText("Close tab");
504	952	closeButton.addActionListener(this);
505	953	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	954	//clearButton.addActionListener(this);
507		- oe.aConstraints.gridx += 1;
508		-
509		- oe.aConstraints.gridx = 1; //
510		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
511		- editButton.addActionListener(this);
512		- oe.aConstraints.gridx += 1;
513		- oe.aConstraints.weighty = 0;
514		- oe.aConstraints.gridwidth = 1;
515	955
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	956	+ cGridBag row1 = new cGridBag();
	957	+
	958	+ // INSERT
	959	+ row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	960	+ gridButton.setToolTipText("Create grid");
	961	+ gridButton.addActionListener(this);
	962	+
	963	+ row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	964	+ boxButton.setToolTipText("Create box");
	965	+ boxButton.addActionListener(this);
	966	+
	967	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	968	+ sphereButton.setToolTipText("Create sphere");
	969	+ sphereButton.addActionListener(this);
	970	+
	971	+ row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	972	+ coneButton.setToolTipText("Create cone");
	973	+ coneButton.addActionListener(this);
	974	+
	975	+ row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	976	+ torusButton.setToolTipText("Create torus");
	977	+ torusButton.addActionListener(this);
	978	+
	979	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	980	+ superButton.setToolTipText("Create superellipsoid");
	981	+ superButton.addActionListener(this);
	982	+
	983	+ if (Globals.ADVANCED)
	984	+ {
	985	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	986	+ kleinButton.setToolTipText("Create Klein bottle");
	987	+ kleinButton.addActionListener(this);
	988	+ }
	989	+
	990	+ row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	991	+ particlesButton.setToolTipText("Create particle system");
	992	+ particlesButton.addActionListener(this);
	993	+
	994	+ oe.toolboxPanel.add(row1);
	995	+
	996	+ cGridBag row2 = new cGridBag();
	997	+
	998	+ row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	999	+ groupButton.setToolTipText("Create group");
	1000	+ groupButton.addActionListener(this);
	1001	+
	1002	+ row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1003	+ compositeButton.setToolTipText("Create composite");
	1004	+ compositeButton.addActionListener(this);
	1005	+
	1006	+ row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1007	+ switchButton.setToolTipText("Create item switcher");
	1008	+ switchButton.addActionListener(this);
	1009	+
	1010	+ row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1011	+ loopButton.setToolTipText("Create loop");
	1012	+ loopButton.addActionListener(this);
	1013	+
	1014	+ row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1015	+ textureButton.setToolTipText("Create texture");
	1016	+ textureButton.addActionListener(this);
	1017	+
	1018	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1019	+ overlayButton.setToolTipText("Create overlay");
	1020	+ overlayButton.addActionListener(this);
	1021	+
	1022	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1023	+ lightButton.setToolTipText("Create light");
	1024	+ lightButton.addActionListener(this);
	1025	+
	1026	+ oe.toolboxPanel.add(row2);
	1027	+
	1028	+ // ENVYMAPS
	1029	+ cGridBag skyboxpane = new cGridBag();
	1030	+ skyboxpane.preferredHeight = 100;
	1031	+
	1032	+ oe.toolboxPanel.add(skyboxpane);
	1033	+
	1034	+ JTabbedPane skyboxpanel = new JTabbedPane();
	1035	+ skyboxpane.add(skyboxpanel);
	1036	+
	1037	+ AddSkyboxTab0(skyboxpanel);
	1038	+ AddSkyboxTab1(skyboxpanel);
	1039	+ AddSkyboxTab2(skyboxpanel);
	1040	+
	1041	+ // EDIT panel
	1042	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1043	+ editButton.setToolTipText("Pin selection controls");
	1044	+ editButton.addActionListener(this);
	1045	+
	1046	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+ uneditButton.setToolTipText("Remove selection controls");
517	1048	uneditButton.addActionListener(this);
518	1049
519		- oe.aConstraints.gridx += 1;
520		- oe.aConstraints.weighty = 0;
521		- oe.aConstraints.gridwidth = 1;
522		-
523		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
524		- clearPanelButton.addActionListener(this);
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	1050	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	1051	+ allParamsButton.setToolTipText("Show all controle");
531	1052	allParamsButton.addActionListener(this);
532	1053
533		- oe.aConstraints.gridx += 1;
534		- oe.aConstraints.weighty = 0;
535		- oe.aConstraints.gridwidth = 1;
536		-
537		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	1054	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+ clearPanelButton.setToolTipText("Clear edit panel");
	1056	+ clearPanelButton.addActionListener(this);
	1057	+
	1058	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ unselectButton.setToolTipText("Unselect");
538	1060	unselectButton.addActionListener(this);
539	1061
	1062	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ flashSelectionButton.setToolTipText("Highlight selection");
	1064	+ flashSelectionButton.addActionListener(this);
	1065	+
	1066	+ editCommandsPanel.preferredHeight = 1;
	1067	+
	1068	+ SetPinStates(false);
	1069	+// oe.treePanel.add(commandsPanel);
	1070	+// oe.treePanel.Return();
	1071	+
540	1072	// oe.aConstraints.gridx += 1;
541	1073	// oe.aConstraints.weighty = 0;
542	1074	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,47 +1080,32 @@
548	1080	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	1081	// gcButton.addActionListener(this);
550	1082
551		- oe.aConstraints.gridx = 0;
552		- oe.aConstraints.gridy += 1;
553		-
554		- //ctrlPanel.add(objList = new List(5, true));
555		- oe.aConstraints.gridwidth = 100;
556		- // oe.aConstraints.gridheight = 100;
557		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
558		- oe.aConstraints.gridheight = 1;
559		- oe.aConstraints.weighty = 0.5;
560		- oe.aConstraints.gridx = 0;
561		- JScrollPane jSP;
	1083	+ cGridBag jSPPanel = new cGridBag();
	1084	+
	1085	+ JScrollPane jSP;
562	1086	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
563		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	1087	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	1088	ResetModel();
565		- oe.aConstraints.weighty = 0.5;
566		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
567		- oe.aConstraints.gridy += 1;
568		- oe.aConstraints.gridwidth = 1;
569		-
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 2;
572		-
573		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
574		- colorCB.addItemListener(this);
575		- oe.aConstraints.gridx += 2;
576		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
577		- materialCB.addItemListener(this);
578		- oe.aConstraints.gridx += 2;
579		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
580		- textureCB.addItemListener(this);
581		-
582		- oe.aConstraints.gridx = 0;
583		- oe.aConstraints.gridy += 1;
584	1089
	1090	+ oe.treePanel.add(jSPPanel);
	1091	+ oe.treePanel.Return();
	1092	+
	1093	+ oe.treePanel.add(copyOptionsPanel);
	1094	+ oe.treePanel.Return();
	1095	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1096	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	1097	+ sliderPane.preferredHeight = 1;
	1098	+
	1099	+// mainPanel.setDividerLocation(0.1); //1.0);
	1100	+ mainPanel.setResizeWeight(0.4);
	1101	+
585	1102	//jList.addListSelectionListener(this);
586	1103	oe.jTree.addTreeSelectionListener(this);
587	1104	//jTree.setRootVisible(false);
588	1105	//jTree.setEditable(true);
589	1106	oe.jTree.setDragEnabled(true);
590	1107	//jTree.setPreferredSize(new Dimension(10,10));
591		- jSP.setPreferredSize(new Dimension(100,200));
	1108	+ //jSP.setPreferredSize(new Dimension(100,200));
592	1109
593	1110	oe.jTree.setCellRenderer(new cTreeModel.Renderer());
594	1111
..	..	@@ -600,97 +1117,160 @@
600	1117	dgr.addDragGestureListener(this);
601	1118	}catch(Exception e) {}
602	1119	*/
603		- radio.layout = sevenButton;
	1120	+ radio.layout = sixButton; // sevenButton;
604	1121	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	1122	}
606	1123
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1124	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	1125	{
609		- constraints.gridx = 0;
610		- constraints.gridy = 0;
611		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), constraints);
612		- fastCB.setToolTipText("Fast mode");
613		- fastCB.addItemListener(this);
614		- constraints.gridy += 1;
615		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), constraints);
616		- supportCB.setToolTipText("Enabled rigging");
617		- supportCB.addItemListener(this);
	1126	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	1127	+ colorCB.setToolTipText("Copy color when dropped");
	1128	+ colorCB.addItemListener(this);
618	1129
619		- // constraints.gridy += 1;
	1130	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	1131	+ materialCB.setToolTipText("Copy material when dropped");
	1132	+ materialCB.addItemListener(this);
	1133	+
	1134	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	1135	+ textureCB.setToolTipText("Copy texture when dropped");
	1136	+ textureCB.addItemListener(this);
	1137	+
	1138	+ panel.Return();
	1139	+
	1140	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	1141	+ boxCB.setToolTipText("Display bounding boxes");
	1142	+ boxCB.addItemListener(this);
	1143	+
	1144	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	1145	+ zoomBoxCB.setToolTipText("Display only for wheel");
	1146	+ zoomBoxCB.addItemListener(this);
	1147	+
	1148	+ if (true) // Globals.ADVANCED)
	1149	+ {
	1150	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	1151	+// supportCB.setToolTipText("Enable rigging");
	1152	+// supportCB.addItemListener(this);
	1153	+
	1154	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1155	+ freezeCB.setToolTipText("Fast moving camera");
	1156	+ freezeCB.addItemListener(this);
	1157	+
620	1158	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	1159	// localCB.addItemListener(this);
622	1160
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	1161	+ panel.Return();
	1162	+
	1163	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	1164	crowdCB.setToolTipText("Used for crowds");
626	1165	crowdCB.addItemListener(this);
627	1166
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	1167	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	1168	smoothCB.setToolTipText("Snapping delay");
631	1169	smoothCB.addItemListener(this);
632	1170
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	1171	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635	1172	slowCB.setToolTipText("Smooth interpolation");
636	1173	slowCB.addItemListener(this);
637		- constraints.gridy += 1;
638		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE), constraints);
639		- boxCB.setToolTipText("Display bounding boxes");
640		- boxCB.addItemListener(this);
641		- constraints.gridy += 1;
642		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE), constraints);
643		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
644		- zoomBoxCB.addItemListener(this);
645		-
	1174	+
646	1175	// constraints.gridy += 1;
647	1176	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	1177	// speakerMocapCB.addItemListener(this);
649	1178
	1179	+ panel.Return();
	1180	+
650	1181	if (false)
651	1182	{
652	1183	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	1184	+ //constraints.gridy += 1;
	1185	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	1186	speakerCameraCB.addItemListener(this);
656	1187
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	1188	+ //constraints.gridy += 1;
	1189	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	1190	speakerFocusCB.addItemListener(this);
660	1191
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	1192	+ //constraints.gridy += 1;
	1193	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	1194	smoothfocusCB.addItemListener(this);
	1195	+ panel.Return();
664	1196	}
665	1197
666	1198	//constraints.gridx += 1;
667	1199	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	1200	// debugCB.addItemListener(this);
669	1201
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	1202	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	1203	+ trackCB.setToolTipText("Enable tracking target");
	1204	+ trackCB.addItemListener(this);
	1205	+
	1206	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	1207	+ oeilCB.setToolTipText("Move camera when tracking");
672	1208	oeilCB.addItemListener(this);
673	1209
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	1210	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	1211	+ shadowCB.setToolTipText("When live compute shadows");
	1212	+ shadowCB.addItemListener(this);
	1213	+
	1214	+ panel.Return();
	1215	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	1216	+ toggleTextureCB.setToolTipText("Load textures");
	1217	+ toggleTextureCB.addItemListener(this);
	1218	+
	1219	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	1220	+ toggleSwitchCB.setToolTipText("Choose a single item");
	1221	+ toggleSwitchCB.addItemListener(this);
	1222	+
	1223	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	1224	+ autokeepCB.setToolTipText("On structure change");
	1225	+ autokeepCB.addItemListener(this);
	1226	+
	1227	+ panel.Return();
	1228	+ if (Globals.ADVANCED)
	1229	+ {
	1230	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	1231	lookAtCB.setToolTipText("Look-at target");
677	1232	lookAtCB.addItemListener(this);
	1233	+ }
	1234	+
	1235	+ }
	1236	+
	1237	+ cGridBag fill = new cGridBag();
	1238	+ fill.preferredHeight = 200;
	1239	+ cGridBag fill2 = new cGridBag();
	1240	+ fill2.preferredHeight = 200;
	1241	+ cGridBag fill3 = new cGridBag();
	1242	+ fill3.preferredHeight = 200;
	1243	+
	1244	+ panel.add(fill);
	1245	+ panel.add(fill2);
	1246	+ panel.add(fill3);
678	1247
679	1248	}
680	1249
681	1250	void EditObject(Object3D obj)
682	1251	{
683	1252	cRadio radioButton = new cRadio(obj.name);
	1253	+
	1254	+ // June 2019. Patch to avoid bug with transparency.
	1255	+ radioButton.hadMaterial = obj.material != null;
	1256	+ if (!radioButton.hadMaterial)
	1257	+ {
	1258	+ obj.material = new cMaterial();
	1259	+ }
	1260	+
684	1261	radioButton.SetObject(obj);
685		- radioButton.layout = sevenButton;
	1262	+ radioButton.layout = sixButton; // sevenButton;
686	1263	radioButton.SetCamera(cameraView.renderCamera, false);
687	1264	radioButton.addActionListener(this);
688	1265	radioPanel.add(radioButton);
689	1266	buttonGroup.add(radioButton);
690	1267	radioButton.doClick();
691	1268	}
	1269	+
692	1270	void SetupViews(ObjEditor oe)
693	1271	{
	1272	+ theFrame = this;
	1273	+
694	1274	oe.SetupViews();
695	1275
696	1276	System.out.println("SetupViews");
..	..	@@ -699,23 +1279,28 @@
699	1279	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1280	}
701	1281
702		- JCheckBox liveCB;
703		- JCheckBox supportCB;
704		- JCheckBox localCB;
705		- JCheckBox crowdCB;
706		- JCheckBox smoothCB;
707		- JCheckBox fastCB;
708		- JCheckBox slowCB;
709		- JCheckBox boxCB;
710		- JCheckBox zoomBoxCB;
711		- JCheckBox trackCB;
712		- JCheckBox smoothfocusCB;
	1282	+ cToggleButton liveCB;
	1283	+ cCheckBox supportCB;
	1284	+ cCheckBox localCB;
	1285	+ cCheckBox crowdCB;
	1286	+ cCheckBox smoothCB;
	1287	+ cToggleButton fastCB;
	1288	+ cCheckBox slowCB;
	1289	+ cCheckBox boxCB;
	1290	+ cCheckBox zoomBoxCB;
	1291	+ cCheckBox freezeCB;
	1292	+ //cToggleButton trackCB;
	1293	+ cCheckBox trackCB;
	1294	+ cCheckBox smoothfocusCB;
713	1295	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1296	+ cCheckBox speakerCameraCB;
	1297	+ cCheckBox speakerFocusCB;
	1298	+ cCheckBox debugCB;
	1299	+
	1300	+ cCheckBox oeilCB;
	1301	+ cCheckBox shadowCB;
	1302	+ cCheckBox autokeepCB;
	1303	+ cCheckBox lookAtCB;
719	1304
720	1305	// static int COLOR = 1;
721	1306	// static int MATERIAL = 2;
..	..	@@ -723,9 +1308,9 @@
723	1308
724	1309	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1310
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1311	+ cCheckBox colorCB;
	1312	+ cCheckBox materialCB;
	1313	+ cCheckBox textureCB;
729	1314
730	1315	public void itemStateChanged(ItemEvent e)
731	1316	{
..	..	@@ -753,6 +1338,7 @@
753	1338	} else if(e.getSource() == liveCB)
754	1339	{
755	1340	cameraView.ToggleLive();
	1341	+ refreshContents(false);
756	1342	}
757	1343	else if(e.getSource() == supportCB)
758	1344	{
..	..	@@ -817,6 +1403,18 @@
817	1403	{
818	1404	cameraView.ToggleOeil();
819	1405	}
	1406	+ else if(e.getSource() == shadowCB)
	1407	+ {
	1408	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1409	+ }
	1410	+ else if(e.getSource() == freezeCB)
	1411	+ {
	1412	+ Globals.FREEZEONMOVE ^= true;
	1413	+ }
	1414	+ else if(e.getSource() == autokeepCB)
	1415	+ {
	1416	+ Globals.REPLACEONMAKE ^= true;
	1417	+ }
820	1418	else if(e.getSource() == lookAtCB)
821	1419	{
822	1420	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1431,8 @@
833	1431
834	1432	/**/
835	1433	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1434	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1435	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1436	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1437	// We can't move the root node or an empty selection
839	1438	return;
..	..	@@ -896,8 +1495,6 @@
896	1495	}
897	1496	}
898	1497
899		- String string = (String) object;
900		-
901	1498	System.out.println("Transfer = " + object + "; drop : " + target);
902	1499	// if( object instanceof java.io.File[])
903	1500	// {
..	..	@@ -905,7 +1502,11 @@
905	1502	// objEditor.DropFile((java.io.File[]) object, true);
906	1503	// return;
907	1504	// }
908		- if (string.charAt(0) == '/')
	1505	+
	1506	+ String string = object.toString();
	1507	+
	1508	+ // File path for Mac and Windows
	1509	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1510	{
910	1511	// file(s)
911	1512	String[] names = string.split("\n");
..	..	@@ -932,7 +1533,7 @@
932	1533
933	1534	flashIt = false;
934	1535	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1536	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1537	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1538
938	1539	if (group.selection.size() == 1)
..	..	@@ -948,23 +1549,33 @@
948	1549
949	1550	assert target == objEditor.jTree;
950	1551	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1552	+ Object3D destinationLeaf;
951	1553	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1554	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1555	} catch (Exception e) {
954	1556	System.out.println("destinationPath : " + destinationPath);
955	1557	return;
956	1558	}
957	1559
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1560	+ for (int i=group.selection.size(); --i>=0;)
959	1561	{
	1562	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1563	+
	1564	+ // Cannot move into itself
	1565	+ if (child == destinationLeaf)
	1566	+ return;
	1567	+ }
	1568	+
	1569	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1570	+// {
960	1571	loadClipboard(true);
961	1572	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1573	+ pasteInto(false, false);
	1574	+// } else {
	1575	+// loadClipboard(false);
	1576	+// objEditor.jTree.setSelectionPath(destinationPath);
	1577	+// pasteInto(false, false); // true); // ???
	1578	+// }
968	1579	}
969	1580	public void dropActionChanged(DropTargetDragEvent dtde)
970	1581	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1680,107 @@
1069	1680	{
1070	1681	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1682	//heightFieldItem.addActionListener(this);
1072		- gridItem = menu.add(new MenuItem("Grid"));
1073		- gridItem.addActionListener(this);
1074		- rectoidItem = menu.add(new MenuItem("Box"));
1075		- rectoidItem.addActionListener(this);
1076		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1077		- ellipsoidItem.addActionListener(this);
1078		- coneItem = menu.add(new MenuItem("Cone"));
1079		- coneItem.addActionListener(this);
1080		- torusItem = menu.add(new MenuItem("Torus"));
1081		- torusItem.addActionListener(this);
1082		- superItem = menu.add(new MenuItem("Superellipsoid"));
1083		- superItem.addActionListener(this);
	1683	+// gridItem = menu.add(new MenuItem("Grid"));
	1684	+// gridItem.addActionListener(this);
	1685	+// rectoidItem = menu.add(new MenuItem("Box"));
	1686	+// rectoidItem.addActionListener(this);
	1687	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1688	+// ellipsoidItem.addActionListener(this);
	1689	+// coneItem = menu.add(new MenuItem("Cone"));
	1690	+// coneItem.addActionListener(this);
	1691	+// torusItem = menu.add(new MenuItem("Torus"));
	1692	+// torusItem.addActionListener(this);
	1693	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1694	+// superItem.addActionListener(this);
	1695	+
	1696	+ cameraItem = menu.add(new MenuItem("Camera"));
	1697	+ cameraItem.addActionListener(this);
	1698	+
	1699	+ if (!Globals.ADVANCED)
	1700	+ {
1084	1701	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1702	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1703	+ }
	1704	+
	1705	+// particleItem = menu.add(new MenuItem("Particle system"));
	1706	+// particleItem.addActionListener(this);
	1707	+ if (Globals.ADVANCED)
	1708	+ {
1088	1709	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1710	ragdollItem.addActionListener(this);
1090	1711	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1712	ragdoll2Item.addActionListener(this);
	1713	+ }
1092	1714	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1715	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1716	meshItem.addActionListener(this);
1095	1717	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1718	// meshGroupItem.addActionListener(this);
	1719	+ if (Globals.ADVANCED)
	1720	+ {
1097	1721	springItem = menu.add(new MenuItem("Spring"));
1098	1722	springItem.addActionListener(this);
1099	1723	flagItem = menu.add(new MenuItem("Flag"));
1100	1724	flagItem.addActionListener(this);
1101		- bezierItem = menu.add(new MenuItem("Patch"));
1102		- bezierItem.addActionListener(this);
1103		- checkerItem = menu.add(new MenuItem("Checker"));
1104		- checkerItem.addActionListener(this);
1105	1725	blobItem = menu.add(new MenuItem("Blob"));
1106	1726	blobItem.addActionListener(this);
1107	1727	latheItem = menu.add(new MenuItem("Lathe"));
1108	1728	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1729	+ }
	1730	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1731	+ bezierItem.addActionListener(this);
	1732	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1733	+// overlayItem.addActionListener(this);
	1734	+// lightItem = menu.add(new MenuItem("Light"));
	1735	+// lightItem.addActionListener(this);
1111	1736	menu.add("-");
1112	1737	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1738	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1739	+// loopItem = menu.add(new MenuItem("Loop"));
	1740	+// loopItem.addActionListener(this);
1116	1741	doubleItem = menu.add(new MenuItem("Fork"));
1117	1742	doubleItem.addActionListener(this);
	1743	+ if (Globals.ADVANCED)
	1744	+ {
1118	1745	tripleItem = menu.add(new MenuItem("Trident"));
1119	1746	tripleItem.addActionListener(this);
	1747	+ }
1120	1748	}
1121	1749
1122	1750	void buildToolsMenu(Menu menu)
1123	1751	{
1124	1752	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1753	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1754	+ animationItem.setState(Globals.ANIMATION);
	1755	+
	1756	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1757	+ archiveItem.addActionListener(this);
1127	1758
1128	1759	menu.add("-");
1129	1760	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1761	parseverticesItem.addActionListener(this);
1131	1762	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1763	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1764	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1765	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1766	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1767	reduceMorphItem.addActionListener(this);
1139	1768	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1769	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	1770	menu.add("-");
1145		-
1146	1771	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1772	memoryItem.addActionListener(this);
	1773	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1774	+ computeAOItem.addActionListener(this);
	1775	+
	1776	+ if (Globals.ADVANCED)
	1777	+ {
	1778	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1779	+ mirrorItem.addActionListener(this);
	1780	+ menu.add("-");
1148	1781	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1782	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1783	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1784	dumpItem.addActionListener(this);
1152	1785	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1786	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1798,7 @@
1165	1798	menu.add("-");
1166	1799	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1800	editScriptItem.addActionListener(this);
	1801	+ }
1168	1802	}
1169	1803
1170	1804	void ScreenFit()
..	..	@@ -1287,9 +1921,34 @@
1287	1921	shadow.material = new cMaterial(obj.material);
1288	1922	shadow.material.diffuse = 0.0001f;
1289	1923	shadow.material.specular = 0.0001f;
	1924	+ //shadow.projectedVertices[1].x = 300;
1290	1925
1291	1926	makeSomething(shadow);
1292	1927	}
	1928	+
	1929	+ private void ClearUnpinned()
	1930	+ {
	1931	+ //for (Object3D obj : listUI)
	1932	+ for (int i=listUI.size(); --i>=0;)
	1933	+ {
	1934	+ Object3D obj = listUI.elementAt(i);
	1935	+ if (!obj.pinned)
	1936	+ {
	1937	+ obj.CloseUI();
	1938	+ listUI.remove(i);
	1939	+ }
	1940	+ }
	1941	+ }
	1942	+
	1943	+ private void EditElement(Object3D elem, boolean newWindow)
	1944	+ {
	1945	+ // if (!(elem instanceof Composite))
	1946	+ // newWindow = false;
	1947	+ listUI.add(elem);
	1948	+ elem.openEditWindow(this, newWindow); //, false);
	1949	+ System.out.println("edit : " + elem);
	1950	+ elem.editWindow.refreshContents(true); // ? new
	1951	+ }
1293	1952
1294	1953	/**
1295	1954	* applyExample
..	..	@@ -1493,9 +2152,9 @@
1493	2152
1494	2153	void Overwrite(int mask)
1495	2154	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2155	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	2156	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	2157	+ Object3D content = Grafreed.clipboard.get(0);
1499	2158
1500	2159	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	2160	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +2193,7 @@
1534	2193	{
1535	2194	ScreenFit();
1536	2195	} else
1537		- if (source == switchItem)
	2196	+ if (source == switchViewItem)
1538	2197	{
1539	2198	cVector v1 = new cVector();
1540	2199	cVector v2 = new cVector();
..	..	@@ -1543,11 +2202,11 @@
1543	2202	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	2203	objEditor.cameraView.repaint();
1545	2204	} else
1546		- if (source == rectoidItem)
	2205	+ if (source == rectoidItem \|\| source == boxButton)
1547	2206	{
1548	2207	makeSomething(new Box());
1549	2208	} else
1550		- if (source == particleItem)
	2209	+ if (source == particleItem \|\| source == particlesButton)
1551	2210	{
1552	2211	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	2212	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2285,27 @@
1626	2285
1627	2286	makeSomething(obj);
1628	2287	} else
1629		- if (source == gridItem)
	2288	+ if (source == gridItem \|\| source == gridButton)
1630	2289	{
1631	2290	makeSomething(new Grid());
1632	2291	} else
1633		- if (source == ellipsoidItem)
	2292	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2293	{
1635	2294	makeSomething(new Sphere());
1636	2295	} else
1637		- if (source == coneItem)
	2296	+ if (source == coneItem \|\| source == coneButton)
1638	2297	{
1639	2298	makeSomething(new Cone());
1640	2299	} else
1641		- if (source == torusItem)
	2300	+ if (source == torusItem \|\| source == torusButton)
1642	2301	{
1643	2302	makeSomething(new Torus());
1644	2303	} else
1645		- if (source == superItem)
	2304	+ if (source == superItem \|\| source == superButton)
1646	2305	{
1647	2306	makeSomething(new Superellipsoid());
1648	2307	} else
1649		- if (source == kleinItem)
	2308	+ if (source == kleinItem \|\| source == kleinButton)
1650	2309	{
1651	2310	makeSomething(new Klein());
1652	2311	} else
..	..	@@ -1666,7 +2325,7 @@
1666	2325	{
1667	2326	makeSomething(new BezierSurface());
1668	2327	} else
1669		- if (source == checkerItem)
	2328	+ if (source == overlayItem \|\| source == overlayButton)
1670	2329	{
1671	2330	/*
1672	2331	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,10 +2373,27 @@
1714	2373	s.setup();
1715	2374	makeSomething(s);
1716	2375	} else
1717		- if (source == lightItem)
	2376	+ if (source == lightItem \|\| source == lightButton)
1718	2377	{
1719	2378	makeSomething(new Light());
1720	2379	} else
	2380	+// if (source == skybox1Button \|\|
	2381	+// source == skybox2Button \|\|
	2382	+// source == skybox3Button \|\|
	2383	+// source == skybox4Button \|\|
	2384	+// source == skybox5Button \|\|
	2385	+// source == skybox6Button \|\|
	2386	+// source == skybox7Button \|\|
	2387	+// source == skybox11Button \|\|
	2388	+// source == skybox12Button \|\|
	2389	+// source == skybox13Button \|\|
	2390	+// source == skybox14Button \|\|
	2391	+// source == skybox15Button \|\|
	2392	+// source == skybox16Button \|\|
	2393	+// source == skybox17Button)
	2394	+// {
	2395	+// ChangeSkybox(source);
	2396	+// } else
1721	2397	if (source == csgItem)
1722	2398	{
1723	2399	group(new CSG());
..	..	@@ -1764,30 +2440,30 @@
1764	2440
1765	2441	group(g);
1766	2442	} else
1767		- if (source == loopItem)
	2443	+ if (source == loopItem \|\| source == loopButton)
1768	2444	{
1769	2445	Composite csg = new GroupLeaf();
1770	2446	csg.count = 5;
1771	2447	group(csg);
1772		- Composite child = new cGroup();
	2448	+ Composite child = new cGroup("Branch");
1773	2449	csg.addChild(child);
1774	2450	child.addChild(csg);
1775	2451	} else
1776	2452	if (source == doubleItem)
1777	2453	{
1778		- Composite csg = new GroupLeaf();
	2454	+ Composite csg = new GroupLeaf("Fork");
1779	2455	csg.count = 5;
1780	2456	group(csg);
1781		- Composite child = new cGroup();
	2457	+ Composite child = new cGroup("Branch A");
1782	2458	csg.addChild(child);
1783	2459	child.addChild(csg);
1784		- child = new cGroup();
	2460	+ child = new cGroup("Branch B");
1785	2461	csg.addChild(child);
1786	2462	child.addChild(csg);
1787	2463	} else
1788	2464	if (source == tripleItem)
1789	2465	{
1790		- Composite csg = new GroupLeaf();
	2466	+ Composite csg = new GroupLeaf("Trident");
1791	2467	csg.count = 4;
1792	2468	group(csg);
1793	2469	Composite child = new cGroup();
..	..	@@ -1800,27 +2476,10 @@
1800	2476	csg.addChild(child);
1801	2477	child.addChild(csg);
1802	2478	} else
1803		-
1804		- if (source == importGFDItem)
1805		- {
1806		- ImportGFD();
1807		- } else
1808		- if (source == importVRMLX3DItem)
1809		- {
1810		- ImportVRMLX3D();
1811		- } else
1812		- if (source == import3DSItem)
1813		- {
1814		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1815		- } else
1816		- if (source == importOBJItem)
1817		- {
1818		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1819		- } else
1820	2479	if (source == computeAOItem)
1821	2480	{
1822	2481	Globals.drawMode = CameraPane.OCCLUSION;
1823		- Globals.theRenderer.repaint();
	2482	+ cameraView.repaint();
1824	2483	} else
1825	2484	if (source == recompileItem)
1826	2485	{
..	..	@@ -1835,7 +2494,7 @@
1835	2494	if (source == invariantsItem)
1836	2495	{
1837	2496	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2497	+ Grafreed.grafreeD.universe.invariants();
1839	2498	} else
1840	2499	if (source == memoryItem)
1841	2500	{
..	..	@@ -1854,19 +2513,61 @@
1854	2513	{
1855	2514	DumpObject();
1856	2515	} else
	2516	+ if (source == minButton)
	2517	+ {
	2518	+ Minimize();
	2519	+ } else
	2520	+ if (source == maxButton)
	2521	+ {
	2522	+ Maximize();
	2523	+ } else
	2524	+ if (source == fullButton)
	2525	+ {
	2526	+ ToggleFullScreen();
	2527	+ } else
	2528	+ if (source == undoButton)
	2529	+ {
	2530	+ // Go to previous version
	2531	+ //if (!Undo())
	2532	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2533	+ Undo();
	2534	+ } else
	2535	+ if (source == restoreButton)
	2536	+ {
	2537	+ // Restore current version
	2538	+ Restore();
	2539	+ } else
	2540	+ if (source == replaceButton)
	2541	+ {
	2542	+ // Overwrite current version
	2543	+ Replace();
	2544	+ } else
	2545	+ if (source == redoButton)
	2546	+ {
	2547	+ // Go to next version
	2548	+ Redo();
	2549	+ } else
	2550	+ if (source == saveButton)
	2551	+ {
	2552	+ // Save a new version
	2553	+ if (!Save(true))
	2554	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2555	+ } else
	2556	+ if (source == oneStepButton)
	2557	+ {
	2558	+ Globals.ONESTEP = true;
	2559	+ cameraView.repaint();
	2560	+ } else
1857	2561	if (source == screenfitButton)
1858	2562	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2563	ScreenFit();
1861	2564	} else
1862	2565	if (source == screenfitpointButton)
1863	2566	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2567	ScreenFitPoint();
1866	2568	} else
1867	2569	if (source == snapobjectButton)
1868	2570	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2571	SnapObject();
1871	2572	} else
1872	2573	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2604,20 @@
1903	2604	{
1904	2605	loadClipboard(true);
1905	2606	} else
	2607	+ if (source == undoItem)
	2608	+ {
	2609	+ Undo();
	2610	+ } else
	2611	+ if (source == redoItem)
	2612	+ {
	2613	+ Redo();
	2614	+ } else
1906	2615	if (source == duplicateItem)
1907	2616	{
1908		- Object3D keep = GrafreeD.clipboard;
	2617	+ Object3D keep = Grafreed.clipboard;
1909	2618	loadClipboard(false);
1910	2619	paste(false);
1911		- GrafreeD.clipboard = keep;
	2620	+ Grafreed.clipboard = keep;
1912	2621	} else
1913	2622	if (source == cloneItem)
1914	2623	{
..	..	@@ -1926,13 +2635,17 @@
1926	2635	{
1927	2636	paste(false);
1928	2637	} else
	2638	+ if (source == pasteIntoItem)
	2639	+ {
	2640	+ pasteInto(true, false);
	2641	+ } else
1929	2642	if (source == pasteLinkItem)
1930	2643	{
1931		- pasteInto(false);
	2644	+ pasteInto(false, false);
1932	2645	} else
1933	2646	if (source == pasteCloneItem)
1934	2647	{
1935		- pasteInto(true);
	2648	+ pasteInto(true, true);
1936	2649	} else
1937	2650	if (source == pasteExpandItem)
1938	2651	{
..	..	@@ -2124,9 +2837,9 @@
2124	2837	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2838	// refreshContents();
2126	2839	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2840	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2841	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2842	+ Object3D content = Grafreed.clipboard.get(0);
2130	2843
2131	2844	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2845	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2847,11 @@
2134	2847	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2848	for (int i=0; i<group.selection.size(); i++)
2136	2849	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2850	+ boolean random = CameraPane.SWITCH;
	2851	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2852	group.selection.get(i).linkVerticesThis(content);
2140	2853	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2854	+ CameraPane.SWITCH = random;
2142	2855	}
2143	2856	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2857	refreshContents();
..	..	@@ -2148,20 +2861,20 @@
2148	2861	{
2149	2862	for (int i=0; i<group.selection.size(); i++)
2150	2863	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2864	+ boolean random = CameraPane.SWITCH;
	2865	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2866	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2867	+ CameraPane.SWITCH = random;
2155	2868	}
2156	2869
2157	2870	refreshContents();
2158	2871	} else
2159	2872	if (source == relinkverticesItem)
2160	2873	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2874	+ boolean random = CameraPane.SWITCH;
	2875	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2876	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2877	+ CameraPane.SWITCH = random;
2165	2878
2166	2879	refreshContents();
2167	2880	} else
..	..	@@ -2176,9 +2889,9 @@
2176	2889	} else
2177	2890	if (source == setMasterItem)
2178	2891	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2892	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2893	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2894	+ Object3D content = Grafreed.clipboard.get(0);
2182	2895
2183	2896	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2897	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2904,9 @@
2191	2904	{
2192	2905	if (group.selection.size() == 1)
2193	2906	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2907	+ if (Grafreed.clipboard.size() == 1)
2195	2908	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2909	+ Object3D content = Grafreed.clipboard.get(0);
2197	2910
2198	2911	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2912	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2923,7 @@
2210	2923	{
2211	2924	RevertMeshes();
2212	2925	} else
2213		- if (source == resetMeshItem)
	2926	+ if (source == resetAllItem)
2214	2927	{
2215	2928	ResetAll();
2216	2929	} else
..	..	@@ -2218,7 +2931,7 @@
2218	2931	{
2219	2932	StepAll();
2220	2933	} else
2221		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2934	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2222	2935	{
2223	2936	//int indices[] = jList.getSelectedIndices();
2224	2937	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2230,9 +2943,9 @@
2230	2943	{
2231	2944	ClearSelection(true);
2232	2945	} else
2233		- if (source == grabItem)
	2946	+ if (source == grabItem \|\| source == groupButton)
2234	2947	{
2235		- group(new cGroup(), true);
	2948	+ group(new cGroup(), false); // true);
2236	2949	} else
2237	2950	if (source == hideItem)
2238	2951	{
..	..	@@ -2250,16 +2963,16 @@
2250	2963	{
2251	2964	makeSomething(new Camera());
2252	2965	} else
2253		- if (source == compositeItem)
	2966	+ if (source == compositeItem \|\| source == compositeButton)
2254	2967	{
2255	2968	group(new Composite());
2256	2969	} else
2257		- if (source == randomItem)
	2970	+ if (source == switchItem \|\| source == switchButton)
2258	2971	{
2259	2972	RandomNode random = new RandomNode();
2260	2973	group(random);
2261	2974	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2975	+ random.name = random.get(0).name + "Switch";
2263	2976	} else
2264	2977	if (source == physicsItem)
2265	2978	{
..	..	@@ -2356,7 +3069,7 @@
2356	3069	{
2357	3070	group(new cLinker());
2358	3071	} else
2359		- if (source == textureItem)
	3072	+ if (source == textureItem \|\| source == textureButton)
2360	3073	{
2361	3074	group(new TextureNode());
2362	3075	} else
..	..	@@ -2376,17 +3089,30 @@
2376	3089	{
2377	3090	CastShadow(2);
2378	3091	} else
2379		- if (source == ungroupItem)
	3092	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	3093	{
2381		- //ungroup();
	3094	+ boolean hasRoot = false;
	3095	+
2382	3096	for (int i=0; i<group.selection.size(); i++)
2383	3097	{
2384		- Ungroup(group.selection.get(i));
	3098	+ if (group.selection.get(i) == group)
	3099	+ {
	3100	+ hasRoot = true;
	3101	+ break;
	3102	+ }
2385	3103	}
2386	3104
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	3105	+ if (!hasRoot)
	3106	+ {
	3107	+ for (int i=0; i<group.selection.size(); i++)
	3108	+ {
	3109	+ Ungroup(group.selection.get(i));
	3110	+ }
	3111	+
	3112	+ ClearSelection(false);
	3113	+
	3114	+ refreshContents();
	3115	+ }
2390	3116	} else
2391	3117	if (source == genUVItem)
2392	3118	{
..	..	@@ -2398,7 +3124,7 @@
2398	3124	} else
2399	3125	if (source == genNormalsMESHItem)
2400	3126	{
2401		- GenNormals(true); // TODO
	3127	+ GenNormalsMESH();
2402	3128	} else
2403	3129	if (source == genNormalsORGANItem)
2404	3130	{
..	..	@@ -2463,6 +3189,22 @@
2463	3189	if (source == unmarkleavesItem)
2464	3190	{
2465	3191	MarkLeaves(false);
	3192	+ } else
	3193	+ if (source == rewindleavesItem)
	3194	+ {
	3195	+ RewindLeaves(true);
	3196	+ } else
	3197	+ if (source == unrewindleavesItem)
	3198	+ {
	3199	+ RewindLeaves(false);
	3200	+ } else
	3201	+ if (source == randomleavesItem)
	3202	+ {
	3203	+ RandomLeaves(true);
	3204	+ } else
	3205	+ if (source == unrandomleavesItem)
	3206	+ {
	3207	+ RandomLeaves(false);
2466	3208	} else
2467	3209	if (source == flipVItem)
2468	3210	{
..	..	@@ -2548,9 +3290,13 @@
2548	3290	{
2549	3291	SmoothMesh();
2550	3292	} else
2551		- if (source == transformgeometryItem)
	3293	+ if (source == transformGeometryItem)
2552	3294	{
2553	3295	TransformGeometry();
	3296	+ } else
	3297	+ if (source == transformChildrenItem)
	3298	+ {
	3299	+ TransformChildren();
2554	3300	} else
2555	3301	if (source == resetTransformItem)
2556	3302	{
..	..	@@ -2558,7 +3304,11 @@
2558	3304	} else
2559	3305	if (source == resetCentroidItem)
2560	3306	{
2561		- ResetCentroid();
	3307	+ ResetCentroid(true);
	3308	+ } else
	3309	+ if (source == resetCentroidXZItem)
	3310	+ {
	3311	+ ResetCentroid(false);
2562	3312	} else
2563	3313	if (source == resetParentItem)
2564	3314	{
..	..	@@ -2663,7 +3413,7 @@
2663	3413	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2664	3414	{
2665	3415	obj = (Object3D)e.nextElement();
2666		- obj.SetBumpTexture(null);
	3416	+ obj.ResetBumpTexture();
2667	3417	}
2668	3418
2669	3419	refreshContents();
..	..	@@ -2679,6 +3429,31 @@
2679	3429
2680	3430	refreshContents();
2681	3431	} else
	3432	+ if (source == embedTexturesItem)
	3433	+ {
	3434	+ Object3D obj;
	3435	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3436	+ {
	3437	+ obj = (Object3D)e.nextElement();
	3438	+ obj.EmbedTextures(true);
	3439	+ }
	3440	+
	3441	+ refreshContents();
	3442	+ } else
	3443	+ if (source == deEmbedTexturesItem)
	3444	+ {
	3445	+ Object3D obj;
	3446	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3447	+ {
	3448	+ obj = (Object3D)e.nextElement();
	3449	+ obj.EmbedTextures(false);
	3450	+ }
	3451	+
	3452	+ CameraPane.texturepigment.clear();
	3453	+ CameraPane.texturebump.clear();
	3454	+
	3455	+ refreshContents();
	3456	+ } else
2682	3457	if (source == flashSelectionButton)
2683	3458	{
2684	3459	CameraPane.flash = true;
..	..	@@ -2690,6 +3465,10 @@
2690	3465	if (source == twoButton)
2691	3466	{
2692	3467	radio.layout = twoButton;
	3468	+
	3469	+ if (CameraPane.FULLSCREEN)
	3470	+ fullscreenLayout = radio.layout;
	3471	+
2693	3472	// bug
2694	3473	//gridPanel.setDividerLocation(1.0);
2695	3474	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2720,12 +3499,33 @@
2720	3499	// centralPanel.setVisible(true);
2721	3500	// XYZPanel.setVisible(false);
2722	3501	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	3502	+ bigThree.add(centralPanel);
2724	3503	bigThree.FlushUI();
	3504	+
	3505	+ cameraView.requestFocusInWindow();
	3506	+
	3507	+// refreshContents(true);
	3508	+//
	3509	+// try
	3510	+// {
	3511	+// java.awt.Robot bot = new java.awt.Robot();
	3512	+// int mask = InputEvent.BUTTON1_MASK;
	3513	+// bot.mouseMove(100, 100);
	3514	+// bot.mousePress(mask);
	3515	+// bot.mouseRelease(mask);
	3516	+// }
	3517	+// catch (Exception e)
	3518	+// {
	3519	+//
	3520	+// }
	3521	+
2725	3522	} else
2726	3523	if (source == threeButton)
2727	3524	{
2728	3525	radio.layout = threeButton;
	3526	+
	3527	+ if (CameraPane.FULLSCREEN)
	3528	+ fullscreenLayout = radio.layout;
2729	3529
2730	3530	// bigThree.remove(scenePanel);
2731	3531	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3555,18 @@
2755	3555	// centralPanel.setVisible(true);
2756	3556	// XYZPanel.setVisible(true);
2757	3557	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	3558	+ bigThree.add(scenePanel);
	3559	+ bigThree.add(centralPanel);
2760	3560	bigThree.FlushUI();
	3561	+
	3562	+ cameraView.requestFocusInWindow();
2761	3563	} else
2762	3564	if (source == fourButton)
2763	3565	{
2764	3566	radio.layout = fourButton;
	3567	+
	3568	+ if (CameraPane.FULLSCREEN)
	3569	+ fullscreenLayout = radio.layout;
2765	3570
2766	3571	// bigThree.remove(scenePanel);
2767	3572	// bigThree.remove(centralPanel);
..	..	@@ -2791,12 +3596,17 @@
2791	3596	// centralPanel.setVisible(false);
2792	3597	// XYZPanel.setVisible(false);
2793	3598	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3599	+ bigThree.add(scenePanel);
2795	3600	bigThree.FlushUI();
	3601	+
	3602	+ cameraView.requestFocusInWindow();
2796	3603	} else
2797	3604	if (source == sixButton)
2798	3605	{
2799	3606	radio.layout = sixButton;
	3607	+
	3608	+ if (CameraPane.FULLSCREEN)
	3609	+ fullscreenLayout = radio.layout;
2800	3610
2801	3611	// bigThree.remove(scenePanel);
2802	3612	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3636,18 @@
2826	3636	// centralPanel.setVisible(true);
2827	3637	// XYZPanel.setVisible(false);
2828	3638	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3639	+ bigThree.add(centralPanel);
	3640	+ bigThree.add(scenePanel);
2831	3641	bigThree.FlushUI();
	3642	+
	3643	+ cameraView.requestFocusInWindow();
2832	3644	} else
2833	3645	if (source == sevenButton)
2834	3646	{
2835	3647	radio.layout = sevenButton;
	3648	+
	3649	+ if (CameraPane.FULLSCREEN)
	3650	+ fullscreenLayout = radio.layout;
2836	3651
2837	3652	// bigThree.remove(scenePanel);
2838	3653	// bigThree.remove(centralPanel);
..	..	@@ -2862,10 +3677,12 @@
2862	3677	// centralPanel.setVisible(true);
2863	3678	// XYZPanel.setVisible(true);
2864	3679	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3680	+ bigThree.add(scenePanel);
	3681	+ bigThree.add(centralPanel);
	3682	+ bigThree.add(XYZPanel);
2868	3683	bigThree.FlushUI();
	3684	+
	3685	+ cameraView.requestFocusInWindow();
2869	3686	} else
2870	3687	if (source == rootButton)
2871	3688	{
..	..	@@ -2877,6 +3694,7 @@
2877	3694	EditObject(obj);
2878	3695	}
2879	3696
	3697	+ cameraView.requestFocusInWindow();
2880	3698	refreshContents(true);
2881	3699	} else
2882	3700	if (source == closeButton)
..	..	@@ -2886,22 +3704,37 @@
2886	3704	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3705	{
2888	3706	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3707	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3708	{
	3709	+ // Patch to avoid bug with transparency.
	3710	+ if (!ab.hadMaterial)
	3711	+ {
	3712	+ ab.object.material = null;
	3713	+ }
	3714	+
2891	3715	buttonGroup.remove(ab);
2892	3716	radioPanel.remove(ab);
2893	3717
2894		- ab.GetObject().editWindow = null;
	3718	+ //ab.GetObject().editWindow = null;
	3719	+ ab.GetObject().manipWindow = null;
2895	3720	// ab.GetObject().objectUI = null; // ?????????
2896	3721
2897	3722	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3723	break;
2899	3724	}
2900	3725	}
	3726	+
	3727	+ cameraView.requestFocusInWindow();
2901	3728	refreshContents(true);
2902	3729	} else
2903	3730	if (source == editItem \|\| source == editButton)
2904	3731	{
	3732	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3733	+ {
	3734	+ Object3D child = (Object3D)e.nextElement();
	3735	+ child.pinned = true;
	3736	+ }
	3737	+
2905	3738	EditSelection(false);
2906	3739	} else
2907	3740	if (source == uneditButton)
..	..	@@ -2911,12 +3744,13 @@
2911	3744	Object3D child = (Object3D)e.nextElement();
2912	3745	if(child.editWindow != null)
2913	3746	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3747	+ child.pinned = false;
2914	3748	child.CloseUI();
2915	3749	listUI.remove(child);
2916	3750
2917		- child.editWindow = null; // ???????????
	3751	+ //child.editWindow = null; // ???????????
2918	3752	}
2919		- objEditor.ctrlPanel.revalidate();
	3753	+ objEditor.ctrlPanel.FlushUI();
2920	3754	//objEditor.jTree.clearSelection();
2921	3755	//objEditor.ResetSliders();
2922	3756	refreshContents(true);
..	..	@@ -2927,6 +3761,7 @@
2927	3761	//copy.ClearUI();
2928	3762	for (Object3D obj : listUI)
2929	3763	{
	3764	+ obj.pinned = false;
2930	3765	obj.CloseUI();
2931	3766	}
2932	3767	listUI.clear();
..	..	@@ -2936,7 +3771,7 @@
2936	3771	{
2937	3772	assert(copy == group);
2938	3773
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3774	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	3775
2941	3776	for (Object3D obj : listUI)
2942	3777	{
..	..	@@ -2985,6 +3820,9 @@
2985	3820	}
2986	3821
2987	3822	copy = group;
	3823	+
	3824	+ SetUndoStates();
	3825	+
2988	3826	//Globals.theRenderer.object = group;
2989	3827	if(!useclient)
2990	3828	{
..	..	@@ -3000,20 +3838,46 @@
3000	3838	frontView.object = group;
3001	3839	sideView.object = group;
3002	3840	}
3003		- group.editWindow = this;
	3841	+
	3842	+// fix "+" issue
	3843	+ //group.editWindow = this;
	3844	+ group.manipWindow = this;
	3845	+
3004	3846	/*
3005	3847	currentLayout = radio.layout;
3006	3848	if (currentLayout == null)
3007	3849	currentLayout = sevenButton;
3008	3850	*/
3009	3851	radio.layout.doClick();
	3852	+
	3853	+ ClearUnpinned();
	3854	+ //Grafreed.Assert(group != null);
	3855	+ //Grafreed.Assert(group.selection != null);
	3856	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3857	+ if (group.selection == null \|\| group.selection.size() == 1)
	3858	+ EditSelection(false);
3010	3859	keepparent = group.parent;
3011	3860	// PARENT = NULL or not???
3012	3861	//group.parent = null; // ROOT
3013	3862	//group.attributes = -1;
3014	3863	ResetModel();
	3864	+
	3865	+ cameraView.requestFocusInWindow();
3015	3866	refreshContents(true);
3016		- }
	3867	+ } else if (event.getSource() == editCameraItem)
	3868	+ {
	3869	+ cameraView.ProtectCamera();
	3870	+ cameraView.repaint();
	3871	+ return;
	3872	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3873	+ {
	3874	+ cameraView.RevertCamera();
	3875	+ cameraView.repaint();
	3876	+ return;
	3877	+ // } else if (event.getSource() == textureButton)
	3878	+ // {
	3879	+ // return; // true;
	3880	+ }
3017	3881	else
3018	3882	{
3019	3883	//return super.action(event, arg);
..	..	@@ -3022,7 +3886,6 @@
3022	3886	}
3023	3887
3024	3888	boolean useclient = false;
3025		- cRadio radio;
3026	3889
3027	3890	void ToggleRoot()
3028	3891	{
..	..	@@ -3074,6 +3937,28 @@
3074	3937	refreshContents();
3075	3938	}
3076	3939
	3940	+ void TransformChildren()
	3941	+ {
	3942	+ Object3D obj;
	3943	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3944	+ {
	3945	+ obj = (Object3D)e.nextElement();
	3946	+ obj.KeepTextureMatrices();
	3947	+ obj.TransformChildren();
	3948	+ obj.RestoreTextureMatrices();
	3949	+
	3950	+// if (obj.parent == null)
	3951	+// {
	3952	+// System.out.println("NULL PARENT!");
	3953	+// new Exception().printStackTrace();
	3954	+// }
	3955	+// else
	3956	+// TouchTransform(obj);
	3957	+// //obj.parent.Touch();
	3958	+ }
	3959	+
	3960	+ refreshContents();
	3961	+ }
3077	3962
3078	3963	void ResetTransform()
3079	3964	{
..	..	@@ -3186,7 +4071,7 @@
3186	4071	refreshContents();
3187	4072	}
3188	4073
3189		- void ResetCentroid()
	4074	+ void ResetCentroid(boolean full)
3190	4075	{
3191	4076	Object3D obj;
3192	4077	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +4086,16 @@
3201	4086	LA.matIdentity(Object3D.mat);
3202	4087	obj.getBounds(minima, maxima, false);
3203	4088	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	4089	+ if (full)
	4090	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	4091	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	4092	obj.TransformMesh(Object3D.mat);
	4093	+
3207	4094	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	4095	+ if (full)
	4096	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	4097	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	4098	+
3210	4099	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	4100	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	4101	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +4124,8 @@
3235	4124
3236	4125	int size = obj.MemorySize();
3237	4126
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	4127	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	4128	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	4129	}
3240	4130	}
3241	4131	catch (Exception e)
..	..	@@ -3272,9 +4162,9 @@
3272	4162	obj = (Object3D)e.nextElement();
3273	4163
3274	4164	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	4165	+ Grafreed.AnalyzeObject(obj);
3276	4166	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	4167	+ Grafreed.AnalyzeObject(obj.bRep);
3278	4168
3279	4169	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	4170	}
..	..	@@ -3316,6 +4206,13 @@
3316	4206	void GenNormals(boolean crease)
3317	4207	{
3318	4208	group.GenNormalsS(crease);
	4209	+
	4210	+ refreshContents();
	4211	+ }
	4212	+
	4213	+ void GenNormalsMESH()
	4214	+ {
	4215	+ group.GenNormalsMeshS();
3319	4216
3320	4217	refreshContents();
3321	4218	}
..	..	@@ -3488,8 +4385,8 @@
3488	4385
3489	4386	void ParseVertices()
3490	4387	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4388	+ boolean epsequal = Grafreed.epsequal;
	4389	+ Grafreed.epsequal = true;
3493	4390
3494	4391	for (int i=0; i<group.selection.size(); i++)
3495	4392	{
..	..	@@ -3514,7 +4411,7 @@
3514	4411	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4412	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4413
3517		- g.add(GrafreeD.clipboard);
	4414	+ g.add(Grafreed.clipboard);
3518	4415
3519	4416	buffer.add(g);
3520	4417	}
..	..	@@ -3529,7 +4426,7 @@
3529	4426	makeSomething(buffer, i==group.selection.size()-1);
3530	4427	}
3531	4428
3532		- GrafreeD.epsequal = epsequal;
	4429	+ Grafreed.epsequal = epsequal;
3533	4430
3534	4431	refreshContents();
3535	4432	}
..	..	@@ -3547,7 +4444,16 @@
3547	4444	String pigment = Object3D.GetPigment(tex);
3548	4445	//String bump = Object3D.GetBump(tex);
3549	4446
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4447	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4448	+
	4449	+ try
	4450	+ {
	4451	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4452	+ }
	4453	+ catch (Exception e)
	4454	+ {
	4455	+ System.err.println("FAIL: " + node);
	4456	+ }
3551	4457
3552	4458	double s = v.s;
3553	4459
..	..	@@ -3635,11 +4541,11 @@
3635	4541
3636	4542	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4543
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4544	+ boolean random = CameraPane.SWITCH;
	4545	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4546	lowres.linkVerticesThis(null);
3641	4547	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4548	+ CameraPane.SWITCH = random;
3643	4549
3644	4550	System.err.flush();
3645	4551
..	..	@@ -3679,7 +4585,7 @@
3679	4585	return;
3680	4586
3681	4587	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4588	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4589
3684	4590	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4591
..	..	@@ -3873,9 +4779,9 @@
3873	4779
3874	4780	void ClipMesh()
3875	4781	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4782	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4783	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4784	+ Object3D content = Grafreed.clipboard.get(0);
3879	4785
3880	4786	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4787	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4790,7 @@
3884	4790	// {
3885	4791	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4792	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4793	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4794	}
3889	4795	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4796	System.out.println("DONE.");
..	..	@@ -3931,6 +4837,18 @@
3931	4837	void MarkLeaves(boolean hide)
3932	4838	{
3933	4839	group.selection.MarkLeaves(hide);
	4840	+ refreshContents();
	4841	+ }
	4842	+
	4843	+ void RewindLeaves(boolean hide)
	4844	+ {
	4845	+ group.selection.RewindLeaves(hide);
	4846	+ refreshContents();
	4847	+ }
	4848	+
	4849	+ void RandomLeaves(boolean hide)
	4850	+ {
	4851	+ group.selection.RandomLeaves(hide);
3934	4852	refreshContents();
3935	4853	}
3936	4854
..	..	@@ -4005,28 +4923,25 @@
4005	4923	// }
4006	4924	// }
4007	4925
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	4926	void EditSelection(boolean newWindow)
4013	4927	{
	4928	+ if (group.selection == null)
	4929	+ {
	4930	+ EditElement(group, newWindow); // ? new
	4931	+ return;
	4932	+ }
	4933	+
4014	4934	// aConstraints.gridy = 0;
4015	4935	for (int i=0; i<group.selection.size(); i++)
4016	4936	{
4017	4937	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	4938	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4939	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4940
4021	4941	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4942	+ if(elem != group \|\| !newWindow)
4023	4943	{
4024		- // if (!(elem instanceof Composite))
4025		- // newWindow = false;
4026		- listUI.add(elem);
4027		- elem.openEditWindow(this, newWindow); //, false);
4028		- System.out.println("edit : " + elem);
4029		- elem.editWindow.refreshContents(true); // ? new
	4944	+ EditElement(elem, newWindow); // ? new
4030	4945	}
4031	4946	}
4032	4947	}
..	..	@@ -4101,7 +5016,8 @@
4101	5016	//new Exception().printStackTrace();
4102	5017
4103	5018	freezemodel = true;
4104		-
	5019	+ ClearUnpinned();
	5020	+
4105	5021	/**/
4106	5022	//switch (event.id)
4107	5023	{
..	..	@@ -4109,7 +5025,6 @@
4109	5025	//case 702: // Event.LIST_DESELECT
4110	5026	group.deselectAll();
4111	5027	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	5028	if (tps != null)
4114	5029	{
4115	5030	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +5033,39 @@
4118	5033
4119	5034	//if (child.parent != null)
4120	5035	//child.parent.addSelectee(child);
	5036	+ objEditor.SetMaterial(child);
4121	5037	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	5038	}
4126	5039	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	5040	+// else
	5041	+// {
	5042	+// objEditor.SetMaterial(group); // .GetMaterial());
	5043	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	5044	+// System.err.println("info : " + group.GetPath());
	5045	+// }
4133	5046
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	5047	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	5048	CameraPane.flash = true;
4138	5049
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	5050	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	5051	// a camera
4141	5052	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5053	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5054	+ {
	5055	+ CameraPane.camerachangeframe = 0; // don't refuse it
	5056	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5057	+ }
4144	5058	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	5059	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	5060	}
4147	5061
	5062	+ if (tps != null && tps.length == 1)
	5063	+ {
	5064	+ EditSelection(false);
	5065	+ }
	5066	+
	5067	+ SetPinStates(tps != null && tps.length > 0);
	5068	+
4148	5069	refreshContents();
4149	5070	//return true;
4150	5071	}
..	..	@@ -4153,6 +5074,35 @@
4153	5074
4154	5075	freezemodel = false;
4155	5076	}
	5077	+
	5078	+ void SetPinStates(boolean enabled)
	5079	+ {
	5080	+ editButton.setEnabled(enabled);
	5081	+ uneditButton.setEnabled(enabled);
	5082	+ unselectButton.setEnabled(enabled);
	5083	+ flashSelectionButton.setEnabled(enabled);
	5084	+ }
	5085	+
	5086	+ void refreshContents(boolean cp)
	5087	+ {
	5088	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5089	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	5090	+ {
	5091	+ objEditor.ClearInfo(); // .GetMaterial());
	5092	+
	5093	+ for (int i=0; i < group.selection.Size(); i++)
	5094	+ {
	5095	+ Object3D child = (Object3D) group.selection.get(i);
	5096	+
	5097	+ objEditor.AddInfo(child, this, true);
	5098	+ System.err.println("info : " + child.GetPath());
	5099	+ }
	5100	+
	5101	+ objEditor.SetText(); // jan 2014
	5102	+ }
	5103	+
	5104	+ super.refreshContents(cp);
	5105	+ }
4156	5106
4157	5107	void linkSomething(Object3D thing)
4158	5108	{
..	..	@@ -4224,16 +5174,19 @@
4224	5174	{
4225	5175	if (group.selection.isEmpty())
4226	5176	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	5177	+
	5178	+ Grafreed.clipboardIsTempGroup = false;
4228	5179	Composite tGroup = null;
4229	5180	if (group.selection.size() > 0) // 1)
4230	5181	{
4231	5182	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	5183	+ Grafreed.clipboardIsTempGroup = true;
4233	5184	}
4234	5185
4235	5186	if (cut)
4236	5187	{
	5188	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	5189	+// Save();
4237	5190	//int indices[] = jList.getSelectedIndices();
4238	5191	//for (int i = indices.length - 1; i >= 0; i--)
4239	5192	//jList.remove(indices[i]);
..	..	@@ -4269,16 +5222,16 @@
4269	5222	//System.out.println("cut " + child);
4270	5223	//System.out.println("parent = " + child.parent);
4271	5224	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	5225	+ if (Grafreed.clipboardIsTempGroup)
4273	5226	tGroup.add/Child/(tmp);
4274	5227	else
4275		- GrafreeD.clipboard = tmp;
	5228	+ Grafreed.clipboard = tmp;
4276	5229	}
4277	5230	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	5231	+ if (Grafreed.clipboardIsTempGroup)
4279	5232	tGroup.add/Child/(child);
4280	5233	else
4281		- GrafreeD.clipboard = child;
	5234	+ Grafreed.clipboard = child;
4282	5235	}
4283	5236
4284	5237	//ResetModel();
..	..	@@ -4310,21 +5263,23 @@
4310	5263	//System.out.println("cut " + elem);
4311	5264	//System.out.println("parent = " + elem.parent);
4312	5265	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	5266	+ if (Grafreed.clipboardIsTempGroup)
4314	5267	tGroup.add/Child/(tmp);
4315	5268	else
4316		- GrafreeD.clipboard = tmp;
	5269	+ Grafreed.clipboard = tmp;
4317	5270	}
4318	5271	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	5272	+ if (Grafreed.clipboardIsTempGroup)
4320	5273	tGroup.add/Child/(child);
4321	5274	else
4322		- GrafreeD.clipboard = child;
	5275	+ Grafreed.clipboard = child;
4323	5276	}
4324	5277
4325	5278	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	5279	+
	5280	+ if (Grafreed.clipboardIsTempGroup)
	5281	+ Grafreed.clipboard = tGroup;
	5282	+
4328	5283	if (cut)
4329	5284	{
4330	5285	ResetModel();
..	..	@@ -4334,11 +5289,15 @@
4334	5289
4335	5290	void paste(boolean expand)
4336	5291	{
	5292	+ if (Globals.REPLACEONMAKE)
	5293	+ Save();
	5294	+ boolean keep = Globals.REPLACEONMAKE;
	5295	+ Globals.REPLACEONMAKE = false;
4337	5296	// if (GrafreeD.clipboard == null)
4338	5297	// return;
4339	5298	boolean first = true;
4340	5299
4341		- if (GrafreeD.clipboardIsTempGroup)
	5300	+ if (Grafreed.clipboardIsTempGroup)
4342	5301	{
4343	5302	Composite temp;
4344	5303
..	..	@@ -4349,7 +5308,7 @@
4349	5308	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	5309	*/
4351	5310	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5311	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	5312	{
4354	5313	Object3D child = (Object3D)e.nextElement();
4355	5314
..	..	@@ -4383,21 +5342,22 @@
4383	5342	//Object3D cb = Applet3D.clipboard;
4384	5343	//temp.addChild(cb);
4385	5344	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4386		- assert(GrafreeD.clipboard.parent == null);
4387		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4388		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4389		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4390		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5345	+ assert(Grafreed.clipboard.parent == null);
	5346	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5347	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5348	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5349	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5350	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5351	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5352	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5353	}
4395	5354
	5355	+ Globals.REPLACEONMAKE = keep;
4396	5356	ResetModel();
4397	5357	refreshContents();
4398	5358	}
4399	5359
4400		- void pasteInto(boolean copyit)
	5360	+ void pasteInto(boolean copyit, boolean clone)
4401	5361	{
4402	5362	// if (GrafreeD.clipboard == null)
4403	5363	// return;
..	..	@@ -4426,15 +5386,22 @@
4426	5386	if (copyit)
4427	5387	{
4428	5388	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5389	+ if (clone)
	5390	+ {
	5391	+ CloneClipboard(false); // sept 2014
	5392	+ }
	5393	+ else
	5394	+ {
	5395	+ paste(false);
	5396	+ }
4430	5397	}
4431	5398	else
4432	5399	{
4433	5400	boolean first = true;
4434	5401
4435		- if (GrafreeD.clipboardIsTempGroup)
	5402	+ if (Grafreed.clipboardIsTempGroup)
4436	5403	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5404	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5405	Object3D copy;
4439	5406	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5407	{
..	..	@@ -4444,7 +5411,7 @@
4444	5411	}
4445	5412	} else
4446	5413	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5414	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5415	}
4449	5416	}
4450	5417	}
..	..	@@ -4521,6 +5488,10 @@
4521	5488
4522	5489	void group(Object3D csg, boolean grab)
4523	5490	{
	5491	+ if (Globals.REPLACEONMAKE)
	5492	+ Save();
	5493	+ boolean keep = Globals.REPLACEONMAKE;
	5494	+ Globals.REPLACEONMAKE = false;
4524	5495	if (//false) // why??
4525	5496	!group.selection.isEmpty())
4526	5497	{
..	..	@@ -4634,10 +5605,15 @@
4634	5605	//node.add(csg);
4635	5606	//makeSomething(node);
4636	5607	makeSomething(csg);
	5608	+ Globals.REPLACEONMAKE = keep;
4637	5609	}
4638	5610
4639	5611	void Ungroup(Object3D g)
4640	5612	{
	5613	+ if (Globals.REPLACEONMAKE)
	5614	+ Save();
	5615	+ boolean keep = Globals.REPLACEONMAKE;
	5616	+ Globals.REPLACEONMAKE = false;
4641	5617	if (g instanceof HiddenObject)
4642	5618	{
4643	5619	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5630,7 @@
4654	5630	objEditor.makeSomething(g.get(i), false);
4655	5631	}
4656	5632	}
	5633	+ Globals.REPLACEONMAKE = keep;
4657	5634	}
4658	5635
4659	5636	void ungroup()
..	..	@@ -4849,21 +5826,6 @@
4849	5826	}
4850	5827	*/
4851	5828
4852		- void ImportGFD()
4853		- {
4854		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4855		- browser.show();
4856		- String filename = browser.getFile();
4857		- if (filename != null && filename.length() > 0)
4858		- {
4859		- String fullname = browser.getDirectory() + filename;
4860		-
4861		- //Object3D readobj =
4862		- objEditor.ReadGFD(fullname, objEditor);
4863		- //makeSomething(readobj);
4864		- }
4865		- }
4866		-
4867	5829	/*
4868	5830	public void Callback(Object obj)
4869	5831	{
..	..	@@ -4887,26 +5849,9 @@
4887	5849	}
4888	5850	*/
4889	5851
4890		- void ImportVRMLX3D()
4891		- {
4892		- if (GrafreeD.standAlone)
4893		- {
4894		- /**/
4895		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4896		- browser.show();
4897		- String filename = browser.getFile();
4898		- if (filename != null && filename.length() > 0)
4899		- {
4900		- String fullname = browser.getDirectory() + filename;
4901		- LoadVRMLX3D(fullname);
4902		- }
4903		- /**/
4904		- }
4905		- }
4906		-
4907	5852	String GetFile(String dialogName)
4908	5853	{
4909		- if (GrafreeD.standAlone)
	5854	+ if (Grafreed.standAlone)
4910	5855	{
4911	5856	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5857	browser.show();
..	..	@@ -4970,10 +5915,49 @@
4970	5915	cButton flashSelectionButton;
4971	5916	cButton editButton;
4972	5917	cButton uneditButton;
	5918	+ JCheckBox allParamsButton;
4973	5919	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5920	cButton unselectButton;
4976	5921
	5922	+ cButton restoreCameraButton;
	5923	+
	5924	+ cButton saveButton;
	5925	+ cButton oneStepButton;
	5926	+
	5927	+ cButton groupButton;
	5928	+ cButton ungroupButton;
	5929	+ cButton compositeButton;
	5930	+ cButton switchButton;
	5931	+ cButton loopButton;
	5932	+ cButton textureButton;
	5933	+
	5934	+ cButton skybox1Button;
	5935	+ cButton skybox2Button;
	5936	+ cButton skybox3Button;
	5937	+ cButton skybox4Button;
	5938	+ cButton skybox5Button;
	5939	+ cButton skybox6Button;
	5940	+ cButton skybox7Button;
	5941	+
	5942	+ cButton skybox11Button;
	5943	+ cButton skybox12Button;
	5944	+ cButton skybox13Button;
	5945	+ cButton skybox14Button;
	5946	+ cButton skybox15Button;
	5947	+ cButton skybox16Button;
	5948	+ cButton skybox17Button;
	5949	+
	5950	+ cButton gridButton;
	5951	+ cButton boxButton;
	5952	+ cButton sphereButton;
	5953	+ cButton coneButton;
	5954	+ cButton torusButton;
	5955	+ cButton superButton;
	5956	+ cButton kleinButton;
	5957	+ cButton particlesButton;
	5958	+ cButton overlayButton;
	5959	+ cButton lightButton;
	5960	+
4977	5961	cButton screenfitButton;
4978	5962	cButton screenfitpointButton;
4979	5963	cButton snapobjectButton;
..	..	@@ -4985,14 +5969,6 @@
4985	5969
4986	5970	cButton setsupportButton;
4987	5971
4988		- cButton twoButton;
4989		- cButton sixButton;
4990		- cButton threeButton;
4991		- cButton sevenButton;
4992		- cButton fourButton; // full panel
4993		- cButton oneButton; // full XYZ
4994		- //cButton currentLayout;
4995		-
4996	5972	//
4997	5973	//Composite
4998	5974	Object3D // to do !!
..	..	@@ -5002,9 +5978,11 @@
5002	5978	//JTree jTree;
5003	5979	private MenuItem lookAtItem;
5004	5980	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	5981	+ private MenuItem switchViewItem;
5006	5982	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	5983	+ private MenuItem undoItem;
	5984	+ private MenuItem redoItem;
	5985	+ private JMenuItem duplicateItem;
5008	5986	private MenuItem cloneItem;
5009	5987	private MenuItem cloneSupportItem;
5010	5988	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +5995,7 @@
5017	5995	private MenuItem linkverticesItem;
5018	5996	private MenuItem relinkverticesItem;
5019	5997	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5998	+ private MenuItem resetAllItem;
5021	5999	private MenuItem stepAllItem;
5022	6000	private MenuItem revertMeshItem;
5023	6001	private MenuItem poseMeshItem;
..	..	@@ -5028,10 +6006,11 @@
5028	6006	private MenuItem mergeGeometriesItem;
5029	6007	private MenuItem copyItem;
5030	6008	private MenuItem pasteItem;
	6009	+ private MenuItem pasteIntoItem;
5031	6010	private MenuItem pasteLinkItem;
5032	6011	private MenuItem pasteCloneItem;
5033	6012	private MenuItem pasteExpandItem;
5034		- private MenuItem clearItem;
	6013	+ private MenuItem deleteItem;
5035	6014	private MenuItem clearAllItem;
5036	6015	private MenuItem genUVItem;
5037	6016	private MenuItem genNormalsMESHItem;
..	..	@@ -5066,6 +6045,10 @@
5066	6045	private MenuItem showleavesItem;
5067	6046	private MenuItem markleavesItem;
5068	6047	private MenuItem unmarkleavesItem;
	6048	+ private MenuItem rewindleavesItem;
	6049	+ private MenuItem unrewindleavesItem;
	6050	+ private MenuItem randomleavesItem;
	6051	+ private MenuItem unrandomleavesItem;
5069	6052
5070	6053	private MenuItem flipVItem;
5071	6054	private MenuItem unflipVItem;
..	..	@@ -5077,15 +6060,17 @@
5077	6060	private MenuItem panoTexturesItem;
5078	6061
5079	6062	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	6063	+ private MenuItem resetCentroidXZItem;
5081	6064	private MenuItem resetTransformItem;
	6065	+ private MenuItem transformGeometryItem;
	6066	+ private MenuItem transformChildrenItem;
5082	6067	private MenuItem hideItem;
5083	6068	private MenuItem grabItem;
5084	6069	private MenuItem backItem;
5085	6070	private MenuItem frontItem;
5086	6071	private MenuItem cameraItem;
5087	6072	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	6073	+ private MenuItem switchItem;
5089	6074	private MenuItem physicsItem;
5090	6075	private MenuItem frameselectorItem;
5091	6076	private MenuItem scriptNodeItem;
..	..	@@ -5109,6 +6094,8 @@
5109	6094	private MenuItem attachBumpItem;
5110	6095	private MenuItem detachBumpItem;
5111	6096	private MenuItem pigmentBumpItem;
	6097	+ private MenuItem embedTexturesItem;
	6098	+ private MenuItem deEmbedTexturesItem;
5112	6099
5113	6100	private MenuItem particleItem;
5114	6101	private MenuItem ragdollItem;
..	..	@@ -5125,7 +6112,7 @@
5125	6112	private MenuItem blobItem;
5126	6113	private MenuItem latheItem;
5127	6114	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	6115	+ private MenuItem overlayItem;
5129	6116	private MenuItem meshItem;
5130	6117	// private MenuItem meshGroupItem;
5131	6118	private MenuItem springItem;
..	..	@@ -5147,11 +6134,6 @@
5147	6134	private MenuItem doubleItem;
5148	6135	private MenuItem tripleItem;
5149	6136
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	6137	private MenuItem computeAOItem;
5156	6138	private MenuItem recompileItem;
5157	6139	private MenuItem editScriptItem;
..	..	@@ -5161,4 +6143,8 @@
5161	6143	private MenuItem analyzeItem;
5162	6144	private MenuItem dumpItem;
5163	6145	//boolean freezemodel = false;
	6146	+
	6147	+ Menu cameraMenu;
	6148	+ MenuItem editCameraItem;
	6149	+ MenuItem restoreCameraItem;
5164	6150	}