~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,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -83,6 +84,10 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
	87	+ if (Globals.REPLACEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.REPLACEONMAKE;
	90	+ Globals.REPLACEONMAKE = false;
86	91	// Object3D keep = GrafreeD.clipboard;
87	92	//Object3D obj;
88	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +98,19 @@
93	98
94	99	makeSomething(clone, i==group.selection.size()-1);
95	100	}
	101	+ Globals.REPLACEONMAKE = keep;
96	102	}
97	103
98	104	void CloneClipboard(boolean supports)
99	105	{
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));
	106	+ assert(Grafreed.clipboard.parent == null);
	107	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	108	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	109	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	110	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	111	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	112	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	113	+ Grafreed.clipboard.get(0).parent = keepparent;
108	114	}
109	115
110	116	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +124,7 @@
118	124	// obj.support = null;
119	125	if (!supports)
120	126	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	127	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	128	obj.parent = parent;
123	129	// obj.support = support;
124	130	// clone.support = support; // aout 2013
..	..	@@ -147,30 +153,29 @@
147	153
148	154	//JTextField nameField;
149	155
150		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
151	157	{
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);
	158	+ oe.jTree = new cTree();
	159	+
163	160	Menu menu;
164	161	oe.menuBar.add(menu = new Menu("Edit"));
165	162	//editItem = menu.add(new MenuItem("Edit"));
166	163	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	171	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	172	cloneItem = menu.add(new MenuItem("Clone"));
171	173	cloneItem.addActionListener(this);
	174	+ if (Globals.ADVANCED)
	175	+ {
172	176	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	177	cloneSupportItem.addActionListener(this);
	178	+ }
174	179	menu.add("-");
175	180	cutItem = menu.add(new MenuItem("Cut"));
176	181	cutItem.addActionListener(this);
..	..	@@ -178,27 +183,123 @@
178	183	copyItem.addActionListener(this);
179	184	pasteItem = menu.add(new MenuItem("Paste"));
180	185	pasteItem.addActionListener(this);
	186	+
	187	+ menu.add("-");
	188	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	189	+ pasteIntoItem.addActionListener(this);
181	190	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	191	pasteLinkItem.addActionListener(this);
183	192	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	193	pasteCloneItem.addActionListener(this);
185	194	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	195	// pasteExpandItem.addActionListener(this);
	196	+ menu.add("-");
187	197	clearItem = menu.add(new MenuItem("Clear"));
188	198	clearItem.addActionListener(this);
	199	+
	200	+ if (Globals.ADVANCED)
	201	+ {
	202	+ // Deletes the cameras...
189	203	clearAllItem = menu.add(new MenuItem("Clear All"));
190	204	clearAllItem.addActionListener(this);
	205	+ }
	206	+
	207	+ menuBar.add(cameraMenu = new Menu("View"));
	208	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	209	+ //zBufferItem.addActionListener(this);
	210	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	211	+ //normalLensItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
	214	+
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	227	+
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	229	+ toggleHandleItem.addItemListener(this);
	230	+ toggleHandleItem.setState(CameraPane.HANDLES);
	231	+
	232	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	233	+ togglePaintItem.addItemListener(this);
	234	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	235	+
	236	+ if (Globals.ADVANCED)
	237	+ {
	238	+ cameraMenu.add("-");
	239	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	240	+ toggleLiveItem.addItemListener(this);
	241	+ toggleLiveItem.setState(Globals.isLIVE());
191	242
	243	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	244	+ stepItem.addActionListener(this);
	245	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	246	+ // toggleDLItem.addItemListener(this);
	247	+ // toggleDLItem.setState(false);
	248	+
	249	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	250	+ toggleRenderItem.addItemListener(this);
	251	+ toggleRenderItem.setState(!CameraPane.frozen);
	252	+
	253	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	254	+ toggleDebugItem.addItemListener(this);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
	256	+
	257	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	258	+ toggleFrustumItem.addItemListener(this);
	259	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	260	+
	261	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	262	+ toggleFootContactItem.addItemListener(this);
	263	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	264	+
	265	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	266	+ toggleTimelineItem.addItemListener(this);
	267	+ }
	268	+
	269	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	270	+// toggleRootItem.addItemListener(this);
	271	+// toggleRootItem.setState(false);
	272	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	273	+// animationItem.addItemListener(this);
	274	+// animationItem.setState(CameraPane.ANIMATION);
	275	+ cameraMenu.add("-");
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	277	+ editCameraItem.addActionListener(this);
	278	+
	279	+ if (Globals.ADVANCED)
	280	+ {
	281	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	282	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	284	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	285	+ oe.cameraMenu.add("-");
	286	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	287	+ openWindowItem.addActionListener(this);
	288	+ editLeafItem.addActionListener(this);
	289	+ lookAtItem.addActionListener(this);
	290	+ //lookFromItem.addActinoListener(this);
	291	+ //switchViewItem.addActionListener(this);
	292	+ }
	293	+
192	294	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);
	295	+ if (Globals.ADVANCED)
	296	+ {
197	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	298	revertMeshItem.addActionListener(this);
199	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	300	resetreferencesItem.addActionListener(this);
201	301	menu.add("-");
	302	+ }
202	303	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	304	overwriteGeoItem.addActionListener(this);
204	305	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +311,104 @@
210	311	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	312	overwriteUVItem.addActionListener(this);
212	313	menu.add("-");
	314	+ if (Globals.ADVANCED)
	315	+ {
213	316	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	317	generateMeshItem.addActionListener(this);
215	318	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	319	poseMeshItem.addActionListener(this);
217	320	menu.add("-");
	321	+ }
218	322	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	323	resetsupportItem.addActionListener(this);
220	324	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	325	linkverticesItem.addActionListener(this);
222	326	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	327	relinkverticesItem.addActionListener(this);
	328	+
	329	+ if (Globals.ADVANCED)
	330	+ {
224	331	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	332	setMasterItem.addActionListener(this);
	333	+ }
226	334
227	335	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
230	338	backItem = menu.add(new MenuItem("Back"));
231	339	backItem.addActionListener(this);
232	340	frontItem = menu.add(new MenuItem("Front"));
233	341	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
	347	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	348	hideItem.addActionListener(this);
	349	+ }
238	350	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	351	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);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
247	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	360	switchGeoItem.addActionListener(this);
249	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	362	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	363	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	364	morphItem.addActionListener(this);
	365	+
	366	+ menu.add("-");
	367	+ physicsItem = menu.add(new MenuItem("Physics"));
	368	+ physicsItem.addActionListener(this);
	369	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	370	+ frameselectorItem.addActionListener(this);
253	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	372	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	373	+ }
257	374
258	375	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
261	378	billboardItem = menu.add(new MenuItem("Billboard"));
262	379	billboardItem.addActionListener(this);
263	380	csgItem = menu.add(new MenuItem("CSG"));
264	381	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	383	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	385	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
	391	+ if (Globals.ADVANCED)
	392	+ {
	393	+ menu.add("-");
271	394	linkerItem = menu.add(new MenuItem("Linker"));
272	395	linkerItem.addActionListener(this);
273	396	templateItem = menu.add(new MenuItem("Template"));
274	397	templateItem.addActionListener(this);
275		- attributeItem = menu.add(new MenuItem("Attribute"));
276		- attributeItem.addActionListener(this);
277	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	399	pointflowItem.addActionListener(this);
	400	+ }
279	401	menu.add("-");
280	402	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	403	resetTransformItem.addActionListener(this);
282	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	405	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	406	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	407	+ resetCentroidXZItem.addActionListener(this);
	408	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	409	+ transformGeometryItem.addActionListener(this);
	410	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	411	+ transformChildrenItem.addActionListener(this);
286	412
287	413	oe.menuBar.add(menu = new Menu("Geometry"));
288	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +419,11 @@
293	419	genNormalsCADItem.addActionListener(this);
294	420	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	421	genNormalsMESHItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
296	424	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	425	genNormalsMINEItem.addActionListener(this);
	426	+ }
298	427	stripifyItem = menu.add(new MenuItem("Stripify"));
299	428	stripifyItem.addActionListener(this);
300	429	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +445,34 @@
316	445	reduce34MeshItem.addActionListener(this);
317	446	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	447	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	448	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	449	clipMeshItem.addActionListener(this);
	450	+
	451	+ if (Globals.ADVANCED)
	452	+ {
	453	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	454	+ smoothMeshItem.addActionListener(this);
	455	+ }
323	456
324	457	oe.menuBar.add(menu = new Menu("Attributes"));
325	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	459	clearMaterialsItem.addActionListener(this);
	460	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	461	+ resetAllItem.addActionListener(this);
	462	+ stepAllItem = menu.add(new MenuItem("Step All"));
	463	+ stepAllItem.addActionListener(this);
327	464	menu.add("-");
328	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	466	liveleavesItem.addActionListener(this);
330	467	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	468	unliveleavesItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
332	471	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	472	supportleavesItem.addActionListener(this);
334	473	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	474	unsupportleavesItem.addActionListener(this);
	475	+ }
336	476	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	477	hideleavesItem.addActionListener(this);
338	478	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +481,14 @@
341	481	markleavesItem.addActionListener(this);
342	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
344	492	menu.add("-");
345	493	flipVItem = menu.add(new MenuItem("Flip V"));
346	494	flipVItem.addActionListener(this);
..	..	@@ -376,35 +524,41 @@
376	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	525	sortbynameItem.addActionListener(this);
378	526	menu.add("-");
	527	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	528	+ shareGeometriesItem.addActionListener(this);
	529	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	530	+ mergeGeometriesItem.addActionListener(this);
	531	+ if (Globals.ADVANCED)
	532	+ {
	533	+ // Pretty much the same as duplicate and clone.
379	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	535	extractGeometriesItem.addActionListener(this);
381	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	537	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);
	538	+ }
387	539
388	540	oe.menuBar.add(menu = new Menu("Insert"));
389	541	buildCreateMenu(menu);
390	542
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	543	oe.menuBar.add(menu = new Menu("Tools"));
403	544	buildToolsMenu(menu);
404	545	}
405	546
	547	+
