~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);
	208	+ menu.add("-");
188	209	clearItem = menu.add(new MenuItem("Clear"));
189	210	clearItem.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);
	434	+ if (Globals.ADVANCED)
	435	+ {
297	436	genNormalsMINEItem = menu.add(new MenuItem("My 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,98 +599,230 @@
434	599	oe.radioPanel.add(dummyButton);
435	600	oe.buttonGroup.add(dummyButton);
436	601	*/
	602	+ cGridBag copyOptionsPanel = new cGridBag();
	603	+
	604	+ copyOptionsPanel.preferredHeight = 1;
	605	+
437	606	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	607
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE()), oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
441		- liveCB.addItemListener(this);
442		-
443		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK), oe.aConstraints);
444		- trackCB.setToolTipText("Enable tracking");
445		- trackCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	608	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ //minButton.setToolTipText("Minimize window");
	610	+ //minButton.addActionListener(this);
	611	+
	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);
448	624	screenfitButton.setToolTipText("Screen fit");
449	625	screenfitButton.addActionListener(this);
450	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	+
451	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
452	677	// screenfitpointButton.addActionListener(this);
453		-// oe.aConstraints.gridx += 1;
454		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
455		- snapobjectButton.addActionListener(this);
456		- snapobjectButton.setToolTipText("Snap Object");
457		- oe.aConstraints.gridx += 1;
458	678
459		- //aConstraints.gridx = 0;
460		- //aConstraints.gridy += 1;
461		- oe.aConstraints.weighty = 0;
462		- oe.aConstraints.gridwidth = 1;
463		-
464		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
465		- flashSelectionButton.setToolTipText("Show selection");
466		- 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));
467	687
468		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
469		-
470		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
471	689	twoButton.setToolTipText("Show center view only");
472	690	twoButton.addActionListener(this);
473		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	691	+ this.fullscreenLayout = twoButton;
	692	+
	693	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
474	694	fourButton.addActionListener(this);
475	695	fourButton.setToolTipText("Show left panel only");
476		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
477	697	sixButton.setToolTipText("2-column layout left");
478	698	sixButton.addActionListener(this);
479		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
480	700	threeButton.setToolTipText("2-column layout right");
481	701	threeButton.addActionListener(this);
482		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
483	703	sevenButton.setToolTipText("3-column layout");
484	704	sevenButton.addActionListener(this);
485	705	//
486	706
487		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
488		- rootButton.setToolTipText("Edit object in new tab");
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ rootButton.setToolTipText("Edit selection in new tab");
489	709	rootButton.addActionListener(this);
490		- oe.aConstraints.gridx += 1;
491		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	710	+
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	712	closeButton.setToolTipText("Close tab");
493	713	closeButton.addActionListener(this);
494	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
495	715	//clearButton.addActionListener(this);
496		- oe.aConstraints.gridx += 1;
497		-
498		- oe.aConstraints.gridx = 1; //
499		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
500		- editButton.addActionListener(this);
501		- oe.aConstraints.gridx += 1;
502		- oe.aConstraints.weighty = 0;
503		- oe.aConstraints.gridwidth = 1;
504	716
505		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	717	+ // INSERT
	718	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ gridButton.setToolTipText("Create grid");
	720	+ gridButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ boxButton.setToolTipText("Create box");
	724	+ boxButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ sphereButton.setToolTipText("Create sphere");
	728	+ sphereButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ coneButton.setToolTipText("Create cone");
	732	+ coneButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ torusButton.setToolTipText("Create torus");
	736	+ torusButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ superButton.setToolTipText("Create superellipsoid");
	740	+ superButton.addActionListener(this);
	741	+
	742	+ if (Globals.ADVANCED)
	743	+ {
	744	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ kleinButton.setToolTipText("Create Klein bottle");
	746	+ kleinButton.addActionListener(this);
	747	+ }
	748	+
	749	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	750	+ particlesButton.setToolTipText("Create particle system");
	751	+ particlesButton.addActionListener(this);
	752	+
	753	+ oe.toolboxPanel.Return();
	754	+
	755	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ groupButton.setToolTipText("Create group");
	757	+ groupButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ compositeButton.setToolTipText("Create composite");
	761	+ compositeButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ switchButton.setToolTipText("Create item switcher");
	765	+ switchButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ loopButton.setToolTipText("Create loop");
	769	+ loopButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ textureButton.setToolTipText("Create texture");
	773	+ textureButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ overlayButton.setToolTipText("Create overlay");
	777	+ overlayButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ lightButton.setToolTipText("Create light");
	781	+ lightButton.addActionListener(this);
	782	+
	783	+ for (int i=6; --i>=0;)
	784	+ {
	785	+ oe.toolboxPanel.Return();
	786	+ oe.toolboxPanel.add(new cGridBag());
	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	+ }
	794	+
	795	+ // EDIT panel
	796	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ editButton.setToolTipText("Pin selection controls");
	798	+ editButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
506	802	uneditButton.addActionListener(this);
507	803
508		- oe.aConstraints.gridx += 1;
509		- oe.aConstraints.weighty = 0;
510		- oe.aConstraints.gridwidth = 1;
511		-
512		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
513		- clearPanelButton.addActionListener(this);
514		-
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
518		-
519		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
520	806	allParamsButton.addActionListener(this);
521	807
522		- oe.aConstraints.gridx += 1;
523		- oe.aConstraints.weighty = 0;
524		- oe.aConstraints.gridwidth = 1;
525		-
526		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ clearPanelButton.setToolTipText("Clear edit panel");
	810	+ clearPanelButton.addActionListener(this);
	811	+
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	813	+ unselectButton.setToolTipText("Unselect");
527	814	unselectButton.addActionListener(this);
528	815
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
	819	+
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
	825	+
529	826	// oe.aConstraints.gridx += 1;
530	827	// oe.aConstraints.weighty = 0;
531	828	// oe.aConstraints.gridwidth = 1;
..	..	@@ -537,40 +834,25 @@
537	834	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
538	835	// gcButton.addActionListener(this);
539	836
540		- oe.aConstraints.gridx = 0;
541		- oe.aConstraints.gridy += 1;
542		-
543		- //ctrlPanel.add(objList = new List(5, true));
544		- oe.aConstraints.gridwidth = 100;
545		- // oe.aConstraints.gridheight = 100;
546		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
547		- oe.aConstraints.gridheight = 1;
548		- oe.aConstraints.weighty = 0.5;
549		- oe.aConstraints.gridx = 0;
550		- JScrollPane jSP;
	837	+ cGridBag jSPPanel = new cGridBag();
	838	+
	839	+ JScrollPane jSP;
551	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
552		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
553	842	ResetModel();
554		- oe.aConstraints.weighty = 0.5;
555		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
556		- oe.aConstraints.gridy += 1;
557		- oe.aConstraints.gridwidth = 1;
558		-
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 2;
561		-
562		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
563		- colorCB.addItemListener(this);
564		- oe.aConstraints.gridx += 2;
565		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
566		- materialCB.addItemListener(this);
567		- oe.aConstraints.gridx += 2;
568		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
569		- textureCB.addItemListener(this);
570		-
571		- oe.aConstraints.gridx = 0;
572		- oe.aConstraints.gridy += 1;
573	843
	844	+ oe.treePanel.add(jSPPanel);
	845	+ oe.treePanel.Return();
	846	+
	847	+ oe.treePanel.add(copyOptionsPanel);
	848	+ oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
	852	+
	853	+// mainPanel.setDividerLocation(0.5); //1.0);
	854	+// mainPanel.setResizeWeight(0.5);
	855	+
