~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,96 +599,229 @@
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(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
444		- fastCB.setToolTipText("Fast mode");
445		- fastCB.addItemListener(this);
446		-
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- 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);
452	624	screenfitButton.setToolTipText("Screen fit");
453	625	screenfitButton.addActionListener(this);
454	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	+
455	676	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	677	// screenfitpointButton.addActionListener(this);
457		-// oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459		- snapobjectButton.addActionListener(this);
460		- snapobjectButton.setToolTipText("Snap Object");
461		- oe.aConstraints.gridx += 1;
462	678
463		- //aConstraints.gridx = 0;
464		- //aConstraints.gridy += 1;
465		- oe.aConstraints.weighty = 0;
466		- oe.aConstraints.gridwidth = 1;
467		-
468		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469		- flashSelectionButton.setToolTipText("Show selection");
470		- 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));
471	687
472		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473		-
474		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	689	twoButton.setToolTipText("Show center view only");
476	690	twoButton.addActionListener(this);
477		- 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);
478	694	fourButton.addActionListener(this);
479	695	fourButton.setToolTipText("Show left panel only");
480		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	696	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	697	sixButton.setToolTipText("2-column layout left");
482	698	sixButton.addActionListener(this);
483		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	699	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	700	threeButton.setToolTipText("2-column layout right");
485	701	threeButton.addActionListener(this);
486		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	702	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
487	703	sevenButton.setToolTipText("3-column layout");
488	704	sevenButton.addActionListener(this);
489	705	//
490	706
491		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	707	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	708	rootButton.setToolTipText("Edit selection in new tab");
493	709	rootButton.addActionListener(this);
494	710
495		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	711	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
496	712	closeButton.setToolTipText("Close tab");
497	713	closeButton.addActionListener(this);
498	714	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
499	715	//clearButton.addActionListener(this);
500		-
501		- cGridBag commandsPanel = new cGridBag();
	716	+
	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	+ }
502	748
503		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- editButton.setToolTipText("Edit selection");
	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");
505	798	editButton.addActionListener(this);
506	799
507		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508		- uneditButton.setToolTipText("Unedit selection");
	800	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ uneditButton.setToolTipText("Remove selection controls");
509	802	uneditButton.addActionListener(this);
510	803
511		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	804	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	805	+ allParamsButton.setToolTipText("Show all controle");
	806	+ allParamsButton.addActionListener(this);
	807	+
	808	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512	809	clearPanelButton.setToolTipText("Clear edit panel");
513	810	clearPanelButton.addActionListener(this);
514	811
515		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516		- allParamsButton.setToolTipText("All params??");
517		- allParamsButton.addActionListener(this);
518		-
519		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	812	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	813	unselectButton.setToolTipText("Unselect");
521	814	unselectButton.addActionListener(this);
522	815
523		- commandsPanel.preferredHeight = 1;
	816	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ flashSelectionButton.setToolTipText("Highlight selection");
	818	+ flashSelectionButton.addActionListener(this);
524	819
525		- oe.treePanel.add(commandsPanel);
526		- oe.treePanel.Return();
	820	+ editCommandsPanel.preferredHeight = 1;
	821	+
	822	+ SetPinStates(false);
	823	+// oe.treePanel.add(commandsPanel);
	824	+// oe.treePanel.Return();
527	825
528	826	// oe.aConstraints.gridx += 1;
529	827	// oe.aConstraints.weighty = 0;
..	..	@@ -540,29 +838,17 @@
540	838
541	839	JScrollPane jSP;
542	840	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
543		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	841	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
544	842	ResetModel();
545	843
546	844	oe.treePanel.add(jSPPanel);
547	845	oe.treePanel.Return();
548	846
549		- cGridBag copyOptionsPanel = new cGridBag();
550		-
551		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
552		- colorCB.setToolTipText("Copy color when dropped");
553		- colorCB.addItemListener(this);
554		-
555		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
556		- materialCB.setToolTipText("Copy material when dropped");
557		- materialCB.addItemListener(this);
558		-
559		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
560		- textureCB.setToolTipText("Copy texture when dropped");
561		- textureCB.addItemListener(this);
562		-
563		- copyOptionsPanel.preferredHeight = 1;
564	847	oe.treePanel.add(copyOptionsPanel);
565	848	oe.treePanel.Return();
	849	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	850	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	851	+ sliderPane.preferredHeight = 1;
566	852
567	853	// mainPanel.setDividerLocation(0.5); //1.0);
568	854	// mainPanel.setResizeWeight(0.5);
..	..	@@ -591,13 +877,43 @@
591	877
592	878	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593	879	{
594		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595		- supportCB.setToolTipText("Enabled rigging");
596		- 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);
	883	+
	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);
597	911
598	912	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
599	913	// localCB.addItemListener(this);
600	914
	915	+ panel.Return();
	916	+
601	917	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
602	918	crowdCB.setToolTipText("Used for crowds");
603	919	crowdCB.addItemListener(this);
..	..	@@ -610,18 +926,12 @@
610	926	slowCB.setToolTipText("Smooth interpolation");
611	927	slowCB.addItemListener(this);
612	928
613		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
614		- boxCB.setToolTipText("Display bounding boxes");
615		- boxCB.addItemListener(this);
616		-
617		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
618		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
619		- zoomBoxCB.addItemListener(this);
620		-
621	929	// constraints.gridy += 1;
622	930	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623	931	// speakerMocapCB.addItemListener(this);
624	932
	933	+ panel.Return();
	934	+
625	935	if (false)
626	936	{
627	937	// handled in scripts
..	..	@@ -636,30 +946,72 @@
636	946	//constraints.gridy += 1;
637	947	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
638	948	smoothfocusCB.addItemListener(this);
	949	+ panel.Return();
639	950	}
640	951
641	952	//constraints.gridx += 1;
642	953	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
643	954	// debugCB.addItemListener(this);
644	955
	956	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	957	+ trackCB.setToolTipText("Enable tracking target");
	958	+ trackCB.addItemListener(this);
	959	+
645	960	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	961	+ oeilCB.setToolTipText("Move camera when tracking");
646	962	oeilCB.addItemListener(this);
647	963
	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	+ {
648	984	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649	985	lookAtCB.setToolTipText("Look-at target");
650	986	lookAtCB.addItemListener(this);
	987	+ }
	988	+
	989	+ }
651	990
652	991	cGridBag fill = new cGridBag();
653		-
654	992	fill.preferredHeight = 200;
	993	+ cGridBag fill2 = new cGridBag();
	994	+ fill2.preferredHeight = 200;
	995	+ cGridBag fill3 = new cGridBag();
	996	+ fill3.preferredHeight = 200;
655	997
656	998	panel.add(fill);
	999	+ panel.add(fill2);
	1000	+ panel.add(fill3);
657	1001
658	1002	}
659	1003
660	1004	void EditObject(Object3D obj)
661	1005	{
662	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	+
663	1015	radioButton.SetObject(obj);
664	1016	radioButton.layout = sevenButton;
665	1017	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -668,8 +1020,11 @@
668	1020	buttonGroup.add(radioButton);
669	1021	radioButton.doClick();
670	1022	}
	1023	+
671	1024	void SetupViews(ObjEditor oe)
672	1025	{
	1026	+ theFrame = this;
	1027	+
673	1028	oe.SetupViews();
674	1029
675	1030	System.out.println("SetupViews");
..	..	@@ -678,23 +1033,28 @@
678	1033	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
679	1034	}
680	1035
681		- JCheckBox liveCB;
682		- JCheckBox supportCB;
683		- JCheckBox localCB;
684		- JCheckBox crowdCB;
685		- JCheckBox smoothCB;
686		- JCheckBox fastCB;
687		- JCheckBox slowCB;
688		- JCheckBox boxCB;
689		- JCheckBox zoomBoxCB;
690		- JCheckBox trackCB;
691		- 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;
692	1049	// JCheckBox speakerMocapCB;
693		- JCheckBox speakerCameraCB;
694		- JCheckBox speakerFocusCB;
695		- JCheckBox debugCB;
696		- JCheckBox oeilCB;
697		- JCheckBox lookAtCB;
	1050	+ cCheckBox speakerCameraCB;
	1051	+ cCheckBox speakerFocusCB;
	1052	+ cCheckBox debugCB;
	1053	+
	1054	+ cCheckBox oeilCB;
	1055	+ cCheckBox shadowCB;
	1056	+ cCheckBox autokeepCB;
	1057	+ cCheckBox lookAtCB;