406	548	void SetupUI2(ObjEditor oe)
407	549	{
	550	+ // June 2019
	551	+ if (oe == null)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ //return;
	555	+ }
	556	+
	557	+ if (copy != group)
	558	+ {
	559	+ //super.SetupUI2(this);
	560	+ }
	561	+
408	562	//new Exception().printStackTrace();
409	563
410	564	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,110 +587,230 @@
433	587	oe.radioPanel.add(dummyButton);
434	588	oe.buttonGroup.add(dummyButton);
435	589	*/
436		- aConstraints.gridy += 1;
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
437	593
438	594	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
439	595
440		- oe.aConstraints.gridwidth = 1;
441		- oe.aConstraints.gridx = 0;
	596	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ //minButton.setToolTipText("Minimize window");
	598	+ //minButton.addActionListener(this);
442	599
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);
	600	+ if (Globals.ADVANCED)
	601	+ {
	602	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ maxButton.setToolTipText("Maximize window");
	604	+ maxButton.addActionListener(this);
	605	+ }
	606	+
	607	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ fullButton.setToolTipText("Full-screen window");
	609	+ fullButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
454	612	screenfitButton.setToolTipText("Screen fit");
455	613	screenfitButton.addActionListener(this);
456		- oe.aConstraints.gridx += 1;
	614	+
	615	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	617	+ restoreCameraButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ saveButton.setToolTipText("New version");
	621	+ saveButton.addActionListener(this);
	622	+
	623	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ undoButton.setToolTipText("Previous version");
	625	+ undoButton.addActionListener(this);
	626	+ undoButton.setEnabled(false);
	627	+
	628	+ cGridBag updown = new cGridBag().setVertical(true);
	629	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreButton.setToolTipText("Restore current");
	631	+ restoreButton.addActionListener(this);
	632	+ restoreButton.setEnabled(false);
	633	+
	634	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ replaceButton.setToolTipText("Replace current");
	636	+ replaceButton.addActionListener(this);
	637	+ replaceButton.setEnabled(false);
	638	+
	639	+ copyOptionsPanel.add(updown);
	640	+
	641	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ redoButton.setToolTipText("Next version");
	643	+ redoButton.addActionListener(this);
	644	+ redoButton.setEnabled(false);
	645	+
	646	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	647	+ liveCB.setToolTipText("Enable animation");
	648	+ liveCB.addItemListener(this);
	649	+
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oneStepButton.setToolTipText("Animate one step forward");
	652	+ oneStepButton.addActionListener(this);
	653	+
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	655	+ fastCB.setToolTipText("Fast mode");
	656	+ fastCB.addItemListener(this);
	657	+
	658	+ //oe.toolboxPanel.Return();
	659	+
	660	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	661	+// trackCB.setToolTipText("Enable tracking");
	662	+// trackCB.addItemListener(this);
	663	+
457	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
458	665	// 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	666
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);
	667	+ if (Globals.ADVANCED)
	668	+ {
	669	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ snapobjectButton.addActionListener(this);
	671	+ snapobjectButton.setToolTipText("Snap Object");
	672	+ }
	673	+
	674	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473	675
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);
	676	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
482	677	twoButton.setToolTipText("Show center view only");
483	678	twoButton.addActionListener(this);
484		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	679	+ this.fullscreenLayout = twoButton;
	680	+
	681	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
485	682	fourButton.addActionListener(this);
486	683	fourButton.setToolTipText("Show left panel only");
487		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	684	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
488	685	sixButton.setToolTipText("2-column layout left");
489	686	sixButton.addActionListener(this);
490		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	687	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
491	688	threeButton.setToolTipText("2-column layout right");
492	689	threeButton.addActionListener(this);
493		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
494	691	sevenButton.setToolTipText("3-column layout");
495	692	sevenButton.addActionListener(this);
496	693	//
497	694
498		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
499		- rootButton.setToolTipText("Edit object in new tab");
	695	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ rootButton.setToolTipText("Edit selection in new tab");
500	697	rootButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	698	+
	699	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
503	700	closeButton.setToolTipText("Close tab");
504	701	closeButton.addActionListener(this);
505	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
506	703	//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	704
516		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	705	+ // INSERT
	706	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ gridButton.setToolTipText("Create grid");
	708	+ gridButton.addActionListener(this);
	709	+
	710	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ boxButton.setToolTipText("Create box");
	712	+ boxButton.addActionListener(this);
	713	+
	714	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ sphereButton.setToolTipText("Create sphere");
	716	+ sphereButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ coneButton.setToolTipText("Create cone");
	720	+ coneButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ torusButton.setToolTipText("Create torus");
	724	+ torusButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ superButton.setToolTipText("Create superellipsoid");
	728	+ superButton.addActionListener(this);
	729	+
	730	+ if (Globals.ADVANCED)
	731	+ {
	732	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ kleinButton.setToolTipText("Create Klein bottle");
	734	+ kleinButton.addActionListener(this);
	735	+ }
	736	+
	737	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ particlesButton.setToolTipText("Create particle system");
	739	+ particlesButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.Return();
	742	+
	743	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ groupButton.setToolTipText("Create group");
	745	+ groupButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ compositeButton.setToolTipText("Create composite");
	749	+ compositeButton.addActionListener(this);
	750	+
	751	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ switchButton.setToolTipText("Create item switcher");
	753	+ switchButton.addActionListener(this);
	754	+
	755	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ loopButton.setToolTipText("Create loop");
	757	+ loopButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ textureButton.setToolTipText("Create texture");
	761	+ textureButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ overlayButton.setToolTipText("Create overlay");
	765	+ overlayButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ lightButton.setToolTipText("Create light");
	769	+ lightButton.addActionListener(this);
	770	+
	771	+ for (int i=6; --i>=0;)
	772	+ {
	773	+ oe.toolboxPanel.Return();
	774	+ oe.toolboxPanel.add(new cGridBag());
	775	+ oe.toolboxPanel.add(new cGridBag());
	776	+ oe.toolboxPanel.add(new cGridBag());
	777	+ oe.toolboxPanel.add(new cGridBag());
	778	+ oe.toolboxPanel.add(new cGridBag());
	779	+ oe.toolboxPanel.add(new cGridBag());
	780	+ oe.toolboxPanel.add(new cGridBag());
	781	+ }
	782	+
	783	+ // EDIT panel
	784	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ editButton.setToolTipText("Pin selection controls");
	786	+ editButton.addActionListener(this);
	787	+
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
517	790	uneditButton.addActionListener(this);
518	791
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);
	792	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	793	+ allParamsButton.setToolTipText("Show all controle");
531	794	allParamsButton.addActionListener(this);
532	795
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);
	796	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ clearPanelButton.setToolTipText("Clear edit panel");
	798	+ clearPanelButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ unselectButton.setToolTipText("Unselect");
538	802	unselectButton.addActionListener(this);
539	803
	804	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ flashSelectionButton.setToolTipText("Highlight selection");
	806	+ flashSelectionButton.addActionListener(this);
	807	+
	808	+ editCommandsPanel.preferredHeight = 1;
	809	+
	810	+ SetPinStates(false);
	811	+// oe.treePanel.add(commandsPanel);
	812	+// oe.treePanel.Return();
	813	+
540	814	// oe.aConstraints.gridx += 1;
541	815	// oe.aConstraints.weighty = 0;
542	816	// oe.aConstraints.gridwidth = 1;
..	..	@@ -548,40 +822,25 @@
548	822	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
549	823	// gcButton.addActionListener(this);
550	824
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;
	825	+ cGridBag jSPPanel = new cGridBag();
	826	+
	827	+ JScrollPane jSP;
562	828	//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);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
564	830	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	831
	832	+ oe.treePanel.add(jSPPanel);
	833	+ oe.treePanel.Return();
	834	+
	835	+ oe.treePanel.add(copyOptionsPanel);
	836	+ oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
	840	+
	841	+// mainPanel.setDividerLocation(0.5); //1.0);
	842	+// mainPanel.setResizeWeight(0.5);
	843	+
585	844	//jList.addListSelectionListener(this);
586	845	oe.jTree.addTreeSelectionListener(this);
587	846	//jTree.setRootVisible(false);
..	..	@@ -604,83 +863,143 @@
604	863	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
605	864	}
606	865
607		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	866	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
608	867	{
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);
	868	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	869	+ colorCB.setToolTipText("Copy color when dropped");
	870	+ colorCB.addItemListener(this);
618	871
619		- // constraints.gridy += 1;
	872	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	873	+ materialCB.setToolTipText("Copy material when dropped");
	874	+ materialCB.addItemListener(this);
	875	+
	876	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	877	+ textureCB.setToolTipText("Copy texture when dropped");
	878	+ textureCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
	882	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	883	+ boxCB.setToolTipText("Display bounding boxes");
	884	+ boxCB.addItemListener(this);
	885	+
	886	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
	888	+ zoomBoxCB.addItemListener(this);
	889	+
	890	+ if (true) // Globals.ADVANCED)
	891	+ {
	892	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	893	+// supportCB.setToolTipText("Enable rigging");
	894	+// supportCB.addItemListener(this);
	895	+
	896	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	897	+ freezeCB.setToolTipText("Fast moving camera");
	898	+ freezeCB.addItemListener(this);
	899	+
620	900	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
621	901	// localCB.addItemListener(this);
622	902
623		- constraints.gridy += 1;
624		- panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD), constraints);
	903	+ panel.Return();
	904	+
	905	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
625	906	crowdCB.setToolTipText("Used for crowds");
626	907	crowdCB.addItemListener(this);
627	908
628		- constraints.gridy += 1;
629		- panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), constraints);
	909	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
630	910	smoothCB.setToolTipText("Snapping delay");
631	911	smoothCB.addItemListener(this);
632	912
633		- constraints.gridy += 1;
634		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), constraints);
	913	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
635	914	slowCB.setToolTipText("Smooth interpolation");
636	915	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		-
	916	+
646	917	// constraints.gridy += 1;
647	918	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
648	919	// speakerMocapCB.addItemListener(this);
649	920
	921	+ panel.Return();
	922	+