574	856	//jList.addListSelectionListener(this);
575	857	oe.jTree.addTreeSelectionListener(this);
576	858	//jTree.setRootVisible(false);
..	..	@@ -595,47 +877,61 @@
595	877
596	878	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
597	879	{
598		- //constraints.gridx = 0;
599		- //constraints.gridy = 0;
600		- panel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
601		- fastCB.setToolTipText("Fast mode");
602		- fastCB.addItemListener(this);
603		- //constraints.gridy += 1;
604		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
605		- supportCB.setToolTipText("Enabled rigging");
606		- supportCB.addItemListener(this);
	880	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	881	+ colorCB.setToolTipText("Copy color when dropped");
	882	+ colorCB.addItemListener(this);
607	883
608		- // constraints.gridy += 1;
	884	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	885	+ materialCB.setToolTipText("Copy material when dropped");
	886	+ materialCB.addItemListener(this);
	887	+
	888	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	889	+ textureCB.setToolTipText("Copy texture when dropped");
	890	+ textureCB.addItemListener(this);
	891	+
	892	+ panel.Return();
	893	+
	894	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	895	+ boxCB.setToolTipText("Display bounding boxes");
	896	+ boxCB.addItemListener(this);
	897	+
	898	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	899	+ zoomBoxCB.setToolTipText("Display only for wheel");
	900	+ zoomBoxCB.addItemListener(this);
	901	+
	902	+ if (true) // Globals.ADVANCED)
	903	+ {
	904	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	905	+// supportCB.setToolTipText("Enable rigging");
	906	+// supportCB.addItemListener(this);
	907	+
	908	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	909	+ freezeCB.setToolTipText("Fast moving camera");
	910	+ freezeCB.addItemListener(this);
	911	+
609	912	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
610	913	// localCB.addItemListener(this);
611	914
612		- //constraints.gridy += 1;
	915	+ panel.Return();
	916	+
613	917	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
614	918	crowdCB.setToolTipText("Used for crowds");
615	919	crowdCB.addItemListener(this);
616	920
617		- //constraints.gridy += 1;
618	921	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
619	922	smoothCB.setToolTipText("Snapping delay");
620	923	smoothCB.addItemListener(this);
621	924
622		- //constraints.gridy += 1;
623	925	panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
624	926	slowCB.setToolTipText("Smooth interpolation");
625	927	slowCB.addItemListener(this);
626		- //constraints.gridy += 1;
627		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
628		- boxCB.setToolTipText("Display bounding boxes");
629		- boxCB.addItemListener(this);
630		- //constraints.gridy += 1;
631		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
632		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
633		- zoomBoxCB.addItemListener(this);
634		-
	928	+
635	929	// constraints.gridy += 1;
636	930	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
637	931	// speakerMocapCB.addItemListener(this);
638	932
	933	+ panel.Return();
	934	+
639	935	if (false)
640	936	{
641	937	// handled in scripts
..	..	@@ -650,26 +946,72 @@
650	946	//constraints.gridy += 1;
651	947	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
652	948	smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
653	950	}
654	951
655	952	//constraints.gridx += 1;
656	953	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
657	954	// debugCB.addItemListener(this);
658	955
659		- //constraints.gridy += 1;
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
660	960	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
661	962	oeilCB.addItemListener(this);
662	963
663		- //constraints.gridy += 1;
	964	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	965	+ shadowCB.setToolTipText("When live compute shadows");
	966	+ shadowCB.addItemListener(this);
	967	+
	968	+ panel.Return();
	969	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	970	+ toggleTextureCB.setToolTipText("Load textures");
	971	+ toggleTextureCB.addItemListener(this);
	972	+
	973	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	974	+ toggleSwitchCB.setToolTipText("Choose a single item");
	975	+ toggleSwitchCB.addItemListener(this);
	976	+
	977	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	978	+ autokeepCB.setToolTipText("On structure change");
	979	+ autokeepCB.addItemListener(this);
	980	+
	981	+ panel.Return();
	982	+ if (Globals.ADVANCED)
	983	+ {
664	984	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
665	985	lookAtCB.setToolTipText("Look-at target");
666	986	lookAtCB.addItemListener(this);
	987	+ }
	988	+
	989	+ }
	990	+
	991	+ cGridBag fill = new cGridBag();
	992	+ fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
	997	+
	998	+ panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
667	1001
668	1002	}
669	1003
670	1004	void EditObject(Object3D obj)
671	1005	{
672	1006	cRadio radioButton = new cRadio(obj.name);
	1007	+
	1008	+ // June 2019. Patch to avoid bug with transparency.
	1009	+ radioButton.hadMaterial = obj.material != null;
	1010	+ if (!radioButton.hadMaterial)
	1011	+ {
	1012	+ obj.material = new cMaterial();
	1013	+ }
	1014	+
673	1015	radioButton.SetObject(obj);
674	1016	radioButton.layout = sevenButton;
675	1017	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -678,8 +1020,11 @@
678	1020	buttonGroup.add(radioButton);
679	1021	radioButton.doClick();
680	1022	}
	1023	+
681	1024	void SetupViews(ObjEditor oe)
682	1025	{
	1026	+ theFrame = this;
	1027	+
683	1028	oe.SetupViews();
684	1029
685	1030	System.out.println("SetupViews");
..	..	@@ -688,23 +1033,28 @@
688	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
689	1034	}
690	1035
691		- JCheckBox liveCB;
692		- JCheckBox supportCB;
693		- JCheckBox localCB;
694		- JCheckBox crowdCB;
695		- JCheckBox smoothCB;
696		- JCheckBox fastCB;
697		- JCheckBox slowCB;
698		- JCheckBox boxCB;
699		- JCheckBox zoomBoxCB;
700		- JCheckBox trackCB;
701		- JCheckBox smoothfocusCB;
	1036	+ cToggleButton liveCB;
	1037	+ cCheckBox supportCB;
	1038	+ cCheckBox localCB;
	1039	+ cCheckBox crowdCB;
	1040	+ cCheckBox smoothCB;
	1041	+ cToggleButton fastCB;
	1042	+ cCheckBox slowCB;
	1043	+ cCheckBox boxCB;
	1044	+ cCheckBox zoomBoxCB;
	1045	+ cCheckBox freezeCB;
	1046	+ //cToggleButton trackCB;
	1047	+ cCheckBox trackCB;
	1048	+ cCheckBox smoothfocusCB;
702	1049	// JCheckBox speakerMocapCB;
703		- JCheckBox speakerCameraCB;
704		- JCheckBox speakerFocusCB;
705		- JCheckBox debugCB;
706		- JCheckBox oeilCB;
707		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
708	1058
709	1059	// static int COLOR = 1;
710	1060	// static int MATERIAL = 2;
..	..	@@ -712,9 +1062,9 @@
712	1062
713	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
714	1064
715		- JCheckBox colorCB;
716		- JCheckBox materialCB;
717		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
718	1068
719	1069	public void itemStateChanged(ItemEvent e)
720	1070	{
..	..	@@ -742,6 +1092,7 @@
742	1092	} else if(e.getSource() == liveCB)
743	1093	{
744	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
745	1096	}
746	1097	else if(e.getSource() == supportCB)
747	1098	{
..	..	@@ -806,6 +1157,18 @@
806	1157	{
807	1158	cameraView.ToggleOeil();
808	1159	}
	1160	+ else if(e.getSource() == shadowCB)
	1161	+ {
	1162	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1163	+ }
	1164	+ else if(e.getSource() == freezeCB)
	1165	+ {
	1166	+ Globals.FREEZEONMOVE ^= true;
	1167	+ }
	1168	+ else if(e.getSource() == autokeepCB)
	1169	+ {
	1170	+ Globals.REPLACEONMAKE ^= true;
	1171	+ }
809	1172	else if(e.getSource() == lookAtCB)
810	1173	{
811	1174	cameraView.ToggleLookAt();
..	..	@@ -822,7 +1185,8 @@
822	1185
823	1186	/**/
824	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
825		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
826	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
827	1191	// We can't move the root node or an empty selection
828	1192	return;
..	..	@@ -885,8 +1249,6 @@
885	1249	}
886	1250	}
887	1251
888		- String string = (String) object;
889		-
890	1252	System.out.println("Transfer = " + object + "; drop : " + target);
891	1253	// if( object instanceof java.io.File[])
892	1254	// {
..	..	@@ -894,7 +1256,11 @@
894	1256	// objEditor.DropFile((java.io.File[]) object, true);
895	1257	// return;
896	1258	// }
897		- if (string.charAt(0) == '/')
	1259	+
	1260	+ String string = object.toString();
	1261	+
	1262	+ // File path for Mac and Windows
	1263	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
