~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,6 +60,12 @@
60	60	this.copy = this.group = group;
61	61	//selectees = this.group.selectees;
62	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
63	69	if(ui)
64	70	SetupUI(objEditor);
65	71	}
..	..	@@ -74,7 +80,13 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ if (copy.versions == null)
	84	+ {
	85	+ copy.versions = new byte[100][];
	86	+ copy.versionindex = -1;
	87	+ }
	88	+
	89	+ SetupMenu2(this); //objEditor);
78	90	SetupUI2(objEditor);
79	91	objEditor.SetupUI(true);
80	92	SetupViews(objEditor);
..	..	@@ -84,6 +96,10 @@
84	96
85	97	void CloneSelection(boolean supports)
86	98	{
	99	+ if (Globals.REPLACEONMAKE)
	100	+ Save();
	101	+ boolean keep = Globals.REPLACEONMAKE;
	102	+ Globals.REPLACEONMAKE = false;
87	103	// Object3D keep = GrafreeD.clipboard;
88	104	//Object3D obj;
89	105	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +110,19 @@
94	110
95	111	makeSomething(clone, i==group.selection.size()-1);
96	112	}
	113	+ Globals.REPLACEONMAKE = keep;
97	114	}
98	115
99	116	void CloneClipboard(boolean supports)
100	117	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	118	+ assert(Grafreed.clipboard.parent == null);
	119	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	120	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	121	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	122	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	123	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	124	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	125	+ Grafreed.clipboard.get(0).parent = keepparent;
109	126	}
110	127
111	128	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +136,7 @@
119	136	// obj.support = null;
120	137	if (!supports)
121	138	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	139	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	140	obj.parent = parent;
124	141	// obj.support = support;
125	142	// clone.support = support; // aout 2013
..	..	@@ -148,30 +165,29 @@
148	165
149	166	//JTextField nameField;
150	167
151		- void SetupMenu2(ObjEditor oe)
	168	+ void SetupMenu2(GroupEditor oe)
152	169	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	170	+ oe.jTree = new cTree();
	171	+
164	172	Menu menu;
165	173	oe.menuBar.add(menu = new Menu("Edit"));
166	174	//editItem = menu.add(new MenuItem("Edit"));
167	175	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	176	+
	177	+// undoItem = menu.add(new MenuItem("Undo"));
	178	+// undoItem.addActionListener(this);
	179	+// redoItem = menu.add(new MenuItem("Redo"));
	180	+// redoItem.addActionListener(this);
	181	+// menu.add("-");
	182	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	183	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	184	cloneItem = menu.add(new MenuItem("Clone"));
172	185	cloneItem.addActionListener(this);
	186	+ if (Globals.ADVANCED)
	187	+ {
173	188	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	189	cloneSupportItem.addActionListener(this);
	190	+ }
175	191	menu.add("-");
176	192	cutItem = menu.add(new MenuItem("Cut"));
177	193	cutItem.addActionListener(this);
..	..	@@ -179,27 +195,123 @@
179	195	copyItem.addActionListener(this);
180	196	pasteItem = menu.add(new MenuItem("Paste"));
181	197	pasteItem.addActionListener(this);
	198	+
	199	+ menu.add("-");
	200	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	201	+ pasteIntoItem.addActionListener(this);
182	202	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	203	pasteLinkItem.addActionListener(this);
184	204	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	205	pasteCloneItem.addActionListener(this);
186	206	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	207	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	208	+ menu.add("-");
	209	+ deleteItem = menu.add(new MenuItem("Delete"));
	210	+ deleteItem.addActionListener(this);
	211	+
	212	+ if (Globals.ADVANCED)
	213	+ {
	214	+ // Deletes the cameras...
190	215	clearAllItem = menu.add(new MenuItem("Clear All"));
191	216	clearAllItem.addActionListener(this);
	217	+ }
	218	+
	219	+ menuBar.add(cameraMenu = new Menu("View"));
	220	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	221	+ //zBufferItem.addActionListener(this);
	222	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	223	+ //normalLensItem.addActionListener(this);
	224	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	225	+ restoreCameraItem.addActionListener(this);
	226	+
	227	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	228	+// toggleFullScreenItem.addItemListener(this);
	229	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	230	+// cameraMenu.add("-");
	231	+//
	232	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	233	+// toggleTextureItem.addItemListener(this);
	234	+// toggleTextureItem.setState(CameraPane.textureon);
	235	+//
	236	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	237	+// toggleSwitchItem.addItemListener(this);
	238	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	239	+
	240	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	241	+ toggleHandleItem.addItemListener(this);
	242	+ toggleHandleItem.setState(CameraPane.HANDLES);
	243	+
	244	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	245	+ togglePaintItem.addItemListener(this);
	246	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	247	+
	248	+ if (Globals.ADVANCED)
	249	+ {
	250	+ cameraMenu.add("-");
	251	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	252	+ toggleLiveItem.addItemListener(this);
	253	+ toggleLiveItem.setState(Globals.isLIVE());
192	254
	255	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	256	+ stepItem.addActionListener(this);
	257	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	258	+ // toggleDLItem.addItemListener(this);
	259	+ // toggleDLItem.setState(false);
	260	+
	261	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	262	+ toggleRenderItem.addItemListener(this);
	263	+ toggleRenderItem.setState(!CameraPane.frozen);
	264	+
	265	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	266	+ toggleDebugItem.addItemListener(this);
	267	+ toggleDebugItem.setState(Globals.DEBUG);
	268	+
	269	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	270	+ toggleFrustumItem.addItemListener(this);
	271	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	272	+
	273	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	274	+ toggleFootContactItem.addItemListener(this);
	275	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	276	+
	277	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	278	+ toggleTimelineItem.addItemListener(this);
	279	+ }
	280	+
	281	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	282	+// toggleRootItem.addItemListener(this);
	283	+// toggleRootItem.setState(false);
	284	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	285	+// animationItem.addItemListener(this);
	286	+// animationItem.setState(CameraPane.ANIMATION);
	287	+ cameraMenu.add("-");
	288	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	289	+ editCameraItem.addActionListener(this);
	290	+
	291	+ if (Globals.ADVANCED)
	292	+ {
	293	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	294	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	295	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	296	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	297	+ oe.cameraMenu.add("-");
	298	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	299	+ openWindowItem.addActionListener(this);
	300	+ editLeafItem.addActionListener(this);
	301	+ lookAtItem.addActionListener(this);
	302	+ //lookFromItem.addActinoListener(this);
	303	+ //switchViewItem.addActionListener(this);
	304	+ }
	305	+
193	306	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	307	+ if (Globals.ADVANCED)
	308	+ {
198	309	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	310	revertMeshItem.addActionListener(this);
200	311	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	312	resetreferencesItem.addActionListener(this);
202	313	menu.add("-");
	314	+ }
203	315	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	316	overwriteGeoItem.addActionListener(this);
205	317	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +323,104 @@
211	323	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	324	overwriteUVItem.addActionListener(this);
213	325	menu.add("-");
	326	+ if (Globals.ADVANCED)
	327	+ {
214	328	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	329	generateMeshItem.addActionListener(this);
216	330	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	331	poseMeshItem.addActionListener(this);
218	332	menu.add("-");
	333	+ }
219	334	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	335	resetsupportItem.addActionListener(this);
221	336	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	337	linkverticesItem.addActionListener(this);
223	338	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	339	relinkverticesItem.addActionListener(this);
	340	+
	341	+ if (Globals.ADVANCED)
	342	+ {
225	343	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	344	setMasterItem.addActionListener(this);
	345	+ }
227	346
228	347	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	348	+// grabItem = menu.add(new MenuItem("Grab"));
	349	+// grabItem.addActionListener(this);
231	350	backItem = menu.add(new MenuItem("Back"));
232	351	backItem.addActionListener(this);
233	352	frontItem = menu.add(new MenuItem("Front"));
234	353	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	354	+// compositeItem = menu.add(new MenuItem("Composite"));
	355	+// compositeItem.addActionListener(this);
	356	+
	357	+ if (Globals.ADVANCED)
	358	+ {
	359	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	360	hideItem.addActionListener(this);
	361	+ }
239	362	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	363	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	364	+
	365	+// menu.add("-");
	366	+//
	367	+// switchItem = menu.add(new MenuItem("Switch node"));
	368	+// switchItem.addActionListener(this);
	369	+ if (Globals.ADVANCED)
	370	+ {
248	371	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	372	switchGeoItem.addActionListener(this);
250	373	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	374	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	375	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	376	morphItem.addActionListener(this);
	377	+
	378	+ menu.add("-");
	379	+ physicsItem = menu.add(new MenuItem("Physics"));
	380	+ physicsItem.addActionListener(this);
	381	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	382	+ frameselectorItem.addActionListener(this);
254	383	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	384	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	385	+ }
258	386
259	387	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	388	+// textureItem = menu.add(new MenuItem("Texture"));
	389	+// textureItem.addActionListener(this);
262	390	billboardItem = menu.add(new MenuItem("Billboard"));
263	391	billboardItem.addActionListener(this);
264	392	csgItem = menu.add(new MenuItem("CSG"));
265	393	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	394	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	395	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	396	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	397	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	398	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	399	shadowZItem.addActionListener(this);
	400	+ attributeItem = menu.add(new MenuItem("Attribute"));
	401	+ attributeItem.addActionListener(this);
	402	+
	403	+ if (Globals.ADVANCED)
	404	+ {
	405	+ menu.add("-");
272	406	linkerItem = menu.add(new MenuItem("Linker"));
273	407	linkerItem.addActionListener(this);
274	408	templateItem = menu.add(new MenuItem("Template"));
275	409	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	410	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	411	pointflowItem.addActionListener(this);
	412	+ }
280	413	menu.add("-");
281	414	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	415	resetTransformItem.addActionListener(this);
283	416	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	417	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	418	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	419	+ resetCentroidXZItem.addActionListener(this);
	420	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	421	+ transformGeometryItem.addActionListener(this);
	422	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	423	+ transformChildrenItem.addActionListener(this);
287	424
288	425	oe.menuBar.add(menu = new Menu("Geometry"));
289	426	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +431,11 @@
294	431	genNormalsCADItem.addActionListener(this);
295	432	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	433	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	434	+ if (Globals.ADVANCED)
	435	+ {
	436	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	437	genNormalsMINEItem.addActionListener(this);
	438	+ }
299	439	stripifyItem = menu.add(new MenuItem("Stripify"));
300	440	stripifyItem.addActionListener(this);
301	441	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +457,34 @@
317	457	reduce34MeshItem.addActionListener(this);
318	458	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	459	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	460	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	461	clipMeshItem.addActionListener(this);
	462	+
	463	+ if (Globals.ADVANCED)
	464	+ {
	465	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	466	+ smoothMeshItem.addActionListener(this);
	467	+ }
324	468
325	469	oe.menuBar.add(menu = new Menu("Attributes"));
326	470	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	471	clearMaterialsItem.addActionListener(this);
	472	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	473	+ resetAllItem.addActionListener(this);
	474	+ stepAllItem = menu.add(new MenuItem("Step All"));
	475	+ stepAllItem.addActionListener(this);
328	476	menu.add("-");
329	477	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	478	liveleavesItem.addActionListener(this);
331	479	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	480	unliveleavesItem.addActionListener(this);
	481	+ if (Globals.ADVANCED)
	482	+ {
333	483	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	484	supportleavesItem.addActionListener(this);
335	485	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	486	unsupportleavesItem.addActionListener(this);
	487	+ }
337	488	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	489	hideleavesItem.addActionListener(this);
339	490	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +493,14 @@
342	493	markleavesItem.addActionListener(this);
343	494	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	495	unmarkleavesItem.addActionListener(this);
	496	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	497	+ rewindleavesItem.addActionListener(this);
	498	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	499	+ unrewindleavesItem.addActionListener(this);
	500	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	501	+ randomleavesItem.addActionListener(this);
	502	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	503	+ unrandomleavesItem.addActionListener(this);