698	1058
699	1059	// static int COLOR = 1;
700	1060	// static int MATERIAL = 2;
..	..	@@ -702,9 +1062,9 @@
702	1062
703	1063	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
704	1064
705		- JCheckBox colorCB;
706		- JCheckBox materialCB;
707		- JCheckBox textureCB;
	1065	+ cCheckBox colorCB;
	1066	+ cCheckBox materialCB;
	1067	+ cCheckBox textureCB;
708	1068
709	1069	public void itemStateChanged(ItemEvent e)
710	1070	{
..	..	@@ -732,6 +1092,7 @@
732	1092	} else if(e.getSource() == liveCB)
733	1093	{
734	1094	cameraView.ToggleLive();
	1095	+ refreshContents(false);
735	1096	}
736	1097	else if(e.getSource() == supportCB)
737	1098	{
..	..	@@ -796,6 +1157,18 @@
796	1157	{
797	1158	cameraView.ToggleOeil();
798	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	+ }
799	1172	else if(e.getSource() == lookAtCB)
800	1173	{
801	1174	cameraView.ToggleLookAt();
..	..	@@ -812,7 +1185,8 @@
812	1185
813	1186	/**/
814	1187	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
815		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1188	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1189	+ TreePath path = objEditor.jTree.getSelectionPath();
816	1190	if ((path == null) \|\| (path.getPathCount() <= 1)) {
817	1191	// We can't move the root node or an empty selection
818	1192	return;
..	..	@@ -875,8 +1249,6 @@
875	1249	}
876	1250	}
877	1251
878		- String string = (String) object;
879		-
880	1252	System.out.println("Transfer = " + object + "; drop : " + target);
881	1253	// if( object instanceof java.io.File[])
882	1254	// {
..	..	@@ -884,7 +1256,11 @@
884	1256	// objEditor.DropFile((java.io.File[]) object, true);
885	1257	// return;
886	1258	// }
887		- 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) == ':')
888	1264	{
889	1265	// file(s)
890	1266	String[] names = string.split("\n");
..	..	@@ -911,7 +1287,7 @@
911	1287
912	1288	flashIt = false;
913	1289	CameraPane pane = (CameraPane) target;
914		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1290	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
915	1291	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
916	1292
917	1293	if (group.selection.size() == 1)
..	..	@@ -927,23 +1303,33 @@
927	1303
928	1304	assert target == objEditor.jTree;
929	1305	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1306	+ Object3D destinationLeaf;
930	1307	try {
931		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1308	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
932	1309	} catch (Exception e) {
933	1310	System.out.println("destinationPath : " + destinationPath);
934	1311	return;
935	1312	}
936	1313
937		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1314	+ for (int i=group.selection.size(); --i>=0;)
938	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	+// {
939	1325	loadClipboard(true);
940	1326	objEditor.jTree.setSelectionPath(destinationPath);
941		- pasteInto(false);
942		- } else {
943		- loadClipboard(false);
944		- objEditor.jTree.setSelectionPath(destinationPath);
945		- pasteInto(false); // true); // ???
946		- }
	1327	+ pasteInto(false, false);
	1328	+// } else {
	1329	+// loadClipboard(false);
	1330	+// objEditor.jTree.setSelectionPath(destinationPath);
	1331	+// pasteInto(false, false); // true); // ???
	1332	+// }
947	1333	}
948	1334	public void dropActionChanged(DropTargetDragEvent dtde)
949	1335	// Called if the user has modified the current drop gesture
..	..	@@ -1048,54 +1434,71 @@
1048	1434	{
1049	1435	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1050	1436	//heightFieldItem.addActionListener(this);
1051		- gridItem = menu.add(new MenuItem("Grid"));
1052		- gridItem.addActionListener(this);
1053		- rectoidItem = menu.add(new MenuItem("Box"));
1054		- rectoidItem.addActionListener(this);
1055		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1056		- ellipsoidItem.addActionListener(this);
1057		- coneItem = menu.add(new MenuItem("Cone"));
1058		- coneItem.addActionListener(this);
1059		- torusItem = menu.add(new MenuItem("Torus"));
1060		- torusItem.addActionListener(this);
1061		- superItem = menu.add(new MenuItem("Superellipsoid"));
1062		- 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	+ {
1063	1455	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1064	1456	kleinItem.addActionListener(this);
1065		- particleItem = menu.add(new MenuItem("Particle system"));
1066		- particleItem.addActionListener(this);
	1457	+ }
	1458	+
	1459	+// particleItem = menu.add(new MenuItem("Particle system"));
	1460	+// particleItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1067	1463	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1068	1464	ragdollItem.addActionListener(this);
1069	1465	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1070	1466	ragdoll2Item.addActionListener(this);
	1467	+ }
1071	1468	menu.add("-");
1072		- meshItem = menu.add(new MenuItem("Mesh"));
	1469	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1073	1470	meshItem.addActionListener(this);
1074	1471	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1075	1472	// meshGroupItem.addActionListener(this);
	1473	+ if (Globals.ADVANCED)
	1474	+ {
1076	1475	springItem = menu.add(new MenuItem("Spring"));
1077	1476	springItem.addActionListener(this);
1078	1477	flagItem = menu.add(new MenuItem("Flag"));
1079	1478	flagItem.addActionListener(this);
1080		- bezierItem = menu.add(new MenuItem("Patch"));
1081		- bezierItem.addActionListener(this);
1082		- checkerItem = menu.add(new MenuItem("Checker"));
1083		- checkerItem.addActionListener(this);
1084	1479	blobItem = menu.add(new MenuItem("Blob"));
1085	1480	blobItem.addActionListener(this);
1086	1481	latheItem = menu.add(new MenuItem("Lathe"));
1087	1482	latheItem.addActionListener(this);
1088		- lightItem = menu.add(new MenuItem("Light"));
1089		- 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);
1090	1490	menu.add("-");
1091	1491	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1092	1492	//superLoopItem.addActionListener(this);
1093		- loopItem = menu.add(new MenuItem("Loop"));
1094		- loopItem.addActionListener(this);
	1493	+// loopItem = menu.add(new MenuItem("Loop"));
	1494	+// loopItem.addActionListener(this);
1095	1495	doubleItem = menu.add(new MenuItem("Fork"));
1096	1496	doubleItem.addActionListener(this);
	1497	+ if (Globals.ADVANCED)
	1498	+ {
1097	1499	tripleItem = menu.add(new MenuItem("Trident"));
1098	1500	tripleItem.addActionListener(this);
	1501	+ }
1099	1502	}
1100	1503
1101	1504	void buildToolsMenu(Menu menu)
..	..	@@ -1104,29 +1507,34 @@
1104	1507	animationItem.addItemListener(this);
1105	1508	animationItem.setState(Globals.ANIMATION);
1106	1509
	1510	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1511	+ archiveItem.addActionListener(this);
	1512	+
1107	1513	menu.add("-");
1108	1514	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1109	1515	parseverticesItem.addActionListener(this);
1110	1516	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1111	1517	textureFieldItem.addActionListener(this);
1112		- alignItem = menu.add(new MenuItem("Align"));
	1518	+ alignItem = menu.add(new MenuItem("Align Objects"));