898	1264	{
899	1265	// file(s)
900	1266	String[] names = string.split("\n");
..	..	@@ -921,7 +1287,7 @@
921	1287
922	1288	flashIt = false;
923	1289	CameraPane pane = (CameraPane) target;
924		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1290	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
925	1291	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
926	1292
927	1293	if (group.selection.size() == 1)
..	..	@@ -937,23 +1303,33 @@
937	1303
938	1304	assert target == objEditor.jTree;
939	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
940	1307	try {
941		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
942	1309	} catch (Exception e) {
943	1310	System.out.println("destinationPath : " + destinationPath);
944	1311	return;
945	1312	}
946	1313
947		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
948	1315	{
	1316	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1317	+
	1318	+ // Cannot move into itself
	1319	+ if (child == destinationLeaf)
	1320	+ return;
	1321	+ }
	1322	+
	1323	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1324	+// {
949	1325	loadClipboard(true);
950	1326	objEditor.jTree.setSelectionPath(destinationPath);
951		- pasteInto(false);
952		- } else {
953		- loadClipboard(false);
954		- objEditor.jTree.setSelectionPath(destinationPath);
955		- pasteInto(false); // true); // ???
956		- }
	1327	+ pasteInto(false, false);
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
957	1333	}
958	1334	public void dropActionChanged(DropTargetDragEvent dtde)
959	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1058,85 +1434,107 @@
1058	1434	{
1059	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1060	1436	//heightFieldItem.addActionListener(this);
1061		- gridItem = menu.add(new MenuItem("Grid"));
1062		- gridItem.addActionListener(this);
1063		- rectoidItem = menu.add(new MenuItem("Box"));
1064		- rectoidItem.addActionListener(this);
1065		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1066		- ellipsoidItem.addActionListener(this);
1067		- coneItem = menu.add(new MenuItem("Cone"));
1068		- coneItem.addActionListener(this);
1069		- torusItem = menu.add(new MenuItem("Torus"));
1070		- torusItem.addActionListener(this);
1071		- superItem = menu.add(new MenuItem("Superellipsoid"));
1072		- superItem.addActionListener(this);
	1437	+// gridItem = menu.add(new MenuItem("Grid"));
	1438	+// gridItem.addActionListener(this);
	1439	+// rectoidItem = menu.add(new MenuItem("Box"));
	1440	+// rectoidItem.addActionListener(this);
	1441	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1442	+// ellipsoidItem.addActionListener(this);
	1443	+// coneItem = menu.add(new MenuItem("Cone"));
	1444	+// coneItem.addActionListener(this);
	1445	+// torusItem = menu.add(new MenuItem("Torus"));
	1446	+// torusItem.addActionListener(this);
	1447	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1448	+// superItem.addActionListener(this);
	1449	+
	1450	+ cameraItem = menu.add(new MenuItem("Camera"));
	1451	+ cameraItem.addActionListener(this);
	1452	+
	1453	+ if (!Globals.ADVANCED)
	1454	+ {
1073	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1074	1456	kleinItem.addActionListener(this);
1075		- particleItem = menu.add(new MenuItem("Particle system"));
1076		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1077	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1078	1464	ragdollItem.addActionListener(this);
1079	1465	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1080	1466	ragdoll2Item.addActionListener(this);
	1467	+ }
1081	1468	menu.add("-");
1082		- meshItem = menu.add(new MenuItem("Mesh"));
	1469	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1083	1470	meshItem.addActionListener(this);
1084	1471	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1085	1472	// meshGroupItem.addActionListener(this);
	1473	+ if (Globals.ADVANCED)
	1474	+ {
1086	1475	springItem = menu.add(new MenuItem("Spring"));
1087	1476	springItem.addActionListener(this);
1088	1477	flagItem = menu.add(new MenuItem("Flag"));
1089	1478	flagItem.addActionListener(this);
1090		- bezierItem = menu.add(new MenuItem("Patch"));
1091		- bezierItem.addActionListener(this);
1092		- checkerItem = menu.add(new MenuItem("Checker"));
1093		- checkerItem.addActionListener(this);
1094	1479	blobItem = menu.add(new MenuItem("Blob"));
1095	1480	blobItem.addActionListener(this);
1096	1481	latheItem = menu.add(new MenuItem("Lathe"));
1097	1482	latheItem.addActionListener(this);
1098		- lightItem = menu.add(new MenuItem("Light"));
1099		- lightItem.addActionListener(this);
	1483	+ }
	1484	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1485	+ bezierItem.addActionListener(this);
	1486	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1487	+// overlayItem.addActionListener(this);
	1488	+// lightItem = menu.add(new MenuItem("Light"));
	1489	+// lightItem.addActionListener(this);
1100	1490	menu.add("-");
1101	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1102	1492	//superLoopItem.addActionListener(this);
1103		- loopItem = menu.add(new MenuItem("Loop"));
1104		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1105	1495	doubleItem = menu.add(new MenuItem("Fork"));
1106	1496	doubleItem.addActionListener(this);
	1497	+ if (Globals.ADVANCED)
	1498	+ {
1107	1499	tripleItem = menu.add(new MenuItem("Trident"));
1108	1500	tripleItem.addActionListener(this);
	1501	+ }
1109	1502	}
1110	1503
1111	1504	void buildToolsMenu(Menu menu)
1112	1505	{
1113	1506	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1114	1507	animationItem.addItemListener(this);
1115		- animationItem.setState(CameraPane.ANIMATION);
	1508	+ animationItem.setState(Globals.ANIMATION);
	1509	+
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
1116	1512
1117	1513	menu.add("-");
1118	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1119	1515	parseverticesItem.addActionListener(this);
1120	1516	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1121	1517	textureFieldItem.addActionListener(this);
1122		- alignItem = menu.add(new MenuItem("Align"));
	1518	+ alignItem = menu.add(new MenuItem("Align Objects"));
1123	1519	alignItem.addActionListener(this);
1124		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1125		- mirrorItem.addActionListener(this);
1126	1520	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1127	1521	reduceMorphItem.addActionListener(this);
1128	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1129	1523	reduce34MorphItem.addActionListener(this);
1130		-
1131		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1132		- computeAOItem.addActionListener(this);
1133	1524	menu.add("-");
1134		-
1135	1525	menu.add(memoryItem = new MenuItem("Memory Usage"));
1136	1526	memoryItem.addActionListener(this);
	1527	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1528	+ computeAOItem.addActionListener(this);
	1529	+
	1530	+ if (Globals.ADVANCED)
	1531	+ {
	1532	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1533	+ mirrorItem.addActionListener(this);
	1534	+ menu.add("-");
1137	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1138	1536	analyzeItem.addActionListener(this);
1139		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1140	1538	dumpItem.addActionListener(this);
1141	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1142	1540	// pathItem.addActionListener(this);
..	..	@@ -1154,6 +1552,7 @@
1154	1552	menu.add("-");
1155	1553	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1156	1554	editScriptItem.addActionListener(this);
	1555	+ }
1157	1556	}
1158	1557
1159	1558	void ScreenFit()
..	..	@@ -1276,9 +1675,24 @@
1276	1675	shadow.material = new cMaterial(obj.material);
1277	1676	shadow.material.diffuse = 0.0001f;
1278	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1279	1679
1280	1680	makeSomething(shadow);
1281	1681	}
	1682	+
	1683	+ private void ClearUnpinned()
	1684	+ {
	1685	+ //for (Object3D obj : listUI)
	1686	+ for (int i=listUI.size(); --i>=0;)
	1687	+ {
	1688	+ Object3D obj = listUI.elementAt(i);
	1689	+ if (!obj.pinned)
	1690	+ {
	1691	+ obj.CloseUI();
	1692	+ listUI.remove(i);
	1693	+ }
	1694	+ }
	1695	+ }