650	923	if (false)
651	924	{
652	925	// handled in scripts
653		- constraints.gridy += 1;
654		- panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), constraints);
	926	+ //constraints.gridy += 1;
	927	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
655	928	speakerCameraCB.addItemListener(this);
656	929
657		- constraints.gridy += 1;
658		- panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), constraints);
	930	+ //constraints.gridy += 1;
	931	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
659	932	speakerFocusCB.addItemListener(this);
660	933
661		- constraints.gridy += 1;
662		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), constraints);
	934	+ //constraints.gridy += 1;
	935	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
663	936	smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
664	938	}
665	939
666	940	//constraints.gridx += 1;
667	941	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
668	942	// debugCB.addItemListener(this);
669	943
670		- constraints.gridy += 1;
671		- panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL), constraints);
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
	948	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	949	+ oeilCB.setToolTipText("Move camera when tracking");
672	950	oeilCB.addItemListener(this);
673	951
674		- constraints.gridy += 1;
675		- panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT), constraints);
	952	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	953	+ shadowCB.setToolTipText("When live compute shadows");
	954	+ shadowCB.addItemListener(this);
	955	+
	956	+ panel.Return();
	957	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	958	+ toggleTextureCB.setToolTipText("Load textures");
	959	+ toggleTextureCB.addItemListener(this);
	960	+
	961	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	962	+ toggleSwitchCB.setToolTipText("Choose a single item");
	963	+ toggleSwitchCB.addItemListener(this);
	964	+
	965	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	966	+ autokeepCB.setToolTipText("On structure change");
	967	+ autokeepCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ if (Globals.ADVANCED)
	971	+ {
	972	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
676	973	lookAtCB.setToolTipText("Look-at target");
677	974	lookAtCB.addItemListener(this);
	975	+ }
	976	+
	977	+ }
	978	+
	979	+ cGridBag fill = new cGridBag();
	980	+ fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
	985	+
	986	+ panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
678	989
679	990	}
680	991
681	992	void EditObject(Object3D obj)
682	993	{
683	994	cRadio radioButton = new cRadio(obj.name);
	995	+
	996	+ // June 2019. Patch to avoid bug with transparency.
	997	+ radioButton.hadMaterial = obj.material != null;
	998	+ if (!radioButton.hadMaterial)
	999	+ {
	1000	+ obj.material = new cMaterial();
	1001	+ }
	1002	+
684	1003	radioButton.SetObject(obj);
685	1004	radioButton.layout = sevenButton;
686	1005	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -689,8 +1008,11 @@
689	1008	buttonGroup.add(radioButton);
690	1009	radioButton.doClick();
691	1010	}
	1011	+
692	1012	void SetupViews(ObjEditor oe)
693	1013	{
	1014	+ theFrame = this;
	1015	+
694	1016	oe.SetupViews();
695	1017
696	1018	System.out.println("SetupViews");
..	..	@@ -699,23 +1021,28 @@
699	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
700	1022	}
701	1023
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;
	1024	+ cToggleButton liveCB;
	1025	+ cCheckBox supportCB;
	1026	+ cCheckBox localCB;
	1027	+ cCheckBox crowdCB;
	1028	+ cCheckBox smoothCB;
	1029	+ cToggleButton fastCB;
	1030	+ cCheckBox slowCB;
	1031	+ cCheckBox boxCB;
	1032	+ cCheckBox zoomBoxCB;
	1033	+ cCheckBox freezeCB;
	1034	+ //cToggleButton trackCB;
	1035	+ cCheckBox trackCB;
	1036	+ cCheckBox smoothfocusCB;
713	1037	// JCheckBox speakerMocapCB;
714		- JCheckBox speakerCameraCB;
715		- JCheckBox speakerFocusCB;
716		- JCheckBox debugCB;
717		- JCheckBox oeilCB;
718		- JCheckBox lookAtCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
	1041	+
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
719	1046
720	1047	// static int COLOR = 1;
721	1048	// static int MATERIAL = 2;
..	..	@@ -723,9 +1050,9 @@
723	1050
724	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
725	1052
726		- JCheckBox colorCB;
727		- JCheckBox materialCB;
728		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
729	1056
730	1057	public void itemStateChanged(ItemEvent e)
731	1058	{
..	..	@@ -753,6 +1080,7 @@
753	1080	} else if(e.getSource() == liveCB)
754	1081	{
755	1082	cameraView.ToggleLive();
	1083	+ refreshContents(false);
756	1084	}
757	1085	else if(e.getSource() == supportCB)
758	1086	{
..	..	@@ -817,6 +1145,18 @@
817	1145	{
818	1146	cameraView.ToggleOeil();
819	1147	}
	1148	+ else if(e.getSource() == shadowCB)
	1149	+ {
	1150	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1151	+ }
	1152	+ else if(e.getSource() == freezeCB)
	1153	+ {
	1154	+ Globals.FREEZEONMOVE ^= true;
	1155	+ }
	1156	+ else if(e.getSource() == autokeepCB)
	1157	+ {
	1158	+ Globals.REPLACEONMAKE ^= true;
	1159	+ }
820	1160	else if(e.getSource() == lookAtCB)
821	1161	{
822	1162	cameraView.ToggleLookAt();
..	..	@@ -833,7 +1173,8 @@
833	1173
834	1174	/**/
835	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
836		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
837	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
838	1179	// We can't move the root node or an empty selection
839	1180	return;
..	..	@@ -896,8 +1237,6 @@
896	1237	}
897	1238	}
898	1239
899		- String string = (String) object;
900		-
901	1240	System.out.println("Transfer = " + object + "; drop : " + target);
902	1241	// if( object instanceof java.io.File[])
903	1242	// {
..	..	@@ -905,7 +1244,11 @@
905	1244	// objEditor.DropFile((java.io.File[]) object, true);
906	1245	// return;
907	1246	// }
908		- if (string.charAt(0) == '/')
	1247	+
	1248	+ String string = object.toString();
	1249	+
	1250	+ // File path for Mac and Windows
	1251	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
909	1252	{
910	1253	// file(s)
911	1254	String[] names = string.split("\n");
..	..	@@ -932,7 +1275,7 @@
932	1275
933	1276	flashIt = false;
934	1277	CameraPane pane = (CameraPane) target;
935		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1278	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
936	1279	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
937	1280
938	1281	if (group.selection.size() == 1)
..	..	@@ -948,23 +1291,33 @@
948	1291
949	1292	assert target == objEditor.jTree;
950	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
951	1295	try {
952		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
953	1297	} catch (Exception e) {
954	1298	System.out.println("destinationPath : " + destinationPath);
955	1299	return;
956	1300	}
957	1301
958		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
959	1303	{
	1304	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1305	+
	1306	+ // Cannot move into itself
	1307	+ if (child == destinationLeaf)
	1308	+ return;
	1309	+ }
	1310	+
	1311	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1312	+// {
960	1313	loadClipboard(true);
961	1314	objEditor.jTree.setSelectionPath(destinationPath);
962		- pasteInto(false);
963		- } else {
964		- loadClipboard(false);
965		- objEditor.jTree.setSelectionPath(destinationPath);
966		- pasteInto(false); // true); // ???
967		- }
	1315	+ pasteInto(false, false);
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
968	1321	}
969	1322	public void dropActionChanged(DropTargetDragEvent dtde)
970	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1069,85 +1422,107 @@
1069	1422	{
1070	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1071	1424	//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);
	1425	+// gridItem = menu.add(new MenuItem("Grid"));
	1426	+// gridItem.addActionListener(this);
	1427	+// rectoidItem = menu.add(new MenuItem("Box"));
	1428	+// rectoidItem.addActionListener(this);
	1429	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1430	+// ellipsoidItem.addActionListener(this);
	1431	+// coneItem = menu.add(new MenuItem("Cone"));
	1432	+// coneItem.addActionListener(this);
	1433	+// torusItem = menu.add(new MenuItem("Torus"));
	1434	+// torusItem.addActionListener(this);
	1435	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1436	+// superItem.addActionListener(this);
	1437	+
	1438	+ cameraItem = menu.add(new MenuItem("Camera"));
	1439	+ cameraItem.addActionListener(this);
	1440	+
	1441	+ if (!Globals.ADVANCED)
	1442	+ {
1084	1443	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1085	1444	kleinItem.addActionListener(this);
1086		- particleItem = menu.add(new MenuItem("Particle system"));
1087		- particleItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
	1449	+ if (Globals.ADVANCED)
	1450	+ {
1088	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1089	1452	ragdollItem.addActionListener(this);
1090	1453	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1091	1454	ragdoll2Item.addActionListener(this);
	1455	+ }
1092	1456	menu.add("-");
1093		- meshItem = menu.add(new MenuItem("Mesh"));
	1457	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1094	1458	meshItem.addActionListener(this);
1095	1459	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1096	1460	// meshGroupItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1097	1463	springItem = menu.add(new MenuItem("Spring"));
1098	1464	springItem.addActionListener(this);
1099	1465	flagItem = menu.add(new MenuItem("Flag"));
1100	1466	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	1467	blobItem = menu.add(new MenuItem("Blob"));
1106	1468	blobItem.addActionListener(this);
1107	1469	latheItem = menu.add(new MenuItem("Lathe"));
1108	1470	latheItem.addActionListener(this);
1109		- lightItem = menu.add(new MenuItem("Light"));
1110		- lightItem.addActionListener(this);
	1471	+ }
	1472	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1473	+ bezierItem.addActionListener(this);
	1474	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1475	+// overlayItem.addActionListener(this);
	1476	+// lightItem = menu.add(new MenuItem("Light"));
	1477	+// lightItem.addActionListener(this);
1111	1478	menu.add("-");
1112	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1113	1480	//superLoopItem.addActionListener(this);
1114		- loopItem = menu.add(new MenuItem("Loop"));
1115		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1116	1483	doubleItem = menu.add(new MenuItem("Fork"));
1117	1484	doubleItem.addActionListener(this);
	1485	+ if (Globals.ADVANCED)
	1486	+ {
1118	1487	tripleItem = menu.add(new MenuItem("Trident"));
1119	1488	tripleItem.addActionListener(this);
	1489	+ }
1120	1490	}
1121	1491
1122	1492	void buildToolsMenu(Menu menu)
1123	1493	{
1124	1494	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1125	1495	animationItem.addItemListener(this);
1126		- animationItem.setState(CameraPane.ANIMATION);
	1496	+ animationItem.setState(Globals.ANIMATION);
	1497	+
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
1127	1500
1128	1501	menu.add("-");
1129	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1130	1503	parseverticesItem.addActionListener(this);
1131	1504	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1132	1505	textureFieldItem.addActionListener(this);
1133		- alignItem = menu.add(new MenuItem("Align"));
	1506	+ alignItem = menu.add(new MenuItem("Align Objects"));
1134	1507	alignItem.addActionListener(this);
1135		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1136		- mirrorItem.addActionListener(this);
1137	1508	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1138	1509	reduceMorphItem.addActionListener(this);
1139	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1140	1511	reduce34MorphItem.addActionListener(this);
1141		-
1142		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1143		- computeAOItem.addActionListener(this);
1144	1512	menu.add("-");
1145		-
1146	1513	menu.add(memoryItem = new MenuItem("Memory Usage"));
1147	1514	memoryItem.addActionListener(this);
	1515	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1516	+ computeAOItem.addActionListener(this);
	1517	+
	1518	+ if (Globals.ADVANCED)
	1519	+ {
	1520	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1521	+ mirrorItem.addActionListener(this);
	1522	+ menu.add("-");
1148	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1149	1524	analyzeItem.addActionListener(this);
1150		- menu.add(dumpItem = new MenuItem("Dump"));
	1525	+ menu.add(dumpItem = new MenuItem("Print"));
1151	1526	dumpItem.addActionListener(this);
1152	1527	// menu.add(pathItem = new MenuItem("From-to path"));
1153	1528	// pathItem.addActionListener(this);
..	..	@@ -1165,6 +1540,7 @@
1165	1540	menu.add("-");
1166	1541	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1167	1542	editScriptItem.addActionListener(this);
	1543	+ }
1168	1544	}
1169	1545
1170	1546	void ScreenFit()
..	..	@@ -1287,9 +1663,24 @@
1287	1663	shadow.material = new cMaterial(obj.material);
1288	1664	shadow.material.diffuse = 0.0001f;
1289	1665	shadow.material.specular = 0.0001f;
	1666	+ //shadow.projectedVertices[1].x = 300;