1113	1519	alignItem.addActionListener(this);
1114		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115		- mirrorItem.addActionListener(this);
1116	1520	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1117	1521	reduceMorphItem.addActionListener(this);
1118	1522	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1119	1523	reduce34MorphItem.addActionListener(this);
1120		-
1121		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1122		- computeAOItem.addActionListener(this);
1123	1524	menu.add("-");
1124		-
1125	1525	menu.add(memoryItem = new MenuItem("Memory Usage"));
1126	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("-");
1127	1535	menu.add(analyzeItem = new MenuItem("Analyze"));
1128	1536	analyzeItem.addActionListener(this);
1129		- menu.add(dumpItem = new MenuItem("Dump"));
	1537	+ menu.add(dumpItem = new MenuItem("Print"));
1130	1538	dumpItem.addActionListener(this);
1131	1539	// menu.add(pathItem = new MenuItem("From-to path"));
1132	1540	// pathItem.addActionListener(this);
..	..	@@ -1144,6 +1552,7 @@
1144	1552	menu.add("-");
1145	1553	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1146	1554	editScriptItem.addActionListener(this);
	1555	+ }
1147	1556	}
1148	1557
1149	1558	void ScreenFit()
..	..	@@ -1266,9 +1675,24 @@
1266	1675	shadow.material = new cMaterial(obj.material);
1267	1676	shadow.material.diffuse = 0.0001f;
1268	1677	shadow.material.specular = 0.0001f;
	1678	+ //shadow.projectedVertices[1].x = 300;