1282	1696
1283	1697	/**
1284	1698	* applyExample
..	..	@@ -1482,9 +1896,9 @@
1482	1896
1483	1897	void Overwrite(int mask)
1484	1898	{
1485		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1899	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1486	1900	{
1487		- Object3D content = GrafreeD.clipboard.get(0);
	1901	+ Object3D content = Grafreed.clipboard.get(0);
1488	1902
1489	1903	if (content instanceof cGroup && ((cGroup)content).transientlink )
1490	1904	content = ((cGroup)content).get(0);
..	..	@@ -1523,7 +1937,7 @@
1523	1937	{
1524	1938	ScreenFit();
1525	1939	} else
1526		- if (source == switchItem)
	1940	+ if (source == switchViewItem)
1527	1941	{
1528	1942	cVector v1 = new cVector();
1529	1943	cVector v2 = new cVector();
..	..	@@ -1532,11 +1946,11 @@
1532	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1533	1947	objEditor.cameraView.repaint();
1534	1948	} else
1535		- if (source == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1536	1950	{
1537	1951	makeSomething(new Box());
1538	1952	} else
1539		- if (source == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1540	1954	{
1541	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1542	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1615,27 +2029,27 @@
1615	2029
1616	2030	makeSomething(obj);
1617	2031	} else
1618		- if (source == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1619	2033	{
1620	2034	makeSomething(new Grid());
1621	2035	} else
1622		- if (source == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1623	2037	{
1624	2038	makeSomething(new Sphere());
1625	2039	} else
1626		- if (source == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1627	2041	{
1628	2042	makeSomething(new Cone());
1629	2043	} else
1630		- if (source == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1631	2045	{
1632	2046	makeSomething(new Torus());
1633	2047	} else
1634		- if (source == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1635	2049	{
1636	2050	makeSomething(new Superellipsoid());
1637	2051	} else
1638		- if (source == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1639	2053	{
1640	2054	makeSomething(new Klein());
1641	2055	} else
..	..	@@ -1655,7 +2069,7 @@
1655	2069	{
1656	2070	makeSomething(new BezierSurface());
1657	2071	} else
1658		- if (source == checkerItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1659	2073	{
1660	2074	/*
1661	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1703,7 +2117,7 @@
1703	2117	s.setup();
1704	2118	makeSomething(s);
1705	2119	} else
1706		- if (source == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1707	2121	{
1708	2122	makeSomething(new Light());
1709	2123	} else
..	..	@@ -1753,30 +2167,30 @@
1753	2167
1754	2168	group(g);
1755	2169	} else
1756		- if (source == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1757	2171	{
1758	2172	Composite csg = new GroupLeaf();
1759	2173	csg.count = 5;
1760	2174	group(csg);
1761		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1762	2176	csg.addChild(child);
1763	2177	child.addChild(csg);
1764	2178	} else
1765	2179	if (source == doubleItem)
1766	2180	{
1767		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1768	2182	csg.count = 5;
1769	2183	group(csg);
1770		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1771	2185	csg.addChild(child);
1772	2186	child.addChild(csg);
1773		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1774	2188	csg.addChild(child);
1775	2189	child.addChild(csg);
1776	2190	} else
1777	2191	if (source == tripleItem)
1778	2192	{
1779		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1780	2194	csg.count = 4;
1781	2195	group(csg);
1782	2196	Composite child = new cGroup();
..	..	@@ -1788,23 +2202,6 @@
1788	2202	child = new cGroup();
1789	2203	csg.addChild(child);
1790	2204	child.addChild(csg);
1791		- } else
1792		-
1793		- if (source == importGFDItem)
1794		- {
1795		- ImportGFD();
1796		- } else
1797		- if (source == importVRMLX3DItem)
1798		- {
1799		- ImportVRMLX3D();
1800		- } else
1801		- if (source == import3DSItem)
1802		- {
1803		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1804		- } else
1805		- if (source == importOBJItem)
1806		- {
1807		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1808	2205	} else
1809	2206	if (source == computeAOItem)
1810	2207	{
..	..	@@ -1824,7 +2221,7 @@
1824	2221	if (source == invariantsItem)
1825	2222	{
1826	2223	System.out.println("Invariants:");
1827		- GrafreeD.grafreeD.universe.invariants();
	2224	+ Grafreed.grafreeD.universe.invariants();
1828	2225	} else
1829	2226	if (source == memoryItem)
1830	2227	{
..	..	@@ -1843,19 +2240,61 @@
1843	2240	{
1844	2241	DumpObject();
1845	2242	} else
	2243	+ if (source == minButton)
	2244	+ {
	2245	+ Minimize();
	2246	+ } else
	2247	+ if (source == maxButton)
	2248	+ {
	2249	+ Maximize();
	2250	+ } else
	2251	+ if (source == fullButton)
	2252	+ {
	2253	+ ToggleFullScreen();
	2254	+ } else
	2255	+ if (source == undoButton)
	2256	+ {
	2257	+ // Go to previous version
	2258	+ //if (!Undo())
	2259	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2260	+ Undo();
	2261	+ } else
	2262	+ if (source == restoreButton)
	2263	+ {
	2264	+ // Restore current version
	2265	+ Restore();
	2266	+ } else
	2267	+ if (source == replaceButton)
	2268	+ {
	2269	+ // Overwrite current version
	2270	+ Replace();
	2271	+ } else
	2272	+ if (source == redoButton)
	2273	+ {
	2274	+ // Go to next version
	2275	+ Redo();
	2276	+ } else
	2277	+ if (source == saveButton)
	2278	+ {
	2279	+ // Save a new version
	2280	+ if (!Save(true))
	2281	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2282	+ } else
	2283	+ if (source == oneStepButton)
	2284	+ {
	2285	+ Globals.ONESTEP = true;
	2286	+ cameraView.repaint();
	2287	+ } else
1846	2288	if (source == screenfitButton)
1847	2289	{
1848		- //Reload(lastConverter, lastFilename, true);
1849	2290	ScreenFit();
1850	2291	} else
1851	2292	if (source == screenfitpointButton)
1852	2293	{
1853		- //Reload(lastConverter, lastFilename, true);
1854	2294	ScreenFitPoint();
1855	2295	} else
1856	2296	if (source == snapobjectButton)
1857	2297	{
1858		- //Reload(lastConverter, lastFilename, true);
1859	2298	SnapObject();
1860	2299	} else
1861	2300	// if (event.getSource() == recompileButton)
..	..	@@ -1892,12 +2331,20 @@
1892	2331	{
1893	2332	loadClipboard(true);
1894	2333	} else
	2334	+ if (source == undoItem)
	2335	+ {
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
	2341	+ } else
1895	2342	if (source == duplicateItem)
1896	2343	{
1897		- Object3D keep = GrafreeD.clipboard;
	2344	+ Object3D keep = Grafreed.clipboard;
1898	2345	loadClipboard(false);
1899	2346	paste(false);
1900		- GrafreeD.clipboard = keep;
	2347	+ Grafreed.clipboard = keep;
1901	2348	} else
1902	2349	if (source == cloneItem)
1903	2350	{
..	..	@@ -1915,13 +2362,17 @@
1915	2362	{
1916	2363	paste(false);
1917	2364	} else
	2365	+ if (source == pasteIntoItem)
	2366	+ {
	2367	+ pasteInto(true, false);
	2368	+ } else
1918	2369	if (source == pasteLinkItem)
1919	2370	{
1920		- pasteInto(false);
	2371	+ pasteInto(false, false);
1921	2372	} else
1922	2373	if (source == pasteCloneItem)
1923	2374	{
1924		- pasteInto(true);
	2375	+ pasteInto(true, true);
1925	2376	} else
1926	2377	if (source == pasteExpandItem)
1927	2378	{
..	..	@@ -2113,9 +2564,9 @@
2113	2564	// group.selection.get(0).setMasterThis(content); // should be identity
2114	2565	// refreshContents();
2115	2566	// }
2116		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2567	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2117	2568	{
2118		- Object3D content = GrafreeD.clipboard.get(0);
	2569	+ Object3D content = Grafreed.clipboard.get(0);
2119	2570
2120	2571	if (content instanceof cGroup && ((cGroup)content).transientlink )
2121	2572	content = ((cGroup)content).get(0);
..	..	@@ -2123,11 +2574,11 @@
2123	2574	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2124	2575	for (int i=0; i<group.selection.size(); i++)
2125	2576	{
2126		- boolean random = CameraPane.RANDOM;
2127		- CameraPane.RANDOM = false; // parse all random nodes
	2577	+ boolean random = CameraPane.SWITCH;
	2578	+ CameraPane.SWITCH = false; // parse all random nodes
2128	2579	group.selection.get(i).linkVerticesThis(content);
2129	2580	// group.selection.get(i).setMasterThis(content); // should be identity
2130		- CameraPane.RANDOM = random;
	2581	+ CameraPane.SWITCH = random;
2131	2582	}
2132	2583	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2133	2584	refreshContents();
..	..	@@ -2137,20 +2588,20 @@
2137	2588	{
2138	2589	for (int i=0; i<group.selection.size(); i++)
2139	2590	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2591	+ boolean random = CameraPane.SWITCH;
	2592	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2593	group.selection.get(i).linkVerticesThis(null);
2143		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2144	2595	}
2145	2596
2146	2597	refreshContents();
2147	2598	} else
2148	2599	if (source == relinkverticesItem)
2149	2600	{
2150		- boolean random = CameraPane.RANDOM;
2151		- CameraPane.RANDOM = false; // parse all random nodes
	2601	+ boolean random = CameraPane.SWITCH;
	2602	+ CameraPane.SWITCH = false; // parse all random nodes
2152	2603	group.selection.RelinkToSupport();
2153		- CameraPane.RANDOM = random;
	2604	+ CameraPane.SWITCH = random;
2154	2605
2155	2606	refreshContents();
2156	2607	} else
..	..	@@ -2165,9 +2616,9 @@
2165	2616	} else
2166	2617	if (source == setMasterItem)
2167	2618	{
2168		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2619	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2169	2620	{
2170		- Object3D content = GrafreeD.clipboard.get(0);
	2621	+ Object3D content = Grafreed.clipboard.get(0);
2171	2622
2172	2623	if (content instanceof cGroup && ((cGroup)content).transientlink )
2173	2624	content = ((cGroup)content).get(0);
..	..	@@ -2180,9 +2631,9 @@
2180	2631	{
2181	2632	if (group.selection.size() == 1)
2182	2633	{
2183		- if (GrafreeD.clipboard.size() == 1)
	2634	+ if (Grafreed.clipboard.size() == 1)
2184	2635	{
2185		- Object3D content = GrafreeD.clipboard.get(0);
	2636	+ Object3D content = Grafreed.clipboard.get(0);
2186	2637
2187	2638	if (content instanceof cGroup && ((cGroup)content).transientlink )
2188	2639	content = ((cGroup)content).get(0);
..	..	@@ -2199,7 +2650,7 @@
2199	2650	{
2200	2651	RevertMeshes();
2201	2652	} else
2202		- if (source == resetMeshItem)
	2653	+ if (source == resetAllItem)
2203	2654	{
2204	2655	ResetAll();
2205	2656	} else
..	..	@@ -2219,9 +2670,9 @@
2219	2670	{
2220	2671	ClearSelection(true);
2221	2672	} else
2222		- if (source == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2223	2674	{
2224		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2225	2676	} else
2226	2677	if (source == hideItem)
2227	2678	{
..	..	@@ -2239,16 +2690,16 @@
2239	2690	{
2240	2691	makeSomething(new Camera());
2241	2692	} else
2242		- if (source == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2243	2694	{
2244	2695	group(new Composite());
2245	2696	} else
2246		- if (source == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2247	2698	{
2248	2699	RandomNode random = new RandomNode();
2249	2700	group(random);
2250	2701	if (random.size() > 0)
2251		- random.name = random.get(0).name + "Rnd";
	2702	+ random.name = random.get(0).name + "Switch";
2252	2703	} else
2253	2704	if (source == physicsItem)
2254	2705	{
..	..	@@ -2345,7 +2796,7 @@
2345	2796	{
2346	2797	group(new cLinker());
2347	2798	} else
2348		- if (source == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2349	2800	{
2350	2801	group(new TextureNode());
2351	2802	} else
..	..	@@ -2365,17 +2816,30 @@
2365	2816	{
2366	2817	CastShadow(2);
2367	2818	} else
2368		- if (source == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2369	2820	{
2370		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2371	2823	for (int i=0; i<group.selection.size(); i++)
2372	2824	{
2373		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2374	2830	}
2375	2831
2376		- ClearSelection(false);
2377		-
2378		- refreshContents();
	2832	+ if (!hasRoot)
	2833	+ {
	2834	+ for (int i=0; i<group.selection.size(); i++)
	2835	+ {
	2836	+ Ungroup(group.selection.get(i));
	2837	+ }
	2838	+
	2839	+ ClearSelection(false);
	2840	+
	2841	+ refreshContents();
	2842	+ }
2379	2843	} else
2380	2844	if (source == genUVItem)
2381	2845	{
..	..	@@ -2387,7 +2851,7 @@
2387	2851	} else
2388	2852	if (source == genNormalsMESHItem)
2389	2853	{
2390		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2391	2855	} else
2392	2856	if (source == genNormalsORGANItem)
2393	2857	{
..	..	@@ -2452,6 +2916,22 @@
2452	2916	if (source == unmarkleavesItem)
2453	2917	{
2454	2918	MarkLeaves(false);
	2919	+ } else
	2920	+ if (source == rewindleavesItem)
	2921	+ {
	2922	+ RewindLeaves(true);
	2923	+ } else
	2924	+ if (source == unrewindleavesItem)
	2925	+ {
	2926	+ RewindLeaves(false);
	2927	+ } else
	2928	+ if (source == randomleavesItem)
	2929	+ {
	2930	+ RandomLeaves(true);
	2931	+ } else
	2932	+ if (source == unrandomleavesItem)
	2933	+ {
	2934	+ RandomLeaves(false);
2455	2935	} else
2456	2936	if (source == flipVItem)
2457	2937	{
..	..	@@ -2537,9 +3017,13 @@
2537	3017	{
2538	3018	SmoothMesh();
2539	3019	} else
2540		- if (source == transformgeometryItem)
	3020	+ if (source == transformGeometryItem)
2541	3021	{
2542	3022	TransformGeometry();
	3023	+ } else
	3024	+ if (source == transformChildrenItem)
	3025	+ {
	3026	+ TransformChildren();
2543	3027	} else
2544	3028	if (source == resetTransformItem)
2545	3029	{
..	..	@@ -2547,7 +3031,11 @@
2547	3031	} else
2548	3032	if (source == resetCentroidItem)
2549	3033	{
2550		- ResetCentroid();
	3034	+ ResetCentroid(true);
	3035	+ } else
	3036	+ if (source == resetCentroidXZItem)
	3037	+ {
	3038	+ ResetCentroid(false);
2551	3039	} else
2552	3040	if (source == resetParentItem)
2553	3041	{
..	..	@@ -2679,6 +3167,10 @@
2679	3167	if (source == twoButton)
2680	3168	{
2681	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2682	3174	// bug
2683	3175	//gridPanel.setDividerLocation(1.0);
2684	3176	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2711,10 +3203,31 @@
2711	3203	bigThree.ClearUI();
2712	3204	bigThree.add(centralPanel);
2713	3205	bigThree.FlushUI();
	3206	+
	3207	+ cameraView.requestFocusInWindow();
	3208	+
	3209	+// refreshContents(true);
	3210	+//
	3211	+// try
	3212	+// {
	3213	+// java.awt.Robot bot = new java.awt.Robot();
	3214	+// int mask = InputEvent.BUTTON1_MASK;
	3215	+// bot.mouseMove(100, 100);
	3216	+// bot.mousePress(mask);
	3217	+// bot.mouseRelease(mask);
	3218	+// }
	3219	+// catch (Exception e)
	3220	+// {
	3221	+//
	3222	+// }
	3223	+
2714	3224	} else
2715	3225	if (source == threeButton)
2716	3226	{
2717	3227	radio.layout = threeButton;
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
2718	3231
2719	3232	// bigThree.remove(scenePanel);
2720	3233	// bigThree.remove(centralPanel);
..	..	@@ -2747,10 +3260,15 @@
2747	3260	bigThree.add(centralPanel);
2748	3261	bigThree.add(XYZPanel);
2749	3262	bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2750	3265	} else
2751	3266	if (source == fourButton)
2752	3267	{
2753	3268	radio.layout = fourButton;
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
2754	3272
2755	3273	// bigThree.remove(scenePanel);
2756	3274	// bigThree.remove(centralPanel);
..	..	@@ -2782,10 +3300,15 @@
2782	3300	bigThree.ClearUI();
2783	3301	bigThree.add(scenePanel);
2784	3302	bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2785	3305	} else
2786	3306	if (source == sixButton)
2787	3307	{
2788	3308	radio.layout = sixButton;
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
2789	3312
2790	3313	// bigThree.remove(scenePanel);
2791	3314	// bigThree.remove(centralPanel);
..	..	@@ -2818,10 +3341,15 @@
2818	3341	bigThree.add(scenePanel);
2819	3342	bigThree.add(centralPanel);
2820	3343	bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2821	3346	} else
2822	3347	if (source == sevenButton)
2823	3348	{
2824	3349	radio.layout = sevenButton;
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
2825	3353
2826	3354	// bigThree.remove(scenePanel);
2827	3355	// bigThree.remove(centralPanel);
..	..	@@ -2855,6 +3383,8 @@
2855	3383	bigThree.add(centralPanel);
2856	3384	bigThree.add(XYZPanel);
2857	3385	bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2858	3388	} else
2859	3389	if (source == rootButton)
2860	3390	{
..	..	@@ -2866,6 +3396,7 @@
2866	3396	EditObject(obj);
2867	3397	}
2868	3398
	3399	+ cameraView.requestFocusInWindow();
2869	3400	refreshContents(true);
2870	3401	} else
2871	3402	if (source == closeButton)
..	..	@@ -2875,22 +3406,37 @@
2875	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2876	3407	{
2877	3408	ab = (cRadio)e.nextElement();
2878		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2879	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
2880	3417	buttonGroup.remove(ab);
2881	3418	radioPanel.remove(ab);
2882	3419
2883		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
2884	3422	// ab.GetObject().objectUI = null; // ?????????
2885	3423
2886	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2887	3425	break;
2888	3426	}
2889	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
2890	3430	refreshContents(true);
2891	3431	} else
2892	3432	if (source == editItem \|\| source == editButton)
2893	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
2894	3440	EditSelection(false);
2895	3441	} else
2896	3442	if (source == uneditButton)
..	..	@@ -2900,12 +3446,13 @@
2900	3446	Object3D child = (Object3D)e.nextElement();
2901	3447	if(child.editWindow != null)
2902	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
2903	3450	child.CloseUI();
2904	3451	listUI.remove(child);
2905	3452
2906		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
2907	3454	}
2908		- objEditor.ctrlPanel.validate();
	3455	+ objEditor.ctrlPanel.FlushUI();
2909	3456	//objEditor.jTree.clearSelection();
2910	3457	//objEditor.ResetSliders();
2911	3458	refreshContents(true);
..	..	@@ -2916,6 +3463,7 @@
2916	3463	//copy.ClearUI();
2917	3464	for (Object3D obj : listUI)
2918	3465	{
	3466	+ obj.pinned = false;
2919	3467	obj.CloseUI();
2920	3468	}
2921	3469	listUI.clear();
..	..	@@ -2925,7 +3473,7 @@
2925	3473	{
2926	3474	assert(copy == group);
2927	3475
2928		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2929	3477
2930	3478	for (Object3D obj : listUI)
2931	3479	{
..	..	@@ -2974,6 +3522,9 @@
2974	3522	}
2975	3523
2976	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
2977	3528	//Globals.theRenderer.object = group;
2978	3529	if(!useclient)
2979	3530	{
..	..	@@ -2989,20 +3540,46 @@
2989	3540	frontView.object = group;
2990	3541	sideView.object = group;
2991	3542	}
2992		- group.editWindow = this;
	3543	+
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
	3547	+
2993	3548	/*
2994	3549	currentLayout = radio.layout;
2995	3550	if (currentLayout == null)
2996	3551	currentLayout = sevenButton;
2997	3552	*/
2998	3553	radio.layout.doClick();
	3554	+
	3555	+ ClearUnpinned();
	3556	+ Grafreed.Assert(group != null);
	3557	+ Grafreed.Assert(group.selection != null);
	3558	+ SetPinStates(group.selection.size() > 0);
	3559	+ if (group.selection.size() == 1)
	3560	+ EditSelection(false);