345	504	menu.add("-");
346	505	flipVItem = menu.add(new MenuItem("Flip V"));
347	506	flipVItem.addActionListener(this);
..	..	@@ -377,35 +536,41 @@
377	536	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	537	sortbynameItem.addActionListener(this);
379	538	menu.add("-");
	539	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	540	+ shareGeometriesItem.addActionListener(this);
	541	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	542	+ mergeGeometriesItem.addActionListener(this);
	543	+ if (Globals.ADVANCED)
	544	+ {
	545	+ // Pretty much the same as duplicate and clone.
380	546	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	547	extractGeometriesItem.addActionListener(this);
382	548	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	549	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	550	+ }
388	551
389	552	oe.menuBar.add(menu = new Menu("Insert"));
390	553	buildCreateMenu(menu);
391	554
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	555	oe.menuBar.add(menu = new Menu("Tools"));
404	556	buildToolsMenu(menu);
405	557	}
406	558
	559	+
407	560	void SetupUI2(ObjEditor oe)
408	561	{
	562	+ // June 2019
	563	+ if (oe == null)
	564	+ {
	565	+ //super.SetupUI2(this);
	566	+ //return;
	567	+ }
	568	+
	569	+ if (copy != group)
	570	+ {
	571	+ //super.SetupUI2(this);
	572	+ }
	573	+
409	574	//new Exception().printStackTrace();
410	575
411	576	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,110 +599,231 @@
434	599	oe.radioPanel.add(dummyButton);
435	600	oe.buttonGroup.add(dummyButton);
436	601	*/
437		- aConstraints.gridy += 1;
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
438	605
439	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
440	607
441		- oe.aConstraints.gridwidth = 1;
442		- oe.aConstraints.gridx = 0;
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
443	611
444		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
445		- liveCB.setToolTipText("Enabled animation");
446		- liveCB.addItemListener(this);
447		-
448		- oe.aConstraints.gridx += 1;
449		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
450		- trackCB.setToolTipText("Enable tracking");
451		- trackCB.addItemListener(this);
452		-
453		- oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	612	+ if (Globals.ADVANCED)
	613	+ {
	614	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ maxButton.setToolTipText("Maximize window");
	616	+ maxButton.addActionListener(this);
	617	+ }
	618	+
	619	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ fullButton.setToolTipText("Full-screen window");
	621	+ fullButton.addActionListener(this);
	622	+
	623	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
455	624	screenfitButton.setToolTipText("Screen fit");
456	625	screenfitButton.addActionListener(this);
457		- oe.aConstraints.gridx += 1;
	626	+
	627	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	628	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	629	+ restoreCameraButton.addActionListener(this);
	630	+
	631	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	632	+ saveButton.setToolTipText("New version");
	633	+ saveButton.addActionListener(this);
	634	+
	635	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	636	+ undoButton.setToolTipText("Previous version");
	637	+ undoButton.addActionListener(this);
	638	+ undoButton.setEnabled(false);
	639	+
	640	+ cGridBag updown = new cGridBag().setVertical(true);
	641	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ restoreButton.setToolTipText("Restore current");
	643	+ restoreButton.addActionListener(this);
	644	+ restoreButton.setEnabled(false);
	645	+
	646	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ replaceButton.setToolTipText("Replace current");
	648	+ replaceButton.addActionListener(this);
	649	+ replaceButton.setEnabled(false);
	650	+
	651	+ copyOptionsPanel.add(updown);
	652	+
	653	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ redoButton.setToolTipText("Next version");
	655	+ redoButton.addActionListener(this);
	656	+ redoButton.setEnabled(false);
	657	+
	658	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	659	+ liveCB.setToolTipText("Enable animation");
	660	+ liveCB.addItemListener(this);
	661	+
	662	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	663	+ oneStepButton.setToolTipText("Animate one step forward");
	664	+ oneStepButton.addActionListener(this);
	665	+
	666	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	667	+ fastCB.setToolTipText("Fast mode");
	668	+ fastCB.addItemListener(this);
	669	+
	670	+ //oe.toolboxPanel.Return();
	671	+
	672	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	673	+// trackCB.setToolTipText("Enable tracking");
	674	+// trackCB.addItemListener(this);
	675	+
458	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
459	677	// screenfitpointButton.addActionListener(this);
460		-// oe.aConstraints.gridx += 1;
461		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
462		- snapobjectButton.addActionListener(this);
463		- snapobjectButton.setToolTipText("Snap Object");
464		- oe.aConstraints.gridx += 1;
465	678
466		- //aConstraints.gridx = 0;
467		- //aConstraints.gridy += 1;
468		- oe.aConstraints.weighty = 0;
469		- oe.aConstraints.gridwidth = 1;
470		-
471		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
472		- flashSelectionButton.setToolTipText("Show selection");
473		- flashSelectionButton.addActionListener(this);
	679	+ if (Globals.ADVANCED)
	680	+ {
	681	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ snapobjectButton.addActionListener(this);
	683	+ snapobjectButton.setToolTipText("Snap Object");
	684	+ }
	685	+
	686	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
474	687
475		- oe.toolbarPanel.add(new cButton(" ", false));
476		-
477		- oe.aConstraints.gridx += 1;
478		- oe.aConstraints.weighty = 0;
479		- oe.aConstraints.gridwidth = 1;
480		-
481		- //
482		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
483		- twoButton.setToolTipText("Show center view only");
484		- twoButton.addActionListener(this);
485		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
486	689	fourButton.addActionListener(this);
487	690	fourButton.setToolTipText("Show left panel only");
488		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
489		- sixButton.setToolTipText("2-column layout left");
	691	+
	692	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ twoButton.setToolTipText("Show right view only");
	694	+ twoButton.addActionListener(this);
	695	+ this.fullscreenLayout = twoButton;
	696	+
	697	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ sixButton.setToolTipText("Show left and right");
490	699	sixButton.addActionListener(this);
491		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
492		- threeButton.setToolTipText("2-column layout right");
493		- threeButton.addActionListener(this);
494		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
495		- sevenButton.setToolTipText("3-column layout");
496		- sevenButton.addActionListener(this);
	700	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	701	+// threeButton.setToolTipText("2-column layout right");
	702	+// threeButton.addActionListener(this);
	703	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+// sevenButton.setToolTipText("3-column layout");
	705	+// sevenButton.addActionListener(this);
497	706	//
498	707
499		- oe.toolbarPanel.add(rootButton = new cButton(" o o o ")); //, oe.aConstraints);
500		- rootButton.setToolTipText("Edit object in new tab");
	708	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	709	+ rootButton.setToolTipText("Open selection in new tab");
501	710	rootButton.addActionListener(this);
502		- oe.aConstraints.gridx += 1;
503		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	711	+
	712	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
504	713	closeButton.setToolTipText("Close tab");
505	714	closeButton.addActionListener(this);
506	715	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
507	716	//clearButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
509		-
510		- oe.aConstraints.gridx = 1; //
511		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
512		- editButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
516	717
517		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	718	+ // INSERT
	719	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	720	+ gridButton.setToolTipText("Create grid");
	721	+ gridButton.addActionListener(this);
	722	+
	723	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ boxButton.setToolTipText("Create box");
	725	+ boxButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ sphereButton.setToolTipText("Create sphere");
	729	+ sphereButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ coneButton.setToolTipText("Create cone");
	733	+ coneButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ torusButton.setToolTipText("Create torus");
	737	+ torusButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ superButton.setToolTipText("Create superellipsoid");
	741	+ superButton.addActionListener(this);
	742	+
	743	+ if (Globals.ADVANCED)
	744	+ {
	745	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	746	+ kleinButton.setToolTipText("Create Klein bottle");
	747	+ kleinButton.addActionListener(this);
	748	+ }
	749	+
	750	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ particlesButton.setToolTipText("Create particle system");
	752	+ particlesButton.addActionListener(this);
	753	+
	754	+ oe.toolboxPanel.Return();
	755	+
	756	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	757	+ groupButton.setToolTipText("Create group");
	758	+ groupButton.addActionListener(this);
	759	+
	760	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	761	+ compositeButton.setToolTipText("Create composite");
	762	+ compositeButton.addActionListener(this);
	763	+
	764	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ switchButton.setToolTipText("Create item switcher");
	766	+ switchButton.addActionListener(this);
	767	+
	768	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ loopButton.setToolTipText("Create loop");
	770	+ loopButton.addActionListener(this);
	771	+
	772	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ textureButton.setToolTipText("Create texture");
	774	+ textureButton.addActionListener(this);
	775	+
	776	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ overlayButton.setToolTipText("Create overlay");
	778	+ overlayButton.addActionListener(this);
	779	+
	780	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ lightButton.setToolTipText("Create light");
	782	+ lightButton.addActionListener(this);
	783	+
	784	+ for (int i=6; --i>=0;)
	785	+ {
	786	+ oe.toolboxPanel.Return();
	787	+ oe.toolboxPanel.add(new cGridBag());
	788	+ oe.toolboxPanel.add(new cGridBag());
	789	+ oe.toolboxPanel.add(new cGridBag());
	790	+ oe.toolboxPanel.add(new cGridBag());
	791	+ oe.toolboxPanel.add(new cGridBag());
	792	+ oe.toolboxPanel.add(new cGridBag());
	793	+ oe.toolboxPanel.add(new cGridBag());
	794	+ }
	795	+
	796	+ // EDIT panel
	797	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	798	+ editButton.setToolTipText("Pin selection controls");
	799	+ editButton.addActionListener(this);
	800	+
	801	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	802	+ uneditButton.setToolTipText("Remove selection controls");
518	803	uneditButton.addActionListener(this);
519	804
520		- oe.aConstraints.gridx += 1;
521		- oe.aConstraints.weighty = 0;
522		- oe.aConstraints.gridwidth = 1;
523		-
524		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
525		- clearPanelButton.addActionListener(this);
526		-
527		- oe.aConstraints.gridx += 1;
528		- oe.aConstraints.weighty = 0;
529		- oe.aConstraints.gridwidth = 1;
530		-
531		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	805	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	806	+ allParamsButton.setToolTipText("Show all controle");
532	807	allParamsButton.addActionListener(this);
533	808
534		- oe.aConstraints.gridx += 1;
535		- oe.aConstraints.weighty = 0;
536		- oe.aConstraints.gridwidth = 1;
537		-
538		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	809	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	810	+ clearPanelButton.setToolTipText("Clear edit panel");
	811	+ clearPanelButton.addActionListener(this);
	812	+
	813	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	814	+ unselectButton.setToolTipText("Unselect");
539	815	unselectButton.addActionListener(this);
540	816
	817	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	818	+ flashSelectionButton.setToolTipText("Highlight selection");
	819	+ flashSelectionButton.addActionListener(this);
	820	+
	821	+ editCommandsPanel.preferredHeight = 1;
	822	+
	823	+ SetPinStates(false);
	824	+// oe.treePanel.add(commandsPanel);
	825	+// oe.treePanel.Return();
	826	+
541	827	// oe.aConstraints.gridx += 1;
542	828	// oe.aConstraints.weighty = 0;
543	829	// oe.aConstraints.gridwidth = 1;
..	..	@@ -549,40 +835,25 @@
549	835	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
550	836	// gcButton.addActionListener(this);
551	837
552		- oe.aConstraints.gridx = 0;
553		- oe.aConstraints.gridy += 1;
554		-
555		- //ctrlPanel.add(objList = new List(5, true));
556		- oe.aConstraints.gridwidth = 100;
557		- // oe.aConstraints.gridheight = 100;
558		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
559		- oe.aConstraints.gridheight = 1;
560		- oe.aConstraints.weighty = 0.5;
561		- oe.aConstraints.gridx = 0;
562		- JScrollPane jSP;
	838	+ cGridBag jSPPanel = new cGridBag();
	839	+
	840	+ JScrollPane jSP;
563	841	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
564		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	842	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
565	843	ResetModel();
566		- oe.aConstraints.weighty = 0.5;
567		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
568		- oe.aConstraints.gridy += 1;
569		- oe.aConstraints.gridwidth = 1;
570		-
571		- oe.aConstraints.weighty = 0;
572		- oe.aConstraints.gridwidth = 2;
573		-
574		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
575		- colorCB.addItemListener(this);
576		- oe.aConstraints.gridx += 2;
577		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
578		- materialCB.addItemListener(this);
579		- oe.aConstraints.gridx += 2;
580		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
581		- textureCB.addItemListener(this);
582		-
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585	844
	845	+ oe.treePanel.add(jSPPanel);
	846	+ oe.treePanel.Return();
	847	+
	848	+ oe.treePanel.add(copyOptionsPanel);
	849	+ oe.treePanel.Return();
	850	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	851	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	852	+ sliderPane.preferredHeight = 1;
	853	+
	854	+// mainPanel.setDividerLocation(0.5); //1.0);
	855	+// mainPanel.setResizeWeight(0.5);
	856	+
586	857	//jList.addListSelectionListener(this);
587	858	oe.jTree.addTreeSelectionListener(this);
588	859	//jTree.setRootVisible(false);
..	..	@@ -601,53 +872,67 @@
601	872	dgr.addDragGestureListener(this);
602	873	}catch(Exception e) {}
603	874	*/
604		- radio.layout = sevenButton;
	875	+ radio.layout = sixButton; // sevenButton;