1290	1667
1291	1668	makeSomething(shadow);
1292	1669	}
	1670	+
	1671	+ private void ClearUnpinned()
	1672	+ {
	1673	+ //for (Object3D obj : listUI)
	1674	+ for (int i=listUI.size(); --i>=0;)
	1675	+ {
	1676	+ Object3D obj = listUI.elementAt(i);
	1677	+ if (!obj.pinned)
	1678	+ {
	1679	+ obj.CloseUI();
	1680	+ listUI.remove(i);
	1681	+ }
	1682	+ }
	1683	+ }
1293	1684
1294	1685	/**
1295	1686	* applyExample
..	..	@@ -1493,9 +1884,9 @@
1493	1884
1494	1885	void Overwrite(int mask)
1495	1886	{
1496		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1497	1888	{
1498		- Object3D content = GrafreeD.clipboard.get(0);
	1889	+ Object3D content = Grafreed.clipboard.get(0);
1499	1890
1500	1891	if (content instanceof cGroup && ((cGroup)content).transientlink )
1501	1892	content = ((cGroup)content).get(0);
..	..	@@ -1534,7 +1925,7 @@
1534	1925	{
1535	1926	ScreenFit();
1536	1927	} else
1537		- if (source == switchItem)
	1928	+ if (source == switchViewItem)
1538	1929	{
1539	1930	cVector v1 = new cVector();
1540	1931	cVector v2 = new cVector();
..	..	@@ -1543,11 +1934,11 @@
1543	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1544	1935	objEditor.cameraView.repaint();
1545	1936	} else
1546		- if (source == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1547	1938	{
1548	1939	makeSomething(new Box());
1549	1940	} else
1550		- if (source == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1551	1942	{
1552	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1553	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1626,27 +2017,27 @@
1626	2017
1627	2018	makeSomething(obj);
1628	2019	} else
1629		- if (source == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1630	2021	{
1631	2022	makeSomething(new Grid());
1632	2023	} else
1633		- if (source == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1634	2025	{
1635	2026	makeSomething(new Sphere());
1636	2027	} else
1637		- if (source == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1638	2029	{
1639	2030	makeSomething(new Cone());
1640	2031	} else
1641		- if (source == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1642	2033	{
1643	2034	makeSomething(new Torus());
1644	2035	} else
1645		- if (source == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1646	2037	{
1647	2038	makeSomething(new Superellipsoid());
1648	2039	} else
1649		- if (source == kleinItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
1650	2041	{
1651	2042	makeSomething(new Klein());
1652	2043	} else
..	..	@@ -1666,7 +2057,7 @@
1666	2057	{
1667	2058	makeSomething(new BezierSurface());
1668	2059	} else
1669		- if (source == checkerItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1670	2061	{
1671	2062	/*
1672	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1714,7 +2105,7 @@
1714	2105	s.setup();
1715	2106	makeSomething(s);
1716	2107	} else
1717		- if (source == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1718	2109	{
1719	2110	makeSomething(new Light());
1720	2111	} else
..	..	@@ -1764,30 +2155,30 @@
1764	2155
1765	2156	group(g);
1766	2157	} else
1767		- if (source == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1768	2159	{
1769	2160	Composite csg = new GroupLeaf();
1770	2161	csg.count = 5;
1771	2162	group(csg);
1772		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1773	2164	csg.addChild(child);
1774	2165	child.addChild(csg);
1775	2166	} else
1776	2167	if (source == doubleItem)
1777	2168	{
1778		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1779	2170	csg.count = 5;
1780	2171	group(csg);
1781		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1782	2173	csg.addChild(child);
1783	2174	child.addChild(csg);
1784		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1785	2176	csg.addChild(child);
1786	2177	child.addChild(csg);
1787	2178	} else
1788	2179	if (source == tripleItem)
1789	2180	{
1790		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1791	2182	csg.count = 4;
1792	2183	group(csg);
1793	2184	Composite child = new cGroup();
..	..	@@ -1799,23 +2190,6 @@
1799	2190	child = new cGroup();
1800	2191	csg.addChild(child);
1801	2192	child.addChild(csg);
1802		- } 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	2193	} else
1820	2194	if (source == computeAOItem)
1821	2195	{
..	..	@@ -1835,7 +2209,7 @@
1835	2209	if (source == invariantsItem)
1836	2210	{
1837	2211	System.out.println("Invariants:");
1838		- GrafreeD.grafreeD.universe.invariants();
	2212	+ Grafreed.grafreeD.universe.invariants();
1839	2213	} else
1840	2214	if (source == memoryItem)
1841	2215	{
..	..	@@ -1854,19 +2228,61 @@
1854	2228	{
1855	2229	DumpObject();
1856	2230	} else
	2231	+ if (source == minButton)
	2232	+ {
	2233	+ Minimize();
	2234	+ } else
	2235	+ if (source == maxButton)
	2236	+ {
	2237	+ Maximize();
	2238	+ } else
	2239	+ if (source == fullButton)
	2240	+ {
	2241	+ ToggleFullScreen();
	2242	+ } else
	2243	+ if (source == undoButton)
	2244	+ {
	2245	+ // Go to previous version
	2246	+ //if (!Undo())
	2247	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2248	+ Undo();
	2249	+ } else
	2250	+ if (source == restoreButton)
	2251	+ {
	2252	+ // Restore current version
	2253	+ Restore();
	2254	+ } else
	2255	+ if (source == replaceButton)
	2256	+ {
	2257	+ // Overwrite current version
	2258	+ Replace();
	2259	+ } else
	2260	+ if (source == redoButton)
	2261	+ {
	2262	+ // Go to next version
	2263	+ Redo();
	2264	+ } else
	2265	+ if (source == saveButton)
	2266	+ {
	2267	+ // Save a new version
	2268	+ if (!Save(true))
	2269	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2270	+ } else
	2271	+ if (source == oneStepButton)
	2272	+ {
	2273	+ Globals.ONESTEP = true;
	2274	+ cameraView.repaint();
	2275	+ } else
1857	2276	if (source == screenfitButton)
1858	2277	{
1859		- //Reload(lastConverter, lastFilename, true);
1860	2278	ScreenFit();
1861	2279	} else
1862	2280	if (source == screenfitpointButton)
1863	2281	{
1864		- //Reload(lastConverter, lastFilename, true);
1865	2282	ScreenFitPoint();
1866	2283	} else
1867	2284	if (source == snapobjectButton)
1868	2285	{
1869		- //Reload(lastConverter, lastFilename, true);
1870	2286	SnapObject();
1871	2287	} else
1872	2288	// if (event.getSource() == recompileButton)
..	..	@@ -1903,12 +2319,20 @@
1903	2319	{
1904	2320	loadClipboard(true);
1905	2321	} else
	2322	+ if (source == undoItem)
	2323	+ {
	2324	+ Undo();
	2325	+ } else
	2326	+ if (source == redoItem)
	2327	+ {
	2328	+ Redo();
	2329	+ } else
1906	2330	if (source == duplicateItem)
1907	2331	{
1908		- Object3D keep = GrafreeD.clipboard;
	2332	+ Object3D keep = Grafreed.clipboard;
1909	2333	loadClipboard(false);
1910	2334	paste(false);
1911		- GrafreeD.clipboard = keep;
	2335	+ Grafreed.clipboard = keep;
1912	2336	} else
1913	2337	if (source == cloneItem)
1914	2338	{
..	..	@@ -1926,13 +2350,17 @@
1926	2350	{
1927	2351	paste(false);
1928	2352	} else
	2353	+ if (source == pasteIntoItem)
	2354	+ {
	2355	+ pasteInto(true, false);
	2356	+ } else
1929	2357	if (source == pasteLinkItem)
1930	2358	{
1931		- pasteInto(false);
	2359	+ pasteInto(false, false);
1932	2360	} else
1933	2361	if (source == pasteCloneItem)
1934	2362	{
1935		- pasteInto(true);
	2363	+ pasteInto(true, true);
1936	2364	} else
1937	2365	if (source == pasteExpandItem)
1938	2366	{
..	..	@@ -2124,9 +2552,9 @@
2124	2552	// group.selection.get(0).setMasterThis(content); // should be identity
2125	2553	// refreshContents();
2126	2554	// }
2127		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2555	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2128	2556	{
2129		- Object3D content = GrafreeD.clipboard.get(0);
	2557	+ Object3D content = Grafreed.clipboard.get(0);
2130	2558
2131	2559	if (content instanceof cGroup && ((cGroup)content).transientlink )
2132	2560	content = ((cGroup)content).get(0);
..	..	@@ -2134,11 +2562,11 @@
2134	2562	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2135	2563	for (int i=0; i<group.selection.size(); i++)
2136	2564	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2565	+ boolean random = CameraPane.SWITCH;
	2566	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2567	group.selection.get(i).linkVerticesThis(content);
2140	2568	// group.selection.get(i).setMasterThis(content); // should be identity
2141		- CameraPane.RANDOM = random;
	2569	+ CameraPane.SWITCH = random;
2142	2570	}
2143	2571	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2144	2572	refreshContents();
..	..	@@ -2148,20 +2576,20 @@
2148	2576	{
2149	2577	for (int i=0; i<group.selection.size(); i++)
2150	2578	{
2151		- boolean random = CameraPane.RANDOM;
2152		- CameraPane.RANDOM = false; // parse all random nodes
	2579	+ boolean random = CameraPane.SWITCH;
	2580	+ CameraPane.SWITCH = false; // parse all random nodes
2153	2581	group.selection.get(i).linkVerticesThis(null);
2154		- CameraPane.RANDOM = random;
	2582	+ CameraPane.SWITCH = random;
2155	2583	}
2156	2584
2157	2585	refreshContents();
2158	2586	} else
2159	2587	if (source == relinkverticesItem)
2160	2588	{
2161		- boolean random = CameraPane.RANDOM;
2162		- CameraPane.RANDOM = false; // parse all random nodes
	2589	+ boolean random = CameraPane.SWITCH;
	2590	+ CameraPane.SWITCH = false; // parse all random nodes
2163	2591	group.selection.RelinkToSupport();
2164		- CameraPane.RANDOM = random;
	2592	+ CameraPane.SWITCH = random;
2165	2593
2166	2594	refreshContents();
2167	2595	} else
..	..	@@ -2176,9 +2604,9 @@
2176	2604	} else
2177	2605	if (source == setMasterItem)
2178	2606	{
2179		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2607	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2180	2608	{
2181		- Object3D content = GrafreeD.clipboard.get(0);
	2609	+ Object3D content = Grafreed.clipboard.get(0);
2182	2610
2183	2611	if (content instanceof cGroup && ((cGroup)content).transientlink )
2184	2612	content = ((cGroup)content).get(0);
..	..	@@ -2191,9 +2619,9 @@
2191	2619	{
2192	2620	if (group.selection.size() == 1)
2193	2621	{
2194		- if (GrafreeD.clipboard.size() == 1)
	2622	+ if (Grafreed.clipboard.size() == 1)
2195	2623	{
2196		- Object3D content = GrafreeD.clipboard.get(0);
	2624	+ Object3D content = Grafreed.clipboard.get(0);
2197	2625
2198	2626	if (content instanceof cGroup && ((cGroup)content).transientlink )
2199	2627	content = ((cGroup)content).get(0);
..	..	@@ -2210,7 +2638,7 @@
2210	2638	{
2211	2639	RevertMeshes();
2212	2640	} else
2213		- if (source == resetMeshItem)
	2641	+ if (source == resetAllItem)
2214	2642	{
2215	2643	ResetAll();
2216	2644	} else
..	..	@@ -2230,9 +2658,9 @@
2230	2658	{
2231	2659	ClearSelection(true);
2232	2660	} else
2233		- if (source == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2234	2662	{
2235		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2236	2664	} else
2237	2665	if (source == hideItem)
2238	2666	{
..	..	@@ -2250,16 +2678,16 @@
2250	2678	{
2251	2679	makeSomething(new Camera());
2252	2680	} else
2253		- if (source == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2254	2682	{
2255	2683	group(new Composite());
2256	2684	} else
2257		- if (source == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2258	2686	{
2259	2687	RandomNode random = new RandomNode();
2260	2688	group(random);
2261	2689	if (random.size() > 0)
2262		- random.name = random.get(0).name + "Rnd";
	2690	+ random.name = random.get(0).name + "Switch";
2263	2691	} else
2264	2692	if (source == physicsItem)
2265	2693	{
..	..	@@ -2356,7 +2784,7 @@
2356	2784	{
2357	2785	group(new cLinker());
2358	2786	} else
2359		- if (source == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2360	2788	{
2361	2789	group(new TextureNode());
2362	2790	} else
..	..	@@ -2376,17 +2804,30 @@
2376	2804	{
2377	2805	CastShadow(2);
2378	2806	} else
2379		- if (source == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2380	2808	{
2381		- //ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
2382	2811	for (int i=0; i<group.selection.size(); i++)
2383	2812	{
2384		- Ungroup(group.selection.get(i));
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
2385	2818	}
2386	2819
2387		- ClearSelection(false);
2388		-
2389		- refreshContents();
	2820	+ if (!hasRoot)
	2821	+ {
	2822	+ for (int i=0; i<group.selection.size(); i++)
	2823	+ {
	2824	+ Ungroup(group.selection.get(i));
	2825	+ }
	2826	+
	2827	+ ClearSelection(false);
	2828	+
	2829	+ refreshContents();
	2830	+ }
2390	2831	} else
2391	2832	if (source == genUVItem)
2392	2833	{
..	..	@@ -2398,7 +2839,7 @@
2398	2839	} else
2399	2840	if (source == genNormalsMESHItem)
2400	2841	{
2401		- GenNormals(true); // TODO
	2842	+ GenNormalsMESH();
2402	2843	} else
2403	2844	if (source == genNormalsORGANItem)
2404	2845	{
..	..	@@ -2463,6 +2904,22 @@
2463	2904	if (source == unmarkleavesItem)
2464	2905	{
2465	2906	MarkLeaves(false);
	2907	+ } else
	2908	+ if (source == rewindleavesItem)
	2909	+ {
	2910	+ RewindLeaves(true);
	2911	+ } else
	2912	+ if (source == unrewindleavesItem)
	2913	+ {
	2914	+ RewindLeaves(false);
	2915	+ } else
	2916	+ if (source == randomleavesItem)
	2917	+ {
	2918	+ RandomLeaves(true);
	2919	+ } else
	2920	+ if (source == unrandomleavesItem)
	2921	+ {
	2922	+ RandomLeaves(false);
2466	2923	} else
2467	2924	if (source == flipVItem)
2468	2925	{
..	..	@@ -2548,9 +3005,13 @@
2548	3005	{
2549	3006	SmoothMesh();
2550	3007	} else
2551		- if (source == transformgeometryItem)
	3008	+ if (source == transformGeometryItem)
2552	3009	{
2553	3010	TransformGeometry();
	3011	+ } else
	3012	+ if (source == transformChildrenItem)
	3013	+ {
	3014	+ TransformChildren();
2554	3015	} else
2555	3016	if (source == resetTransformItem)
2556	3017	{
..	..	@@ -2558,7 +3019,11 @@
2558	3019	} else
2559	3020	if (source == resetCentroidItem)
2560	3021	{
2561		- ResetCentroid();
	3022	+ ResetCentroid(true);
	3023	+ } else
	3024	+ if (source == resetCentroidXZItem)
	3025	+ {
	3026	+ ResetCentroid(false);
2562	3027	} else
2563	3028	if (source == resetParentItem)
2564	3029	{
..	..	@@ -2690,6 +3155,10 @@
2690	3155	if (source == twoButton)
2691	3156	{
2692	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2693	3162	// bug
2694	3163	//gridPanel.setDividerLocation(1.0);
2695	3164	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2720,12 +3189,33 @@
2720	3189	// centralPanel.setVisible(true);
2721	3190	// XYZPanel.setVisible(false);
2722	3191	bigThree.ClearUI();
2723		- bigThree.addComponent(centralPanel);
	3192	+ bigThree.add(centralPanel);
2724	3193	bigThree.FlushUI();
	3194	+
	3195	+ cameraView.requestFocusInWindow();
	3196	+
	3197	+// refreshContents(true);
	3198	+//
	3199	+// try
	3200	+// {
	3201	+// java.awt.Robot bot = new java.awt.Robot();
	3202	+// int mask = InputEvent.BUTTON1_MASK;
	3203	+// bot.mouseMove(100, 100);
	3204	+// bot.mousePress(mask);
	3205	+// bot.mouseRelease(mask);
	3206	+// }
	3207	+// catch (Exception e)
	3208	+// {
	3209	+//
	3210	+// }
	3211	+
2725	3212	} else
2726	3213	if (source == threeButton)
2727	3214	{
2728	3215	radio.layout = threeButton;
	3216	+
	3217	+ if (CameraPane.FULLSCREEN)
	3218	+ fullscreenLayout = radio.layout;
2729	3219
2730	3220	// bigThree.remove(scenePanel);
2731	3221	// bigThree.remove(centralPanel);
..	..	@@ -2755,13 +3245,18 @@
2755	3245	// centralPanel.setVisible(true);
2756	3246	// XYZPanel.setVisible(true);
2757	3247	bigThree.ClearUI();
2758		- bigThree.addComponent(centralPanel);
2759		- bigThree.addComponent(XYZPanel);
	3248	+ bigThree.add(centralPanel);
	3249	+ bigThree.add(XYZPanel);
2760	3250	bigThree.FlushUI();
	3251	+
	3252	+ cameraView.requestFocusInWindow();
2761	3253	} else
2762	3254	if (source == fourButton)
2763	3255	{
2764	3256	radio.layout = fourButton;
	3257	+
	3258	+ if (CameraPane.FULLSCREEN)
	3259	+ fullscreenLayout = radio.layout;
2765	3260
2766	3261	// bigThree.remove(scenePanel);
2767	3262	// bigThree.remove(centralPanel);
..	..	@@ -2791,12 +3286,17 @@
2791	3286	// centralPanel.setVisible(false);
2792	3287	// XYZPanel.setVisible(false);
2793	3288	bigThree.ClearUI();
2794		- bigThree.addComponent(scenePanel);
	3289	+ bigThree.add(scenePanel);
2795	3290	bigThree.FlushUI();
	3291	+
	3292	+ cameraView.requestFocusInWindow();
2796	3293	} else
2797	3294	if (source == sixButton)
2798	3295	{
2799	3296	radio.layout = sixButton;
	3297	+
	3298	+ if (CameraPane.FULLSCREEN)
	3299	+ fullscreenLayout = radio.layout;
2800	3300
2801	3301	// bigThree.remove(scenePanel);
2802	3302	// bigThree.remove(centralPanel);
..	..	@@ -2826,13 +3326,18 @@
2826	3326	// centralPanel.setVisible(true);
2827	3327	// XYZPanel.setVisible(false);
2828	3328	bigThree.ClearUI();
2829		- bigThree.addComponent(scenePanel);
2830		- bigThree.addComponent(centralPanel);
	3329	+ bigThree.add(scenePanel);
	3330	+ bigThree.add(centralPanel);
2831	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2832	3334	} else
2833	3335	if (source == sevenButton)
2834	3336	{
2835	3337	radio.layout = sevenButton;
	3338	+
	3339	+ if (CameraPane.FULLSCREEN)
	3340	+ fullscreenLayout = radio.layout;
2836	3341
2837	3342	// bigThree.remove(scenePanel);
2838	3343	// bigThree.remove(centralPanel);
..	..	@@ -2862,10 +3367,12 @@
2862	3367	// centralPanel.setVisible(true);
2863	3368	// XYZPanel.setVisible(true);
2864	3369	bigThree.ClearUI();
2865		- bigThree.addComponent(scenePanel);
2866		- bigThree.addComponent(centralPanel);
2867		- bigThree.addComponent(XYZPanel);
	3370	+ bigThree.add(scenePanel);
	3371	+ bigThree.add(centralPanel);
	3372	+ bigThree.add(XYZPanel);
2868	3373	bigThree.FlushUI();
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2869	3376	} else
2870	3377	if (source == rootButton)
2871	3378	{
..	..	@@ -2877,6 +3384,7 @@
2877	3384	EditObject(obj);
2878	3385	}
2879	3386
	3387	+ cameraView.requestFocusInWindow();
2880	3388	refreshContents(true);
2881	3389	} else
2882	3390	if (source == closeButton)
..	..	@@ -2886,22 +3394,37 @@
2886	3394	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2887	3395	{
2888	3396	ab = (cRadio)e.nextElement();
2889		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3397	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2890	3398	{
	3399	+ // Patch to avoid bug with transparency.
	3400	+ if (!ab.hadMaterial)
	3401	+ {
	3402	+ ab.object.material = null;
	3403	+ }
	3404	+
2891	3405	buttonGroup.remove(ab);
2892	3406	radioPanel.remove(ab);
2893	3407
2894		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
2895	3410	// ab.GetObject().objectUI = null; // ?????????
2896	3411
2897	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2898	3413	break;
2899	3414	}
2900	3415	}
	3416	+
	3417	+ cameraView.requestFocusInWindow();
2901	3418	refreshContents(true);
2902	3419	} else
2903	3420	if (source == editItem \|\| source == editButton)
2904	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
2905	3428	EditSelection(false);
2906	3429	} else
2907	3430	if (source == uneditButton)
..	..	@@ -2911,12 +3434,13 @@
2911	3434	Object3D child = (Object3D)e.nextElement();
2912	3435	if(child.editWindow != null)
2913	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
2914	3438	child.CloseUI();
2915	3439	listUI.remove(child);
2916	3440
2917		- child.editWindow = null; // ???????????
	3441	+ //child.editWindow = null; // ???????????
2918	3442	}
2919		- objEditor.ctrlPanel.revalidate();
	3443	+ objEditor.ctrlPanel.FlushUI();
2920	3444	//objEditor.jTree.clearSelection();
2921	3445	//objEditor.ResetSliders();
2922	3446	refreshContents(true);
..	..	@@ -2927,6 +3451,7 @@
2927	3451	//copy.ClearUI();
2928	3452	for (Object3D obj : listUI)
2929	3453	{
	3454	+ obj.pinned = false;
2930	3455	obj.CloseUI();
2931	3456	}
2932	3457	listUI.clear();
..	..	@@ -2936,7 +3461,7 @@
2936	3461	{
2937	3462	assert(copy == group);
2938	3463
2939		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2940	3465
2941	3466	for (Object3D obj : listUI)
2942	3467	{
..	..	@@ -2985,6 +3510,9 @@
2985	3510	}
2986	3511
2987	3512	copy = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
2988	3516	//Globals.theRenderer.object = group;
2989	3517	if(!useclient)
2990	3518	{
..	..	@@ -3000,20 +3528,44 @@
3000	3528	frontView.object = group;
3001	3529	sideView.object = group;
3002	3530	}
3003		- group.editWindow = this;
	3531	+
	3532	+// fix "+" issue
	3533	+ //group.editWindow = this;
	3534	+ group.manipWindow = this;
	3535	+
3004	3536	/*
3005	3537	currentLayout = radio.layout;
3006	3538	if (currentLayout == null)
3007	3539	currentLayout = sevenButton;
3008	3540	*/
3009	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
3010	3547	keepparent = group.parent;
3011	3548	// PARENT = NULL or not???
3012	3549	//group.parent = null; // ROOT
3013	3550	//group.attributes = -1;
3014	3551	ResetModel();
	3552	+
	3553	+ cameraView.requestFocusInWindow();