2999	3561	keepparent = group.parent;
3000	3562	// PARENT = NULL or not???
3001	3563	//group.parent = null; // ROOT
3002	3564	//group.attributes = -1;
3003	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
3004	3568	refreshContents(true);
3005		- }
	3569	+ } else if (event.getSource() == editCameraItem)
	3570	+ {
	3571	+ cameraView.ProtectCamera();
	3572	+ cameraView.repaint();
	3573	+ return;
	3574	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3575	+ {
	3576	+ cameraView.RevertCamera();
	3577	+ cameraView.repaint();
	3578	+ return;
	3579	+ // } else if (event.getSource() == textureButton)
	3580	+ // {
	3581	+ // return; // true;
	3582	+ }
3006	3583	else
3007	3584	{
3008	3585	//return super.action(event, arg);
..	..	@@ -3011,7 +3588,6 @@
3011	3588	}
3012	3589
3013	3590	boolean useclient = false;
3014		- cRadio radio;
3015	3591
3016	3592	void ToggleRoot()
3017	3593	{
..	..	@@ -3063,6 +3639,28 @@
3063	3639	refreshContents();
3064	3640	}
3065	3641
	3642	+ void TransformChildren()
	3643	+ {
	3644	+ Object3D obj;
	3645	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3646	+ {
	3647	+ obj = (Object3D)e.nextElement();
	3648	+ obj.KeepTextureMatrices();
	3649	+ obj.TransformChildren();
	3650	+ obj.RestoreTextureMatrices();
	3651	+
	3652	+// if (obj.parent == null)
	3653	+// {
	3654	+// System.out.println("NULL PARENT!");
	3655	+// new Exception().printStackTrace();
	3656	+// }
	3657	+// else
	3658	+// TouchTransform(obj);
	3659	+// //obj.parent.Touch();
	3660	+ }
	3661	+
	3662	+ refreshContents();
	3663	+ }
3066	3664
3067	3665	void ResetTransform()
3068	3666	{
..	..	@@ -3175,7 +3773,7 @@
3175	3773	refreshContents();
3176	3774	}
3177	3775
3178		- void ResetCentroid()
	3776	+ void ResetCentroid(boolean full)
3179	3777	{
3180	3778	Object3D obj;
3181	3779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3190,12 +3788,16 @@
3190	3788	LA.matIdentity(Object3D.mat);
3191	3789	obj.getBounds(minima, maxima, false);
3192	3790	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3193		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3791	+ if (full)
	3792	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3194	3793	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3195	3794	obj.TransformMesh(Object3D.mat);
	3795	+
3196	3796	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3197		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3797	+ if (full)
	3798	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3198	3799	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3800	+
3199	3801	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3200	3802	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3201	3803	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3224,7 +3826,8 @@
3224	3826
3225	3827	int size = obj.MemorySize();
3226	3828
3227		- System.err.println((size/1024) + " KB is the size of " + obj);
	3829	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3830	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3228	3831	}
3229	3832	}
3230	3833	catch (Exception e)
..	..	@@ -3261,9 +3864,9 @@
3261	3864	obj = (Object3D)e.nextElement();
3262	3865
3263	3866	System.out.println("Object is: " + obj);
3264		- GrafreeD.AnalyzeObject(obj);
	3867	+ Grafreed.AnalyzeObject(obj);