605	876	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
606	877	}
607	878
608	879	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
609	880	{
610		- //constraints.gridx = 0;
611		- //constraints.gridy = 0;
612		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
613		- fastCB.setToolTipText("Fast mode");
614		- fastCB.addItemListener(this);
615		- //constraints.gridy += 1;
616		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
617		- supportCB.setToolTipText("Enabled rigging");
618		- supportCB.addItemListener(this);
	881	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	882	+ colorCB.setToolTipText("Copy color when dropped");
	883	+ colorCB.addItemListener(this);
619	884
620		- // constraints.gridy += 1;
	885	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	886	+ materialCB.setToolTipText("Copy material when dropped");
	887	+ materialCB.addItemListener(this);
	888	+
	889	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	890	+ textureCB.setToolTipText("Copy texture when dropped");
	891	+ textureCB.addItemListener(this);
	892	+
	893	+ panel.Return();
	894	+
	895	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	896	+ boxCB.setToolTipText("Display bounding boxes");
	897	+ boxCB.addItemListener(this);
	898	+
	899	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	900	+ zoomBoxCB.setToolTipText("Display only for wheel");
	901	+ zoomBoxCB.addItemListener(this);
	902	+
	903	+ if (true) // Globals.ADVANCED)
	904	+ {
	905	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	906	+// supportCB.setToolTipText("Enable rigging");
	907	+// supportCB.addItemListener(this);
	908	+
	909	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	910	+ freezeCB.setToolTipText("Fast moving camera");
	911	+ freezeCB.addItemListener(this);
	912	+
621	913	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
622	914	// localCB.addItemListener(this);
623	915
624		- //constraints.gridy += 1;
	916	+ panel.Return();
	917	+
625	918	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
626	919	crowdCB.setToolTipText("Used for crowds");
627	920	crowdCB.addItemListener(this);
628	921
629		- //constraints.gridy += 1;
630	922	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
631	923	smoothCB.setToolTipText("Snapping delay");
632	924	smoothCB.addItemListener(this);
633	925
634		- //constraints.gridy += 1;
635	926	panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
636	927	slowCB.setToolTipText("Smooth interpolation");
637	928	slowCB.addItemListener(this);
638		- //constraints.gridy += 1;
639		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
640		- boxCB.setToolTipText("Display bounding boxes");
641		- boxCB.addItemListener(this);
642		- //constraints.gridy += 1;
643		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
644		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
645		- zoomBoxCB.addItemListener(this);
646		-
	929	+
647	930	// constraints.gridy += 1;
648	931	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
649	932	// speakerMocapCB.addItemListener(this);
650	933
	934	+ panel.Return();
	935	+
651	936	if (false)
652	937	{
653	938	// handled in scripts
..	..	@@ -662,36 +947,85 @@
662	947	//constraints.gridy += 1;
663	948	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
664	949	smoothfocusCB.addItemListener(this);
	950	+ panel.Return();
665	951	}
666	952
667	953	//constraints.gridx += 1;
668	954	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
669	955	// debugCB.addItemListener(this);
670	956
671		- //constraints.gridy += 1;
	957	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	958	+ trackCB.setToolTipText("Enable tracking target");
	959	+ trackCB.addItemListener(this);
	960	+
672	961	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	962	+ oeilCB.setToolTipText("Move camera when tracking");
673	963	oeilCB.addItemListener(this);
674	964
675		- //constraints.gridy += 1;
	965	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	966	+ shadowCB.setToolTipText("When live compute shadows");
	967	+ shadowCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	971	+ toggleTextureCB.setToolTipText("Load textures");
	972	+ toggleTextureCB.addItemListener(this);
	973	+
	974	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	975	+ toggleSwitchCB.setToolTipText("Choose a single item");
	976	+ toggleSwitchCB.addItemListener(this);
	977	+
	978	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	979	+ autokeepCB.setToolTipText("On structure change");
	980	+ autokeepCB.addItemListener(this);
	981	+
	982	+ panel.Return();
	983	+ if (Globals.ADVANCED)
	984	+ {
676	985	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
677	986	lookAtCB.setToolTipText("Look-at target");
678	987	lookAtCB.addItemListener(this);
	988	+ }
	989	+
	990	+ }
	991	+
	992	+ cGridBag fill = new cGridBag();
	993	+ fill.preferredHeight = 200;
	994	+ cGridBag fill2 = new cGridBag();
	995	+ fill2.preferredHeight = 200;
	996	+ cGridBag fill3 = new cGridBag();
	997	+ fill3.preferredHeight = 200;
	998	+
	999	+ panel.add(fill);
	1000	+ panel.add(fill2);
	1001	+ panel.add(fill3);
679	1002
680	1003	}
681	1004
682	1005	void EditObject(Object3D obj)
683	1006	{
684	1007	cRadio radioButton = new cRadio(obj.name);
	1008	+
	1009	+ // June 2019. Patch to avoid bug with transparency.
	1010	+ radioButton.hadMaterial = obj.material != null;
	1011	+ if (!radioButton.hadMaterial)
	1012	+ {
	1013	+ obj.material = new cMaterial();
	1014	+ }
	1015	+
685	1016	radioButton.SetObject(obj);
686		- radioButton.layout = sevenButton;
	1017	+ radioButton.layout = sixButton; // sevenButton;
687	1018	radioButton.SetCamera(cameraView.renderCamera, false);
688	1019	radioButton.addActionListener(this);
689	1020	radioPanel.add(radioButton);
690	1021	buttonGroup.add(radioButton);
691	1022	radioButton.doClick();
692	1023	}
	1024	+
693	1025	void SetupViews(ObjEditor oe)
694	1026	{
	1027	+ theFrame = this;
	1028	+
695	1029	oe.SetupViews();
696	1030
697	1031	System.out.println("SetupViews");
..	..	@@ -700,23 +1034,28 @@
700	1034	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
701	1035	}
702	1036
703		- JCheckBox liveCB;
704		- JCheckBox supportCB;
705		- JCheckBox localCB;
706		- JCheckBox crowdCB;
707		- JCheckBox smoothCB;
708		- JCheckBox fastCB;
709		- JCheckBox slowCB;
710		- JCheckBox boxCB;
711		- JCheckBox zoomBoxCB;
712		- JCheckBox trackCB;
713		- JCheckBox smoothfocusCB;
	1037	+ cToggleButton liveCB;
	1038	+ cCheckBox supportCB;
	1039	+ cCheckBox localCB;
	1040	+ cCheckBox crowdCB;
	1041	+ cCheckBox smoothCB;
	1042	+ cToggleButton fastCB;
	1043	+ cCheckBox slowCB;
	1044	+ cCheckBox boxCB;
	1045	+ cCheckBox zoomBoxCB;
	1046	+ cCheckBox freezeCB;
	1047	+ //cToggleButton trackCB;
	1048	+ cCheckBox trackCB;
	1049	+ cCheckBox smoothfocusCB;
714	1050	// JCheckBox speakerMocapCB;
715		- JCheckBox speakerCameraCB;
716		- JCheckBox speakerFocusCB;
717		- JCheckBox debugCB;
718		- JCheckBox oeilCB;
719		- JCheckBox lookAtCB;
	1051	+ cCheckBox speakerCameraCB;
	1052	+ cCheckBox speakerFocusCB;
	1053	+ cCheckBox debugCB;
	1054	+
	1055	+ cCheckBox oeilCB;
	1056	+ cCheckBox shadowCB;
	1057	+ cCheckBox autokeepCB;
	1058	+ cCheckBox lookAtCB;
720	1059
721	1060	// static int COLOR = 1;
722	1061	// static int MATERIAL = 2;
..	..	@@ -724,9 +1063,9 @@
724	1063
725	1064	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
726	1065
727		- JCheckBox colorCB;
728		- JCheckBox materialCB;
729		- JCheckBox textureCB;
	1066	+ cCheckBox colorCB;
	1067	+ cCheckBox materialCB;
	1068	+ cCheckBox textureCB;