3015	3554	refreshContents(true);
3016		- }
	3555	+ } else if (event.getSource() == editCameraItem)
	3556	+ {
	3557	+ cameraView.ProtectCamera();
	3558	+ cameraView.repaint();
	3559	+ return;
	3560	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3561	+ {
	3562	+ cameraView.RevertCamera();
	3563	+ cameraView.repaint();
	3564	+ return;
	3565	+ // } else if (event.getSource() == textureButton)
	3566	+ // {
	3567	+ // return; // true;
	3568	+ }
3017	3569	else
3018	3570	{
3019	3571	//return super.action(event, arg);
..	..	@@ -3022,7 +3574,6 @@
3022	3574	}
3023	3575
3024	3576	boolean useclient = false;
3025		- cRadio radio;
3026	3577
3027	3578	void ToggleRoot()
3028	3579	{
..	..	@@ -3074,6 +3625,28 @@
3074	3625	refreshContents();
3075	3626	}
3076	3627
	3628	+ void TransformChildren()
	3629	+ {
	3630	+ Object3D obj;
	3631	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3632	+ {
	3633	+ obj = (Object3D)e.nextElement();
	3634	+ obj.KeepTextureMatrices();
	3635	+ obj.TransformChildren();
	3636	+ obj.RestoreTextureMatrices();
	3637	+
	3638	+// if (obj.parent == null)
	3639	+// {
	3640	+// System.out.println("NULL PARENT!");
	3641	+// new Exception().printStackTrace();
	3642	+// }
	3643	+// else
	3644	+// TouchTransform(obj);
	3645	+// //obj.parent.Touch();
	3646	+ }
	3647	+
	3648	+ refreshContents();
	3649	+ }
3077	3650
3078	3651	void ResetTransform()
3079	3652	{
..	..	@@ -3186,7 +3759,7 @@
3186	3759	refreshContents();
3187	3760	}
3188	3761
3189		- void ResetCentroid()
	3762	+ void ResetCentroid(boolean full)
3190	3763	{
3191	3764	Object3D obj;
3192	3765	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3201,12 +3774,16 @@
3201	3774	LA.matIdentity(Object3D.mat);
3202	3775	obj.getBounds(minima, maxima, false);
3203	3776	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3204		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3777	+ if (full)
	3778	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3205	3779	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3206	3780	obj.TransformMesh(Object3D.mat);
	3781	+
3207	3782	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3208		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3783	+ if (full)
	3784	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3209	3785	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3786	+
3210	3787	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3211	3788	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3212	3789	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3235,7 +3812,8 @@
3235	3812
3236	3813	int size = obj.MemorySize();
3237	3814
3238		- System.err.println((size/1024) + " KB is the size of " + obj);
	3815	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3816	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3239	3817	}
3240	3818	}
3241	3819	catch (Exception e)
..	..	@@ -3272,9 +3850,9 @@
3272	3850	obj = (Object3D)e.nextElement();
3273	3851
3274	3852	System.out.println("Object is: " + obj);
3275		- GrafreeD.AnalyzeObject(obj);
	3853	+ Grafreed.AnalyzeObject(obj);