1269	1679
1270	1680	makeSomething(shadow);
1271	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	+ }
1272	1696
1273	1697	/**
1274	1698	* applyExample
..	..	@@ -1472,9 +1896,9 @@
1472	1896
1473	1897	void Overwrite(int mask)
1474	1898	{
1475		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1899	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1476	1900	{
1477		- Object3D content = GrafreeD.clipboard.get(0);
	1901	+ Object3D content = Grafreed.clipboard.get(0);
1478	1902
1479	1903	if (content instanceof cGroup && ((cGroup)content).transientlink )
1480	1904	content = ((cGroup)content).get(0);
..	..	@@ -1513,7 +1937,7 @@
1513	1937	{
1514	1938	ScreenFit();
1515	1939	} else
1516		- if (source == switchItem)
	1940	+ if (source == switchViewItem)
1517	1941	{
1518	1942	cVector v1 = new cVector();
1519	1943	cVector v2 = new cVector();
..	..	@@ -1522,11 +1946,11 @@
1522	1946	objEditor.cameraView.renderCamera.setAim(v2, v1);
1523	1947	objEditor.cameraView.repaint();
1524	1948	} else
1525		- if (source == rectoidItem)
	1949	+ if (source == rectoidItem \|\| source == boxButton)
1526	1950	{
1527	1951	makeSomething(new Box());
1528	1952	} else
1529		- if (source == particleItem)
	1953	+ if (source == particleItem \|\| source == particlesButton)
1530	1954	{
1531	1955	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1532	1956	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1605,27 +2029,27 @@
1605	2029
1606	2030	makeSomething(obj);
1607	2031	} else
1608		- if (source == gridItem)
	2032	+ if (source == gridItem \|\| source == gridButton)
1609	2033	{
1610	2034	makeSomething(new Grid());
1611	2035	} else
1612		- if (source == ellipsoidItem)
	2036	+ if (source == ellipsoidItem \|\| source == sphereButton)
1613	2037	{
1614	2038	makeSomething(new Sphere());
1615	2039	} else
1616		- if (source == coneItem)
	2040	+ if (source == coneItem \|\| source == coneButton)
1617	2041	{
1618	2042	makeSomething(new Cone());
1619	2043	} else
1620		- if (source == torusItem)
	2044	+ if (source == torusItem \|\| source == torusButton)
1621	2045	{
1622	2046	makeSomething(new Torus());
1623	2047	} else
1624		- if (source == superItem)
	2048	+ if (source == superItem \|\| source == superButton)
1625	2049	{
1626	2050	makeSomething(new Superellipsoid());
1627	2051	} else
1628		- if (source == kleinItem)
	2052	+ if (source == kleinItem \|\| source == kleinButton)
1629	2053	{
1630	2054	makeSomething(new Klein());
1631	2055	} else
..	..	@@ -1645,7 +2069,7 @@
1645	2069	{
1646	2070	makeSomething(new BezierSurface());
1647	2071	} else
1648		- if (source == checkerItem)
	2072	+ if (source == overlayItem \|\| source == overlayButton)
1649	2073	{
1650	2074	/*
1651	2075	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1693,7 +2117,7 @@
1693	2117	s.setup();
1694	2118	makeSomething(s);
1695	2119	} else
1696		- if (source == lightItem)
	2120	+ if (source == lightItem \|\| source == lightButton)
1697	2121	{
1698	2122	makeSomething(new Light());
1699	2123	} else
..	..	@@ -1743,30 +2167,30 @@
1743	2167
1744	2168	group(g);
1745	2169	} else
1746		- if (source == loopItem)
	2170	+ if (source == loopItem \|\| source == loopButton)
1747	2171	{
1748	2172	Composite csg = new GroupLeaf();
1749	2173	csg.count = 5;
1750	2174	group(csg);
1751		- Composite child = new cGroup();
	2175	+ Composite child = new cGroup("Branch");
1752	2176	csg.addChild(child);
1753	2177	child.addChild(csg);
1754	2178	} else
1755	2179	if (source == doubleItem)
1756	2180	{
1757		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Fork");
1758	2182	csg.count = 5;
1759	2183	group(csg);
1760		- Composite child = new cGroup();
	2184	+ Composite child = new cGroup("Branch A");
1761	2185	csg.addChild(child);
1762	2186	child.addChild(csg);
1763		- child = new cGroup();
	2187	+ child = new cGroup("Branch B");
1764	2188	csg.addChild(child);
1765	2189	child.addChild(csg);
1766	2190	} else
1767	2191	if (source == tripleItem)
1768	2192	{
1769		- Composite csg = new GroupLeaf();
	2193	+ Composite csg = new GroupLeaf("Trident");
1770	2194	csg.count = 4;
1771	2195	group(csg);
1772	2196	Composite child = new cGroup();
..	..	@@ -1778,23 +2202,6 @@
1778	2202	child = new cGroup();
1779	2203	csg.addChild(child);
1780	2204	child.addChild(csg);
1781		- } else
1782		-
1783		- if (source == importGFDItem)
1784		- {
1785		- ImportGFD();
1786		- } else
1787		- if (source == importVRMLX3DItem)
1788		- {
1789		- ImportVRMLX3D();
1790		- } else
1791		- if (source == import3DSItem)
1792		- {
1793		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1794		- } else
1795		- if (source == importOBJItem)
1796		- {
1797		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1798	2205	} else
1799	2206	if (source == computeAOItem)
1800	2207	{
..	..	@@ -1814,7 +2221,7 @@
1814	2221	if (source == invariantsItem)
1815	2222	{
1816	2223	System.out.println("Invariants:");
1817		- GrafreeD.grafreeD.universe.invariants();
	2224	+ Grafreed.grafreeD.universe.invariants();
1818	2225	} else
1819	2226	if (source == memoryItem)
1820	2227	{
..	..	@@ -1833,19 +2240,61 @@
1833	2240	{
1834	2241	DumpObject();
1835	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
1836	2288	if (source == screenfitButton)
1837	2289	{
1838		- //Reload(lastConverter, lastFilename, true);
1839	2290	ScreenFit();
1840	2291	} else
1841	2292	if (source == screenfitpointButton)
1842	2293	{
1843		- //Reload(lastConverter, lastFilename, true);
1844	2294	ScreenFitPoint();
1845	2295	} else
1846	2296	if (source == snapobjectButton)
1847	2297	{
1848		- //Reload(lastConverter, lastFilename, true);
1849	2298	SnapObject();
1850	2299	} else
1851	2300	// if (event.getSource() == recompileButton)
..	..	@@ -1882,12 +2331,20 @@
1882	2331	{
1883	2332	loadClipboard(true);
1884	2333	} else
	2334	+ if (source == undoItem)
	2335	+ {
	2336	+ Undo();
	2337	+ } else
	2338	+ if (source == redoItem)
	2339	+ {
	2340	+ Redo();
	2341	+ } else
1885	2342	if (source == duplicateItem)
1886	2343	{
1887		- Object3D keep = GrafreeD.clipboard;
	2344	+ Object3D keep = Grafreed.clipboard;
1888	2345	loadClipboard(false);
1889	2346	paste(false);
1890		- GrafreeD.clipboard = keep;
	2347	+ Grafreed.clipboard = keep;
1891	2348	} else
1892	2349	if (source == cloneItem)
1893	2350	{
..	..	@@ -1905,13 +2362,17 @@
1905	2362	{
1906	2363	paste(false);
1907	2364	} else
	2365	+ if (source == pasteIntoItem)
	2366	+ {
	2367	+ pasteInto(true, false);
	2368	+ } else
1908	2369	if (source == pasteLinkItem)
1909	2370	{
1910		- pasteInto(false);
	2371	+ pasteInto(false, false);
1911	2372	} else
1912	2373	if (source == pasteCloneItem)
1913	2374	{
1914		- pasteInto(true);
	2375	+ pasteInto(true, true);
1915	2376	} else
1916	2377	if (source == pasteExpandItem)
1917	2378	{
..	..	@@ -2103,9 +2564,9 @@
2103	2564	// group.selection.get(0).setMasterThis(content); // should be identity
2104	2565	// refreshContents();
2105	2566	// }
2106		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2567	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2107	2568	{
2108		- Object3D content = GrafreeD.clipboard.get(0);
	2569	+ Object3D content = Grafreed.clipboard.get(0);
2109	2570
2110	2571	if (content instanceof cGroup && ((cGroup)content).transientlink )
2111	2572	content = ((cGroup)content).get(0);
..	..	@@ -2113,11 +2574,11 @@
2113	2574	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2114	2575	for (int i=0; i<group.selection.size(); i++)
2115	2576	{
2116		- boolean random = CameraPane.RANDOM;
2117		- CameraPane.RANDOM = false; // parse all random nodes
	2577	+ boolean random = CameraPane.SWITCH;
	2578	+ CameraPane.SWITCH = false; // parse all random nodes
2118	2579	group.selection.get(i).linkVerticesThis(content);
2119	2580	// group.selection.get(i).setMasterThis(content); // should be identity
2120		- CameraPane.RANDOM = random;
	2581	+ CameraPane.SWITCH = random;
2121	2582	}
2122	2583	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2123	2584	refreshContents();
..	..	@@ -2127,20 +2588,20 @@
2127	2588	{
2128	2589	for (int i=0; i<group.selection.size(); i++)
2129	2590	{
2130		- boolean random = CameraPane.RANDOM;
2131		- CameraPane.RANDOM = false; // parse all random nodes
	2591	+ boolean random = CameraPane.SWITCH;
	2592	+ CameraPane.SWITCH = false; // parse all random nodes
2132	2593	group.selection.get(i).linkVerticesThis(null);
2133		- CameraPane.RANDOM = random;
	2594	+ CameraPane.SWITCH = random;
2134	2595	}
2135	2596
2136	2597	refreshContents();
2137	2598	} else
2138	2599	if (source == relinkverticesItem)
2139	2600	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2601	+ boolean random = CameraPane.SWITCH;
	2602	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2603	group.selection.RelinkToSupport();
2143		- CameraPane.RANDOM = random;
	2604	+ CameraPane.SWITCH = random;
2144	2605
2145	2606	refreshContents();
2146	2607	} else
..	..	@@ -2155,9 +2616,9 @@
2155	2616	} else
2156	2617	if (source == setMasterItem)
2157	2618	{
2158		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2619	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2159	2620	{
2160		- Object3D content = GrafreeD.clipboard.get(0);
	2621	+ Object3D content = Grafreed.clipboard.get(0);
2161	2622
2162	2623	if (content instanceof cGroup && ((cGroup)content).transientlink )
2163	2624	content = ((cGroup)content).get(0);
..	..	@@ -2170,9 +2631,9 @@
2170	2631	{
2171	2632	if (group.selection.size() == 1)
2172	2633	{
2173		- if (GrafreeD.clipboard.size() == 1)
	2634	+ if (Grafreed.clipboard.size() == 1)
2174	2635	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2636	+ Object3D content = Grafreed.clipboard.get(0);
2176	2637
2177	2638	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2639	content = ((cGroup)content).get(0);
..	..	@@ -2189,7 +2650,7 @@
2189	2650	{
2190	2651	RevertMeshes();
2191	2652	} else
2192		- if (source == resetMeshItem)
	2653	+ if (source == resetAllItem)
2193	2654	{
2194	2655	ResetAll();
2195	2656	} else
..	..	@@ -2209,9 +2670,9 @@
2209	2670	{
2210	2671	ClearSelection(true);
2211	2672	} else
2212		- if (source == grabItem)
	2673	+ if (source == grabItem \|\| source == groupButton)
2213	2674	{
2214		- group(new cGroup(), true);
	2675	+ group(new cGroup(), false); // true);
2215	2676	} else
2216	2677	if (source == hideItem)
2217	2678	{
..	..	@@ -2229,16 +2690,16 @@
2229	2690	{
2230	2691	makeSomething(new Camera());
2231	2692	} else
2232		- if (source == compositeItem)
	2693	+ if (source == compositeItem \|\| source == compositeButton)
2233	2694	{
2234	2695	group(new Composite());
2235	2696	} else
2236		- if (source == randomItem)
	2697	+ if (source == switchItem \|\| source == switchButton)
2237	2698	{
2238	2699	RandomNode random = new RandomNode();
2239	2700	group(random);
2240	2701	if (random.size() > 0)
2241		- random.name = random.get(0).name + "Rnd";
	2702	+ random.name = random.get(0).name + "Switch";
2242	2703	} else
2243	2704	if (source == physicsItem)
2244	2705	{
..	..	@@ -2335,7 +2796,7 @@
2335	2796	{
2336	2797	group(new cLinker());
2337	2798	} else
2338		- if (source == textureItem)
	2799	+ if (source == textureItem \|\| source == textureButton)
2339	2800	{
2340	2801	group(new TextureNode());
2341	2802	} else
..	..	@@ -2355,17 +2816,30 @@
2355	2816	{
2356	2817	CastShadow(2);
2357	2818	} else
2358		- if (source == ungroupItem)
	2819	+ if (source == ungroupItem \|\| source == ungroupButton)
2359	2820	{
2360		- //ungroup();
	2821	+ boolean hasRoot = false;
	2822	+
2361	2823	for (int i=0; i<group.selection.size(); i++)
2362	2824	{
2363		- Ungroup(group.selection.get(i));
	2825	+ if (group.selection.get(i) == group)
	2826	+ {
	2827	+ hasRoot = true;
	2828	+ break;
	2829	+ }
2364	2830	}
2365	2831
2366		- ClearSelection(false);
2367		-
2368		- 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	+ }
2369	2843	} else
2370	2844	if (source == genUVItem)
2371	2845	{
..	..	@@ -2377,7 +2851,7 @@
2377	2851	} else
2378	2852	if (source == genNormalsMESHItem)
2379	2853	{
2380		- GenNormals(true); // TODO
	2854	+ GenNormalsMESH();
2381	2855	} else
2382	2856	if (source == genNormalsORGANItem)
2383	2857	{
..	..	@@ -2442,6 +2916,22 @@
2442	2916	if (source == unmarkleavesItem)
2443	2917	{
2444	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);
2445	2935	} else
2446	2936	if (source == flipVItem)
2447	2937	{
..	..	@@ -2527,9 +3017,13 @@
2527	3017	{
2528	3018	SmoothMesh();
2529	3019	} else
2530		- if (source == transformgeometryItem)
	3020	+ if (source == transformGeometryItem)
2531	3021	{
2532	3022	TransformGeometry();
	3023	+ } else
	3024	+ if (source == transformChildrenItem)
	3025	+ {
	3026	+ TransformChildren();
2533	3027	} else
2534	3028	if (source == resetTransformItem)
2535	3029	{
..	..	@@ -2537,7 +3031,11 @@
2537	3031	} else
2538	3032	if (source == resetCentroidItem)
2539	3033	{
2540		- ResetCentroid();
	3034	+ ResetCentroid(true);
	3035	+ } else
	3036	+ if (source == resetCentroidXZItem)
	3037	+ {
	3038	+ ResetCentroid(false);
2541	3039	} else
2542	3040	if (source == resetParentItem)
2543	3041	{
..	..	@@ -2669,6 +3167,10 @@
2669	3167	if (source == twoButton)
2670	3168	{
2671	3169	radio.layout = twoButton;
	3170	+
	3171	+ if (CameraPane.FULLSCREEN)
	3172	+ fullscreenLayout = radio.layout;
	3173	+
2672	3174	// bug
2673	3175	//gridPanel.setDividerLocation(1.0);
2674	3176	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2701,10 +3203,31 @@
2701	3203	bigThree.ClearUI();
2702	3204	bigThree.add(centralPanel);
2703	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	+
2704	3224	} else
2705	3225	if (source == threeButton)
2706	3226	{
2707	3227	radio.layout = threeButton;
	3228	+
	3229	+ if (CameraPane.FULLSCREEN)
	3230	+ fullscreenLayout = radio.layout;
2708	3231
2709	3232	// bigThree.remove(scenePanel);
2710	3233	// bigThree.remove(centralPanel);
..	..	@@ -2737,10 +3260,15 @@
2737	3260	bigThree.add(centralPanel);
2738	3261	bigThree.add(XYZPanel);
2739	3262	bigThree.FlushUI();
	3263	+
	3264	+ cameraView.requestFocusInWindow();
2740	3265	} else
2741	3266	if (source == fourButton)
2742	3267	{
2743	3268	radio.layout = fourButton;
	3269	+
	3270	+ if (CameraPane.FULLSCREEN)
	3271	+ fullscreenLayout = radio.layout;
2744	3272
2745	3273	// bigThree.remove(scenePanel);
2746	3274	// bigThree.remove(centralPanel);
..	..	@@ -2772,10 +3300,15 @@
2772	3300	bigThree.ClearUI();
2773	3301	bigThree.add(scenePanel);
2774	3302	bigThree.FlushUI();
	3303	+
	3304	+ cameraView.requestFocusInWindow();
2775	3305	} else
2776	3306	if (source == sixButton)
2777	3307	{
2778	3308	radio.layout = sixButton;
	3309	+
	3310	+ if (CameraPane.FULLSCREEN)
	3311	+ fullscreenLayout = radio.layout;
2779	3312
2780	3313	// bigThree.remove(scenePanel);
2781	3314	// bigThree.remove(centralPanel);
..	..	@@ -2808,10 +3341,15 @@
2808	3341	bigThree.add(scenePanel);
2809	3342	bigThree.add(centralPanel);
2810	3343	bigThree.FlushUI();
	3344	+
	3345	+ cameraView.requestFocusInWindow();
2811	3346	} else
2812	3347	if (source == sevenButton)
2813	3348	{
2814	3349	radio.layout = sevenButton;
	3350	+
	3351	+ if (CameraPane.FULLSCREEN)
	3352	+ fullscreenLayout = radio.layout;
2815	3353
2816	3354	// bigThree.remove(scenePanel);
2817	3355	// bigThree.remove(centralPanel);
..	..	@@ -2845,6 +3383,8 @@
2845	3383	bigThree.add(centralPanel);
2846	3384	bigThree.add(XYZPanel);
2847	3385	bigThree.FlushUI();
	3386	+
	3387	+ cameraView.requestFocusInWindow();
2848	3388	} else
2849	3389	if (source == rootButton)
2850	3390	{
..	..	@@ -2856,6 +3396,7 @@
2856	3396	EditObject(obj);
2857	3397	}
2858	3398
	3399	+ cameraView.requestFocusInWindow();
2859	3400	refreshContents(true);
2860	3401	} else
2861	3402	if (source == closeButton)
..	..	@@ -2865,22 +3406,37 @@
2865	3406	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2866	3407	{
2867	3408	ab = (cRadio)e.nextElement();
2868		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3409	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2869	3410	{
	3411	+ // Patch to avoid bug with transparency.
	3412	+ if (!ab.hadMaterial)
	3413	+ {
	3414	+ ab.object.material = null;
	3415	+ }
	3416	+
2870	3417	buttonGroup.remove(ab);
2871	3418	radioPanel.remove(ab);
2872	3419
2873		- ab.GetObject().editWindow = null;
	3420	+ //ab.GetObject().editWindow = null;
	3421	+ ab.GetObject().manipWindow = null;
2874	3422	// ab.GetObject().objectUI = null; // ?????????
2875	3423
2876	3424	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2877	3425	break;
2878	3426	}
2879	3427	}
	3428	+
	3429	+ cameraView.requestFocusInWindow();
2880	3430	refreshContents(true);
2881	3431	} else
2882	3432	if (source == editItem \|\| source == editButton)
2883	3433	{
	3434	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3435	+ {
	3436	+ Object3D child = (Object3D)e.nextElement();
	3437	+ child.pinned = true;
	3438	+ }
	3439	+
2884	3440	EditSelection(false);
2885	3441	} else
2886	3442	if (source == uneditButton)
..	..	@@ -2890,12 +3446,13 @@
2890	3446	Object3D child = (Object3D)e.nextElement();
2891	3447	if(child.editWindow != null)
2892	3448	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3449	+ child.pinned = false;
2893	3450	child.CloseUI();
2894	3451	listUI.remove(child);
2895	3452
2896		- child.editWindow = null; // ???????????
	3453	+ //child.editWindow = null; // ???????????
2897	3454	}
2898		- objEditor.ctrlPanel.validate();
	3455	+ objEditor.ctrlPanel.FlushUI();
2899	3456	//objEditor.jTree.clearSelection();
2900	3457	//objEditor.ResetSliders();
2901	3458	refreshContents(true);
..	..	@@ -2906,6 +3463,7 @@
2906	3463	//copy.ClearUI();
2907	3464	for (Object3D obj : listUI)
2908	3465	{
	3466	+ obj.pinned = false;
2909	3467	obj.CloseUI();
2910	3468	}
2911	3469	listUI.clear();
..	..	@@ -2915,7 +3473,7 @@
2915	3473	{
2916	3474	assert(copy == group);
2917	3475
2918		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3476	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2919	3477
2920	3478	for (Object3D obj : listUI)
2921	3479	{
..	..	@@ -2964,6 +3522,9 @@
2964	3522	}
2965	3523
2966	3524	copy = group;
	3525	+
	3526	+ SetUndoStates();
	3527	+
2967	3528	//Globals.theRenderer.object = group;
2968	3529	if(!useclient)
2969	3530	{
..	..	@@ -2979,20 +3540,46 @@
2979	3540	frontView.object = group;
2980	3541	sideView.object = group;
2981	3542	}
2982		- group.editWindow = this;
	3543	+
	3544	+// fix "+" issue
	3545	+ //group.editWindow = this;
	3546	+ group.manipWindow = this;
	3547	+
2983	3548	/*
2984	3549	currentLayout = radio.layout;
2985	3550	if (currentLayout == null)
2986	3551	currentLayout = sevenButton;
2987	3552	*/
2988	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);
2989	3561	keepparent = group.parent;
2990	3562	// PARENT = NULL or not???
2991	3563	//group.parent = null; // ROOT
2992	3564	//group.attributes = -1;
2993	3565	ResetModel();
	3566	+
	3567	+ cameraView.requestFocusInWindow();