730	1069
731	1070	public void itemStateChanged(ItemEvent e)
732	1071	{
..	..	@@ -754,6 +1093,7 @@
754	1093	} else if(e.getSource() == liveCB)
755	1094	{
756	1095	cameraView.ToggleLive();
	1096	+ refreshContents(false);
757	1097	}
758	1098	else if(e.getSource() == supportCB)
759	1099	{
..	..	@@ -818,6 +1158,18 @@
818	1158	{
819	1159	cameraView.ToggleOeil();
820	1160	}
	1161	+ else if(e.getSource() == shadowCB)
	1162	+ {
	1163	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1164	+ }
	1165	+ else if(e.getSource() == freezeCB)
	1166	+ {
	1167	+ Globals.FREEZEONMOVE ^= true;
	1168	+ }
	1169	+ else if(e.getSource() == autokeepCB)
	1170	+ {
	1171	+ Globals.REPLACEONMAKE ^= true;
	1172	+ }
821	1173	else if(e.getSource() == lookAtCB)
822	1174	{
823	1175	cameraView.ToggleLookAt();
..	..	@@ -834,7 +1186,8 @@
834	1186
835	1187	/**/
836	1188	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
837		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1190	+ TreePath path = objEditor.jTree.getSelectionPath();
838	1191	if ((path == null) \|\| (path.getPathCount() <= 1)) {
839	1192	// We can't move the root node or an empty selection
840	1193	return;
..	..	@@ -897,8 +1250,6 @@
897	1250	}
898	1251	}
899	1252
900		- String string = (String) object;
901		-
902	1253	System.out.println("Transfer = " + object + "; drop : " + target);
903	1254	// if( object instanceof java.io.File[])
904	1255	// {
..	..	@@ -906,7 +1257,11 @@
906	1257	// objEditor.DropFile((java.io.File[]) object, true);
907	1258	// return;
908	1259	// }
909		- if (string.charAt(0) == '/')
	1260	+
	1261	+ String string = object.toString();
	1262	+
	1263	+ // File path for Mac and Windows
	1264	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
910	1265	{
911	1266	// file(s)
912	1267	String[] names = string.split("\n");
..	..	@@ -933,7 +1288,7 @@
933	1288
934	1289	flashIt = false;
935	1290	CameraPane pane = (CameraPane) target;
936		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1291	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
937	1292	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
938	1293
939	1294	if (group.selection.size() == 1)
..	..	@@ -949,23 +1304,33 @@
949	1304
950	1305	assert target == objEditor.jTree;
951	1306	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1307	+ Object3D destinationLeaf;
952	1308	try {
953		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1309	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
954	1310	} catch (Exception e) {
955	1311	System.out.println("destinationPath : " + destinationPath);
956	1312	return;
957	1313	}
958	1314
959		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1315	+ for (int i=group.selection.size(); --i>=0;)
960	1316	{
	1317	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1318	+
	1319	+ // Cannot move into itself
	1320	+ if (child == destinationLeaf)
	1321	+ return;
	1322	+ }
	1323	+
	1324	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1325	+// {
961	1326	loadClipboard(true);
962	1327	objEditor.jTree.setSelectionPath(destinationPath);
963		- pasteInto(false);
964		- } else {
965		- loadClipboard(false);
966		- objEditor.jTree.setSelectionPath(destinationPath);
967		- pasteInto(false); // true); // ???
968		- }
	1328	+ pasteInto(false, false);
	1329	+// } else {
	1330	+// loadClipboard(false);
	1331	+// objEditor.jTree.setSelectionPath(destinationPath);
	1332	+// pasteInto(false, false); // true); // ???
	1333	+// }
969	1334	}
970	1335	public void dropActionChanged(DropTargetDragEvent dtde)
971	1336	// Called if the user has modified the current drop gesture
..	..	@@ -1070,85 +1435,107 @@
1070	1435	{
1071	1436	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1072	1437	//heightFieldItem.addActionListener(this);
1073		- gridItem = menu.add(new MenuItem("Grid"));
1074		- gridItem.addActionListener(this);
1075		- rectoidItem = menu.add(new MenuItem("Box"));
1076		- rectoidItem.addActionListener(this);
1077		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1078		- ellipsoidItem.addActionListener(this);
1079		- coneItem = menu.add(new MenuItem("Cone"));
1080		- coneItem.addActionListener(this);
1081		- torusItem = menu.add(new MenuItem("Torus"));
1082		- torusItem.addActionListener(this);
1083		- superItem = menu.add(new MenuItem("Superellipsoid"));
1084		- superItem.addActionListener(this);
	1438	+// gridItem = menu.add(new MenuItem("Grid"));
	1439	+// gridItem.addActionListener(this);
	1440	+// rectoidItem = menu.add(new MenuItem("Box"));
	1441	+// rectoidItem.addActionListener(this);
	1442	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1443	+// ellipsoidItem.addActionListener(this);
	1444	+// coneItem = menu.add(new MenuItem("Cone"));
	1445	+// coneItem.addActionListener(this);
	1446	+// torusItem = menu.add(new MenuItem("Torus"));
	1447	+// torusItem.addActionListener(this);
	1448	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1449	+// superItem.addActionListener(this);
	1450	+
	1451	+ cameraItem = menu.add(new MenuItem("Camera"));
	1452	+ cameraItem.addActionListener(this);
	1453	+
	1454	+ if (!Globals.ADVANCED)
	1455	+ {
1085	1456	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1086	1457	kleinItem.addActionListener(this);
1087		- particleItem = menu.add(new MenuItem("Particle system"));
1088		- particleItem.addActionListener(this);
	1458	+ }
	1459	+
	1460	+// particleItem = menu.add(new MenuItem("Particle system"));
	1461	+// particleItem.addActionListener(this);
	1462	+ if (Globals.ADVANCED)
	1463	+ {
1089	1464	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1090	1465	ragdollItem.addActionListener(this);
1091	1466	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1092	1467	ragdoll2Item.addActionListener(this);
	1468	+ }
1093	1469	menu.add("-");
1094		- meshItem = menu.add(new MenuItem("Mesh"));
	1470	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1095	1471	meshItem.addActionListener(this);
1096	1472	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1097	1473	// meshGroupItem.addActionListener(this);
	1474	+ if (Globals.ADVANCED)
	1475	+ {
1098	1476	springItem = menu.add(new MenuItem("Spring"));
1099	1477	springItem.addActionListener(this);
1100	1478	flagItem = menu.add(new MenuItem("Flag"));
1101	1479	flagItem.addActionListener(this);
1102		- bezierItem = menu.add(new MenuItem("Patch"));
1103		- bezierItem.addActionListener(this);
1104		- checkerItem = menu.add(new MenuItem("Checker"));
1105		- checkerItem.addActionListener(this);
1106	1480	blobItem = menu.add(new MenuItem("Blob"));
1107	1481	blobItem.addActionListener(this);
1108	1482	latheItem = menu.add(new MenuItem("Lathe"));
1109	1483	latheItem.addActionListener(this);
1110		- lightItem = menu.add(new MenuItem("Light"));
1111		- lightItem.addActionListener(this);
	1484	+ }
	1485	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1486	+ bezierItem.addActionListener(this);
	1487	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1488	+// overlayItem.addActionListener(this);
	1489	+// lightItem = menu.add(new MenuItem("Light"));
	1490	+// lightItem.addActionListener(this);
1112	1491	menu.add("-");
1113	1492	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1114	1493	//superLoopItem.addActionListener(this);
1115		- loopItem = menu.add(new MenuItem("Loop"));
1116		- loopItem.addActionListener(this);
	1494	+// loopItem = menu.add(new MenuItem("Loop"));
	1495	+// loopItem.addActionListener(this);
1117	1496	doubleItem = menu.add(new MenuItem("Fork"));
1118	1497	doubleItem.addActionListener(this);
	1498	+ if (Globals.ADVANCED)
	1499	+ {
1119	1500	tripleItem = menu.add(new MenuItem("Trident"));
1120	1501	tripleItem.addActionListener(this);
	1502	+ }
1121	1503	}
1122	1504
1123	1505	void buildToolsMenu(Menu menu)
1124	1506	{
1125	1507	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1126	1508	animationItem.addItemListener(this);
1127		- animationItem.setState(CameraPane.ANIMATION);
	1509	+ animationItem.setState(Globals.ANIMATION);
	1510	+
	1511	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1512	+ archiveItem.addActionListener(this);
1128	1513
1129	1514	menu.add("-");
1130	1515	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1131	1516	parseverticesItem.addActionListener(this);
1132	1517	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1133	1518	textureFieldItem.addActionListener(this);
1134		- alignItem = menu.add(new MenuItem("Align"));
	1519	+ alignItem = menu.add(new MenuItem("Align Objects"));
1135	1520	alignItem.addActionListener(this);
1136		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1137		- mirrorItem.addActionListener(this);
1138	1521	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1139	1522	reduceMorphItem.addActionListener(this);
1140	1523	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1141	1524	reduce34MorphItem.addActionListener(this);
1142		-
1143		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1144		- computeAOItem.addActionListener(this);
1145	1525	menu.add("-");
1146		-
1147	1526	menu.add(memoryItem = new MenuItem("Memory Usage"));
1148	1527	memoryItem.addActionListener(this);
	1528	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1529	+ computeAOItem.addActionListener(this);
	1530	+
	1531	+ if (Globals.ADVANCED)
	1532	+ {
	1533	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1534	+ mirrorItem.addActionListener(this);
	1535	+ menu.add("-");
1149	1536	menu.add(analyzeItem = new MenuItem("Analyze"));
1150	1537	analyzeItem.addActionListener(this);
1151		- menu.add(dumpItem = new MenuItem("Dump"));
	1538	+ menu.add(dumpItem = new MenuItem("Print"));
1152	1539	dumpItem.addActionListener(this);
1153	1540	// menu.add(pathItem = new MenuItem("From-to path"));
1154	1541	// pathItem.addActionListener(this);
..	..	@@ -1166,6 +1553,7 @@
1166	1553	menu.add("-");
1167	1554	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1168	1555	editScriptItem.addActionListener(this);
	1556	+ }
1169	1557	}
1170	1558
1171	1559	void ScreenFit()
..	..	@@ -1288,9 +1676,34 @@
1288	1676	shadow.material = new cMaterial(obj.material);
1289	1677	shadow.material.diffuse = 0.0001f;
1290	1678	shadow.material.specular = 0.0001f;
	1679	+ //shadow.projectedVertices[1].x = 300;
1291	1680
1292	1681	makeSomething(shadow);
1293	1682	}
	1683	+
	1684	+ private void ClearUnpinned()
	1685	+ {
	1686	+ //for (Object3D obj : listUI)
	1687	+ for (int i=listUI.size(); --i>=0;)
	1688	+ {
	1689	+ Object3D obj = listUI.elementAt(i);
	1690	+ if (!obj.pinned)
	1691	+ {
	1692	+ obj.CloseUI();
	1693	+ listUI.remove(i);
	1694	+ }
	1695	+ }
	1696	+ }
	1697	+
	1698	+ private void EditElement(Object3D elem, boolean newWindow)
	1699	+ {
	1700	+ // if (!(elem instanceof Composite))
	1701	+ // newWindow = false;
	1702	+ listUI.add(elem);
	1703	+ elem.openEditWindow(this, newWindow); //, false);
	1704	+ System.out.println("edit : " + elem);
	1705	+ elem.editWindow.refreshContents(true); // ? new
	1706	+ }