3276	3854	System.out.println("Boundary rep: " + obj.bRep);
3277		- GrafreeD.AnalyzeObject(obj.bRep);
	3855	+ Grafreed.AnalyzeObject(obj.bRep);
3278	3856
3279	3857	// System.err.println((size/1024) + " KB is the size of " + obj);
3280	3858	}
..	..	@@ -3316,6 +3894,13 @@
3316	3894	void GenNormals(boolean crease)
3317	3895	{
3318	3896	group.GenNormalsS(crease);
	3897	+
	3898	+ refreshContents();
	3899	+ }
	3900	+
	3901	+ void GenNormalsMESH()
	3902	+ {
	3903	+ group.GenNormalsMeshS();
3319	3904
3320	3905	refreshContents();
3321	3906	}
..	..	@@ -3488,8 +4073,8 @@
3488	4073
3489	4074	void ParseVertices()
3490	4075	{
3491		- boolean epsequal = GrafreeD.epsequal;
3492		- GrafreeD.epsequal = true;
	4076	+ boolean epsequal = Grafreed.epsequal;
	4077	+ Grafreed.epsequal = true;
3493	4078
3494	4079	for (int i=0; i<group.selection.size(); i++)
3495	4080	{
..	..	@@ -3514,7 +4099,7 @@
3514	4099	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3515	4100	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3516	4101
3517		- g.add(GrafreeD.clipboard);
	4102	+ g.add(Grafreed.clipboard);
3518	4103
3519	4104	buffer.add(g);
3520	4105	}
..	..	@@ -3529,7 +4114,7 @@
3529	4114	makeSomething(buffer, i==group.selection.size()-1);
3530	4115	}
3531	4116
3532		- GrafreeD.epsequal = epsequal;
	4117	+ Grafreed.epsequal = epsequal;