2994	3568	refreshContents(true);
2995		- }
	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	+ }
2996	3583	else
2997	3584	{
2998	3585	//return super.action(event, arg);
..	..	@@ -3001,7 +3588,6 @@
3001	3588	}
3002	3589
3003	3590	boolean useclient = false;
3004		- cRadio radio;
3005	3591
3006	3592	void ToggleRoot()
3007	3593	{
..	..	@@ -3053,6 +3639,28 @@
3053	3639	refreshContents();
3054	3640	}
3055	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	+ }
3056	3664
3057	3665	void ResetTransform()
3058	3666	{
..	..	@@ -3165,7 +3773,7 @@
3165	3773	refreshContents();
3166	3774	}
3167	3775
3168		- void ResetCentroid()
	3776	+ void ResetCentroid(boolean full)
3169	3777	{
3170	3778	Object3D obj;
3171	3779	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3180,12 +3788,16 @@
3180	3788	LA.matIdentity(Object3D.mat);
3181	3789	obj.getBounds(minima, maxima, false);
3182	3790	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3183		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3791	+ if (full)
	3792	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3184	3793	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3185	3794	obj.TransformMesh(Object3D.mat);
	3795	+
3186	3796	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3187		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3797	+ if (full)
	3798	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3188	3799	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3800	+
3189	3801	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3190	3802	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3191	3803	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3214,7 +3826,8 @@
3214	3826
3215	3827	int size = obj.MemorySize();
3216	3828
3217		- 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)");
3218	3831	}
3219	3832	}
3220	3833	catch (Exception e)
..	..	@@ -3251,9 +3864,9 @@
3251	3864	obj = (Object3D)e.nextElement();
3252	3865
3253	3866	System.out.println("Object is: " + obj);
3254		- GrafreeD.AnalyzeObject(obj);
	3867	+ Grafreed.AnalyzeObject(obj);