1294	1707
1295	1708	/**
1296	1709	* applyExample
..	..	@@ -1494,9 +1907,9 @@
1494	1907
1495	1908	void Overwrite(int mask)
1496	1909	{
1497		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1910	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1498	1911	{
1499		- Object3D content = GrafreeD.clipboard.get(0);
	1912	+ Object3D content = Grafreed.clipboard.get(0);
1500	1913
1501	1914	if (content instanceof cGroup && ((cGroup)content).transientlink )
1502	1915	content = ((cGroup)content).get(0);
..	..	@@ -1535,7 +1948,7 @@
1535	1948	{
1536	1949	ScreenFit();
1537	1950	} else
1538		- if (source == switchItem)
	1951	+ if (source == switchViewItem)
1539	1952	{
1540	1953	cVector v1 = new cVector();
1541	1954	cVector v2 = new cVector();
..	..	@@ -1544,11 +1957,11 @@
1544	1957	objEditor.cameraView.renderCamera.setAim(v2, v1);
1545	1958	objEditor.cameraView.repaint();
1546	1959	} else
1547		- if (source == rectoidItem)
	1960	+ if (source == rectoidItem \|\| source == boxButton)
1548	1961	{
1549	1962	makeSomething(new Box());
1550	1963	} else
1551		- if (source == particleItem)
	1964	+ if (source == particleItem \|\| source == particlesButton)
1552	1965	{
1553	1966	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1554	1967	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1627,27 +2040,27 @@
1627	2040
1628	2041	makeSomething(obj);
1629	2042	} else
1630		- if (source == gridItem)
	2043	+ if (source == gridItem \|\| source == gridButton)
1631	2044	{
1632	2045	makeSomething(new Grid());
1633	2046	} else
1634		- if (source == ellipsoidItem)
	2047	+ if (source == ellipsoidItem \|\| source == sphereButton)
1635	2048	{
1636	2049	makeSomething(new Sphere());
1637	2050	} else
1638		- if (source == coneItem)
	2051	+ if (source == coneItem \|\| source == coneButton)
1639	2052	{
1640	2053	makeSomething(new Cone());
1641	2054	} else
1642		- if (source == torusItem)
	2055	+ if (source == torusItem \|\| source == torusButton)
1643	2056	{
1644	2057	makeSomething(new Torus());
1645	2058	} else
1646		- if (source == superItem)
	2059	+ if (source == superItem \|\| source == superButton)
1647	2060	{
1648	2061	makeSomething(new Superellipsoid());
1649	2062	} else
1650		- if (source == kleinItem)
	2063	+ if (source == kleinItem \|\| source == kleinButton)
1651	2064	{
1652	2065	makeSomething(new Klein());
1653	2066	} else
..	..	@@ -1667,7 +2080,7 @@
1667	2080	{
1668	2081	makeSomething(new BezierSurface());
1669	2082	} else
1670		- if (source == checkerItem)
	2083	+ if (source == overlayItem \|\| source == overlayButton)
1671	2084	{
1672	2085	/*
1673	2086	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1715,7 +2128,7 @@
1715	2128	s.setup();
1716	2129	makeSomething(s);
1717	2130	} else
1718		- if (source == lightItem)
	2131	+ if (source == lightItem \|\| source == lightButton)
1719	2132	{
1720	2133	makeSomething(new Light());
1721	2134	} else
..	..	@@ -1765,30 +2178,30 @@
1765	2178
1766	2179	group(g);
1767	2180	} else
1768		- if (source == loopItem)
	2181	+ if (source == loopItem \|\| source == loopButton)
1769	2182	{
1770	2183	Composite csg = new GroupLeaf();
1771	2184	csg.count = 5;
1772	2185	group(csg);
1773		- Composite child = new cGroup();
	2186	+ Composite child = new cGroup("Branch");
1774	2187	csg.addChild(child);
1775	2188	child.addChild(csg);
1776	2189	} else
1777	2190	if (source == doubleItem)
1778	2191	{
1779		- Composite csg = new GroupLeaf();
	2192	+ Composite csg = new GroupLeaf("Fork");
1780	2193	csg.count = 5;
1781	2194	group(csg);
1782		- Composite child = new cGroup();
	2195	+ Composite child = new cGroup("Branch A");
1783	2196	csg.addChild(child);
1784	2197	child.addChild(csg);
1785		- child = new cGroup();
	2198	+ child = new cGroup("Branch B");
1786	2199	csg.addChild(child);
1787	2200	child.addChild(csg);
1788	2201	} else
1789	2202	if (source == tripleItem)
1790	2203	{
1791		- Composite csg = new GroupLeaf();
	2204	+ Composite csg = new GroupLeaf("Trident");
1792	2205	csg.count = 4;
1793	2206	group(csg);
1794	2207	Composite child = new cGroup();
..	..	@@ -1800,23 +2213,6 @@
1800	2213	child = new cGroup();
1801	2214	csg.addChild(child);
1802	2215	child.addChild(csg);
1803		- } else
1804		-
1805		- if (source == importGFDItem)
1806		- {
1807		- ImportGFD();
1808		- } else
1809		- if (source == importVRMLX3DItem)
1810		- {
1811		- ImportVRMLX3D();
1812		- } else
1813		- if (source == import3DSItem)
1814		- {
1815		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1816		- } else
1817		- if (source == importOBJItem)
1818		- {
1819		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1820	2216	} else
1821	2217	if (source == computeAOItem)
1822	2218	{
..	..	@@ -1836,7 +2232,7 @@
1836	2232	if (source == invariantsItem)
1837	2233	{
1838	2234	System.out.println("Invariants:");
1839		- GrafreeD.grafreeD.universe.invariants();
	2235	+ Grafreed.grafreeD.universe.invariants();
1840	2236	} else
1841	2237	if (source == memoryItem)
1842	2238	{
..	..	@@ -1855,19 +2251,61 @@
1855	2251	{
1856	2252	DumpObject();
1857	2253	} else
	2254	+ if (source == minButton)
	2255	+ {
	2256	+ Minimize();
	2257	+ } else
	2258	+ if (source == maxButton)
	2259	+ {
	2260	+ Maximize();
	2261	+ } else
	2262	+ if (source == fullButton)
	2263	+ {
	2264	+ ToggleFullScreen();
	2265	+ } else
	2266	+ if (source == undoButton)
	2267	+ {
	2268	+ // Go to previous version
	2269	+ //if (!Undo())
	2270	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2271	+ Undo();
	2272	+ } else
	2273	+ if (source == restoreButton)
	2274	+ {
	2275	+ // Restore current version
	2276	+ Restore();
	2277	+ } else
	2278	+ if (source == replaceButton)
	2279	+ {
	2280	+ // Overwrite current version
	2281	+ Replace();
	2282	+ } else
	2283	+ if (source == redoButton)
	2284	+ {
	2285	+ // Go to next version
	2286	+ Redo();
	2287	+ } else
	2288	+ if (source == saveButton)
	2289	+ {
	2290	+ // Save a new version
	2291	+ if (!Save(true))
	2292	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2293	+ } else
	2294	+ if (source == oneStepButton)
	2295	+ {
	2296	+ Globals.ONESTEP = true;
	2297	+ cameraView.repaint();
	2298	+ } else
1858	2299	if (source == screenfitButton)
1859	2300	{
1860		- //Reload(lastConverter, lastFilename, true);
1861	2301	ScreenFit();
1862	2302	} else
1863	2303	if (source == screenfitpointButton)
1864	2304	{
1865		- //Reload(lastConverter, lastFilename, true);
1866	2305	ScreenFitPoint();
1867	2306	} else
1868	2307	if (source == snapobjectButton)
1869	2308	{
1870		- //Reload(lastConverter, lastFilename, true);
1871	2309	SnapObject();
1872	2310	} else
1873	2311	// if (event.getSource() == recompileButton)
..	..	@@ -1904,12 +2342,20 @@
1904	2342	{
1905	2343	loadClipboard(true);
1906	2344	} else
	2345	+ if (source == undoItem)
	2346	+ {
	2347	+ Undo();
	2348	+ } else
	2349	+ if (source == redoItem)
	2350	+ {
	2351	+ Redo();
	2352	+ } else
1907	2353	if (source == duplicateItem)
1908	2354	{
1909		- Object3D keep = GrafreeD.clipboard;
	2355	+ Object3D keep = Grafreed.clipboard;
1910	2356	loadClipboard(false);
1911	2357	paste(false);
1912		- GrafreeD.clipboard = keep;
	2358	+ Grafreed.clipboard = keep;
1913	2359	} else
1914	2360	if (source == cloneItem)
1915	2361	{
..	..	@@ -1927,13 +2373,17 @@
1927	2373	{
1928	2374	paste(false);
1929	2375	} else
	2376	+ if (source == pasteIntoItem)
	2377	+ {
	2378	+ pasteInto(true, false);
	2379	+ } else
1930	2380	if (source == pasteLinkItem)
1931	2381	{
1932		- pasteInto(false);
	2382	+ pasteInto(false, false);
1933	2383	} else
1934	2384	if (source == pasteCloneItem)
1935	2385	{
1936		- pasteInto(true);
	2386	+ pasteInto(true, true);
1937	2387	} else
1938	2388	if (source == pasteExpandItem)
1939	2389	{
..	..	@@ -2125,9 +2575,9 @@
2125	2575	// group.selection.get(0).setMasterThis(content); // should be identity
2126	2576	// refreshContents();
2127	2577	// }
2128		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2578	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2129	2579	{
2130		- Object3D content = GrafreeD.clipboard.get(0);
	2580	+ Object3D content = Grafreed.clipboard.get(0);
2131	2581
2132	2582	if (content instanceof cGroup && ((cGroup)content).transientlink )
2133	2583	content = ((cGroup)content).get(0);
..	..	@@ -2135,11 +2585,11 @@
2135	2585	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2136	2586	for (int i=0; i<group.selection.size(); i++)
2137	2587	{
2138		- boolean random = CameraPane.RANDOM;
2139		- CameraPane.RANDOM = false; // parse all random nodes
	2588	+ boolean random = CameraPane.SWITCH;
	2589	+ CameraPane.SWITCH = false; // parse all random nodes
2140	2590	group.selection.get(i).linkVerticesThis(content);
2141	2591	// group.selection.get(i).setMasterThis(content); // should be identity
2142		- CameraPane.RANDOM = random;
	2592	+ CameraPane.SWITCH = random;
2143	2593	}
2144	2594	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2145	2595	refreshContents();
..	..	@@ -2149,20 +2599,20 @@
2149	2599	{
2150	2600	for (int i=0; i<group.selection.size(); i++)
2151	2601	{
2152		- boolean random = CameraPane.RANDOM;
2153		- CameraPane.RANDOM = false; // parse all random nodes
	2602	+ boolean random = CameraPane.SWITCH;
	2603	+ CameraPane.SWITCH = false; // parse all random nodes
2154	2604	group.selection.get(i).linkVerticesThis(null);
2155		- CameraPane.RANDOM = random;
	2605	+ CameraPane.SWITCH = random;
2156	2606	}
2157	2607
2158	2608	refreshContents();
2159	2609	} else
2160	2610	if (source == relinkverticesItem)
2161	2611	{
2162		- boolean random = CameraPane.RANDOM;
2163		- CameraPane.RANDOM = false; // parse all random nodes
	2612	+ boolean random = CameraPane.SWITCH;
	2613	+ CameraPane.SWITCH = false; // parse all random nodes
2164	2614	group.selection.RelinkToSupport();
2165		- CameraPane.RANDOM = random;
	2615	+ CameraPane.SWITCH = random;
2166	2616
2167	2617	refreshContents();
2168	2618	} else
..	..	@@ -2177,9 +2627,9 @@
2177	2627	} else
2178	2628	if (source == setMasterItem)
2179	2629	{
2180		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2630	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2181	2631	{
2182		- Object3D content = GrafreeD.clipboard.get(0);
	2632	+ Object3D content = Grafreed.clipboard.get(0);
2183	2633
2184	2634	if (content instanceof cGroup && ((cGroup)content).transientlink )
2185	2635	content = ((cGroup)content).get(0);
..	..	@@ -2192,9 +2642,9 @@
2192	2642	{
2193	2643	if (group.selection.size() == 1)
2194	2644	{
2195		- if (GrafreeD.clipboard.size() == 1)
	2645	+ if (Grafreed.clipboard.size() == 1)
2196	2646	{
2197		- Object3D content = GrafreeD.clipboard.get(0);
	2647	+ Object3D content = Grafreed.clipboard.get(0);
2198	2648
2199	2649	if (content instanceof cGroup && ((cGroup)content).transientlink )
2200	2650	content = ((cGroup)content).get(0);
..	..	@@ -2211,7 +2661,7 @@
2211	2661	{
2212	2662	RevertMeshes();
2213	2663	} else
2214		- if (source == resetMeshItem)
	2664	+ if (source == resetAllItem)
2215	2665	{
2216	2666	ResetAll();
2217	2667	} else
..	..	@@ -2219,7 +2669,7 @@
2219	2669	{
2220	2670	StepAll();
2221	2671	} else
2222		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2672	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2223	2673	{
2224	2674	//int indices[] = jList.getSelectedIndices();
2225	2675	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2231,9 +2681,9 @@
2231	2681	{
2232	2682	ClearSelection(true);
2233	2683	} else
2234		- if (source == grabItem)
	2684	+ if (source == grabItem \|\| source == groupButton)
2235	2685	{
2236		- group(new cGroup(), true);
	2686	+ group(new cGroup(), false); // true);
2237	2687	} else
2238	2688	if (source == hideItem)
2239	2689	{
..	..	@@ -2251,16 +2701,16 @@
2251	2701	{
2252	2702	makeSomething(new Camera());
2253	2703	} else
2254		- if (source == compositeItem)
	2704	+ if (source == compositeItem \|\| source == compositeButton)
2255	2705	{
2256	2706	group(new Composite());
2257	2707	} else
2258		- if (source == randomItem)
	2708	+ if (source == switchItem \|\| source == switchButton)
2259	2709	{
2260	2710	RandomNode random = new RandomNode();
2261	2711	group(random);
2262	2712	if (random.size() > 0)
2263		- random.name = random.get(0).name + "Rnd";
	2713	+ random.name = random.get(0).name + "Switch";
2264	2714	} else
2265	2715	if (source == physicsItem)
2266	2716	{
..	..	@@ -2357,7 +2807,7 @@
2357	2807	{
2358	2808	group(new cLinker());
2359	2809	} else
2360		- if (source == textureItem)
	2810	+ if (source == textureItem \|\| source == textureButton)
2361	2811	{
2362	2812	group(new TextureNode());
2363	2813	} else
..	..	@@ -2377,17 +2827,30 @@
2377	2827	{
2378	2828	CastShadow(2);
2379	2829	} else
2380		- if (source == ungroupItem)
	2830	+ if (source == ungroupItem \|\| source == ungroupButton)
2381	2831	{
2382		- //ungroup();
	2832	+ boolean hasRoot = false;
	2833	+
2383	2834	for (int i=0; i<group.selection.size(); i++)
2384	2835	{
2385		- Ungroup(group.selection.get(i));
	2836	+ if (group.selection.get(i) == group)
	2837	+ {
	2838	+ hasRoot = true;
	2839	+ break;
	2840	+ }
2386	2841	}
2387	2842
2388		- ClearSelection(false);
2389		-
2390		- refreshContents();
	2843	+ if (!hasRoot)
	2844	+ {
	2845	+ for (int i=0; i<group.selection.size(); i++)
	2846	+ {
	2847	+ Ungroup(group.selection.get(i));
	2848	+ }
	2849	+
	2850	+ ClearSelection(false);
	2851	+
	2852	+ refreshContents();
	2853	+ }
2391	2854	} else
2392	2855	if (source == genUVItem)
2393	2856	{
..	..	@@ -2399,7 +2862,7 @@
2399	2862	} else
2400	2863	if (source == genNormalsMESHItem)
2401	2864	{
2402		- GenNormals(true); // TODO
	2865	+ GenNormalsMESH();
2403	2866	} else
2404	2867	if (source == genNormalsORGANItem)
2405	2868	{
..	..	@@ -2464,6 +2927,22 @@
2464	2927	if (source == unmarkleavesItem)
2465	2928	{
2466	2929	MarkLeaves(false);
	2930	+ } else
	2931	+ if (source == rewindleavesItem)
	2932	+ {
	2933	+ RewindLeaves(true);
	2934	+ } else
	2935	+ if (source == unrewindleavesItem)
	2936	+ {
	2937	+ RewindLeaves(false);
	2938	+ } else
	2939	+ if (source == randomleavesItem)
	2940	+ {
	2941	+ RandomLeaves(true);
	2942	+ } else
	2943	+ if (source == unrandomleavesItem)
	2944	+ {
	2945	+ RandomLeaves(false);
2467	2946	} else
2468	2947	if (source == flipVItem)
2469	2948	{
..	..	@@ -2549,9 +3028,13 @@
2549	3028	{
2550	3029	SmoothMesh();
2551	3030	} else
2552		- if (source == transformgeometryItem)
	3031	+ if (source == transformGeometryItem)
2553	3032	{
2554	3033	TransformGeometry();
	3034	+ } else
	3035	+ if (source == transformChildrenItem)
	3036	+ {
	3037	+ TransformChildren();
2555	3038	} else
2556	3039	if (source == resetTransformItem)
2557	3040	{
..	..	@@ -2559,7 +3042,11 @@
2559	3042	} else
2560	3043	if (source == resetCentroidItem)
2561	3044	{
2562		- ResetCentroid();
	3045	+ ResetCentroid(true);
	3046	+ } else
	3047	+ if (source == resetCentroidXZItem)
	3048	+ {
	3049	+ ResetCentroid(false);
2563	3050	} else
2564	3051	if (source == resetParentItem)
2565	3052	{
..	..	@@ -2691,6 +3178,10 @@
2691	3178	if (source == twoButton)
2692	3179	{
2693	3180	radio.layout = twoButton;
	3181	+
	3182	+ if (CameraPane.FULLSCREEN)
	3183	+ fullscreenLayout = radio.layout;
	3184	+
2694	3185	// bug
2695	3186	//gridPanel.setDividerLocation(1.0);
2696	3187	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2723,10 +3214,31 @@
2723	3214	bigThree.ClearUI();
2724	3215	bigThree.add(centralPanel);
2725	3216	bigThree.FlushUI();
	3217	+
	3218	+ cameraView.requestFocusInWindow();
	3219	+
	3220	+// refreshContents(true);
	3221	+//
	3222	+// try
	3223	+// {
	3224	+// java.awt.Robot bot = new java.awt.Robot();
	3225	+// int mask = InputEvent.BUTTON1_MASK;
	3226	+// bot.mouseMove(100, 100);
	3227	+// bot.mousePress(mask);
	3228	+// bot.mouseRelease(mask);
	3229	+// }
	3230	+// catch (Exception e)
	3231	+// {
	3232	+//
	3233	+// }
	3234	+
2726	3235	} else
2727	3236	if (source == threeButton)
2728	3237	{
2729	3238	radio.layout = threeButton;
	3239	+
	3240	+ if (CameraPane.FULLSCREEN)
	3241	+ fullscreenLayout = radio.layout;
2730	3242
2731	3243	// bigThree.remove(scenePanel);
2732	3244	// bigThree.remove(centralPanel);
..	..	@@ -2759,10 +3271,15 @@
2759	3271	bigThree.add(centralPanel);
2760	3272	bigThree.add(XYZPanel);
2761	3273	bigThree.FlushUI();
	3274	+
	3275	+ cameraView.requestFocusInWindow();
2762	3276	} else
2763	3277	if (source == fourButton)
2764	3278	{
2765	3279	radio.layout = fourButton;
	3280	+
	3281	+ if (CameraPane.FULLSCREEN)
	3282	+ fullscreenLayout = radio.layout;
2766	3283
2767	3284	// bigThree.remove(scenePanel);
2768	3285	// bigThree.remove(centralPanel);
..	..	@@ -2794,10 +3311,15 @@
2794	3311	bigThree.ClearUI();
2795	3312	bigThree.add(scenePanel);
2796	3313	bigThree.FlushUI();
	3314	+
	3315	+ cameraView.requestFocusInWindow();
2797	3316	} else
2798	3317	if (source == sixButton)
2799	3318	{
2800	3319	radio.layout = sixButton;
	3320	+
	3321	+ if (CameraPane.FULLSCREEN)
	3322	+ fullscreenLayout = radio.layout;
2801	3323
2802	3324	// bigThree.remove(scenePanel);
2803	3325	// bigThree.remove(centralPanel);
..	..	@@ -2830,10 +3352,15 @@
2830	3352	bigThree.add(scenePanel);
2831	3353	bigThree.add(centralPanel);
2832	3354	bigThree.FlushUI();
	3355	+
	3356	+ cameraView.requestFocusInWindow();
2833	3357	} else
2834	3358	if (source == sevenButton)
2835	3359	{
2836	3360	radio.layout = sevenButton;
	3361	+
	3362	+ if (CameraPane.FULLSCREEN)
	3363	+ fullscreenLayout = radio.layout;
2837	3364
2838	3365	// bigThree.remove(scenePanel);
2839	3366	// bigThree.remove(centralPanel);
..	..	@@ -2867,6 +3394,8 @@
2867	3394	bigThree.add(centralPanel);
2868	3395	bigThree.add(XYZPanel);
2869	3396	bigThree.FlushUI();
	3397	+
	3398	+ cameraView.requestFocusInWindow();
2870	3399	} else
2871	3400	if (source == rootButton)
2872	3401	{
..	..	@@ -2878,6 +3407,7 @@
2878	3407	EditObject(obj);
2879	3408	}
2880	3409
	3410	+ cameraView.requestFocusInWindow();
2881	3411	refreshContents(true);
2882	3412	} else
2883	3413	if (source == closeButton)
..	..	@@ -2887,22 +3417,37 @@
2887	3417	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2888	3418	{
2889	3419	ab = (cRadio)e.nextElement();
2890		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3420	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2891	3421	{
	3422	+ // Patch to avoid bug with transparency.
	3423	+ if (!ab.hadMaterial)
	3424	+ {
	3425	+ ab.object.material = null;
	3426	+ }
	3427	+
2892	3428	buttonGroup.remove(ab);
2893	3429	radioPanel.remove(ab);
2894	3430
2895		- ab.GetObject().editWindow = null;
	3431	+ //ab.GetObject().editWindow = null;
	3432	+ ab.GetObject().manipWindow = null;
2896	3433	// ab.GetObject().objectUI = null; // ?????????
2897	3434
2898	3435	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2899	3436	break;
2900	3437	}
2901	3438	}
	3439	+
	3440	+ cameraView.requestFocusInWindow();
2902	3441	refreshContents(true);
2903	3442	} else
2904	3443	if (source == editItem \|\| source == editButton)
2905	3444	{
	3445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3446	+ {
	3447	+ Object3D child = (Object3D)e.nextElement();
	3448	+ child.pinned = true;
	3449	+ }
	3450	+
2906	3451	EditSelection(false);
2907	3452	} else
2908	3453	if (source == uneditButton)
..	..	@@ -2912,12 +3457,13 @@
2912	3457	Object3D child = (Object3D)e.nextElement();
2913	3458	if(child.editWindow != null)
2914	3459	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3460	+ child.pinned = false;
2915	3461	child.CloseUI();
2916	3462	listUI.remove(child);
2917	3463
2918		- child.editWindow = null; // ???????????
	3464	+ //child.editWindow = null; // ???????????
2919	3465	}
2920		- objEditor.ctrlPanel.validate();
	3466	+ objEditor.ctrlPanel.FlushUI();
2921	3467	//objEditor.jTree.clearSelection();
2922	3468	//objEditor.ResetSliders();
2923	3469	refreshContents(true);
..	..	@@ -2928,6 +3474,7 @@
2928	3474	//copy.ClearUI();
2929	3475	for (Object3D obj : listUI)
2930	3476	{
	3477	+ obj.pinned = false;
2931	3478	obj.CloseUI();
2932	3479	}
2933	3480	listUI.clear();
..	..	@@ -2937,7 +3484,7 @@
2937	3484	{
2938	3485	assert(copy == group);
2939	3486
2940		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3487	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2941	3488
2942	3489	for (Object3D obj : listUI)
2943	3490	{
..	..	@@ -2986,6 +3533,9 @@
2986	3533	}
2987	3534
2988	3535	copy = group;
	3536	+
	3537	+ SetUndoStates();
	3538	+
2989	3539	//Globals.theRenderer.object = group;
2990	3540	if(!useclient)
2991	3541	{
..	..	@@ -3001,20 +3551,46 @@
3001	3551	frontView.object = group;
3002	3552	sideView.object = group;
3003	3553	}
3004		- group.editWindow = this;
	3554	+
	3555	+// fix "+" issue
	3556	+ //group.editWindow = this;
	3557	+ group.manipWindow = this;
	3558	+
3005	3559	/*
3006	3560	currentLayout = radio.layout;
3007	3561	if (currentLayout == null)
3008	3562	currentLayout = sevenButton;
3009	3563	*/
3010	3564	radio.layout.doClick();
	3565	+
	3566	+ ClearUnpinned();
	3567	+ //Grafreed.Assert(group != null);
	3568	+ //Grafreed.Assert(group.selection != null);
	3569	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3570	+ if (group.selection == null \|\| group.selection.size() == 1)
	3571	+ EditSelection(false);