3265	3868	System.out.println("Boundary rep: " + obj.bRep);
3266		- GrafreeD.AnalyzeObject(obj.bRep);
	3869	+ Grafreed.AnalyzeObject(obj.bRep);
3267	3870
3268	3871	// System.err.println((size/1024) + " KB is the size of " + obj);
3269	3872	}
..	..	@@ -3305,6 +3908,13 @@
3305	3908	void GenNormals(boolean crease)
3306	3909	{
3307	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3308	3918
3309	3919	refreshContents();
3310	3920	}
..	..	@@ -3477,8 +4087,8 @@
3477	4087
3478	4088	void ParseVertices()
3479	4089	{
3480		- boolean epsequal = GrafreeD.epsequal;
3481		- GrafreeD.epsequal = true;
	4090	+ boolean epsequal = Grafreed.epsequal;
	4091	+ Grafreed.epsequal = true;
3482	4092
3483	4093	for (int i=0; i<group.selection.size(); i++)
3484	4094	{
..	..	@@ -3503,7 +4113,7 @@
3503	4113	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3504	4114	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3505	4115
3506		- g.add(GrafreeD.clipboard);
	4116	+ g.add(Grafreed.clipboard);
3507	4117
3508	4118	buffer.add(g);
3509	4119	}
..	..	@@ -3518,7 +4128,7 @@
3518	4128	makeSomething(buffer, i==group.selection.size()-1);
3519	4129	}
3520	4130
3521		- GrafreeD.epsequal = epsequal;
	4131	+ Grafreed.epsequal = epsequal;
3522	4132
3523	4133	refreshContents();
3524	4134	}
..	..	@@ -3536,7 +4146,16 @@
3536	4146	String pigment = Object3D.GetPigment(tex);
3537	4147	//String bump = Object3D.GetBump(tex);
3538	4148
3539		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4149	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4150	+
	4151	+ try
	4152	+ {
	4153	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4154	+ }
	4155	+ catch (Exception e)
	4156	+ {
	4157	+ System.err.println("FAIL: " + node);
	4158	+ }
3540	4159
3541	4160	double s = v.s;
3542	4161
..	..	@@ -3624,11 +4243,11 @@
3624	4243
3625	4244	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3626	4245
3627		- boolean random = CameraPane.RANDOM;
3628		- CameraPane.RANDOM = false; // parse all random nodes
	4246	+ boolean random = CameraPane.SWITCH;
	4247	+ CameraPane.SWITCH = false; // parse all random nodes
3629	4248	lowres.linkVerticesThis(null);
3630	4249	lowres.linkVerticesThis(sn);
3631		- CameraPane.RANDOM = random;
	4250	+ CameraPane.SWITCH = random;
3632	4251
3633	4252	System.err.flush();
3634	4253
..	..	@@ -3668,7 +4287,7 @@
3668	4287	return;
3669	4288
3670	4289	Object3D poses = group.selection.get(0);
3671		- Object3D ref = GrafreeD.clipboard.get(0);
	4290	+ Object3D ref = Grafreed.clipboard.get(0);