3255	3868	System.out.println("Boundary rep: " + obj.bRep);
3256		- GrafreeD.AnalyzeObject(obj.bRep);
	3869	+ Grafreed.AnalyzeObject(obj.bRep);
3257	3870
3258	3871	// System.err.println((size/1024) + " KB is the size of " + obj);
3259	3872	}
..	..	@@ -3295,6 +3908,13 @@
3295	3908	void GenNormals(boolean crease)
3296	3909	{
3297	3910	group.GenNormalsS(crease);
	3911	+
	3912	+ refreshContents();
	3913	+ }
	3914	+
	3915	+ void GenNormalsMESH()
	3916	+ {
	3917	+ group.GenNormalsMeshS();
3298	3918
3299	3919	refreshContents();
3300	3920	}
..	..	@@ -3467,8 +4087,8 @@
3467	4087
3468	4088	void ParseVertices()
3469	4089	{
3470		- boolean epsequal = GrafreeD.epsequal;
3471		- GrafreeD.epsequal = true;
	4090	+ boolean epsequal = Grafreed.epsequal;
	4091	+ Grafreed.epsequal = true;
3472	4092
3473	4093	for (int i=0; i<group.selection.size(); i++)
3474	4094	{
..	..	@@ -3493,7 +4113,7 @@
3493	4113	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3494	4114	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3495	4115
3496		- g.add(GrafreeD.clipboard);
	4116	+ g.add(Grafreed.clipboard);
3497	4117
3498	4118	buffer.add(g);
3499	4119	}
..	..	@@ -3508,7 +4128,7 @@
3508	4128	makeSomething(buffer, i==group.selection.size()-1);
3509	4129	}
3510	4130
3511		- GrafreeD.epsequal = epsequal;
	4131	+ Grafreed.epsequal = epsequal;
3512	4132
3513	4133	refreshContents();
3514	4134	}
..	..	@@ -3526,7 +4146,16 @@
3526	4146	String pigment = Object3D.GetPigment(tex);
3527	4147	//String bump = Object3D.GetBump(tex);
3528	4148
3529		- 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	+ }
3530	4159
3531	4160	double s = v.s;
3532	4161
..	..	@@ -3614,11 +4243,11 @@
3614	4243
3615	4244	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3616	4245
3617		- boolean random = CameraPane.RANDOM;
3618		- CameraPane.RANDOM = false; // parse all random nodes
	4246	+ boolean random = CameraPane.SWITCH;
	4247	+ CameraPane.SWITCH = false; // parse all random nodes
3619	4248	lowres.linkVerticesThis(null);
3620	4249	lowres.linkVerticesThis(sn);
3621		- CameraPane.RANDOM = random;
	4250	+ CameraPane.SWITCH = random;
3622	4251
3623	4252	System.err.flush();
3624	4253
..	..	@@ -3658,7 +4287,7 @@
3658	4287	return;
3659	4288
3660	4289	Object3D poses = group.selection.get(0);
3661		- Object3D ref = GrafreeD.clipboard.get(0);
	4290	+ Object3D ref = Grafreed.clipboard.get(0);
3662	4291
3663	4292	Object3D newgroup = new Object3D("Po:" + poses.name);
3664	4293
..	..	@@ -3852,9 +4481,9 @@
3852	4481
3853	4482	void ClipMesh()
3854	4483	{
3855		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4484	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3856	4485	{
3857		- Object3D content = GrafreeD.clipboard.get(0);
	4486	+ Object3D content = Grafreed.clipboard.get(0);
3858	4487
3859	4488	if (content instanceof cGroup && ((cGroup)content).transientlink )
3860	4489	content = ((cGroup)content).get(0);
..	..	@@ -3863,7 +4492,7 @@
3863	4492	// {
3864	4493	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3865	4494	// }
3866		- group.selection.ClipMesh(GrafreeD.clipboard);
	4495	+ group.selection.ClipMesh(Grafreed.clipboard);
3867	4496	}
3868	4497	// group.selection.ClipMesh(GrafreeD.clipboard);
3869	4498	System.out.println("DONE.");
..	..	@@ -3910,6 +4539,18 @@
3910	4539	void MarkLeaves(boolean hide)
3911	4540	{
3912	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);
3913	4554	refreshContents();
3914	4555	}
3915	4556
..	..	@@ -3984,10 +4625,6 @@
3984	4625	// }
3985	4626	// }
3986	4627
3987		- static boolean allparams = true;
3988		-
3989		- static Vector<Object3D> listUI = new Vector<Object3D>();
3990		-
3991	4628	void EditSelection(boolean newWindow)
3992	4629	{
3993	4630	// aConstraints.gridy = 0;
..	..	@@ -3995,10 +4632,10 @@
3995	4632	{
3996	4633	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3997	4634	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3998		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4635	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999	4636
4000	4637	Object3D elem = (Object3D)group.selection.elementAt(i);
4001		- if(elem != group)
	4638	+ if(elem != group \|\| !newWindow)
4002	4639	{
4003	4640	// if (!(elem instanceof Composite))
4004	4641	// newWindow = false;
..	..	@@ -4080,7 +4717,8 @@
4080	4717	//new Exception().printStackTrace();
4081	4718
4082	4719	freezemodel = true;
4083		-
	4720	+ ClearUnpinned();
	4721	+
4084	4722	/**/
4085	4723	//switch (event.id)
4086	4724	{
..	..	@@ -4088,7 +4726,6 @@
4088	4726	//case 702: // Event.LIST_DESELECT
4089	4727	group.deselectAll();
4090	4728	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4091		- objEditor.ClearInfo(); // .GetMaterial());
4092	4729	if (tps != null)
4093	4730	{
4094	4731	for (int i=0; i < tps.length; i++)
..	..	@@ -4097,10 +4734,8 @@
4097	4734
4098	4735	//if (child.parent != null)
4099	4736	//child.parent.addSelectee(child);
	4737	+ objEditor.SetMaterial(child);
4100	4738	group.addSelectee(child);
4101		- objEditor.SetMaterial(child); // .GetMaterial());
4102		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4103		- System.err.println("info : " + child.GetPath());
4104	4739	}
4105	4740	}
4106	4741	// else
..	..	@@ -4110,20 +4745,28 @@
4110	4745	// System.err.println("info : " + group.GetPath());
4111	4746	// }
4112	4747
4113		- objEditor.SetText(); // jan 2014
4114		-
4115		- 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))
4116	4749	CameraPane.flash = true;
4117	4750
4118		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4751	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4119	4752	// a camera
4120	4753	{
4121		- CameraPane.camerachangeframe = 0; // don't refuse it
4122		- 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	+ }
4123	4759	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4124	4760	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4125	4761	}
4126	4762
	4763	+ if (tps != null && tps.length == 1)
	4764	+ {
	4765	+ EditSelection(false);
	4766	+ }
	4767	+
	4768	+ SetPinStates(tps != null && tps.length > 0);
	4769	+