3011	3572	keepparent = group.parent;
3012	3573	// PARENT = NULL or not???
3013	3574	//group.parent = null; // ROOT
3014	3575	//group.attributes = -1;
3015	3576	ResetModel();
	3577	+
	3578	+ cameraView.requestFocusInWindow();
3016	3579	refreshContents(true);
3017		- }
	3580	+ } else if (event.getSource() == editCameraItem)
	3581	+ {
	3582	+ cameraView.ProtectCamera();
	3583	+ cameraView.repaint();
	3584	+ return;
	3585	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3586	+ {
	3587	+ cameraView.RevertCamera();
	3588	+ cameraView.repaint();
	3589	+ return;
	3590	+ // } else if (event.getSource() == textureButton)
	3591	+ // {
	3592	+ // return; // true;
	3593	+ }
3018	3594	else
3019	3595	{
3020	3596	//return super.action(event, arg);
..	..	@@ -3023,7 +3599,6 @@
3023	3599	}
3024	3600
3025	3601	boolean useclient = false;
3026		- cRadio radio;
3027	3602
3028	3603	void ToggleRoot()
3029	3604	{
..	..	@@ -3075,6 +3650,28 @@
3075	3650	refreshContents();
3076	3651	}
3077	3652
	3653	+ void TransformChildren()
	3654	+ {
	3655	+ Object3D obj;
	3656	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3657	+ {
	3658	+ obj = (Object3D)e.nextElement();
	3659	+ obj.KeepTextureMatrices();
	3660	+ obj.TransformChildren();
	3661	+ obj.RestoreTextureMatrices();
	3662	+
	3663	+// if (obj.parent == null)
	3664	+// {
	3665	+// System.out.println("NULL PARENT!");
	3666	+// new Exception().printStackTrace();
	3667	+// }
	3668	+// else
	3669	+// TouchTransform(obj);
	3670	+// //obj.parent.Touch();
	3671	+ }
	3672	+
	3673	+ refreshContents();
	3674	+ }
3078	3675
3079	3676	void ResetTransform()
3080	3677	{
..	..	@@ -3187,7 +3784,7 @@
3187	3784	refreshContents();
3188	3785	}
3189	3786
3190		- void ResetCentroid()
	3787	+ void ResetCentroid(boolean full)
3191	3788	{
3192	3789	Object3D obj;
3193	3790	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3202,12 +3799,16 @@
3202	3799	LA.matIdentity(Object3D.mat);
3203	3800	obj.getBounds(minima, maxima, false);
3204	3801	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3205		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3802	+ if (full)
	3803	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3206	3804	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3207	3805	obj.TransformMesh(Object3D.mat);
	3806	+
3208	3807	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3209		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3808	+ if (full)
	3809	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3210	3810	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3811	+
3211	3812	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3212	3813	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3213	3814	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3236,7 +3837,8 @@
3236	3837
3237	3838	int size = obj.MemorySize();
3238	3839
3239		- System.err.println((size/1024) + " KB is the size of " + obj);
	3840	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3841	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3240	3842	}
3241	3843	}
3242	3844	catch (Exception e)
..	..	@@ -3273,9 +3875,9 @@
3273	3875	obj = (Object3D)e.nextElement();
3274	3876
3275	3877	System.out.println("Object is: " + obj);
3276		- GrafreeD.AnalyzeObject(obj);
	3878	+ Grafreed.AnalyzeObject(obj);
3277	3879	System.out.println("Boundary rep: " + obj.bRep);
3278		- GrafreeD.AnalyzeObject(obj.bRep);
	3880	+ Grafreed.AnalyzeObject(obj.bRep);