3533	4118
3534	4119	refreshContents();
3535	4120	}
..	..	@@ -3547,7 +4132,16 @@
3547	4132	String pigment = Object3D.GetPigment(tex);
3548	4133	//String bump = Object3D.GetBump(tex);
3549	4134
3550		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4135	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4136	+
	4137	+ try
	4138	+ {
	4139	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4140	+ }
	4141	+ catch (Exception e)
	4142	+ {
	4143	+ System.err.println("FAIL: " + node);
	4144	+ }
3551	4145
3552	4146	double s = v.s;
3553	4147
..	..	@@ -3635,11 +4229,11 @@
3635	4229
3636	4230	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3637	4231
3638		- boolean random = CameraPane.RANDOM;
3639		- CameraPane.RANDOM = false; // parse all random nodes
	4232	+ boolean random = CameraPane.SWITCH;
	4233	+ CameraPane.SWITCH = false; // parse all random nodes
3640	4234	lowres.linkVerticesThis(null);
3641	4235	lowres.linkVerticesThis(sn);
3642		- CameraPane.RANDOM = random;
	4236	+ CameraPane.SWITCH = random;
3643	4237
3644	4238	System.err.flush();
3645	4239
..	..	@@ -3679,7 +4273,7 @@
3679	4273	return;
3680	4274
3681	4275	Object3D poses = group.selection.get(0);
3682		- Object3D ref = GrafreeD.clipboard.get(0);
	4276	+ Object3D ref = Grafreed.clipboard.get(0);