4127	4770	refreshContents();
4128	4771	//return true;
4129	4772	}
..	..	@@ -4132,6 +4775,35 @@
4132	4775
4133	4776	freezemodel = false;
4134	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	+ }
4135	4807
4136	4808	void linkSomething(Object3D thing)
4137	4809	{
..	..	@@ -4203,16 +4875,19 @@
4203	4875	{
4204	4876	if (group.selection.isEmpty())
4205	4877	return;
4206		- GrafreeD.clipboardIsTempGroup = false;
	4878	+
	4879	+ Grafreed.clipboardIsTempGroup = false;
4207	4880	Composite tGroup = null;
4208	4881	if (group.selection.size() > 0) // 1)
4209	4882	{
4210	4883	tGroup = new cGroup();
4211		- GrafreeD.clipboardIsTempGroup = true;
	4884	+ Grafreed.clipboardIsTempGroup = true;
4212	4885	}
4213	4886
4214	4887	if (cut)
4215	4888	{
	4889	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4890	+// Save();
4216	4891	//int indices[] = jList.getSelectedIndices();
4217	4892	//for (int i = indices.length - 1; i >= 0; i--)
4218	4893	//jList.remove(indices[i]);
..	..	@@ -4248,16 +4923,16 @@
4248	4923	//System.out.println("cut " + child);
4249	4924	//System.out.println("parent = " + child.parent);
4250	4925	// tmp.addChild(child);
4251		- if (GrafreeD.clipboardIsTempGroup)
	4926	+ if (Grafreed.clipboardIsTempGroup)
4252	4927	tGroup.add/Child/(tmp);
4253	4928	else
4254		- GrafreeD.clipboard = tmp;
	4929	+ Grafreed.clipboard = tmp;
4255	4930	}
4256	4931	else
4257		- if (GrafreeD.clipboardIsTempGroup)
	4932	+ if (Grafreed.clipboardIsTempGroup)
4258	4933	tGroup.add/Child/(child);
4259	4934	else
4260		- GrafreeD.clipboard = child;
	4935	+ Grafreed.clipboard = child;
4261	4936	}
4262	4937
4263	4938	//ResetModel();
..	..	@@ -4289,21 +4964,23 @@
4289	4964	//System.out.println("cut " + elem);
4290	4965	//System.out.println("parent = " + elem.parent);
4291	4966	// tmp.addChild(elem);
4292		- if (GrafreeD.clipboardIsTempGroup)
	4967	+ if (Grafreed.clipboardIsTempGroup)
4293	4968	tGroup.add/Child/(tmp);
4294	4969	else
4295		- GrafreeD.clipboard = tmp;
	4970	+ Grafreed.clipboard = tmp;
4296	4971	}
4297	4972	else
4298		- if (GrafreeD.clipboardIsTempGroup)
	4973	+ if (Grafreed.clipboardIsTempGroup)
4299	4974	tGroup.add/Child/(child);
4300	4975	else
4301		- GrafreeD.clipboard = child;
	4976	+ Grafreed.clipboard = child;
4302	4977	}
4303	4978
4304	4979	}
4305		- if (GrafreeD.clipboardIsTempGroup)
4306		- GrafreeD.clipboard = tGroup;
	4980	+
	4981	+ if (Grafreed.clipboardIsTempGroup)
	4982	+ Grafreed.clipboard = tGroup;
	4983	+
4307	4984	if (cut)
4308	4985	{
4309	4986	ResetModel();
..	..	@@ -4313,11 +4990,15 @@
4313	4990
4314	4991	void paste(boolean expand)
4315	4992	{
	4993	+ if (Globals.REPLACEONMAKE)
	4994	+ Save();
	4995	+ boolean keep = Globals.REPLACEONMAKE;
	4996	+ Globals.REPLACEONMAKE = false;
4316	4997	// if (GrafreeD.clipboard == null)
4317	4998	// return;
4318	4999	boolean first = true;
4319	5000
4320		- if (GrafreeD.clipboardIsTempGroup)
	5001	+ if (Grafreed.clipboardIsTempGroup)
4321	5002	{
4322	5003	Composite temp;
4323	5004
..	..	@@ -4328,7 +5009,7 @@
4328	5009	temp = (Composite)Applet3D.clipboard.deepCopy();
4329	5010	*/
4330	5011	Object3D elem;
4331		- 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))
4332	5013	{
4333	5014	Object3D child = (Object3D)e.nextElement();
4334	5015
..	..	@@ -4362,21 +5043,22 @@
4362	5043	//Object3D cb = Applet3D.clipboard;
4363	5044	//temp.addChild(cb);
4364	5045	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4365		- assert(GrafreeD.clipboard.parent == null);
4366		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4367		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4368		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4369		- 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());
4370	5051	else
4371		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4372		- GrafreeD.clipboard.get(0).parent = keepparent;
	5052	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5053	+ Grafreed.clipboard.get(0).parent = keepparent;
4373	5054	}
4374	5055
	5056	+ Globals.REPLACEONMAKE = keep;
4375	5057	ResetModel();
4376	5058	refreshContents();
4377	5059	}
4378	5060
4379		- void pasteInto(boolean copyit)
	5061	+ void pasteInto(boolean copyit, boolean clone)