3279	3881
3280	3882	// System.err.println((size/1024) + " KB is the size of " + obj);
3281	3883	}
..	..	@@ -3317,6 +3919,13 @@
3317	3919	void GenNormals(boolean crease)
3318	3920	{
3319	3921	group.GenNormalsS(crease);
	3922	+
	3923	+ refreshContents();
	3924	+ }
	3925	+
	3926	+ void GenNormalsMESH()
	3927	+ {
	3928	+ group.GenNormalsMeshS();
3320	3929
3321	3930	refreshContents();
3322	3931	}
..	..	@@ -3489,8 +4098,8 @@
3489	4098
3490	4099	void ParseVertices()
3491	4100	{
3492		- boolean epsequal = GrafreeD.epsequal;
3493		- GrafreeD.epsequal = true;
	4101	+ boolean epsequal = Grafreed.epsequal;
	4102	+ Grafreed.epsequal = true;
3494	4103
3495	4104	for (int i=0; i<group.selection.size(); i++)
3496	4105	{
..	..	@@ -3515,7 +4124,7 @@
3515	4124	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3516	4125	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3517	4126
3518		- g.add(GrafreeD.clipboard);
	4127	+ g.add(Grafreed.clipboard);
3519	4128
3520	4129	buffer.add(g);
3521	4130	}
..	..	@@ -3530,7 +4139,7 @@
3530	4139	makeSomething(buffer, i==group.selection.size()-1);
3531	4140	}
3532	4141
3533		- GrafreeD.epsequal = epsequal;
	4142	+ Grafreed.epsequal = epsequal;
3534	4143
3535	4144	refreshContents();
3536	4145	}
..	..	@@ -3548,7 +4157,16 @@
3548	4157	String pigment = Object3D.GetPigment(tex);
3549	4158	//String bump = Object3D.GetBump(tex);
3550	4159
3551		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4160	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4161	+
	4162	+ try
	4163	+ {
	4164	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4165	+ }
	4166	+ catch (Exception e)
	4167	+ {
	4168	+ System.err.println("FAIL: " + node);
	4169	+ }
3552	4170
3553	4171	double s = v.s;
3554	4172
..	..	@@ -3636,11 +4254,11 @@
3636	4254
3637	4255	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3638	4256
3639		- boolean random = CameraPane.RANDOM;
3640		- CameraPane.RANDOM = false; // parse all random nodes
	4257	+ boolean random = CameraPane.SWITCH;
	4258	+ CameraPane.SWITCH = false; // parse all random nodes
3641	4259	lowres.linkVerticesThis(null);
3642	4260	lowres.linkVerticesThis(sn);
3643		- CameraPane.RANDOM = random;
	4261	+ CameraPane.SWITCH = random;
3644	4262
3645	4263	System.err.flush();
3646	4264
..	..	@@ -3680,7 +4298,7 @@
3680	4298	return;
3681	4299
3682	4300	Object3D poses = group.selection.get(0);
3683		- Object3D ref = GrafreeD.clipboard.get(0);
	4301	+ Object3D ref = Grafreed.clipboard.get(0);
3684	4302
3685	4303	Object3D newgroup = new Object3D("Po:" + poses.name);
3686	4304
..	..	@@ -3874,9 +4492,9 @@
3874	4492
3875	4493	void ClipMesh()
3876	4494	{
3877		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4495	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3878	4496	{
3879		- Object3D content = GrafreeD.clipboard.get(0);
	4497	+ Object3D content = Grafreed.clipboard.get(0);
3880	4498
3881	4499	if (content instanceof cGroup && ((cGroup)content).transientlink )
3882	4500	content = ((cGroup)content).get(0);
..	..	@@ -3885,7 +4503,7 @@
3885	4503	// {
3886	4504	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3887	4505	// }
3888		- group.selection.ClipMesh(GrafreeD.clipboard);
	4506	+ group.selection.ClipMesh(Grafreed.clipboard);
3889	4507	}
3890	4508	// group.selection.ClipMesh(GrafreeD.clipboard);
3891	4509	System.out.println("DONE.");
..	..	@@ -3932,6 +4550,18 @@
3932	4550	void MarkLeaves(boolean hide)
3933	4551	{
3934	4552	group.selection.MarkLeaves(hide);
	4553	+ refreshContents();
	4554	+ }
	4555	+
	4556	+ void RewindLeaves(boolean hide)
	4557	+ {
	4558	+ group.selection.RewindLeaves(hide);
	4559	+ refreshContents();
	4560	+ }
	4561	+
	4562	+ void RandomLeaves(boolean hide)
	4563	+ {
	4564	+ group.selection.RandomLeaves(hide);
3935	4565	refreshContents();
3936	4566	}
3937	4567
..	..	@@ -4006,28 +4636,25 @@
4006	4636	// }
4007	4637	// }
4008	4638
4009		- static boolean allparams = true;
4010		-
4011		- static Vector<Object3D> listUI = new Vector<Object3D>();
4012		-
4013	4639	void EditSelection(boolean newWindow)
4014	4640	{
	4641	+ if (group.selection == null)
	4642	+ {
	4643	+ EditElement(group, newWindow); // ? new
	4644	+ return;
	4645	+ }
	4646	+
4015	4647	// aConstraints.gridy = 0;
4016	4648	for (int i=0; i<group.selection.size(); i++)
4017	4649	{
4018	4650	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4019	4651	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4020		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4652	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4021	4653
4022	4654	Object3D elem = (Object3D)group.selection.elementAt(i);
4023		- if(elem != group)
	4655	+ if(elem != group \|\| !newWindow)
4024	4656	{
4025		- // if (!(elem instanceof Composite))
4026		- // newWindow = false;
4027		- listUI.add(elem);
4028		- elem.openEditWindow(this, newWindow); //, false);
4029		- System.out.println("edit : " + elem);
4030		- elem.editWindow.refreshContents(true); // ? new
	4657	+ EditElement(elem, newWindow); // ? new
4031	4658	}
4032	4659	}
4033	4660	}
..	..	@@ -4102,7 +4729,8 @@
4102	4729	//new Exception().printStackTrace();
4103	4730
4104	4731	freezemodel = true;
4105		-
	4732	+ ClearUnpinned();
	4733	+
4106	4734	/**/
4107	4735	//switch (event.id)
4108	4736	{
..	..	@@ -4110,7 +4738,6 @@
4110	4738	//case 702: // Event.LIST_DESELECT
4111	4739	group.deselectAll();
4112	4740	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4113		- objEditor.ClearInfo(); // .GetMaterial());
4114	4741	if (tps != null)
4115	4742	{
4116	4743	for (int i=0; i < tps.length; i++)
..	..	@@ -4119,33 +4746,39 @@
4119	4746
4120	4747	//if (child.parent != null)
4121	4748	//child.parent.addSelectee(child);
	4749	+ objEditor.SetMaterial(child);
4122	4750	group.addSelectee(child);
4123		- objEditor.SetMaterial(child); // .GetMaterial());
4124		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4125		- System.err.println("info : " + child.GetPath());
4126	4751	}
4127	4752	}
4128		- else
4129		- {
4130		- objEditor.SetMaterial(group); // .GetMaterial());
4131		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4132		- System.err.println("info : " + group.GetPath());
4133		- }
	4753	+// else
	4754	+// {
	4755	+// objEditor.SetMaterial(group); // .GetMaterial());
	4756	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4757	+// System.err.println("info : " + group.GetPath());
	4758	+// }
4134	4759
4135		- objEditor.SetText(); // jan 2014
4136		-
4137		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4760	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4138	4761	CameraPane.flash = true;
4139	4762
4140		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4763	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4141	4764	// a camera
4142	4765	{
4143		- CameraPane.camerachangeframe = 0; // don't refuse it
4144		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4766	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4767	+ {
	4768	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4769	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4770	+ }
4145	4771	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4146	4772	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4147	4773	}
4148	4774
	4775	+ if (tps != null && tps.length == 1)
	4776	+ {
	4777	+ EditSelection(false);
	4778	+ }
	4779	+
	4780	+ SetPinStates(tps != null && tps.length > 0);
	4781	+
4149	4782	refreshContents();
4150	4783	//return true;
4151	4784	}
..	..	@@ -4154,6 +4787,35 @@
4154	4787
4155	4788	freezemodel = false;
4156	4789	}
	4790	+
	4791	+ void SetPinStates(boolean enabled)
	4792	+ {
	4793	+ editButton.setEnabled(enabled);
	4794	+ uneditButton.setEnabled(enabled);
	4795	+ unselectButton.setEnabled(enabled);
	4796	+ flashSelectionButton.setEnabled(enabled);
	4797	+ }
	4798	+
	4799	+ void refreshContents(boolean cp)
	4800	+ {
	4801	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4802	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4803	+ {
	4804	+ objEditor.ClearInfo(); // .GetMaterial());
	4805	+
	4806	+ for (int i=0; i < group.selection.Size(); i++)
	4807	+ {
	4808	+ Object3D child = (Object3D) group.selection.get(i);
	4809	+
	4810	+ objEditor.AddInfo(child, this, true);
	4811	+ System.err.println("info : " + child.GetPath());
	4812	+ }
	4813	+
	4814	+ objEditor.SetText(); // jan 2014
	4815	+ }
	4816	+
	4817	+ super.refreshContents(cp);
	4818	+ }
4157	4819
4158	4820	void linkSomething(Object3D thing)
4159	4821	{
..	..	@@ -4225,16 +4887,19 @@
4225	4887	{
4226	4888	if (group.selection.isEmpty())
4227	4889	return;
4228		- GrafreeD.clipboardIsTempGroup = false;
	4890	+
	4891	+ Grafreed.clipboardIsTempGroup = false;
4229	4892	Composite tGroup = null;
4230	4893	if (group.selection.size() > 0) // 1)
4231	4894	{
4232	4895	tGroup = new cGroup();
4233		- GrafreeD.clipboardIsTempGroup = true;
	4896	+ Grafreed.clipboardIsTempGroup = true;
4234	4897	}
4235	4898
4236	4899	if (cut)
4237	4900	{
	4901	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4902	+// Save();
4238	4903	//int indices[] = jList.getSelectedIndices();
4239	4904	//for (int i = indices.length - 1; i >= 0; i--)
4240	4905	//jList.remove(indices[i]);
..	..	@@ -4270,16 +4935,16 @@
4270	4935	//System.out.println("cut " + child);
4271	4936	//System.out.println("parent = " + child.parent);
4272	4937	// tmp.addChild(child);
4273		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4274	4939	tGroup.add/Child/(tmp);
4275	4940	else
4276		- GrafreeD.clipboard = tmp;
	4941	+ Grafreed.clipboard = tmp;
4277	4942	}
4278	4943	else
4279		- if (GrafreeD.clipboardIsTempGroup)
	4944	+ if (Grafreed.clipboardIsTempGroup)
4280	4945	tGroup.add/Child/(child);
4281	4946	else
4282		- GrafreeD.clipboard = child;
	4947	+ Grafreed.clipboard = child;
4283	4948	}
4284	4949
4285	4950	//ResetModel();
..	..	@@ -4311,21 +4976,23 @@
4311	4976	//System.out.println("cut " + elem);
4312	4977	//System.out.println("parent = " + elem.parent);
4313	4978	// tmp.addChild(elem);
4314		- if (GrafreeD.clipboardIsTempGroup)
	4979	+ if (Grafreed.clipboardIsTempGroup)
4315	4980	tGroup.add/Child/(tmp);
4316	4981	else
4317		- GrafreeD.clipboard = tmp;
	4982	+ Grafreed.clipboard = tmp;
4318	4983	}
4319	4984	else
4320		- if (GrafreeD.clipboardIsTempGroup)
	4985	+ if (Grafreed.clipboardIsTempGroup)
4321	4986	tGroup.add/Child/(child);
4322	4987	else
4323		- GrafreeD.clipboard = child;
	4988	+ Grafreed.clipboard = child;
4324	4989	}
4325	4990
4326	4991	}
4327		- if (GrafreeD.clipboardIsTempGroup)
4328		- GrafreeD.clipboard = tGroup;
	4992	+
	4993	+ if (Grafreed.clipboardIsTempGroup)
	4994	+ Grafreed.clipboard = tGroup;
	4995	+