3683	4277
3684	4278	Object3D newgroup = new Object3D("Po:" + poses.name);
3685	4279
..	..	@@ -3873,9 +4467,9 @@
3873	4467
3874	4468	void ClipMesh()
3875	4469	{
3876		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4470	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3877	4471	{
3878		- Object3D content = GrafreeD.clipboard.get(0);
	4472	+ Object3D content = Grafreed.clipboard.get(0);
3879	4473
3880	4474	if (content instanceof cGroup && ((cGroup)content).transientlink )
3881	4475	content = ((cGroup)content).get(0);
..	..	@@ -3884,7 +4478,7 @@
3884	4478	// {
3885	4479	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3886	4480	// }
3887		- group.selection.ClipMesh(GrafreeD.clipboard);
	4481	+ group.selection.ClipMesh(Grafreed.clipboard);
3888	4482	}
3889	4483	// group.selection.ClipMesh(GrafreeD.clipboard);
3890	4484	System.out.println("DONE.");
..	..	@@ -3931,6 +4525,18 @@
3931	4525	void MarkLeaves(boolean hide)
3932	4526	{
3933	4527	group.selection.MarkLeaves(hide);
	4528	+ refreshContents();
	4529	+ }
	4530	+
	4531	+ void RewindLeaves(boolean hide)
	4532	+ {
	4533	+ group.selection.RewindLeaves(hide);
	4534	+ refreshContents();
	4535	+ }
	4536	+
	4537	+ void RandomLeaves(boolean hide)
	4538	+ {
	4539	+ group.selection.RandomLeaves(hide);
3934	4540	refreshContents();
3935	4541	}
3936	4542
..	..	@@ -4005,10 +4611,6 @@
4005	4611	// }
4006	4612	// }
4007	4613
4008		- static boolean allparams = true;
4009		-
4010		- static Vector<Object3D> listUI = new Vector<Object3D>();
4011		-
4012	4614	void EditSelection(boolean newWindow)
4013	4615	{
4014	4616	// aConstraints.gridy = 0;
..	..	@@ -4016,10 +4618,10 @@
4016	4618	{
4017	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4018	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4019		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4020	4622
4021	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
4022		- if(elem != group)
	4624	+ if(elem != group \|\| !newWindow)
4023	4625	{
4024	4626	// if (!(elem instanceof Composite))
4025	4627	// newWindow = false;
..	..	@@ -4101,7 +4703,8 @@
4101	4703	//new Exception().printStackTrace();
4102	4704
4103	4705	freezemodel = true;
4104		-
	4706	+ ClearUnpinned();
	4707	+
4105	4708	/**/
4106	4709	//switch (event.id)
4107	4710	{
..	..	@@ -4109,7 +4712,6 @@
4109	4712	//case 702: // Event.LIST_DESELECT
4110	4713	group.deselectAll();
4111	4714	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4112		- objEditor.ClearInfo(); // .GetMaterial());
4113	4715	if (tps != null)
4114	4716	{
4115	4717	for (int i=0; i < tps.length; i++)
..	..	@@ -4118,33 +4720,39 @@
4118	4720
4119	4721	//if (child.parent != null)
4120	4722	//child.parent.addSelectee(child);
	4723	+ objEditor.SetMaterial(child);
4121	4724	group.addSelectee(child);
4122		- objEditor.SetMaterial(child); // .GetMaterial());
4123		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4124		- System.err.println("info : " + child.GetPath());
4125	4725	}
4126	4726	}
4127		- else
4128		- {
4129		- objEditor.SetMaterial(group); // .GetMaterial());
4130		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4131		- System.err.println("info : " + group.GetPath());
4132		- }
	4727	+// else
	4728	+// {
	4729	+// objEditor.SetMaterial(group); // .GetMaterial());
	4730	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4731	+// System.err.println("info : " + group.GetPath());
	4732	+// }
4133	4733
4134		- objEditor.SetText(); // jan 2014
4135		-
4136		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4734	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4137	4735	CameraPane.flash = true;
4138	4736
4139		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4737	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4140	4738	// a camera
4141	4739	{
4142		- CameraPane.camerachangeframe = 0; // don't refuse it
4143		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4740	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4741	+ {
	4742	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4743	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4744	+ }
4144	4745	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4145	4746	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4146	4747	}
4147	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
4148	4756	refreshContents();
4149	4757	//return true;
4150	4758	}
..	..	@@ -4153,6 +4761,35 @@
4153	4761
4154	4762	freezemodel = false;
4155	4763	}
	4764	+
	4765	+ void SetPinStates(boolean enabled)
	4766	+ {
	4767	+ editButton.setEnabled(enabled);
	4768	+ uneditButton.setEnabled(enabled);
	4769	+ unselectButton.setEnabled(enabled);
	4770	+ flashSelectionButton.setEnabled(enabled);
	4771	+ }
	4772	+
	4773	+ void refreshContents(boolean cp)
	4774	+ {
	4775	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4776	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4777	+ {
	4778	+ objEditor.ClearInfo(); // .GetMaterial());
	4779	+
	4780	+ for (int i=0; i < group.selection.Size(); i++)
	4781	+ {
	4782	+ Object3D child = (Object3D) group.selection.get(i);
	4783	+
	4784	+ objEditor.AddInfo(child, this, true);
	4785	+ System.err.println("info : " + child.GetPath());
	4786	+ }
	4787	+
	4788	+ objEditor.SetText(); // jan 2014
	4789	+ }
	4790	+
	4791	+ super.refreshContents(cp);
	4792	+ }
4156	4793
4157	4794	void linkSomething(Object3D thing)
4158	4795	{
..	..	@@ -4224,16 +4861,19 @@
4224	4861	{
4225	4862	if (group.selection.isEmpty())
4226	4863	return;
4227		- GrafreeD.clipboardIsTempGroup = false;
	4864	+
	4865	+ Grafreed.clipboardIsTempGroup = false;
4228	4866	Composite tGroup = null;
4229	4867	if (group.selection.size() > 0) // 1)
4230	4868	{
4231	4869	tGroup = new cGroup();
4232		- GrafreeD.clipboardIsTempGroup = true;
	4870	+ Grafreed.clipboardIsTempGroup = true;
4233	4871	}
4234	4872
4235	4873	if (cut)
4236	4874	{
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4237	4877	//int indices[] = jList.getSelectedIndices();
4238	4878	//for (int i = indices.length - 1; i >= 0; i--)
4239	4879	//jList.remove(indices[i]);
..	..	@@ -4269,16 +4909,16 @@
4269	4909	//System.out.println("cut " + child);
4270	4910	//System.out.println("parent = " + child.parent);
4271	4911	// tmp.addChild(child);
4272		- if (GrafreeD.clipboardIsTempGroup)
	4912	+ if (Grafreed.clipboardIsTempGroup)
4273	4913	tGroup.add/Child/(tmp);
4274	4914	else
4275		- GrafreeD.clipboard = tmp;
	4915	+ Grafreed.clipboard = tmp;
4276	4916	}
4277	4917	else
4278		- if (GrafreeD.clipboardIsTempGroup)
	4918	+ if (Grafreed.clipboardIsTempGroup)
4279	4919	tGroup.add/Child/(child);
4280	4920	else
4281		- GrafreeD.clipboard = child;
	4921	+ Grafreed.clipboard = child;
4282	4922	}
4283	4923
4284	4924	//ResetModel();
..	..	@@ -4310,21 +4950,23 @@
4310	4950	//System.out.println("cut " + elem);
4311	4951	//System.out.println("parent = " + elem.parent);
4312	4952	// tmp.addChild(elem);
4313		- if (GrafreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4314	4954	tGroup.add/Child/(tmp);
4315	4955	else
4316		- GrafreeD.clipboard = tmp;
	4956	+ Grafreed.clipboard = tmp;
4317	4957	}
4318	4958	else
4319		- if (GrafreeD.clipboardIsTempGroup)
	4959	+ if (Grafreed.clipboardIsTempGroup)
4320	4960	tGroup.add/Child/(child);
4321	4961	else
4322		- GrafreeD.clipboard = child;
	4962	+ Grafreed.clipboard = child;
4323	4963	}
4324	4964
4325	4965	}
4326		- if (GrafreeD.clipboardIsTempGroup)
4327		- GrafreeD.clipboard = tGroup;
	4966	+
	4967	+ if (Grafreed.clipboardIsTempGroup)
	4968	+ Grafreed.clipboard = tGroup;
	4969	+
4328	4970	if (cut)
4329	4971	{
4330	4972	ResetModel();
..	..	@@ -4334,11 +4976,15 @@
4334	4976
4335	4977	void paste(boolean expand)
4336	4978	{
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
4337	4983	// if (GrafreeD.clipboard == null)
4338	4984	// return;
4339	4985	boolean first = true;
4340	4986
4341		- if (GrafreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4342	4988	{
4343	4989	Composite temp;
4344	4990
..	..	@@ -4349,7 +4995,7 @@
4349	4995	temp = (Composite)Applet3D.clipboard.deepCopy();
4350	4996	*/
4351	4997	Object3D elem;
4352		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4998	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4353	4999	{
4354	5000	Object3D child = (Object3D)e.nextElement();
4355	5001
..	..	@@ -4383,21 +5029,22 @@
4383	5029	//Object3D cb = Applet3D.clipboard;
4384	5030	//temp.addChild(cb);
4385	5031	//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());
	5032	+ assert(Grafreed.clipboard.parent == null);
	5033	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5034	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5035	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5036	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4391	5037	else
4392		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4393		- GrafreeD.clipboard.get(0).parent = keepparent;
	5038	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5039	+ Grafreed.clipboard.get(0).parent = keepparent;
4394	5040	}
4395	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4396	5043	ResetModel();
4397	5044	refreshContents();
4398	5045	}
4399	5046
4400		- void pasteInto(boolean copyit)
	5047	+ void pasteInto(boolean copyit, boolean clone)
4401	5048	{
4402	5049	// if (GrafreeD.clipboard == null)
4403	5050	// return;
..	..	@@ -4426,15 +5073,22 @@
4426	5073	if (copyit)
4427	5074	{
4428	5075	// paste(false);
4429		- CloneClipboard(false); // sept 2014
	5076	+ if (clone)
	5077	+ {
	5078	+ CloneClipboard(false); // sept 2014
	5079	+ }
	5080	+ else
	5081	+ {
	5082	+ paste(false);
	5083	+ }
4430	5084	}
4431	5085	else
4432	5086	{
4433	5087	boolean first = true;
4434	5088
4435		- if (GrafreeD.clipboardIsTempGroup)
	5089	+ if (Grafreed.clipboardIsTempGroup)
4436	5090	{
4437		- Composite temp = (Composite)GrafreeD.clipboard;
	5091	+ Composite temp = (Composite)Grafreed.clipboard;
4438	5092	Object3D copy;
4439	5093	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4440	5094	{
..	..	@@ -4444,7 +5098,7 @@
4444	5098	}
4445	5099	} else
4446	5100	{
4447		- linkSomething(GrafreeD.clipboard); //.get(0));
	5101	+ linkSomething(Grafreed.clipboard); //.get(0));
4448	5102	}
4449	5103	}
4450	5104	}
..	..	@@ -4521,6 +5175,10 @@
4521	5175
4522	5176	void group(Object3D csg, boolean grab)
4523	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4524	5182	if (//false) // why??
4525	5183	!group.selection.isEmpty())
4526	5184	{
..	..	@@ -4634,10 +5292,15 @@
4634	5292	//node.add(csg);
4635	5293	//makeSomething(node);
4636	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
4637	5296	}
4638	5297
4639	5298	void Ungroup(Object3D g)
4640	5299	{
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
4641	5304	if (g instanceof HiddenObject)
4642	5305	{
4643	5306	HiddenObject h = (HiddenObject) g;
..	..	@@ -4654,6 +5317,7 @@
4654	5317	objEditor.makeSomething(g.get(i), false);
4655	5318	}
4656	5319	}
	5320	+ Globals.REPLACEONMAKE = keep;
4657	5321	}
4658	5322
4659	5323	void ungroup()
..	..	@@ -4849,21 +5513,6 @@
4849	5513	}
4850	5514	*/
4851	5515
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	5516	/*
4868	5517	public void Callback(Object obj)
4869	5518	{
..	..	@@ -4887,26 +5536,9 @@
4887	5536	}
4888	5537	*/
4889	5538
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	5539	String GetFile(String dialogName)
4908	5540	{
4909		- if (GrafreeD.standAlone)
	5541	+ if (Grafreed.standAlone)
4910	5542	{
4911	5543	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4912	5544	browser.show();
..	..	@@ -4970,10 +5602,33 @@
4970	5602	cButton flashSelectionButton;
4971	5603	cButton editButton;
4972	5604	cButton uneditButton;
	5605	+ JCheckBox allParamsButton;
4973	5606	cButton clearpanelButton;
4974		- cButton allParamsButton;
4975	5607	cButton unselectButton;
4976	5608
	5609	+ cButton restoreCameraButton;
	5610	+
	5611	+ cButton saveButton;
	5612	+ cButton oneStepButton;
	5613	+
	5614	+ cButton groupButton;
	5615	+ cButton ungroupButton;
	5616	+ cButton compositeButton;
	5617	+ cButton switchButton;
	5618	+ cButton loopButton;
	5619	+ cButton textureButton;
	5620	+
	5621	+ cButton gridButton;
	5622	+ cButton boxButton;
	5623	+ cButton sphereButton;
	5624	+ cButton coneButton;
	5625	+ cButton torusButton;
	5626	+ cButton superButton;
	5627	+ cButton kleinButton;
	5628	+ cButton particlesButton;
	5629	+ cButton overlayButton;
	5630	+ cButton lightButton;
	5631	+
4977	5632	cButton screenfitButton;
4978	5633	cButton screenfitpointButton;
4979	5634	cButton snapobjectButton;
..	..	@@ -4985,14 +5640,6 @@
4985	5640
4986	5641	cButton setsupportButton;
4987	5642
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	5643	//
4997	5644	//Composite
4998	5645	Object3D // to do !!
..	..	@@ -5002,9 +5649,11 @@
5002	5649	//JTree jTree;
5003	5650	private MenuItem lookAtItem;
5004	5651	private MenuItem lookFromItem;
5005		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
5006	5653	private MenuItem cutItem;
5007		- private MenuItem duplicateItem;
	5654	+ private MenuItem undoItem;
	5655	+ private MenuItem redoItem;
	5656	+ private JMenuItem duplicateItem;
5008	5657	private MenuItem cloneItem;
5009	5658	private MenuItem cloneSupportItem;
5010	5659	private MenuItem overwriteGeoItem;
..	..	@@ -5017,7 +5666,7 @@
5017	5666	private MenuItem linkverticesItem;
5018	5667	private MenuItem relinkverticesItem;
5019	5668	private MenuItem setMasterItem;
5020		- private MenuItem resetMeshItem;
	5669	+ private MenuItem resetAllItem;
5021	5670	private MenuItem stepAllItem;
5022	5671	private MenuItem revertMeshItem;
5023	5672	private MenuItem poseMeshItem;
..	..	@@ -5028,6 +5677,7 @@
5028	5677	private MenuItem mergeGeometriesItem;
5029	5678	private MenuItem copyItem;
5030	5679	private MenuItem pasteItem;
	5680	+ private MenuItem pasteIntoItem;
5031	5681	private MenuItem pasteLinkItem;
5032	5682	private MenuItem pasteCloneItem;
5033	5683	private MenuItem pasteExpandItem;
..	..	@@ -5066,6 +5716,10 @@
5066	5716	private MenuItem showleavesItem;
5067	5717	private MenuItem markleavesItem;
5068	5718	private MenuItem unmarkleavesItem;
	5719	+ private MenuItem rewindleavesItem;
	5720	+ private MenuItem unrewindleavesItem;
	5721	+ private MenuItem randomleavesItem;
	5722	+ private MenuItem unrandomleavesItem;
5069	5723
5070	5724	private MenuItem flipVItem;
5071	5725	private MenuItem unflipVItem;
..	..	@@ -5077,15 +5731,17 @@
5077	5731	private MenuItem panoTexturesItem;
5078	5732
5079	5733	private MenuItem resetCentroidItem;
5080		- private MenuItem transformgeometryItem;
	5734	+ private MenuItem resetCentroidXZItem;
5081	5735	private MenuItem resetTransformItem;
	5736	+ private MenuItem transformGeometryItem;
	5737	+ private MenuItem transformChildrenItem;
5082	5738	private MenuItem hideItem;
5083	5739	private MenuItem grabItem;
5084	5740	private MenuItem backItem;
5085	5741	private MenuItem frontItem;
5086	5742	private MenuItem cameraItem;
5087	5743	private MenuItem compositeItem;
5088		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
5089	5745	private MenuItem physicsItem;
5090	5746	private MenuItem frameselectorItem;
5091	5747	private MenuItem scriptNodeItem;
..	..	@@ -5125,7 +5781,7 @@
5125	5781	private MenuItem blobItem;
5126	5782	private MenuItem latheItem;
5127	5783	private MenuItem bezierItem;
5128		- private MenuItem checkerItem;
	5784	+ private MenuItem overlayItem;
5129	5785	private MenuItem meshItem;
5130	5786	// private MenuItem meshGroupItem;
5131	5787	private MenuItem springItem;
..	..	@@ -5147,11 +5803,6 @@
5147	5803	private MenuItem doubleItem;
5148	5804	private MenuItem tripleItem;
5149	5805
5150		- private MenuItem importGFDItem;
5151		- private MenuItem importVRMLX3DItem;
5152		- private MenuItem import3DSItem;
5153		- private MenuItem importOBJItem;
5154		-
5155	5806	private MenuItem computeAOItem;
5156	5807	private MenuItem recompileItem;
5157	5808	private MenuItem editScriptItem;
..	..	@@ -5161,4 +5812,8 @@
5161	5812	private MenuItem analyzeItem;
5162	5813	private MenuItem dumpItem;
5163	5814	//boolean freezemodel = false;
	5815	+
	5816	+ Menu cameraMenu;
	5817	+ MenuItem editCameraItem;
	5818	+ MenuItem restoreCameraItem;
5164	5819	}