3672	4291
3673	4292	Object3D newgroup = new Object3D("Po:" + poses.name);
3674	4293
..	..	@@ -3862,9 +4481,9 @@
3862	4481
3863	4482	void ClipMesh()
3864	4483	{
3865		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4484	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3866	4485	{
3867		- Object3D content = GrafreeD.clipboard.get(0);
	4486	+ Object3D content = Grafreed.clipboard.get(0);
3868	4487
3869	4488	if (content instanceof cGroup && ((cGroup)content).transientlink )
3870	4489	content = ((cGroup)content).get(0);
..	..	@@ -3873,7 +4492,7 @@
3873	4492	// {
3874	4493	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3875	4494	// }
3876		- group.selection.ClipMesh(GrafreeD.clipboard);
	4495	+ group.selection.ClipMesh(Grafreed.clipboard);
3877	4496	}
3878	4497	// group.selection.ClipMesh(GrafreeD.clipboard);
3879	4498	System.out.println("DONE.");
..	..	@@ -3920,6 +4539,18 @@
3920	4539	void MarkLeaves(boolean hide)
3921	4540	{
3922	4541	group.selection.MarkLeaves(hide);
	4542	+ refreshContents();
	4543	+ }
	4544	+
	4545	+ void RewindLeaves(boolean hide)
	4546	+ {
	4547	+ group.selection.RewindLeaves(hide);
	4548	+ refreshContents();
	4549	+ }
	4550	+
	4551	+ void RandomLeaves(boolean hide)
	4552	+ {
	4553	+ group.selection.RandomLeaves(hide);
3923	4554	refreshContents();
3924	4555	}
3925	4556
..	..	@@ -3994,10 +4625,6 @@
3994	4625	// }
3995	4626	// }
3996	4627
3997		- static boolean allparams = true;
3998		-
3999		- static Vector<Object3D> listUI = new Vector<Object3D>();
4000		-
4001	4628	void EditSelection(boolean newWindow)
4002	4629	{
4003	4630	// aConstraints.gridy = 0;
..	..	@@ -4005,10 +4632,10 @@
4005	4632	{
4006	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4007	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4008		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4009	4636
4010	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
4011		- if(elem != group)
	4638	+ if(elem != group \|\| !newWindow)
4012	4639	{
4013	4640	// if (!(elem instanceof Composite))
4014	4641	// newWindow = false;
..	..	@@ -4090,7 +4717,8 @@
4090	4717	//new Exception().printStackTrace();
4091	4718
4092	4719	freezemodel = true;
4093		-
	4720	+ ClearUnpinned();
	4721	+
4094	4722	/**/
4095	4723	//switch (event.id)
4096	4724	{
..	..	@@ -4098,7 +4726,6 @@
4098	4726	//case 702: // Event.LIST_DESELECT
4099	4727	group.deselectAll();
4100	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4101		- objEditor.ClearInfo(); // .GetMaterial());
4102	4729	if (tps != null)
4103	4730	{
4104	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4107,33 +4734,39 @@
4107	4734
4108	4735	//if (child.parent != null)
4109	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4110	4738	group.addSelectee(child);
4111		- objEditor.SetMaterial(child); // .GetMaterial());
4112		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4113		- System.err.println("info : " + child.GetPath());
4114	4739	}
4115	4740	}
4116		- else
4117		- {
4118		- objEditor.SetMaterial(group); // .GetMaterial());
4119		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4120		- System.err.println("info : " + group.GetPath());
4121		- }
	4741	+// else
	4742	+// {
	4743	+// objEditor.SetMaterial(group); // .GetMaterial());
	4744	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4745	+// System.err.println("info : " + group.GetPath());
	4746	+// }
4122	4747
4123		- objEditor.SetText(); // jan 2014
4124		-
4125		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4748	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4126	4749	CameraPane.flash = true;
4127	4750
4128		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4129	4752	// a camera
4130	4753	{
4131		- CameraPane.camerachangeframe = 0; // don't refuse it
4132		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4754	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4755	+ {
	4756	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4757	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4758	+ }
4133	4759	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4134	4760	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4135	4761	}
4136	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4137	4770	refreshContents();
4138	4771	//return true;
4139	4772	}
..	..	@@ -4142,6 +4775,35 @@
4142	4775
4143	4776	freezemodel = false;
4144	4777	}
	4778	+
	4779	+ void SetPinStates(boolean enabled)
	4780	+ {
	4781	+ editButton.setEnabled(enabled);
	4782	+ uneditButton.setEnabled(enabled);
	4783	+ unselectButton.setEnabled(enabled);
	4784	+ flashSelectionButton.setEnabled(enabled);
	4785	+ }
	4786	+
	4787	+ void refreshContents(boolean cp)
	4788	+ {
	4789	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4790	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4791	+ {
	4792	+ objEditor.ClearInfo(); // .GetMaterial());
	4793	+
	4794	+ for (int i=0; i < group.selection.Size(); i++)
	4795	+ {
	4796	+ Object3D child = (Object3D) group.selection.get(i);
	4797	+
	4798	+ objEditor.AddInfo(child, this, true);
	4799	+ System.err.println("info : " + child.GetPath());
	4800	+ }
	4801	+
	4802	+ objEditor.SetText(); // jan 2014
	4803	+ }
	4804	+
	4805	+ super.refreshContents(cp);
	4806	+ }
4145	4807
4146	4808	void linkSomething(Object3D thing)
4147	4809	{
..	..	@@ -4213,16 +4875,19 @@
4213	4875	{
4214	4876	if (group.selection.isEmpty())
4215	4877	return;
4216		- GrafreeD.clipboardIsTempGroup = false;
	4878	+
	4879	+ Grafreed.clipboardIsTempGroup = false;
4217	4880	Composite tGroup = null;
4218	4881	if (group.selection.size() > 0) // 1)
4219	4882	{
4220	4883	tGroup = new cGroup();
4221		- GrafreeD.clipboardIsTempGroup = true;
	4884	+ Grafreed.clipboardIsTempGroup = true;
4222	4885	}
4223	4886
4224	4887	if (cut)
4225	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4226	4891	//int indices[] = jList.getSelectedIndices();
4227	4892	//for (int i = indices.length - 1; i >= 0; i--)
4228	4893	//jList.remove(indices[i]);
..	..	@@ -4258,16 +4923,16 @@
4258	4923	//System.out.println("cut " + child);
4259	4924	//System.out.println("parent = " + child.parent);
4260	4925	// tmp.addChild(child);
4261		- if (GrafreeD.clipboardIsTempGroup)
	4926	+ if (Grafreed.clipboardIsTempGroup)
4262	4927	tGroup.add/Child/(tmp);
4263	4928	else
4264		- GrafreeD.clipboard = tmp;
	4929	+ Grafreed.clipboard = tmp;
4265	4930	}
4266	4931	else
4267		- if (GrafreeD.clipboardIsTempGroup)
	4932	+ if (Grafreed.clipboardIsTempGroup)
4268	4933	tGroup.add/Child/(child);
4269	4934	else
4270		- GrafreeD.clipboard = child;
	4935	+ Grafreed.clipboard = child;
4271	4936	}
4272	4937
4273	4938	//ResetModel();
..	..	@@ -4299,21 +4964,23 @@
4299	4964	//System.out.println("cut " + elem);
4300	4965	//System.out.println("parent = " + elem.parent);
4301	4966	// tmp.addChild(elem);
4302		- if (GrafreeD.clipboardIsTempGroup)
	4967	+ if (Grafreed.clipboardIsTempGroup)
4303	4968	tGroup.add/Child/(tmp);
4304	4969	else
4305		- GrafreeD.clipboard = tmp;
	4970	+ Grafreed.clipboard = tmp;
4306	4971	}
4307	4972	else
4308		- if (GrafreeD.clipboardIsTempGroup)
	4973	+ if (Grafreed.clipboardIsTempGroup)
4309	4974	tGroup.add/Child/(child);
4310	4975	else
4311		- GrafreeD.clipboard = child;
	4976	+ Grafreed.clipboard = child;
4312	4977	}
4313	4978
4314	4979	}
4315		- if (GrafreeD.clipboardIsTempGroup)
4316		- GrafreeD.clipboard = tGroup;
	4980	+
	4981	+ if (Grafreed.clipboardIsTempGroup)
	4982	+ Grafreed.clipboard = tGroup;
	4983	+