4329	4996	if (cut)
4330	4997	{
4331	4998	ResetModel();
..	..	@@ -4335,11 +5002,15 @@
4335	5002
4336	5003	void paste(boolean expand)
4337	5004	{
	5005	+ if (Globals.REPLACEONMAKE)
	5006	+ Save();
	5007	+ boolean keep = Globals.REPLACEONMAKE;
	5008	+ Globals.REPLACEONMAKE = false;
4338	5009	// if (GrafreeD.clipboard == null)
4339	5010	// return;
4340	5011	boolean first = true;
4341	5012
4342		- if (GrafreeD.clipboardIsTempGroup)
	5013	+ if (Grafreed.clipboardIsTempGroup)
4343	5014	{
4344	5015	Composite temp;
4345	5016
..	..	@@ -4350,7 +5021,7 @@
4350	5021	temp = (Composite)Applet3D.clipboard.deepCopy();
4351	5022	*/
4352	5023	Object3D elem;
4353		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5024	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4354	5025	{
4355	5026	Object3D child = (Object3D)e.nextElement();
4356	5027
..	..	@@ -4384,21 +5055,22 @@
4384	5055	//Object3D cb = Applet3D.clipboard;
4385	5056	//temp.addChild(cb);
4386	5057	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4387		- assert(GrafreeD.clipboard.parent == null);
4388		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4389		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4390		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4391		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5058	+ assert(Grafreed.clipboard.parent == null);
	5059	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5060	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5061	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5062	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4392	5063	else
4393		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4394		- GrafreeD.clipboard.get(0).parent = keepparent;
	5064	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5065	+ Grafreed.clipboard.get(0).parent = keepparent;
4395	5066	}
4396	5067
	5068	+ Globals.REPLACEONMAKE = keep;
4397	5069	ResetModel();
4398	5070	refreshContents();
4399	5071	}
4400	5072
4401		- void pasteInto(boolean copyit)
	5073	+ void pasteInto(boolean copyit, boolean clone)
4402	5074	{
4403	5075	// if (GrafreeD.clipboard == null)
4404	5076	// return;
..	..	@@ -4427,15 +5099,22 @@
4427	5099	if (copyit)
4428	5100	{
4429	5101	// paste(false);
4430		- CloneClipboard(false); // sept 2014
	5102	+ if (clone)
	5103	+ {
	5104	+ CloneClipboard(false); // sept 2014
	5105	+ }
	5106	+ else
	5107	+ {
	5108	+ paste(false);
	5109	+ }
4431	5110	}
4432	5111	else
4433	5112	{
4434	5113	boolean first = true;
4435	5114
4436		- if (GrafreeD.clipboardIsTempGroup)
	5115	+ if (Grafreed.clipboardIsTempGroup)
4437	5116	{
4438		- Composite temp = (Composite)GrafreeD.clipboard;
	5117	+ Composite temp = (Composite)Grafreed.clipboard;
4439	5118	Object3D copy;
4440	5119	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4441	5120	{
..	..	@@ -4445,7 +5124,7 @@
4445	5124	}
4446	5125	} else
4447	5126	{
4448		- linkSomething(GrafreeD.clipboard); //.get(0));
	5127	+ linkSomething(Grafreed.clipboard); //.get(0));
4449	5128	}
4450	5129	}
4451	5130	}
..	..	@@ -4522,6 +5201,10 @@
4522	5201
4523	5202	void group(Object3D csg, boolean grab)
4524	5203	{
	5204	+ if (Globals.REPLACEONMAKE)
	5205	+ Save();
	5206	+ boolean keep = Globals.REPLACEONMAKE;
	5207	+ Globals.REPLACEONMAKE = false;
4525	5208	if (//false) // why??
4526	5209	!group.selection.isEmpty())
4527	5210	{
..	..	@@ -4635,10 +5318,15 @@
4635	5318	//node.add(csg);
4636	5319	//makeSomething(node);
4637	5320	makeSomething(csg);
	5321	+ Globals.REPLACEONMAKE = keep;
4638	5322	}
4639	5323
4640	5324	void Ungroup(Object3D g)
4641	5325	{
	5326	+ if (Globals.REPLACEONMAKE)
	5327	+ Save();
	5328	+ boolean keep = Globals.REPLACEONMAKE;
	5329	+ Globals.REPLACEONMAKE = false;
4642	5330	if (g instanceof HiddenObject)
4643	5331	{
4644	5332	HiddenObject h = (HiddenObject) g;
..	..	@@ -4655,6 +5343,7 @@
4655	5343	objEditor.makeSomething(g.get(i), false);
4656	5344	}
4657	5345	}
	5346	+ Globals.REPLACEONMAKE = keep;
4658	5347	}
4659	5348
4660	5349	void ungroup()
..	..	@@ -4850,21 +5539,6 @@
4850	5539	}
4851	5540	*/
4852	5541
4853		- void ImportGFD()
4854		- {
4855		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4856		- browser.show();
4857		- String filename = browser.getFile();
4858		- if (filename != null && filename.length() > 0)
4859		- {
4860		- String fullname = browser.getDirectory() + filename;
4861		-
4862		- //Object3D readobj =
4863		- objEditor.ReadGFD(fullname, objEditor);
4864		- //makeSomething(readobj);
4865		- }
4866		- }
4867		-
4868	5542	/*
4869	5543	public void Callback(Object obj)
4870	5544	{
..	..	@@ -4888,26 +5562,9 @@
4888	5562	}
4889	5563	*/
4890	5564
4891		- void ImportVRMLX3D()
4892		- {
4893		- if (GrafreeD.standAlone)
4894		- {
4895		- /**/
4896		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4897		- browser.show();
4898		- String filename = browser.getFile();
4899		- if (filename != null && filename.length() > 0)
4900		- {
4901		- String fullname = browser.getDirectory() + filename;
4902		- LoadVRMLX3D(fullname);
4903		- }
4904		- /**/
4905		- }
4906		- }
4907		-
4908	5565	String GetFile(String dialogName)
4909	5566	{
4910		- if (GrafreeD.standAlone)
	5567	+ if (Grafreed.standAlone)
4911	5568	{
4912	5569	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4913	5570	browser.show();
..	..	@@ -4971,10 +5628,33 @@
4971	5628	cButton flashSelectionButton;
4972	5629	cButton editButton;
4973	5630	cButton uneditButton;
	5631	+ JCheckBox allParamsButton;
4974	5632	cButton clearpanelButton;
4975		- cButton allParamsButton;
4976	5633	cButton unselectButton;
4977	5634
	5635	+ cButton restoreCameraButton;
	5636	+
	5637	+ cButton saveButton;
	5638	+ cButton oneStepButton;
	5639	+
	5640	+ cButton groupButton;
	5641	+ cButton ungroupButton;
	5642	+ cButton compositeButton;
	5643	+ cButton switchButton;
	5644	+ cButton loopButton;
	5645	+ cButton textureButton;
	5646	+
	5647	+ cButton gridButton;
	5648	+ cButton boxButton;
	5649	+ cButton sphereButton;
	5650	+ cButton coneButton;
	5651	+ cButton torusButton;
	5652	+ cButton superButton;
	5653	+ cButton kleinButton;
	5654	+ cButton particlesButton;
	5655	+ cButton overlayButton;
	5656	+ cButton lightButton;
	5657	+
4978	5658	cButton screenfitButton;
4979	5659	cButton screenfitpointButton;
4980	5660	cButton snapobjectButton;
..	..	@@ -4986,14 +5666,6 @@
4986	5666
4987	5667	cButton setsupportButton;
4988	5668
4989		- cButton twoButton;
4990		- cButton sixButton;
4991		- cButton threeButton;
4992		- cButton sevenButton;
4993		- cButton fourButton; // full panel
4994		- cButton oneButton; // full XYZ
4995		- //cButton currentLayout;
4996		-
4997	5669	//
4998	5670	//Composite
4999	5671	Object3D // to do !!
..	..	@@ -5003,9 +5675,11 @@
5003	5675	//JTree jTree;
5004	5676	private MenuItem lookAtItem;
5005	5677	private MenuItem lookFromItem;
5006		- private MenuItem switchItem;
	5678	+ private MenuItem switchViewItem;
5007	5679	private MenuItem cutItem;
5008		- private MenuItem duplicateItem;
	5680	+ private MenuItem undoItem;
	5681	+ private MenuItem redoItem;
	5682	+ private JMenuItem duplicateItem;
5009	5683	private MenuItem cloneItem;
5010	5684	private MenuItem cloneSupportItem;
5011	5685	private MenuItem overwriteGeoItem;
..	..	@@ -5018,7 +5692,7 @@
5018	5692	private MenuItem linkverticesItem;
5019	5693	private MenuItem relinkverticesItem;
5020	5694	private MenuItem setMasterItem;
5021		- private MenuItem resetMeshItem;
	5695	+ private MenuItem resetAllItem;
5022	5696	private MenuItem stepAllItem;
5023	5697	private MenuItem revertMeshItem;
5024	5698	private MenuItem poseMeshItem;
..	..	@@ -5029,10 +5703,11 @@
5029	5703	private MenuItem mergeGeometriesItem;
5030	5704	private MenuItem copyItem;
5031	5705	private MenuItem pasteItem;
	5706	+ private MenuItem pasteIntoItem;
5032	5707	private MenuItem pasteLinkItem;
5033	5708	private MenuItem pasteCloneItem;
5034	5709	private MenuItem pasteExpandItem;
5035		- private MenuItem clearItem;
	5710	+ private MenuItem deleteItem;
5036	5711	private MenuItem clearAllItem;
5037	5712	private MenuItem genUVItem;
5038	5713	private MenuItem genNormalsMESHItem;
..	..	@@ -5067,6 +5742,10 @@
5067	5742	private MenuItem showleavesItem;
5068	5743	private MenuItem markleavesItem;
5069	5744	private MenuItem unmarkleavesItem;
	5745	+ private MenuItem rewindleavesItem;
	5746	+ private MenuItem unrewindleavesItem;
	5747	+ private MenuItem randomleavesItem;
	5748	+ private MenuItem unrandomleavesItem;
5070	5749
5071	5750	private MenuItem flipVItem;
5072	5751	private MenuItem unflipVItem;
..	..	@@ -5078,15 +5757,17 @@
5078	5757	private MenuItem panoTexturesItem;
5079	5758
5080	5759	private MenuItem resetCentroidItem;
5081		- private MenuItem transformgeometryItem;
	5760	+ private MenuItem resetCentroidXZItem;
5082	5761	private MenuItem resetTransformItem;
	5762	+ private MenuItem transformGeometryItem;
	5763	+ private MenuItem transformChildrenItem;
5083	5764	private MenuItem hideItem;
5084	5765	private MenuItem grabItem;
5085	5766	private MenuItem backItem;
5086	5767	private MenuItem frontItem;
5087	5768	private MenuItem cameraItem;
5088	5769	private MenuItem compositeItem;
5089		- private MenuItem randomItem;
	5770	+ private MenuItem switchItem;
5090	5771	private MenuItem physicsItem;
5091	5772	private MenuItem frameselectorItem;
5092	5773	private MenuItem scriptNodeItem;
..	..	@@ -5126,7 +5807,7 @@
5126	5807	private MenuItem blobItem;
5127	5808	private MenuItem latheItem;
5128	5809	private MenuItem bezierItem;
5129		- private MenuItem checkerItem;
	5810	+ private MenuItem overlayItem;
5130	5811	private MenuItem meshItem;
5131	5812	// private MenuItem meshGroupItem;
5132	5813	private MenuItem springItem;
..	..	@@ -5148,11 +5829,6 @@
5148	5829	private MenuItem doubleItem;
5149	5830	private MenuItem tripleItem;
5150	5831
5151		- private MenuItem importGFDItem;
5152		- private MenuItem importVRMLX3DItem;
5153		- private MenuItem import3DSItem;
5154		- private MenuItem importOBJItem;
5155		-
5156	5832	private MenuItem computeAOItem;
5157	5833	private MenuItem recompileItem;
5158	5834	private MenuItem editScriptItem;
..	..	@@ -5162,4 +5838,8 @@
5162	5838	private MenuItem analyzeItem;
5163	5839	private MenuItem dumpItem;
5164	5840	//boolean freezemodel = false;
	5841	+
	5842	+ Menu cameraMenu;
	5843	+ MenuItem editCameraItem;
	5844	+ MenuItem restoreCameraItem;
5165	5845	}