4380	5062	{
4381	5063	// if (GrafreeD.clipboard == null)
4382	5064	// return;
..	..	@@ -4405,15 +5087,22 @@
4405	5087	if (copyit)
4406	5088	{
4407	5089	// paste(false);
4408		- CloneClipboard(false); // sept 2014
	5090	+ if (clone)
	5091	+ {
	5092	+ CloneClipboard(false); // sept 2014
	5093	+ }
	5094	+ else
	5095	+ {
	5096	+ paste(false);
	5097	+ }
4409	5098	}
4410	5099	else
4411	5100	{
4412	5101	boolean first = true;
4413	5102
4414		- if (GrafreeD.clipboardIsTempGroup)
	5103	+ if (Grafreed.clipboardIsTempGroup)
4415	5104	{
4416		- Composite temp = (Composite)GrafreeD.clipboard;
	5105	+ Composite temp = (Composite)Grafreed.clipboard;
4417	5106	Object3D copy;
4418	5107	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4419	5108	{
..	..	@@ -4423,7 +5112,7 @@
4423	5112	}
4424	5113	} else
4425	5114	{
4426		- linkSomething(GrafreeD.clipboard); //.get(0));
	5115	+ linkSomething(Grafreed.clipboard); //.get(0));
4427	5116	}
4428	5117	}
4429	5118	}
..	..	@@ -4500,6 +5189,10 @@
4500	5189
4501	5190	void group(Object3D csg, boolean grab)
4502	5191	{
	5192	+ if (Globals.REPLACEONMAKE)
	5193	+ Save();
	5194	+ boolean keep = Globals.REPLACEONMAKE;
	5195	+ Globals.REPLACEONMAKE = false;
4503	5196	if (//false) // why??
4504	5197	!group.selection.isEmpty())
4505	5198	{
..	..	@@ -4613,10 +5306,15 @@
4613	5306	//node.add(csg);
4614	5307	//makeSomething(node);
4615	5308	makeSomething(csg);
	5309	+ Globals.REPLACEONMAKE = keep;
4616	5310	}
4617	5311
4618	5312	void Ungroup(Object3D g)
4619	5313	{
	5314	+ if (Globals.REPLACEONMAKE)
	5315	+ Save();
	5316	+ boolean keep = Globals.REPLACEONMAKE;
	5317	+ Globals.REPLACEONMAKE = false;
4620	5318	if (g instanceof HiddenObject)
4621	5319	{
4622	5320	HiddenObject h = (HiddenObject) g;
..	..	@@ -4633,6 +5331,7 @@
4633	5331	objEditor.makeSomething(g.get(i), false);
4634	5332	}
4635	5333	}
	5334	+ Globals.REPLACEONMAKE = keep;
4636	5335	}
4637	5336
4638	5337	void ungroup()
..	..	@@ -4828,21 +5527,6 @@
4828	5527	}
4829	5528	*/
4830	5529
4831		- void ImportGFD()
4832		- {
4833		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4834		- browser.show();
4835		- String filename = browser.getFile();
4836		- if (filename != null && filename.length() > 0)
4837		- {
4838		- String fullname = browser.getDirectory() + filename;
4839		-
4840		- //Object3D readobj =
4841		- objEditor.ReadGFD(fullname, objEditor);
4842		- //makeSomething(readobj);
4843		- }
4844		- }
4845		-
4846	5530	/*
4847	5531	public void Callback(Object obj)
4848	5532	{
..	..	@@ -4866,26 +5550,9 @@
4866	5550	}
4867	5551	*/
4868	5552
4869		- void ImportVRMLX3D()
4870		- {
4871		- if (GrafreeD.standAlone)
4872		- {
4873		- /**/
4874		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4875		- browser.show();
4876		- String filename = browser.getFile();
4877		- if (filename != null && filename.length() > 0)
4878		- {
4879		- String fullname = browser.getDirectory() + filename;
4880		- LoadVRMLX3D(fullname);
4881		- }
4882		- /**/
4883		- }
4884		- }
4885		-
4886	5553	String GetFile(String dialogName)
4887	5554	{
4888		- if (GrafreeD.standAlone)
	5555	+ if (Grafreed.standAlone)
4889	5556	{
4890	5557	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4891	5558	browser.show();
..	..	@@ -4949,10 +5616,33 @@
4949	5616	cButton flashSelectionButton;
4950	5617	cButton editButton;
4951	5618	cButton uneditButton;
	5619	+ JCheckBox allParamsButton;
4952	5620	cButton clearpanelButton;
4953		- cButton allParamsButton;
4954	5621	cButton unselectButton;
4955	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	+
4956	5646	cButton screenfitButton;
4957	5647	cButton screenfitpointButton;
4958	5648	cButton snapobjectButton;
..	..	@@ -4964,14 +5654,6 @@
4964	5654
4965	5655	cButton setsupportButton;
4966	5656
4967		- cButton twoButton;
4968		- cButton sixButton;
4969		- cButton threeButton;
4970		- cButton sevenButton;
4971		- cButton fourButton; // full panel
4972		- cButton oneButton; // full XYZ
4973		- //cButton currentLayout;
4974		-
4975	5657	//
4976	5658	//Composite
4977	5659	Object3D // to do !!
..	..	@@ -4981,9 +5663,11 @@
4981	5663	//JTree jTree;
4982	5664	private MenuItem lookAtItem;
4983	5665	private MenuItem lookFromItem;
4984		- private MenuItem switchItem;
	5666	+ private MenuItem switchViewItem;
4985	5667	private MenuItem cutItem;
4986		- private MenuItem duplicateItem;
	5668	+ private MenuItem undoItem;
	5669	+ private MenuItem redoItem;
	5670	+ private JMenuItem duplicateItem;
4987	5671	private MenuItem cloneItem;
4988	5672	private MenuItem cloneSupportItem;
4989	5673	private MenuItem overwriteGeoItem;
..	..	@@ -4996,7 +5680,7 @@
4996	5680	private MenuItem linkverticesItem;
4997	5681	private MenuItem relinkverticesItem;
4998	5682	private MenuItem setMasterItem;
4999		- private MenuItem resetMeshItem;
	5683	+ private MenuItem resetAllItem;
5000	5684	private MenuItem stepAllItem;
5001	5685	private MenuItem revertMeshItem;
5002	5686	private MenuItem poseMeshItem;
..	..	@@ -5007,6 +5691,7 @@
5007	5691	private MenuItem mergeGeometriesItem;
5008	5692	private MenuItem copyItem;
5009	5693	private MenuItem pasteItem;
	5694	+ private MenuItem pasteIntoItem;
5010	5695	private MenuItem pasteLinkItem;
5011	5696	private MenuItem pasteCloneItem;
5012	5697	private MenuItem pasteExpandItem;
..	..	@@ -5045,6 +5730,10 @@
5045	5730	private MenuItem showleavesItem;
5046	5731	private MenuItem markleavesItem;
5047	5732	private MenuItem unmarkleavesItem;
	5733	+ private MenuItem rewindleavesItem;
	5734	+ private MenuItem unrewindleavesItem;
	5735	+ private MenuItem randomleavesItem;
	5736	+ private MenuItem unrandomleavesItem;
5048	5737
5049	5738	private MenuItem flipVItem;
5050	5739	private MenuItem unflipVItem;
..	..	@@ -5056,15 +5745,17 @@
5056	5745	private MenuItem panoTexturesItem;
5057	5746
5058	5747	private MenuItem resetCentroidItem;
5059		- private MenuItem transformgeometryItem;
	5748	+ private MenuItem resetCentroidXZItem;
5060	5749	private MenuItem resetTransformItem;
	5750	+ private MenuItem transformGeometryItem;
	5751	+ private MenuItem transformChildrenItem;
5061	5752	private MenuItem hideItem;
5062	5753	private MenuItem grabItem;
5063	5754	private MenuItem backItem;
5064	5755	private MenuItem frontItem;
5065	5756	private MenuItem cameraItem;
5066	5757	private MenuItem compositeItem;
5067		- private MenuItem randomItem;
	5758	+ private MenuItem switchItem;
5068	5759	private MenuItem physicsItem;
5069	5760	private MenuItem frameselectorItem;
5070	5761	private MenuItem scriptNodeItem;
..	..	@@ -5104,7 +5795,7 @@
5104	5795	private MenuItem blobItem;
5105	5796	private MenuItem latheItem;
5106	5797	private MenuItem bezierItem;
5107		- private MenuItem checkerItem;
	5798	+ private MenuItem overlayItem;
5108	5799	private MenuItem meshItem;
5109	5800	// private MenuItem meshGroupItem;
5110	5801	private MenuItem springItem;
..	..	@@ -5126,11 +5817,6 @@
5126	5817	private MenuItem doubleItem;
5127	5818	private MenuItem tripleItem;
5128	5819
5129		- private MenuItem importGFDItem;
5130		- private MenuItem importVRMLX3DItem;
5131		- private MenuItem import3DSItem;
5132		- private MenuItem importOBJItem;
5133		-
5134	5820	private MenuItem computeAOItem;
5135	5821	private MenuItem recompileItem;
5136	5822	private MenuItem editScriptItem;
..	..	@@ -5140,4 +5826,8 @@
5140	5826	private MenuItem analyzeItem;
5141	5827	private MenuItem dumpItem;
5142	5828	//boolean freezemodel = false;
	5829	+
	5830	+ Menu cameraMenu;
	5831	+ MenuItem editCameraItem;
	5832	+ MenuItem restoreCameraItem;
5143	5833	}