4317	4984	if (cut)
4318	4985	{
4319	4986	ResetModel();
..	..	@@ -4323,11 +4990,15 @@
4323	4990
4324	4991	void paste(boolean expand)
4325	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4326	4997	// if (GrafreeD.clipboard == null)
4327	4998	// return;
4328	4999	boolean first = true;
4329	5000
4330		- if (GrafreeD.clipboardIsTempGroup)
	5001	+ if (Grafreed.clipboardIsTempGroup)
4331	5002	{
4332	5003	Composite temp;
4333	5004
..	..	@@ -4338,7 +5009,7 @@
4338	5009	temp = (Composite)Applet3D.clipboard.deepCopy();
4339	5010	*/
4340	5011	Object3D elem;
4341		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5012	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4342	5013	{
4343	5014	Object3D child = (Object3D)e.nextElement();
4344	5015
..	..	@@ -4372,21 +5043,22 @@
4372	5043	//Object3D cb = Applet3D.clipboard;
4373	5044	//temp.addChild(cb);
4374	5045	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4375		- assert(GrafreeD.clipboard.parent == null);
4376		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4377		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4378		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4379		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5046	+ assert(Grafreed.clipboard.parent == null);
	5047	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5048	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5049	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5050	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4380	5051	else
4381		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4382		- GrafreeD.clipboard.get(0).parent = keepparent;
	5052	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5053	+ Grafreed.clipboard.get(0).parent = keepparent;
4383	5054	}
4384	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4385	5057	ResetModel();
4386	5058	refreshContents();
4387	5059	}
4388	5060
4389		- void pasteInto(boolean copyit)
	5061	+ void pasteInto(boolean copyit, boolean clone)
4390	5062	{
4391	5063	// if (GrafreeD.clipboard == null)
4392	5064	// return;
..	..	@@ -4415,15 +5087,22 @@
4415	5087	if (copyit)
4416	5088	{
4417	5089	// paste(false);
4418		- CloneClipboard(false); // sept 2014
	5090	+ if (clone)
	5091	+ {
	5092	+ CloneClipboard(false); // sept 2014
	5093	+ }
	5094	+ else
	5095	+ {
	5096	+ paste(false);
	5097	+ }
4419	5098	}
4420	5099	else
4421	5100	{
4422	5101	boolean first = true;
4423	5102
4424		- if (GrafreeD.clipboardIsTempGroup)
	5103	+ if (Grafreed.clipboardIsTempGroup)
4425	5104	{
4426		- Composite temp = (Composite)GrafreeD.clipboard;
	5105	+ Composite temp = (Composite)Grafreed.clipboard;
4427	5106	Object3D copy;
4428	5107	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4429	5108	{
..	..	@@ -4433,7 +5112,7 @@
4433	5112	}
4434	5113	} else
4435	5114	{
4436		- linkSomething(GrafreeD.clipboard); //.get(0));
	5115	+ linkSomething(Grafreed.clipboard); //.get(0));
4437	5116	}
4438	5117	}
4439	5118	}
..	..	@@ -4510,6 +5189,10 @@
4510	5189
4511	5190	void group(Object3D csg, boolean grab)
4512	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4513	5196	if (//false) // why??
4514	5197	!group.selection.isEmpty())
4515	5198	{
..	..	@@ -4623,10 +5306,15 @@
4623	5306	//node.add(csg);
4624	5307	//makeSomething(node);
4625	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4626	5310	}
4627	5311
4628	5312	void Ungroup(Object3D g)
4629	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4630	5318	if (g instanceof HiddenObject)
4631	5319	{
4632	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4643,6 +5331,7 @@
4643	5331	objEditor.makeSomething(g.get(i), false);
4644	5332	}
4645	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4646	5335	}
4647	5336
4648	5337	void ungroup()
..	..	@@ -4838,21 +5527,6 @@
4838	5527	}
4839	5528	*/
4840	5529
4841		- void ImportGFD()
4842		- {
4843		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4844		- browser.show();
4845		- String filename = browser.getFile();
4846		- if (filename != null && filename.length() > 0)
4847		- {
4848		- String fullname = browser.getDirectory() + filename;
4849		-
4850		- //Object3D readobj =
4851		- objEditor.ReadGFD(fullname, objEditor);
4852		- //makeSomething(readobj);
4853		- }
4854		- }
4855		-
4856	5530	/*
4857	5531	public void Callback(Object obj)
4858	5532	{
..	..	@@ -4876,26 +5550,9 @@
4876	5550	}
4877	5551	*/
4878	5552
4879		- void ImportVRMLX3D()
4880		- {
4881		- if (GrafreeD.standAlone)
4882		- {
4883		- /**/
4884		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4885		- browser.show();
4886		- String filename = browser.getFile();
4887		- if (filename != null && filename.length() > 0)
4888		- {
4889		- String fullname = browser.getDirectory() + filename;
4890		- LoadVRMLX3D(fullname);
4891		- }
4892		- /**/
4893		- }
4894		- }
4895		-
4896	5553	String GetFile(String dialogName)
4897	5554	{
4898		- if (GrafreeD.standAlone)
	5555	+ if (Grafreed.standAlone)
4899	5556	{
4900	5557	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4901	5558	browser.show();
..	..	@@ -4959,10 +5616,33 @@
4959	5616	cButton flashSelectionButton;
4960	5617	cButton editButton;
4961	5618	cButton uneditButton;
	5619	+ JCheckBox allParamsButton;
4962	5620	cButton clearpanelButton;
4963		- cButton allParamsButton;
4964	5621	cButton unselectButton;
4965	5622
	5623	+ cButton restoreCameraButton;
	5624	+
	5625	+ cButton saveButton;
	5626	+ cButton oneStepButton;
	5627	+
	5628	+ cButton groupButton;
	5629	+ cButton ungroupButton;
	5630	+ cButton compositeButton;
	5631	+ cButton switchButton;
	5632	+ cButton loopButton;
	5633	+ cButton textureButton;
	5634	+
	5635	+ cButton gridButton;
	5636	+ cButton boxButton;
	5637	+ cButton sphereButton;
	5638	+ cButton coneButton;
	5639	+ cButton torusButton;
	5640	+ cButton superButton;
	5641	+ cButton kleinButton;
	5642	+ cButton particlesButton;
	5643	+ cButton overlayButton;
	5644	+ cButton lightButton;
	5645	+
4966	5646	cButton screenfitButton;
4967	5647	cButton screenfitpointButton;
4968	5648	cButton snapobjectButton;
..	..	@@ -4974,14 +5654,6 @@
4974	5654
4975	5655	cButton setsupportButton;
4976	5656
4977		- cButton twoButton;
4978		- cButton sixButton;
4979		- cButton threeButton;
4980		- cButton sevenButton;
4981		- cButton fourButton; // full panel
4982		- cButton oneButton; // full XYZ
4983		- //cButton currentLayout;
4984		-
4985	5657	//
4986	5658	//Composite
4987	5659	Object3D // to do !!
..	..	@@ -4991,9 +5663,11 @@
4991	5663	//JTree jTree;
4992	5664	private MenuItem lookAtItem;
4993	5665	private MenuItem lookFromItem;
4994		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
4995	5667	private MenuItem cutItem;
4996		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
4997	5671	private MenuItem cloneItem;
4998	5672	private MenuItem cloneSupportItem;
4999	5673	private MenuItem overwriteGeoItem;
..	..	@@ -5006,7 +5680,7 @@
5006	5680	private MenuItem linkverticesItem;
5007	5681	private MenuItem relinkverticesItem;
5008	5682	private MenuItem setMasterItem;
5009		- private MenuItem resetMeshItem;
	5683	+ private MenuItem resetAllItem;
5010	5684	private MenuItem stepAllItem;
5011	5685	private MenuItem revertMeshItem;
5012	5686	private MenuItem poseMeshItem;
..	..	@@ -5017,6 +5691,7 @@
5017	5691	private MenuItem mergeGeometriesItem;
5018	5692	private MenuItem copyItem;
5019	5693	private MenuItem pasteItem;
	5694	+ private MenuItem pasteIntoItem;
5020	5695	private MenuItem pasteLinkItem;
5021	5696	private MenuItem pasteCloneItem;
5022	5697	private MenuItem pasteExpandItem;
..	..	@@ -5055,6 +5730,10 @@
5055	5730	private MenuItem showleavesItem;
5056	5731	private MenuItem markleavesItem;
5057	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
5058	5737
5059	5738	private MenuItem flipVItem;
5060	5739	private MenuItem unflipVItem;
..	..	@@ -5066,15 +5745,17 @@
5066	5745	private MenuItem panoTexturesItem;
5067	5746
5068	5747	private MenuItem resetCentroidItem;
5069		- private MenuItem transformgeometryItem;
	5748	+ private MenuItem resetCentroidXZItem;
5070	5749	private MenuItem resetTransformItem;
	5750	+ private MenuItem transformGeometryItem;
	5751	+ private MenuItem transformChildrenItem;
5071	5752	private MenuItem hideItem;
5072	5753	private MenuItem grabItem;
5073	5754	private MenuItem backItem;
5074	5755	private MenuItem frontItem;
5075	5756	private MenuItem cameraItem;
5076	5757	private MenuItem compositeItem;
5077		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
5078	5759	private MenuItem physicsItem;
5079	5760	private MenuItem frameselectorItem;
5080	5761	private MenuItem scriptNodeItem;
..	..	@@ -5114,7 +5795,7 @@
5114	5795	private MenuItem blobItem;
5115	5796	private MenuItem latheItem;
5116	5797	private MenuItem bezierItem;
5117		- private MenuItem checkerItem;
	5798	+ private MenuItem overlayItem;
5118	5799	private MenuItem meshItem;
5119	5800	// private MenuItem meshGroupItem;
5120	5801	private MenuItem springItem;
..	..	@@ -5136,11 +5817,6 @@
5136	5817	private MenuItem doubleItem;
5137	5818	private MenuItem tripleItem;
5138	5819
5139		- private MenuItem importGFDItem;
5140		- private MenuItem importVRMLX3DItem;
5141		- private MenuItem import3DSItem;
5142		- private MenuItem importOBJItem;
5143		-
5144	5820	private MenuItem computeAOItem;
5145	5821	private MenuItem recompileItem;
5146	5822	private MenuItem editScriptItem;
..	..	@@ -5150,4 +5826,8 @@
5150	5826	private MenuItem analyzeItem;
5151	5827	private MenuItem dumpItem;
5152	5828	//boolean freezemodel = false;
	5829	+
	5830	+ Menu cameraMenu;
	5831	+ MenuItem editCameraItem;
	5832	+ MenuItem restoreCameraItem;
5153	5833	}