~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,16 +80,28 @@
74	80	this.copy = this.group = copy;
75	81	//selectees = this.group.selectees;
76	82
77		- SetupMenu2(objEditor);
	83	+ SetupMenu2(this); //objEditor);
78	84	SetupUI2(objEditor);
79	85	objEditor.SetupUI(true);
80	86	SetupViews(objEditor);
81	87
82	88	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
	89	+
	90	+ if (copy.versions == null)
	91	+ {
	92	+ copy.versions = new byte[100][];
	93	+ copy.versionindex = -1;
	94	+
	95	+ Save(true);
	96	+ }
83	97	}
84	98
85	99	void CloneSelection(boolean supports)
86	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
87	105	// Object3D keep = GrafreeD.clipboard;
88	106	//Object3D obj;
89	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -94,18 +112,19 @@
94	112
95	113	makeSomething(clone, i==group.selection.size()-1);
96	114	}
	115	+ Globals.REPLACEONMAKE = keep;
97	116	}
98	117
99	118	void CloneClipboard(boolean supports)
100	119	{
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));
	120	+ assert(Grafreed.clipboard.parent == null);
	121	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	122	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	123	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	124	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	125	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	126	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	127	+ Grafreed.clipboard.get(0).parent = keepparent;
109	128	}
110	129
111	130	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +138,7 @@
119	138	// obj.support = null;
120	139	if (!supports)
121	140	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	141	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	142	obj.parent = parent;
124	143	// obj.support = support;
125	144	// clone.support = support; // aout 2013
..	..	@@ -148,30 +167,29 @@
148	167
149	168	//JTextField nameField;
150	169
151		- void SetupMenu2(ObjEditor oe)
	170	+ void SetupMenu2(GroupEditor oe)
152	171	{
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);
	172	+ oe.jTree = new cTree();
	173	+
164	174	Menu menu;
165	175	oe.menuBar.add(menu = new Menu("Edit"));
166	176	//editItem = menu.add(new MenuItem("Edit"));
167	177	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	178	+
	179	+// undoItem = menu.add(new MenuItem("Undo"));
	180	+// undoItem.addActionListener(this);
	181	+// redoItem = menu.add(new MenuItem("Redo"));
	182	+// redoItem.addActionListener(this);
	183	+// menu.add("-");
	184	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	185	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	186	cloneItem = menu.add(new MenuItem("Clone"));
172	187	cloneItem.addActionListener(this);
	188	+ if (Globals.ADVANCED)
	189	+ {
173	190	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	191	cloneSupportItem.addActionListener(this);
	192	+ }
175	193	menu.add("-");
176	194	cutItem = menu.add(new MenuItem("Cut"));
177	195	cutItem.addActionListener(this);
..	..	@@ -179,27 +197,123 @@
179	197	copyItem.addActionListener(this);
180	198	pasteItem = menu.add(new MenuItem("Paste"));
181	199	pasteItem.addActionListener(this);
	200	+
	201	+ menu.add("-");
	202	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	203	+ pasteIntoItem.addActionListener(this);
182	204	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	205	pasteLinkItem.addActionListener(this);
184	206	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	207	pasteCloneItem.addActionListener(this);
186	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	209	// pasteExpandItem.addActionListener(this);
188		- clearItem = menu.add(new MenuItem("Clear"));
189		- clearItem.addActionListener(this);
	210	+ menu.add("-");
	211	+ deleteItem = menu.add(new MenuItem("Delete"));
	212	+ deleteItem.addActionListener(this);
	213	+
	214	+ if (Globals.ADVANCED)
	215	+ {
	216	+ // Deletes the cameras...
190	217	clearAllItem = menu.add(new MenuItem("Clear All"));
191	218	clearAllItem.addActionListener(this);
	219	+ }
	220	+
	221	+ menuBar.add(cameraMenu = new Menu("View"));
	222	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	223	+ //zBufferItem.addActionListener(this);
	224	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	225	+ //normalLensItem.addActionListener(this);
	226	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	227	+ restoreCameraItem.addActionListener(this);
	228	+
	229	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	230	+// toggleFullScreenItem.addItemListener(this);
	231	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	232	+// cameraMenu.add("-");
	233	+//
	234	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	235	+// toggleTextureItem.addItemListener(this);
	236	+// toggleTextureItem.setState(CameraPane.textureon);
	237	+//
	238	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	239	+// toggleSwitchItem.addItemListener(this);
	240	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	241	+
	242	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	243	+ toggleHandleItem.addItemListener(this);
	244	+ toggleHandleItem.setState(CameraPane.HANDLES);
	245	+
	246	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	247	+ togglePaintItem.addItemListener(this);
	248	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	249	+
	250	+ if (Globals.ADVANCED)
	251	+ {
	252	+ cameraMenu.add("-");
	253	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	254	+ toggleLiveItem.addItemListener(this);
	255	+ toggleLiveItem.setState(Globals.isLIVE());
192	256
	257	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	258	+ stepItem.addActionListener(this);
	259	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	260	+ // toggleDLItem.addItemListener(this);
	261	+ // toggleDLItem.setState(false);
	262	+
	263	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	264	+ toggleRenderItem.addItemListener(this);
	265	+ toggleRenderItem.setState(!CameraPane.frozen);
	266	+
	267	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	268	+ toggleDebugItem.addItemListener(this);
	269	+ toggleDebugItem.setState(Globals.DEBUG);
	270	+
	271	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	272	+ toggleFrustumItem.addItemListener(this);
	273	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	274	+
	275	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	276	+ toggleFootContactItem.addItemListener(this);
	277	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	278	+
	279	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	280	+ toggleTimelineItem.addItemListener(this);
	281	+ }
	282	+
	283	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	284	+// toggleRootItem.addItemListener(this);
	285	+// toggleRootItem.setState(false);
	286	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	287	+// animationItem.addItemListener(this);
	288	+// animationItem.setState(CameraPane.ANIMATION);
	289	+ cameraMenu.add("-");
	290	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	291	+ editCameraItem.addActionListener(this);
	292	+
	293	+ if (Globals.ADVANCED)
	294	+ {
	295	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	296	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	297	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	298	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	299	+ oe.cameraMenu.add("-");
	300	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	301	+ openWindowItem.addActionListener(this);
	302	+ editLeafItem.addActionListener(this);
	303	+ lookAtItem.addActionListener(this);
	304	+ //lookFromItem.addActinoListener(this);
	305	+ //switchViewItem.addActionListener(this);
	306	+ }
	307	+
193	308	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);
	309	+ if (Globals.ADVANCED)
	310	+ {
198	311	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	312	revertMeshItem.addActionListener(this);
200	313	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	314	resetreferencesItem.addActionListener(this);
202	315	menu.add("-");
	316	+ }
203	317	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	318	overwriteGeoItem.addActionListener(this);
205	319	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +325,104 @@
211	325	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	326	overwriteUVItem.addActionListener(this);
213	327	menu.add("-");
	328	+ if (Globals.ADVANCED)
	329	+ {
214	330	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	331	generateMeshItem.addActionListener(this);
216	332	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	333	poseMeshItem.addActionListener(this);
218	334	menu.add("-");
	335	+ }
219	336	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	337	resetsupportItem.addActionListener(this);
221	338	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	339	linkverticesItem.addActionListener(this);
223	340	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	341	relinkverticesItem.addActionListener(this);
	342	+
	343	+ if (Globals.ADVANCED)
	344	+ {
225	345	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	346	setMasterItem.addActionListener(this);
	347	+ }
227	348
228	349	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
231	352	backItem = menu.add(new MenuItem("Back"));
232	353	backItem.addActionListener(this);
233	354	frontItem = menu.add(new MenuItem("Front"));
234	355	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	356	+// compositeItem = menu.add(new MenuItem("Composite"));
	357	+// compositeItem.addActionListener(this);
	358	+
	359	+ if (Globals.ADVANCED)
	360	+ {
	361	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	362	hideItem.addActionListener(this);
	363	+ }
239	364	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	365	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Switch node"));
243		- randomItem.addActionListener(this);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
244	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
245	374	switchGeoItem.addActionListener(this);
246	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
247	376	switchTransfoItem.addActionListener(this);
	377	+ morphItem = menu.add(new MenuItem("Morph Group"));
	378	+ morphItem.addActionListener(this);
	379	+
	380	+ menu.add("-");
248	381	physicsItem = menu.add(new MenuItem("Physics"));
249	382	physicsItem.addActionListener(this);
250	383	frameselectorItem = menu.add(new MenuItem("Frame Selector"));
251	384	frameselectorItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
253		- morphItem.addActionListener(this);
254	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	386	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	387	+ }
258	388
259	389	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
262	392	billboardItem = menu.add(new MenuItem("Billboard"));
263	393	billboardItem.addActionListener(this);
264	394	csgItem = menu.add(new MenuItem("CSG"));
265	395	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	397	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	399	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
	405	+ if (Globals.ADVANCED)
	406	+ {
	407	+ menu.add("-");
272	408	linkerItem = menu.add(new MenuItem("Linker"));
273	409	linkerItem.addActionListener(this);
274	410	templateItem = menu.add(new MenuItem("Template"));
275	411	templateItem.addActionListener(this);
276		- attributeItem = menu.add(new MenuItem("Attribute"));
277		- attributeItem.addActionListener(this);
278	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	413	pointflowItem.addActionListener(this);
	414	+ }
280	415	menu.add("-");
281	416	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	417	resetTransformItem.addActionListener(this);
283	418	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	419	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	420	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	421	+ resetCentroidXZItem.addActionListener(this);
	422	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	423	+ transformGeometryItem.addActionListener(this);
	424	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	425	+ transformChildrenItem.addActionListener(this);
287	426
288	427	oe.menuBar.add(menu = new Menu("Geometry"));
289	428	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +433,11 @@
294	433	genNormalsCADItem.addActionListener(this);
295	434	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	435	genNormalsMESHItem.addActionListener(this);
297		- genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	436	+ if (Globals.ADVANCED)
	437	+ {
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
298	439	genNormalsMINEItem.addActionListener(this);
	440	+ }
299	441	stripifyItem = menu.add(new MenuItem("Stripify"));
300	442	stripifyItem.addActionListener(this);
301	443	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +459,34 @@
317	459	reduce34MeshItem.addActionListener(this);
318	460	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	461	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	462	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	463	clipMeshItem.addActionListener(this);
	464	+
	465	+ if (Globals.ADVANCED)
	466	+ {
	467	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	468	+ smoothMeshItem.addActionListener(this);
	469	+ }
324	470
325	471	oe.menuBar.add(menu = new Menu("Attributes"));
326	472	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	473	clearMaterialsItem.addActionListener(this);
	474	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	475	+ resetAllItem.addActionListener(this);
	476	+ stepAllItem = menu.add(new MenuItem("Step All"));
	477	+ stepAllItem.addActionListener(this);
328	478	menu.add("-");
329	479	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	480	liveleavesItem.addActionListener(this);
331	481	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	482	unliveleavesItem.addActionListener(this);
	483	+ if (Globals.ADVANCED)
	484	+ {
333	485	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	486	supportleavesItem.addActionListener(this);
335	487	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	488	unsupportleavesItem.addActionListener(this);
	489	+ }
337	490	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	491	hideleavesItem.addActionListener(this);
339	492	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +495,14 @@
342	495	markleavesItem.addActionListener(this);
343	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	497	unmarkleavesItem.addActionListener(this);
	498	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	499	+ rewindleavesItem.addActionListener(this);
	500	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	501	+ unrewindleavesItem.addActionListener(this);
	502	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	503	+ randomleavesItem.addActionListener(this);
	504	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	505	+ unrandomleavesItem.addActionListener(this);
345	506	menu.add("-");
346	507	flipVItem = menu.add(new MenuItem("Flip V"));
347	508	flipVItem.addActionListener(this);
..	..	@@ -367,45 +528,56 @@
367	528	attachBumpItem.addActionListener(this);
368	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
369	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
370	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
371	533	detachPigmentItem.addActionListener(this);
372	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
373	535	detachBumpItem.addActionListener(this);
	536	+ embedTexturesItem = menu.add(new MenuItem("Embed Textures"));
	537	+ embedTexturesItem.addActionListener(this);
	538	+ deEmbedTexturesItem = menu.add(new MenuItem("De-embed Textures"));
	539	+ deEmbedTexturesItem.addActionListener(this);
374	540	menu.add("-");
375	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
376	542	sortbysizeItem.addActionListener(this);
377	543	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	544	sortbynameItem.addActionListener(this);
379	545	menu.add("-");
	546	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	547	+ shareGeometriesItem.addActionListener(this);
	548	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	549	+ mergeGeometriesItem.addActionListener(this);
	550	+ if (Globals.ADVANCED)
	551	+ {
	552	+ // Pretty much the same as duplicate and clone.
380	553	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	554	extractGeometriesItem.addActionListener(this);
382	555	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	556	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);
	557	+ }
388	558
389	559	oe.menuBar.add(menu = new Menu("Insert"));
390	560	buildCreateMenu(menu);
391	561
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	562	oe.menuBar.add(menu = new Menu("Tools"));
404	563	buildToolsMenu(menu);
405	564	}
406	565
	566	+
407	567	void SetupUI2(ObjEditor oe)
408	568	{
	569	+ // June 2019
	570	+ if (oe == null)
	571	+ {
	572	+ //super.SetupUI2(this);
	573	+ //return;
	574	+ }
	575	+
	576	+ if (copy != group)
	577	+ {
	578	+ //super.SetupUI2(this);
	579	+ }
	580	+
409	581	//new Exception().printStackTrace();
410	582
411	583	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,93 +606,230 @@
434	606	oe.radioPanel.add(dummyButton);
435	607	oe.buttonGroup.add(dummyButton);
436	608	*/
	609	+ cGridBag copyOptionsPanel = new cGridBag();
	610	+
	611	+ copyOptionsPanel.preferredHeight = 1;
	612	+
437	613	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	614
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	615	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ //minButton.setToolTipText("Minimize window");
	617	+ //minButton.addActionListener(this);
	618	+
	619	+ if (Globals.ADVANCED)
	620	+ {
	621	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	622	+ maxButton.setToolTipText("Maximize window");
	623	+ maxButton.addActionListener(this);
	624	+ }
	625	+
	626	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	627	+ fullButton.setToolTipText("Full-screen window");
	628	+ fullButton.addActionListener(this);
	629	+
	630	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ screenfitButton.setToolTipText("Screen fit");
	632	+ screenfitButton.addActionListener(this);
	633	+
	634	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	636	+ restoreCameraButton.addActionListener(this);
	637	+
	638	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	639	+ saveButton.setToolTipText("New version");
	640	+ saveButton.addActionListener(this);
	641	+
	642	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	643	+ undoButton.setToolTipText("Previous version");
	644	+ undoButton.addActionListener(this);
	645	+ undoButton.setEnabled(false);
	646	+
	647	+ cGridBag updown = new cGridBag().setVertical(true);
	648	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	649	+ restoreButton.setToolTipText("Restore current");
	650	+ restoreButton.addActionListener(this);
	651	+ restoreButton.setEnabled(false);
	652	+
	653	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ replaceButton.setToolTipText("Replace current");
	655	+ replaceButton.addActionListener(this);
	656	+ replaceButton.setEnabled(false);
	657	+
	658	+ copyOptionsPanel.add(updown);
	659	+
	660	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ redoButton.setToolTipText("Next version");
	662	+ redoButton.addActionListener(this);
	663	+ redoButton.setEnabled(false);
	664	+
	665	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	666	+ liveCB.setToolTipText("Enable animation");
441	667	liveCB.addItemListener(this);
442	668
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	669	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oneStepButton.setToolTipText("Animate one step forward");
	671	+ oneStepButton.addActionListener(this);
	672	+
	673	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	674	fastCB.setToolTipText("Fast mode");
445	675	fastCB.addItemListener(this);
446	676
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);
452		- screenfitButton.setToolTipText("Screen fit");
453		- screenfitButton.addActionListener(this);
	677	+ //oe.toolboxPanel.Return();
	678	+
	679	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	680	+// trackCB.setToolTipText("Enable tracking");
	681	+// trackCB.addItemListener(this);
454	682
455	683	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	684	// screenfitpointButton.addActionListener(this);
457	685
458	686	if (Globals.ADVANCED)
459	687	{
460		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	688	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
461	689	snapobjectButton.addActionListener(this);
462	690	snapobjectButton.setToolTipText("Snap Object");
	691	+
	692	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	693	+ fourButton.addActionListener(this);
	694	+ fourButton.setToolTipText("Show control panel only");
463	695	}
464	696
465		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
466		- flashSelectionButton.setToolTipText("Show selection");
467		- flashSelectionButton.addActionListener(this);
	697	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
468	698
469		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
470		-
471		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
472		- twoButton.setToolTipText("Show center view only");
	699	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show 3D view only");
473	701	twoButton.addActionListener(this);
474		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
475		- fourButton.addActionListener(this);
476		- fourButton.setToolTipText("Show left panel only");
477		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
478		- sixButton.setToolTipText("2-column layout left");
479		- sixButton.addActionListener(this);
480		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
481		- threeButton.setToolTipText("2-column layout right");
	702	+ this.fullscreenLayout = twoButton;
	703	+
	704	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ threeButton.setToolTipText("Show controls and 3D view");
482	706	threeButton.addActionListener(this);
483		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
484		- sevenButton.setToolTipText("3-column layout");
485		- sevenButton.addActionListener(this);
	707	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ sixButton.setToolTipText("Show 3D view and controls");
	709	+ sixButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
486	713	//
487	714
488		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
489		- rootButton.setToolTipText("Edit selection in new tab");
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
490	717	rootButton.addActionListener(this);
491	718
492		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	719	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
493	720	closeButton.setToolTipText("Close tab");
494	721	closeButton.addActionListener(this);
495	722	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
496	723	//clearButton.addActionListener(this);
497		-
498		- cGridBag commandsPanel = new cGridBag();
	724	+
	725	+ // INSERT
	726	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ gridButton.setToolTipText("Create grid");
	728	+ gridButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ boxButton.setToolTipText("Create box");
	732	+ boxButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ sphereButton.setToolTipText("Create sphere");
	736	+ sphereButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ coneButton.setToolTipText("Create cone");
	740	+ coneButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ torusButton.setToolTipText("Create torus");
	744	+ torusButton.addActionListener(this);
	745	+
	746	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	747	+ superButton.setToolTipText("Create superellipsoid");
	748	+ superButton.addActionListener(this);
	749	+
	750	+ if (Globals.ADVANCED)
	751	+ {
	752	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	753	+ kleinButton.setToolTipText("Create Klein bottle");
	754	+ kleinButton.addActionListener(this);
	755	+ }
499	756
500		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
501		- editButton.setToolTipText("Edit selection");
	757	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	758	+ particlesButton.setToolTipText("Create particle system");
	759	+ particlesButton.addActionListener(this);
	760	+
	761	+ oe.toolboxPanel.Return();
	762	+
	763	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ groupButton.setToolTipText("Create group");
	765	+ groupButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ compositeButton.setToolTipText("Create composite");
	769	+ compositeButton.addActionListener(this);
	770	+
	771	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	772	+ switchButton.setToolTipText("Create item switcher");
	773	+ switchButton.addActionListener(this);
	774	+
	775	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ loopButton.setToolTipText("Create loop");
	777	+ loopButton.addActionListener(this);
	778	+
	779	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ textureButton.setToolTipText("Create texture");
	781	+ textureButton.addActionListener(this);
	782	+
	783	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	784	+ overlayButton.setToolTipText("Create overlay");
	785	+ overlayButton.addActionListener(this);
	786	+
	787	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	788	+ lightButton.setToolTipText("Create light");
	789	+ lightButton.addActionListener(this);
	790	+
	791	+ for (int i=6; --i>=0;)
	792	+ {
	793	+ oe.toolboxPanel.Return();
	794	+ oe.toolboxPanel.add(new cGridBag());
	795	+ oe.toolboxPanel.add(new cGridBag());
	796	+ oe.toolboxPanel.add(new cGridBag());
	797	+ oe.toolboxPanel.add(new cGridBag());
	798	+ oe.toolboxPanel.add(new cGridBag());
	799	+ oe.toolboxPanel.add(new cGridBag());
	800	+ oe.toolboxPanel.add(new cGridBag());
	801	+ }
	802	+
	803	+ // EDIT panel
	804	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ editButton.setToolTipText("Pin selection controls");
502	806	editButton.addActionListener(this);
503	807
504		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
505		- uneditButton.setToolTipText("Unedit selection");
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
506	810	uneditButton.addActionListener(this);
507	811
508		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	812	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	813	+ allParamsButton.setToolTipText("Show all controle");
	814	+ allParamsButton.addActionListener(this);
	815	+
	816	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
509	817	clearPanelButton.setToolTipText("Clear edit panel");
510	818	clearPanelButton.addActionListener(this);
511	819
512		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
513		- allParamsButton.setToolTipText("All params??");
514		- allParamsButton.addActionListener(this);
515		-
516		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	820	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
517	821	unselectButton.setToolTipText("Unselect");
518	822	unselectButton.addActionListener(this);
519	823
520		- commandsPanel.preferredHeight = 1;
	824	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	825	+ flashSelectionButton.setToolTipText("Highlight selection");
	826	+ flashSelectionButton.addActionListener(this);
521	827
522		- oe.treePanel.add(commandsPanel);
523		- oe.treePanel.Return();
	828	+ editCommandsPanel.preferredHeight = 1;
	829	+
	830	+ SetPinStates(false);
	831	+// oe.treePanel.add(commandsPanel);
	832	+// oe.treePanel.Return();
524	833
525	834	// oe.aConstraints.gridx += 1;
526	835	// oe.aConstraints.weighty = 0;
..	..	@@ -537,29 +846,17 @@
537	846
538	847	JScrollPane jSP;
539	848	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
540		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	849	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
541	850	ResetModel();
542	851
543	852	oe.treePanel.add(jSPPanel);
544	853	oe.treePanel.Return();
545	854
546		- cGridBag copyOptionsPanel = new cGridBag();
547		-
548		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
549		- colorCB.setToolTipText("Copy color when dropped");
550		- colorCB.addItemListener(this);
551		-
552		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
553		- materialCB.setToolTipText("Copy material when dropped");
554		- materialCB.addItemListener(this);
555		-
556		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
557		- textureCB.setToolTipText("Copy texture when dropped");
558		- textureCB.addItemListener(this);
559		-
560		- copyOptionsPanel.preferredHeight = 1;
561	855	oe.treePanel.add(copyOptionsPanel);
562	856	oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
563	860
564	861	// mainPanel.setDividerLocation(0.5); //1.0);
565	862	// mainPanel.setResizeWeight(0.5);
..	..	@@ -582,19 +879,49 @@
582	879	dgr.addDragGestureListener(this);
583	880	}catch(Exception e) {}
584	881	*/
585		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
586	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
587	884	}
588	885
589	886	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
590	887	{
591		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
592		- supportCB.setToolTipText("Enabled rigging");
593		- supportCB.addItemListener(this);
	888	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	889	+ colorCB.setToolTipText("Copy color when dropped");
	890	+ colorCB.addItemListener(this);
	891	+
	892	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	893	+ materialCB.setToolTipText("Copy material when dropped");
	894	+ materialCB.addItemListener(this);
	895	+
	896	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	897	+ textureCB.setToolTipText("Copy texture when dropped");
	898	+ textureCB.addItemListener(this);
	899	+
	900	+ panel.Return();
	901	+
	902	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	903	+ boxCB.setToolTipText("Display bounding boxes");
	904	+ boxCB.addItemListener(this);
	905	+
	906	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	907	+ zoomBoxCB.setToolTipText("Display only for wheel");
	908	+ zoomBoxCB.addItemListener(this);
	909	+
	910	+ if (true) // Globals.ADVANCED)
	911	+ {
	912	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	913	+// supportCB.setToolTipText("Enable rigging");
	914	+// supportCB.addItemListener(this);
	915	+
	916	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	917	+ freezeCB.setToolTipText("Fast moving camera");
	918	+ freezeCB.addItemListener(this);
594	919
595	920	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
596	921	// localCB.addItemListener(this);
597	922
	923	+ panel.Return();
	924	+
598	925	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
599	926	crowdCB.setToolTipText("Used for crowds");
600	927	crowdCB.addItemListener(this);
..	..	@@ -607,18 +934,12 @@
607	934	slowCB.setToolTipText("Smooth interpolation");
608	935	slowCB.addItemListener(this);
609	936
610		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
611		- boxCB.setToolTipText("Display bounding boxes");
612		- boxCB.addItemListener(this);
613		-
614		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
615		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
616		- zoomBoxCB.addItemListener(this);
617		-
618	937	// constraints.gridy += 1;
619	938	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
620	939	// speakerMocapCB.addItemListener(this);
621	940
	941	+ panel.Return();
	942	+
622	943	if (false)
623	944	{
624	945	// handled in scripts
..	..	@@ -633,40 +954,85 @@
633	954	//constraints.gridy += 1;
634	955	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
635	956	smoothfocusCB.addItemListener(this);
	957	+ panel.Return();
636	958	}
637	959
638	960	//constraints.gridx += 1;
639	961	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
640	962	// debugCB.addItemListener(this);
641	963
	964	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	965	+ trackCB.setToolTipText("Enable tracking target");
	966	+ trackCB.addItemListener(this);
	967	+
642	968	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	969	+ oeilCB.setToolTipText("Move camera when tracking");
643	970	oeilCB.addItemListener(this);
644	971
	972	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	973	+ shadowCB.setToolTipText("When live compute shadows");
	974	+ shadowCB.addItemListener(this);
	975	+
	976	+ panel.Return();
	977	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	978	+ toggleTextureCB.setToolTipText("Load textures");
	979	+ toggleTextureCB.addItemListener(this);
	980	+
	981	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	982	+ toggleSwitchCB.setToolTipText("Choose a single item");
	983	+ toggleSwitchCB.addItemListener(this);
	984	+
	985	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	986	+ autokeepCB.setToolTipText("On structure change");
	987	+ autokeepCB.addItemListener(this);
	988	+
	989	+ panel.Return();
	990	+ if (Globals.ADVANCED)
	991	+ {
645	992	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
646	993	lookAtCB.setToolTipText("Look-at target");
647	994	lookAtCB.addItemListener(this);
	995	+ }
	996	+
	997	+ }
648	998
649	999	cGridBag fill = new cGridBag();
650		-
651	1000	fill.preferredHeight = 200;
	1001	+ cGridBag fill2 = new cGridBag();
	1002	+ fill2.preferredHeight = 200;
	1003	+ cGridBag fill3 = new cGridBag();
	1004	+ fill3.preferredHeight = 200;
652	1005
653	1006	panel.add(fill);
	1007	+ panel.add(fill2);
	1008	+ panel.add(fill3);
654	1009
655	1010	}
656	1011
657	1012	void EditObject(Object3D obj)
658	1013	{
659	1014	cRadio radioButton = new cRadio(obj.name);
	1015	+
	1016	+ // June 2019. Patch to avoid bug with transparency.
	1017	+ radioButton.hadMaterial = obj.material != null;
	1018	+ if (!radioButton.hadMaterial)
	1019	+ {
	1020	+ obj.material = new cMaterial();
	1021	+ }
	1022	+
660	1023	radioButton.SetObject(obj);
661		- radioButton.layout = sevenButton;
	1024	+ radioButton.layout = sixButton; // sevenButton;
662	1025	radioButton.SetCamera(cameraView.renderCamera, false);
663	1026	radioButton.addActionListener(this);
664	1027	radioPanel.add(radioButton);
665	1028	buttonGroup.add(radioButton);
666	1029	radioButton.doClick();
667	1030	}
	1031	+
668	1032	void SetupViews(ObjEditor oe)
669	1033	{
	1034	+ theFrame = this;
	1035	+
670	1036	oe.SetupViews();
671	1037
672	1038	System.out.println("SetupViews");
..	..	@@ -675,23 +1041,28 @@
675	1041	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
676	1042	}
677	1043
678		- JCheckBox liveCB;
679		- JCheckBox supportCB;
680		- JCheckBox localCB;
681		- JCheckBox crowdCB;
682		- JCheckBox smoothCB;
683		- JCheckBox fastCB;
684		- JCheckBox slowCB;
685		- JCheckBox boxCB;
686		- JCheckBox zoomBoxCB;
687		- JCheckBox trackCB;
688		- JCheckBox smoothfocusCB;
	1044	+ cToggleButton liveCB;
	1045	+ cCheckBox supportCB;
	1046	+ cCheckBox localCB;
	1047	+ cCheckBox crowdCB;
	1048	+ cCheckBox smoothCB;
	1049	+ cToggleButton fastCB;
	1050	+ cCheckBox slowCB;
	1051	+ cCheckBox boxCB;
	1052	+ cCheckBox zoomBoxCB;
	1053	+ cCheckBox freezeCB;
	1054	+ //cToggleButton trackCB;
	1055	+ cCheckBox trackCB;
	1056	+ cCheckBox smoothfocusCB;
689	1057	// JCheckBox speakerMocapCB;
690		- JCheckBox speakerCameraCB;
691		- JCheckBox speakerFocusCB;
692		- JCheckBox debugCB;
693		- JCheckBox oeilCB;
694		- JCheckBox lookAtCB;
	1058	+ cCheckBox speakerCameraCB;
	1059	+ cCheckBox speakerFocusCB;
	1060	+ cCheckBox debugCB;
	1061	+
	1062	+ cCheckBox oeilCB;
	1063	+ cCheckBox shadowCB;
	1064	+ cCheckBox autokeepCB;
	1065	+ cCheckBox lookAtCB;
695	1066
696	1067	// static int COLOR = 1;
697	1068	// static int MATERIAL = 2;
..	..	@@ -699,9 +1070,9 @@
699	1070
700	1071	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
701	1072
702		- JCheckBox colorCB;
703		- JCheckBox materialCB;
704		- JCheckBox textureCB;
	1073	+ cCheckBox colorCB;
	1074	+ cCheckBox materialCB;
	1075	+ cCheckBox textureCB;
705	1076
706	1077	public void itemStateChanged(ItemEvent e)
707	1078	{
..	..	@@ -729,6 +1100,7 @@
729	1100	} else if(e.getSource() == liveCB)
730	1101	{
731	1102	cameraView.ToggleLive();
	1103	+ refreshContents(false);
732	1104	}
733	1105	else if(e.getSource() == supportCB)
734	1106	{
..	..	@@ -793,6 +1165,18 @@
793	1165	{
794	1166	cameraView.ToggleOeil();
795	1167	}
	1168	+ else if(e.getSource() == shadowCB)
	1169	+ {
	1170	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1171	+ }
	1172	+ else if(e.getSource() == freezeCB)
	1173	+ {
	1174	+ Globals.FREEZEONMOVE ^= true;
	1175	+ }
	1176	+ else if(e.getSource() == autokeepCB)
	1177	+ {
	1178	+ Globals.REPLACEONMAKE ^= true;
	1179	+ }
796	1180	else if(e.getSource() == lookAtCB)
797	1181	{
798	1182	cameraView.ToggleLookAt();
..	..	@@ -809,7 +1193,8 @@
809	1193
810	1194	/**/
811	1195	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
812		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1196	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1197	+ TreePath path = objEditor.jTree.getSelectionPath();
813	1198	if ((path == null) \|\| (path.getPathCount() <= 1)) {
814	1199	// We can't move the root node or an empty selection
815	1200	return;
..	..	@@ -872,8 +1257,6 @@
872	1257	}
873	1258	}
874	1259
875		- String string = (String) object;
876		-
877	1260	System.out.println("Transfer = " + object + "; drop : " + target);
878	1261	// if( object instanceof java.io.File[])
879	1262	// {
..	..	@@ -881,7 +1264,11 @@
881	1264	// objEditor.DropFile((java.io.File[]) object, true);
882	1265	// return;
883	1266	// }
884		- if (string.charAt(0) == '/')
	1267	+
	1268	+ String string = object.toString();
	1269	+
	1270	+ // File path for Mac and Windows
	1271	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
885	1272	{
886	1273	// file(s)
887	1274	String[] names = string.split("\n");
..	..	@@ -908,7 +1295,7 @@
908	1295
909	1296	flashIt = false;
910	1297	CameraPane pane = (CameraPane) target;
911		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1298	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
912	1299	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
913	1300
914	1301	if (group.selection.size() == 1)
..	..	@@ -924,23 +1311,33 @@
924	1311
925	1312	assert target == objEditor.jTree;
926	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
927	1315	try {
928		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
929	1317	} catch (Exception e) {
930	1318	System.out.println("destinationPath : " + destinationPath);
931	1319	return;
932	1320	}
933	1321
934		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1322	+ for (int i=group.selection.size(); --i>=0;)
935	1323	{
	1324	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1325	+
	1326	+ // Cannot move into itself
	1327	+ if (child == destinationLeaf)
	1328	+ return;
	1329	+ }
	1330	+
	1331	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1332	+// {
936	1333	loadClipboard(true);
937	1334	objEditor.jTree.setSelectionPath(destinationPath);
938		- pasteInto(false);
939		- } else {
940		- loadClipboard(false);
941		- objEditor.jTree.setSelectionPath(destinationPath);
942		- pasteInto(false); // true); // ???
943		- }
	1335	+ pasteInto(false, false);
	1336	+// } else {
	1337	+// loadClipboard(false);
	1338	+// objEditor.jTree.setSelectionPath(destinationPath);
	1339	+// pasteInto(false, false); // true); // ???
	1340	+// }
944	1341	}
945	1342	public void dropActionChanged(DropTargetDragEvent dtde)
946	1343	// Called if the user has modified the current drop gesture
..	..	@@ -1045,54 +1442,71 @@
1045	1442	{
1046	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1047	1444	//heightFieldItem.addActionListener(this);
1048		- gridItem = menu.add(new MenuItem("Grid"));
1049		- gridItem.addActionListener(this);
1050		- rectoidItem = menu.add(new MenuItem("Box"));
1051		- rectoidItem.addActionListener(this);
1052		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1053		- ellipsoidItem.addActionListener(this);
1054		- coneItem = menu.add(new MenuItem("Cone"));
1055		- coneItem.addActionListener(this);
1056		- torusItem = menu.add(new MenuItem("Torus"));
1057		- torusItem.addActionListener(this);
1058		- superItem = menu.add(new MenuItem("Superellipsoid"));
1059		- superItem.addActionListener(this);
	1445	+// gridItem = menu.add(new MenuItem("Grid"));
	1446	+// gridItem.addActionListener(this);
	1447	+// rectoidItem = menu.add(new MenuItem("Box"));
	1448	+// rectoidItem.addActionListener(this);
	1449	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1450	+// ellipsoidItem.addActionListener(this);
	1451	+// coneItem = menu.add(new MenuItem("Cone"));
	1452	+// coneItem.addActionListener(this);
	1453	+// torusItem = menu.add(new MenuItem("Torus"));
	1454	+// torusItem.addActionListener(this);
	1455	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1456	+// superItem.addActionListener(this);
	1457	+
	1458	+ cameraItem = menu.add(new MenuItem("Camera"));
	1459	+ cameraItem.addActionListener(this);
	1460	+
	1461	+ if (!Globals.ADVANCED)
	1462	+ {
1060	1463	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1061	1464	kleinItem.addActionListener(this);
1062		- particleItem = menu.add(new MenuItem("Particle system"));
1063		- particleItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
	1469	+ if (Globals.ADVANCED)
	1470	+ {
1064	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1065	1472	ragdollItem.addActionListener(this);
1066	1473	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1067	1474	ragdoll2Item.addActionListener(this);
	1475	+ }
1068	1476	menu.add("-");
1069		- meshItem = menu.add(new MenuItem("Mesh"));
	1477	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1070	1478	meshItem.addActionListener(this);
1071	1479	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1072	1480	// meshGroupItem.addActionListener(this);
	1481	+ if (Globals.ADVANCED)
	1482	+ {
1073	1483	springItem = menu.add(new MenuItem("Spring"));
1074	1484	springItem.addActionListener(this);
1075	1485	flagItem = menu.add(new MenuItem("Flag"));
1076	1486	flagItem.addActionListener(this);
1077		- bezierItem = menu.add(new MenuItem("Patch"));
1078		- bezierItem.addActionListener(this);
1079		- checkerItem = menu.add(new MenuItem("Checker"));
1080		- checkerItem.addActionListener(this);
1081	1487	blobItem = menu.add(new MenuItem("Blob"));
1082	1488	blobItem.addActionListener(this);
1083	1489	latheItem = menu.add(new MenuItem("Lathe"));
1084	1490	latheItem.addActionListener(this);
1085		- lightItem = menu.add(new MenuItem("Light"));
1086		- lightItem.addActionListener(this);
	1491	+ }
	1492	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1493	+ bezierItem.addActionListener(this);
	1494	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1495	+// overlayItem.addActionListener(this);
	1496	+// lightItem = menu.add(new MenuItem("Light"));
	1497	+// lightItem.addActionListener(this);
1087	1498	menu.add("-");
1088	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1089	1500	//superLoopItem.addActionListener(this);
1090		- loopItem = menu.add(new MenuItem("Loop"));
1091		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1092	1503	doubleItem = menu.add(new MenuItem("Fork"));
1093	1504	doubleItem.addActionListener(this);
	1505	+ if (Globals.ADVANCED)
	1506	+ {
1094	1507	tripleItem = menu.add(new MenuItem("Trident"));
1095	1508	tripleItem.addActionListener(this);
	1509	+ }
1096	1510	}
1097	1511
1098	1512	void buildToolsMenu(Menu menu)
..	..	@@ -1101,29 +1515,34 @@
1101	1515	animationItem.addItemListener(this);
1102	1516	animationItem.setState(Globals.ANIMATION);
1103	1517
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
	1520	+
1104	1521	menu.add("-");
1105	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1106	1523	parseverticesItem.addActionListener(this);
1107	1524	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1108	1525	textureFieldItem.addActionListener(this);
1109		- alignItem = menu.add(new MenuItem("Align"));
	1526	+ alignItem = menu.add(new MenuItem("Align Objects"));
1110	1527	alignItem.addActionListener(this);
1111		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1112		- mirrorItem.addActionListener(this);
1113	1528	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1114	1529	reduceMorphItem.addActionListener(this);
1115	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1116	1531	reduce34MorphItem.addActionListener(this);
1117		-
1118		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1119		- computeAOItem.addActionListener(this);
1120	1532	menu.add("-");
1121		-
1122	1533	menu.add(memoryItem = new MenuItem("Memory Usage"));
1123	1534	memoryItem.addActionListener(this);
	1535	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1536	+ computeAOItem.addActionListener(this);
	1537	+
	1538	+ if (Globals.ADVANCED)
	1539	+ {
	1540	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1541	+ mirrorItem.addActionListener(this);
	1542	+ menu.add("-");
1124	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1125	1544	analyzeItem.addActionListener(this);
1126		- menu.add(dumpItem = new MenuItem("Dump"));
	1545	+ menu.add(dumpItem = new MenuItem("Print"));
1127	1546	dumpItem.addActionListener(this);
1128	1547	// menu.add(pathItem = new MenuItem("From-to path"));
1129	1548	// pathItem.addActionListener(this);
..	..	@@ -1141,6 +1560,7 @@
1141	1560	menu.add("-");
1142	1561	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1143	1562	editScriptItem.addActionListener(this);
	1563	+ }
1144	1564	}
1145	1565
1146	1566	void ScreenFit()
..	..	@@ -1263,9 +1683,34 @@
1263	1683	shadow.material = new cMaterial(obj.material);
1264	1684	shadow.material.diffuse = 0.0001f;
1265	1685	shadow.material.specular = 0.0001f;
	1686	+ //shadow.projectedVertices[1].x = 300;
1266	1687
1267	1688	makeSomething(shadow);
1268	1689	}
	1690	+
	1691	+ private void ClearUnpinned()
	1692	+ {
	1693	+ //for (Object3D obj : listUI)
	1694	+ for (int i=listUI.size(); --i>=0;)
	1695	+ {
	1696	+ Object3D obj = listUI.elementAt(i);
	1697	+ if (!obj.pinned)
	1698	+ {
	1699	+ obj.CloseUI();
	1700	+ listUI.remove(i);
	1701	+ }
	1702	+ }
	1703	+ }
	1704	+
	1705	+ private void EditElement(Object3D elem, boolean newWindow)
	1706	+ {
	1707	+ // if (!(elem instanceof Composite))
	1708	+ // newWindow = false;
	1709	+ listUI.add(elem);
	1710	+ elem.openEditWindow(this, newWindow); //, false);
	1711	+ System.out.println("edit : " + elem);
	1712	+ elem.editWindow.refreshContents(true); // ? new
	1713	+ }
1269	1714
1270	1715	/**
1271	1716	* applyExample
..	..	@@ -1469,9 +1914,9 @@
1469	1914
1470	1915	void Overwrite(int mask)
1471	1916	{
1472		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1917	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1473	1918	{
1474		- Object3D content = GrafreeD.clipboard.get(0);
	1919	+ Object3D content = Grafreed.clipboard.get(0);
1475	1920
1476	1921	if (content instanceof cGroup && ((cGroup)content).transientlink )
1477	1922	content = ((cGroup)content).get(0);
..	..	@@ -1510,7 +1955,7 @@
1510	1955	{
1511	1956	ScreenFit();
1512	1957	} else
1513		- if (source == switchItem)
	1958	+ if (source == switchViewItem)
1514	1959	{
1515	1960	cVector v1 = new cVector();
1516	1961	cVector v2 = new cVector();
..	..	@@ -1519,11 +1964,11 @@
1519	1964	objEditor.cameraView.renderCamera.setAim(v2, v1);
1520	1965	objEditor.cameraView.repaint();
1521	1966	} else
1522		- if (source == rectoidItem)
	1967	+ if (source == rectoidItem \|\| source == boxButton)
1523	1968	{
1524	1969	makeSomething(new Box());
1525	1970	} else
1526		- if (source == particleItem)
	1971	+ if (source == particleItem \|\| source == particlesButton)
1527	1972	{
1528	1973	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1529	1974	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1602,27 +2047,27 @@
1602	2047
1603	2048	makeSomething(obj);
1604	2049	} else
1605		- if (source == gridItem)
	2050	+ if (source == gridItem \|\| source == gridButton)
1606	2051	{
1607	2052	makeSomething(new Grid());
1608	2053	} else
1609		- if (source == ellipsoidItem)
	2054	+ if (source == ellipsoidItem \|\| source == sphereButton)
1610	2055	{
1611	2056	makeSomething(new Sphere());
1612	2057	} else
1613		- if (source == coneItem)
	2058	+ if (source == coneItem \|\| source == coneButton)
1614	2059	{
1615	2060	makeSomething(new Cone());
1616	2061	} else
1617		- if (source == torusItem)
	2062	+ if (source == torusItem \|\| source == torusButton)
1618	2063	{
1619	2064	makeSomething(new Torus());
1620	2065	} else
1621		- if (source == superItem)
	2066	+ if (source == superItem \|\| source == superButton)
1622	2067	{
1623	2068	makeSomething(new Superellipsoid());
1624	2069	} else
1625		- if (source == kleinItem)
	2070	+ if (source == kleinItem \|\| source == kleinButton)
1626	2071	{
1627	2072	makeSomething(new Klein());
1628	2073	} else
..	..	@@ -1642,7 +2087,7 @@
1642	2087	{
1643	2088	makeSomething(new BezierSurface());
1644	2089	} else
1645		- if (source == checkerItem)
	2090	+ if (source == overlayItem \|\| source == overlayButton)
1646	2091	{
1647	2092	/*
1648	2093	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1690,7 +2135,7 @@
1690	2135	s.setup();
1691	2136	makeSomething(s);
1692	2137	} else
1693		- if (source == lightItem)
	2138	+ if (source == lightItem \|\| source == lightButton)
1694	2139	{
1695	2140	makeSomething(new Light());
1696	2141	} else
..	..	@@ -1740,30 +2185,30 @@
1740	2185
1741	2186	group(g);
1742	2187	} else
1743		- if (source == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
1744	2189	{
1745	2190	Composite csg = new GroupLeaf();
1746	2191	csg.count = 5;
1747	2192	group(csg);
1748		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
1749	2194	csg.addChild(child);
1750	2195	child.addChild(csg);
1751	2196	} else
1752	2197	if (source == doubleItem)
1753	2198	{
1754		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
1755	2200	csg.count = 5;
1756	2201	group(csg);
1757		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
1758	2203	csg.addChild(child);
1759	2204	child.addChild(csg);
1760		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
1761	2206	csg.addChild(child);
1762	2207	child.addChild(csg);
1763	2208	} else
1764	2209	if (source == tripleItem)
1765	2210	{
1766		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
1767	2212	csg.count = 4;
1768	2213	group(csg);
1769	2214	Composite child = new cGroup();
..	..	@@ -1775,23 +2220,6 @@
1775	2220	child = new cGroup();
1776	2221	csg.addChild(child);
1777	2222	child.addChild(csg);
1778		- } else
1779		-
1780		- if (source == importGFDItem)
1781		- {
1782		- ImportGFD();
1783		- } else
1784		- if (source == importVRMLX3DItem)
1785		- {
1786		- ImportVRMLX3D();
1787		- } else
1788		- if (source == import3DSItem)
1789		- {
1790		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1791		- } else
1792		- if (source == importOBJItem)
1793		- {
1794		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1795	2223	} else
1796	2224	if (source == computeAOItem)
1797	2225	{
..	..	@@ -1811,7 +2239,7 @@
1811	2239	if (source == invariantsItem)
1812	2240	{
1813	2241	System.out.println("Invariants:");
1814		- GrafreeD.grafreeD.universe.invariants();
	2242	+ Grafreed.grafreeD.universe.invariants();
1815	2243	} else
1816	2244	if (source == memoryItem)
1817	2245	{
..	..	@@ -1830,19 +2258,61 @@
1830	2258	{
1831	2259	DumpObject();
1832	2260	} else
	2261	+ if (source == minButton)
	2262	+ {
	2263	+ Minimize();
	2264	+ } else
	2265	+ if (source == maxButton)
	2266	+ {
	2267	+ Maximize();
	2268	+ } else
	2269	+ if (source == fullButton)
	2270	+ {
	2271	+ ToggleFullScreen();
	2272	+ } else
	2273	+ if (source == undoButton)
	2274	+ {
	2275	+ // Go to previous version
	2276	+ //if (!Undo())
	2277	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2278	+ Undo();
	2279	+ } else
	2280	+ if (source == restoreButton)
	2281	+ {
	2282	+ // Restore current version
	2283	+ Restore();
	2284	+ } else
	2285	+ if (source == replaceButton)
	2286	+ {
	2287	+ // Overwrite current version
	2288	+ Replace();
	2289	+ } else
	2290	+ if (source == redoButton)
	2291	+ {
	2292	+ // Go to next version
	2293	+ Redo();
	2294	+ } else
	2295	+ if (source == saveButton)
	2296	+ {
	2297	+ // Save a new version
	2298	+ if (!Save(true))
	2299	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2300	+ } else
	2301	+ if (source == oneStepButton)
	2302	+ {
	2303	+ Globals.ONESTEP = true;
	2304	+ cameraView.repaint();
	2305	+ } else
1833	2306	if (source == screenfitButton)
1834	2307	{
1835		- //Reload(lastConverter, lastFilename, true);
1836	2308	ScreenFit();
1837	2309	} else
1838	2310	if (source == screenfitpointButton)
1839	2311	{
1840		- //Reload(lastConverter, lastFilename, true);
1841	2312	ScreenFitPoint();
1842	2313	} else
1843	2314	if (source == snapobjectButton)
1844	2315	{
1845		- //Reload(lastConverter, lastFilename, true);
1846	2316	SnapObject();
1847	2317	} else
1848	2318	// if (event.getSource() == recompileButton)
..	..	@@ -1879,12 +2349,20 @@
1879	2349	{
1880	2350	loadClipboard(true);
1881	2351	} else
	2352	+ if (source == undoItem)
	2353	+ {
	2354	+ Undo();
	2355	+ } else
	2356	+ if (source == redoItem)
	2357	+ {
	2358	+ Redo();
	2359	+ } else
1882	2360	if (source == duplicateItem)
1883	2361	{
1884		- Object3D keep = GrafreeD.clipboard;
	2362	+ Object3D keep = Grafreed.clipboard;
1885	2363	loadClipboard(false);
1886	2364	paste(false);
1887		- GrafreeD.clipboard = keep;
	2365	+ Grafreed.clipboard = keep;
1888	2366	} else
1889	2367	if (source == cloneItem)
1890	2368	{
..	..	@@ -1902,13 +2380,17 @@
1902	2380	{
1903	2381	paste(false);
1904	2382	} else
	2383	+ if (source == pasteIntoItem)
	2384	+ {
	2385	+ pasteInto(true, false);
	2386	+ } else
1905	2387	if (source == pasteLinkItem)
1906	2388	{
1907		- pasteInto(false);
	2389	+ pasteInto(false, false);
1908	2390	} else
1909	2391	if (source == pasteCloneItem)
1910	2392	{
1911		- pasteInto(true);
	2393	+ pasteInto(true, true);
1912	2394	} else
1913	2395	if (source == pasteExpandItem)
1914	2396	{
..	..	@@ -2100,9 +2582,9 @@
2100	2582	// group.selection.get(0).setMasterThis(content); // should be identity
2101	2583	// refreshContents();
2102	2584	// }
2103		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2585	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2104	2586	{
2105		- Object3D content = GrafreeD.clipboard.get(0);
	2587	+ Object3D content = Grafreed.clipboard.get(0);
2106	2588
2107	2589	if (content instanceof cGroup && ((cGroup)content).transientlink )
2108	2590	content = ((cGroup)content).get(0);
..	..	@@ -2110,11 +2592,11 @@
2110	2592	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2111	2593	for (int i=0; i<group.selection.size(); i++)
2112	2594	{
2113		- boolean random = CameraPane.RANDOM;
2114		- CameraPane.RANDOM = false; // parse all random nodes
	2595	+ boolean random = CameraPane.SWITCH;
	2596	+ CameraPane.SWITCH = false; // parse all random nodes
2115	2597	group.selection.get(i).linkVerticesThis(content);
2116	2598	// group.selection.get(i).setMasterThis(content); // should be identity
2117		- CameraPane.RANDOM = random;
	2599	+ CameraPane.SWITCH = random;
2118	2600	}
2119	2601	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2120	2602	refreshContents();
..	..	@@ -2124,20 +2606,20 @@
2124	2606	{
2125	2607	for (int i=0; i<group.selection.size(); i++)
2126	2608	{
2127		- boolean random = CameraPane.RANDOM;
2128		- CameraPane.RANDOM = false; // parse all random nodes
	2609	+ boolean random = CameraPane.SWITCH;
	2610	+ CameraPane.SWITCH = false; // parse all random nodes
2129	2611	group.selection.get(i).linkVerticesThis(null);
2130		- CameraPane.RANDOM = random;
	2612	+ CameraPane.SWITCH = random;
2131	2613	}
2132	2614
2133	2615	refreshContents();
2134	2616	} else
2135	2617	if (source == relinkverticesItem)
2136	2618	{
2137		- boolean random = CameraPane.RANDOM;
2138		- CameraPane.RANDOM = false; // parse all random nodes
	2619	+ boolean random = CameraPane.SWITCH;
	2620	+ CameraPane.SWITCH = false; // parse all random nodes
2139	2621	group.selection.RelinkToSupport();
2140		- CameraPane.RANDOM = random;
	2622	+ CameraPane.SWITCH = random;
2141	2623
2142	2624	refreshContents();
2143	2625	} else
..	..	@@ -2152,9 +2634,9 @@
2152	2634	} else
2153	2635	if (source == setMasterItem)
2154	2636	{
2155		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2637	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2156	2638	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	2639	+ Object3D content = Grafreed.clipboard.get(0);
2158	2640
2159	2641	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	2642	content = ((cGroup)content).get(0);
..	..	@@ -2167,9 +2649,9 @@
2167	2649	{
2168	2650	if (group.selection.size() == 1)
2169	2651	{
2170		- if (GrafreeD.clipboard.size() == 1)
	2652	+ if (Grafreed.clipboard.size() == 1)
2171	2653	{
2172		- Object3D content = GrafreeD.clipboard.get(0);
	2654	+ Object3D content = Grafreed.clipboard.get(0);
2173	2655
2174	2656	if (content instanceof cGroup && ((cGroup)content).transientlink )
2175	2657	content = ((cGroup)content).get(0);
..	..	@@ -2186,7 +2668,7 @@
2186	2668	{
2187	2669	RevertMeshes();
2188	2670	} else
2189		- if (source == resetMeshItem)
	2671	+ if (source == resetAllItem)
2190	2672	{
2191	2673	ResetAll();
2192	2674	} else
..	..	@@ -2194,7 +2676,7 @@
2194	2676	{
2195	2677	StepAll();
2196	2678	} else
2197		- if (source == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2198	2680	{
2199	2681	//int indices[] = jList.getSelectedIndices();
2200	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2206,9 +2688,9 @@
2206	2688	{
2207	2689	ClearSelection(true);
2208	2690	} else
2209		- if (source == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2210	2692	{
2211		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2212	2694	} else
2213	2695	if (source == hideItem)
2214	2696	{
..	..	@@ -2226,11 +2708,11 @@
2226	2708	{
2227	2709	makeSomething(new Camera());
2228	2710	} else
2229		- if (source == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2230	2712	{
2231	2713	group(new Composite());
2232	2714	} else
2233		- if (source == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2234	2716	{
2235	2717	RandomNode random = new RandomNode();
2236	2718	group(random);
..	..	@@ -2332,7 +2814,7 @@
2332	2814	{
2333	2815	group(new cLinker());
2334	2816	} else
2335		- if (source == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2336	2818	{
2337	2819	group(new TextureNode());
2338	2820	} else
..	..	@@ -2352,17 +2834,30 @@
2352	2834	{
2353	2835	CastShadow(2);
2354	2836	} else
2355		- if (source == ungroupItem)
	2837	+ if (source == ungroupItem \|\| source == ungroupButton)
2356	2838	{
2357		- //ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
2358	2841	for (int i=0; i<group.selection.size(); i++)
2359	2842	{
2360		- Ungroup(group.selection.get(i));
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
2361	2848	}
2362	2849
2363		- ClearSelection(false);
2364		-
2365		- refreshContents();
	2850	+ if (!hasRoot)
	2851	+ {
	2852	+ for (int i=0; i<group.selection.size(); i++)
	2853	+ {
	2854	+ Ungroup(group.selection.get(i));
	2855	+ }
	2856	+
	2857	+ ClearSelection(false);
	2858	+
	2859	+ refreshContents();
	2860	+ }
2366	2861	} else
2367	2862	if (source == genUVItem)
2368	2863	{
..	..	@@ -2374,7 +2869,7 @@
2374	2869	} else
2375	2870	if (source == genNormalsMESHItem)
2376	2871	{
2377		- GenNormals(true); // TODO
	2872	+ GenNormalsMESH();
2378	2873	} else
2379	2874	if (source == genNormalsORGANItem)
2380	2875	{
..	..	@@ -2439,6 +2934,22 @@
2439	2934	if (source == unmarkleavesItem)
2440	2935	{
2441	2936	MarkLeaves(false);
	2937	+ } else
	2938	+ if (source == rewindleavesItem)
	2939	+ {
	2940	+ RewindLeaves(true);
	2941	+ } else
	2942	+ if (source == unrewindleavesItem)
	2943	+ {
	2944	+ RewindLeaves(false);
	2945	+ } else
	2946	+ if (source == randomleavesItem)
	2947	+ {
	2948	+ RandomLeaves(true);
	2949	+ } else
	2950	+ if (source == unrandomleavesItem)
	2951	+ {
	2952	+ RandomLeaves(false);
2442	2953	} else
2443	2954	if (source == flipVItem)
2444	2955	{
..	..	@@ -2524,9 +3035,13 @@
2524	3035	{
2525	3036	SmoothMesh();
2526	3037	} else
2527		- if (source == transformgeometryItem)
	3038	+ if (source == transformGeometryItem)
2528	3039	{
2529	3040	TransformGeometry();
	3041	+ } else
	3042	+ if (source == transformChildrenItem)
	3043	+ {
	3044	+ TransformChildren();
2530	3045	} else
2531	3046	if (source == resetTransformItem)
2532	3047	{
..	..	@@ -2534,7 +3049,11 @@
2534	3049	} else
2535	3050	if (source == resetCentroidItem)
2536	3051	{
2537		- ResetCentroid();
	3052	+ ResetCentroid(true);
	3053	+ } else
	3054	+ if (source == resetCentroidXZItem)
	3055	+ {
	3056	+ ResetCentroid(false);
2538	3057	} else
2539	3058	if (source == resetParentItem)
2540	3059	{
..	..	@@ -2639,7 +3158,7 @@
2639	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2640	3159	{
2641	3160	obj = (Object3D)e.nextElement();
2642		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2643	3162	}
2644	3163
2645	3164	refreshContents();
..	..	@@ -2655,6 +3174,31 @@
2655	3174
2656	3175	refreshContents();
2657	3176	} else
	3177	+ if (source == embedTexturesItem)
	3178	+ {
	3179	+ Object3D obj;
	3180	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3181	+ {
	3182	+ obj = (Object3D)e.nextElement();
	3183	+ obj.EmbedTextures(true);
	3184	+ }
	3185	+
	3186	+ refreshContents();
	3187	+ } else
	3188	+ if (source == deEmbedTexturesItem)
	3189	+ {
	3190	+ Object3D obj;
	3191	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3192	+ {
	3193	+ obj = (Object3D)e.nextElement();
	3194	+ obj.EmbedTextures(false);
	3195	+ }
	3196	+
	3197	+ CameraPane.texturepigment.clear();
	3198	+ CameraPane.texturebump.clear();
	3199	+
	3200	+ refreshContents();
	3201	+ } else
2658	3202	if (source == flashSelectionButton)
2659	3203	{
2660	3204	CameraPane.flash = true;
..	..	@@ -2666,6 +3210,10 @@
2666	3210	if (source == twoButton)
2667	3211	{
2668	3212	radio.layout = twoButton;
	3213	+
	3214	+ if (CameraPane.FULLSCREEN)
	3215	+ fullscreenLayout = radio.layout;
	3216	+
2669	3217	// bug
2670	3218	//gridPanel.setDividerLocation(1.0);
2671	3219	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2698,10 +3246,31 @@
2698	3246	bigThree.ClearUI();
2699	3247	bigThree.add(centralPanel);
2700	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
	3251	+
	3252	+// refreshContents(true);
	3253	+//
	3254	+// try
	3255	+// {
	3256	+// java.awt.Robot bot = new java.awt.Robot();
	3257	+// int mask = InputEvent.BUTTON1_MASK;
	3258	+// bot.mouseMove(100, 100);
	3259	+// bot.mousePress(mask);
	3260	+// bot.mouseRelease(mask);
	3261	+// }
	3262	+// catch (Exception e)
	3263	+// {
	3264	+//
	3265	+// }
	3266	+
2701	3267	} else
2702	3268	if (source == threeButton)
2703	3269	{
2704	3270	radio.layout = threeButton;
	3271	+
	3272	+ if (CameraPane.FULLSCREEN)
	3273	+ fullscreenLayout = radio.layout;
2705	3274
2706	3275	// bigThree.remove(scenePanel);
2707	3276	// bigThree.remove(centralPanel);
..	..	@@ -2731,13 +3300,18 @@
2731	3300	// centralPanel.setVisible(true);
2732	3301	// XYZPanel.setVisible(true);
2733	3302	bigThree.ClearUI();
	3303	+ bigThree.add(scenePanel);
2734	3304	bigThree.add(centralPanel);
2735		- bigThree.add(XYZPanel);
2736	3305	bigThree.FlushUI();
	3306	+
	3307	+ cameraView.requestFocusInWindow();
2737	3308	} else
2738	3309	if (source == fourButton)
2739	3310	{
2740	3311	radio.layout = fourButton;
	3312	+
	3313	+ if (CameraPane.FULLSCREEN)
	3314	+ fullscreenLayout = radio.layout;
2741	3315
2742	3316	// bigThree.remove(scenePanel);
2743	3317	// bigThree.remove(centralPanel);
..	..	@@ -2769,10 +3343,15 @@
2769	3343	bigThree.ClearUI();
2770	3344	bigThree.add(scenePanel);
2771	3345	bigThree.FlushUI();
	3346	+
	3347	+ cameraView.requestFocusInWindow();
2772	3348	} else
2773	3349	if (source == sixButton)
2774	3350	{
2775	3351	radio.layout = sixButton;
	3352	+
	3353	+ if (CameraPane.FULLSCREEN)
	3354	+ fullscreenLayout = radio.layout;
2776	3355
2777	3356	// bigThree.remove(scenePanel);
2778	3357	// bigThree.remove(centralPanel);
..	..	@@ -2802,13 +3381,18 @@
2802	3381	// centralPanel.setVisible(true);
2803	3382	// XYZPanel.setVisible(false);
2804	3383	bigThree.ClearUI();
2805		- bigThree.add(scenePanel);
2806	3384	bigThree.add(centralPanel);
	3385	+ bigThree.add(scenePanel);
2807	3386	bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
2808	3389	} else
2809	3390	if (source == sevenButton)
2810	3391	{
2811	3392	radio.layout = sevenButton;
	3393	+
	3394	+ if (CameraPane.FULLSCREEN)
	3395	+ fullscreenLayout = radio.layout;
2812	3396
2813	3397	// bigThree.remove(scenePanel);
2814	3398	// bigThree.remove(centralPanel);
..	..	@@ -2842,6 +3426,8 @@
2842	3426	bigThree.add(centralPanel);
2843	3427	bigThree.add(XYZPanel);
2844	3428	bigThree.FlushUI();
	3429	+
	3430	+ cameraView.requestFocusInWindow();
2845	3431	} else
2846	3432	if (source == rootButton)
2847	3433	{
..	..	@@ -2853,6 +3439,7 @@
2853	3439	EditObject(obj);
2854	3440	}
2855	3441
	3442	+ cameraView.requestFocusInWindow();
2856	3443	refreshContents(true);
2857	3444	} else
2858	3445	if (source == closeButton)
..	..	@@ -2862,22 +3449,37 @@
2862	3449	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2863	3450	{
2864	3451	ab = (cRadio)e.nextElement();
2865		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3452	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2866	3453	{
	3454	+ // Patch to avoid bug with transparency.
	3455	+ if (!ab.hadMaterial)
	3456	+ {
	3457	+ ab.object.material = null;
	3458	+ }
	3459	+
2867	3460	buttonGroup.remove(ab);
2868	3461	radioPanel.remove(ab);
2869	3462
2870		- ab.GetObject().editWindow = null;
	3463	+ //ab.GetObject().editWindow = null;
	3464	+ ab.GetObject().manipWindow = null;
2871	3465	// ab.GetObject().objectUI = null; // ?????????
2872	3466
2873	3467	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2874	3468	break;
2875	3469	}
2876	3470	}
	3471	+
	3472	+ cameraView.requestFocusInWindow();
2877	3473	refreshContents(true);
2878	3474	} else
2879	3475	if (source == editItem \|\| source == editButton)
2880	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
2881	3483	EditSelection(false);
2882	3484	} else
2883	3485	if (source == uneditButton)
..	..	@@ -2887,12 +3489,13 @@
2887	3489	Object3D child = (Object3D)e.nextElement();
2888	3490	if(child.editWindow != null)
2889	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
2890	3493	child.CloseUI();
2891	3494	listUI.remove(child);
2892	3495
2893		- child.editWindow = null; // ???????????
	3496	+ //child.editWindow = null; // ???????????
2894	3497	}
2895		- objEditor.ctrlPanel.validate();
	3498	+ objEditor.ctrlPanel.FlushUI();
2896	3499	//objEditor.jTree.clearSelection();
2897	3500	//objEditor.ResetSliders();
2898	3501	refreshContents(true);
..	..	@@ -2903,6 +3506,7 @@
2903	3506	//copy.ClearUI();
2904	3507	for (Object3D obj : listUI)
2905	3508	{
	3509	+ obj.pinned = false;
2906	3510	obj.CloseUI();
2907	3511	}
2908	3512	listUI.clear();
..	..	@@ -2912,7 +3516,7 @@
2912	3516	{
2913	3517	assert(copy == group);
2914	3518
2915		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2916	3520
2917	3521	for (Object3D obj : listUI)
2918	3522	{
..	..	@@ -2961,6 +3565,9 @@
2961	3565	}
2962	3566
2963	3567	copy = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
2964	3571	//Globals.theRenderer.object = group;
2965	3572	if(!useclient)
2966	3573	{
..	..	@@ -2976,20 +3583,46 @@
2976	3583	frontView.object = group;
2977	3584	sideView.object = group;
2978	3585	}
2979		- group.editWindow = this;
	3586	+
	3587	+// fix "+" issue
	3588	+ //group.editWindow = this;
	3589	+ group.manipWindow = this;
	3590	+
2980	3591	/*
2981	3592	currentLayout = radio.layout;
2982	3593	if (currentLayout == null)
2983	3594	currentLayout = sevenButton;
2984	3595	*/
2985	3596	radio.layout.doClick();
	3597	+
	3598	+ ClearUnpinned();
	3599	+ //Grafreed.Assert(group != null);
	3600	+ //Grafreed.Assert(group.selection != null);
	3601	+ SetPinStates(group.selection == null \|\| group.selection.size() > 0);
	3602	+ if (group.selection == null \|\| group.selection.size() == 1)
	3603	+ EditSelection(false);
2986	3604	keepparent = group.parent;
2987	3605	// PARENT = NULL or not???
2988	3606	//group.parent = null; // ROOT
2989	3607	//group.attributes = -1;
2990	3608	ResetModel();
	3609	+
	3610	+ cameraView.requestFocusInWindow();
2991	3611	refreshContents(true);
2992		- }
	3612	+ } else if (event.getSource() == editCameraItem)
	3613	+ {
	3614	+ cameraView.ProtectCamera();
	3615	+ cameraView.repaint();
	3616	+ return;
	3617	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3618	+ {
	3619	+ cameraView.RevertCamera();
	3620	+ cameraView.repaint();
	3621	+ return;
	3622	+ // } else if (event.getSource() == textureButton)
	3623	+ // {
	3624	+ // return; // true;
	3625	+ }
2993	3626	else
2994	3627	{
2995	3628	//return super.action(event, arg);
..	..	@@ -2998,7 +3631,6 @@
2998	3631	}
2999	3632
3000	3633	boolean useclient = false;
3001		- cRadio radio;
3002	3634
3003	3635	void ToggleRoot()
3004	3636	{
..	..	@@ -3050,6 +3682,28 @@
3050	3682	refreshContents();
3051	3683	}
3052	3684
	3685	+ void TransformChildren()
	3686	+ {
	3687	+ Object3D obj;
	3688	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3689	+ {
	3690	+ obj = (Object3D)e.nextElement();
	3691	+ obj.KeepTextureMatrices();
	3692	+ obj.TransformChildren();
	3693	+ obj.RestoreTextureMatrices();
	3694	+
	3695	+// if (obj.parent == null)
	3696	+// {
	3697	+// System.out.println("NULL PARENT!");
	3698	+// new Exception().printStackTrace();
	3699	+// }
	3700	+// else
	3701	+// TouchTransform(obj);
	3702	+// //obj.parent.Touch();
	3703	+ }
	3704	+
	3705	+ refreshContents();
	3706	+ }
3053	3707
3054	3708	void ResetTransform()
3055	3709	{
..	..	@@ -3162,7 +3816,7 @@
3162	3816	refreshContents();
3163	3817	}
3164	3818
3165		- void ResetCentroid()
	3819	+ void ResetCentroid(boolean full)
3166	3820	{
3167	3821	Object3D obj;
3168	3822	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3177,12 +3831,16 @@
3177	3831	LA.matIdentity(Object3D.mat);
3178	3832	obj.getBounds(minima, maxima, false);
3179	3833	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3180		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3834	+ if (full)
	3835	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3181	3836	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3182	3837	obj.TransformMesh(Object3D.mat);
	3838	+
3183	3839	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3184		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3840	+ if (full)
	3841	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3185	3842	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3843	+
3186	3844	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3187	3845	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3188	3846	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3211,7 +3869,8 @@
3211	3869
3212	3870	int size = obj.MemorySize();
3213	3871
3214		- System.err.println((size/1024) + " KB is the size of " + obj);
	3872	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3873	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3215	3874	}
3216	3875	}
3217	3876	catch (Exception e)
..	..	@@ -3248,9 +3907,9 @@
3248	3907	obj = (Object3D)e.nextElement();
3249	3908
3250	3909	System.out.println("Object is: " + obj);
3251		- GrafreeD.AnalyzeObject(obj);
	3910	+ Grafreed.AnalyzeObject(obj);
3252	3911	System.out.println("Boundary rep: " + obj.bRep);
3253		- GrafreeD.AnalyzeObject(obj.bRep);
	3912	+ Grafreed.AnalyzeObject(obj.bRep);
3254	3913
3255	3914	// System.err.println((size/1024) + " KB is the size of " + obj);
3256	3915	}
..	..	@@ -3292,6 +3951,13 @@
3292	3951	void GenNormals(boolean crease)
3293	3952	{
3294	3953	group.GenNormalsS(crease);
	3954	+
	3955	+ refreshContents();
	3956	+ }
	3957	+
	3958	+ void GenNormalsMESH()
	3959	+ {
	3960	+ group.GenNormalsMeshS();
3295	3961
3296	3962	refreshContents();
3297	3963	}
..	..	@@ -3464,8 +4130,8 @@
3464	4130
3465	4131	void ParseVertices()
3466	4132	{
3467		- boolean epsequal = GrafreeD.epsequal;
3468		- GrafreeD.epsequal = true;
	4133	+ boolean epsequal = Grafreed.epsequal;
	4134	+ Grafreed.epsequal = true;
3469	4135
3470	4136	for (int i=0; i<group.selection.size(); i++)
3471	4137	{
..	..	@@ -3490,7 +4156,7 @@
3490	4156	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3491	4157	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3492	4158
3493		- g.add(GrafreeD.clipboard);
	4159	+ g.add(Grafreed.clipboard);
3494	4160
3495	4161	buffer.add(g);
3496	4162	}
..	..	@@ -3505,7 +4171,7 @@
3505	4171	makeSomething(buffer, i==group.selection.size()-1);
3506	4172	}
3507	4173
3508		- GrafreeD.epsequal = epsequal;
	4174	+ Grafreed.epsequal = epsequal;
3509	4175
3510	4176	refreshContents();
3511	4177	}
..	..	@@ -3523,7 +4189,16 @@
3523	4189	String pigment = Object3D.GetPigment(tex);
3524	4190	//String bump = Object3D.GetBump(tex);
3525	4191
3526		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4192	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4193	+
	4194	+ try
	4195	+ {
	4196	+ texturedata = Globals.theRenderer.GetTextureData(tex, false, node.texres);
	4197	+ }
	4198	+ catch (Exception e)
	4199	+ {
	4200	+ System.err.println("FAIL: " + node);
	4201	+ }
3527	4202
3528	4203	double s = v.s;
3529	4204
..	..	@@ -3611,11 +4286,11 @@
3611	4286
3612	4287	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3613	4288
3614		- boolean random = CameraPane.RANDOM;
3615		- CameraPane.RANDOM = false; // parse all random nodes
	4289	+ boolean random = CameraPane.SWITCH;
	4290	+ CameraPane.SWITCH = false; // parse all random nodes
3616	4291	lowres.linkVerticesThis(null);
3617	4292	lowres.linkVerticesThis(sn);
3618		- CameraPane.RANDOM = random;
	4293	+ CameraPane.SWITCH = random;
3619	4294
3620	4295	System.err.flush();
3621	4296
..	..	@@ -3655,7 +4330,7 @@
3655	4330	return;
3656	4331
3657	4332	Object3D poses = group.selection.get(0);
3658		- Object3D ref = GrafreeD.clipboard.get(0);
	4333	+ Object3D ref = Grafreed.clipboard.get(0);
3659	4334
3660	4335	Object3D newgroup = new Object3D("Po:" + poses.name);
3661	4336
..	..	@@ -3849,9 +4524,9 @@
3849	4524
3850	4525	void ClipMesh()
3851	4526	{
3852		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4527	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3853	4528	{
3854		- Object3D content = GrafreeD.clipboard.get(0);
	4529	+ Object3D content = Grafreed.clipboard.get(0);
3855	4530
3856	4531	if (content instanceof cGroup && ((cGroup)content).transientlink )
3857	4532	content = ((cGroup)content).get(0);
..	..	@@ -3860,7 +4535,7 @@
3860	4535	// {
3861	4536	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3862	4537	// }
3863		- group.selection.ClipMesh(GrafreeD.clipboard);
	4538	+ group.selection.ClipMesh(Grafreed.clipboard);
3864	4539	}
3865	4540	// group.selection.ClipMesh(GrafreeD.clipboard);
3866	4541	System.out.println("DONE.");
..	..	@@ -3907,6 +4582,18 @@
3907	4582	void MarkLeaves(boolean hide)
3908	4583	{
3909	4584	group.selection.MarkLeaves(hide);
	4585	+ refreshContents();
	4586	+ }
	4587	+
	4588	+ void RewindLeaves(boolean hide)
	4589	+ {
	4590	+ group.selection.RewindLeaves(hide);
	4591	+ refreshContents();
	4592	+ }
	4593	+
	4594	+ void RandomLeaves(boolean hide)
	4595	+ {
	4596	+ group.selection.RandomLeaves(hide);
3910	4597	refreshContents();
3911	4598	}
3912	4599
..	..	@@ -3981,28 +4668,25 @@
3981	4668	// }
3982	4669	// }
3983	4670
3984		- static boolean allparams = true;
3985		-
3986		- static Vector<Object3D> listUI = new Vector<Object3D>();
3987		-
3988	4671	void EditSelection(boolean newWindow)
3989	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
3990	4679	// aConstraints.gridy = 0;
3991	4680	for (int i=0; i<group.selection.size(); i++)
3992	4681	{
3993	4682	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3994	4683	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3995		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4684	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3996	4685
3997	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
3998		- if(elem != group)
	4687	+ if(elem != group \|\| !newWindow)
3999	4688	{
4000		- // if (!(elem instanceof Composite))
4001		- // newWindow = false;
4002		- listUI.add(elem);
4003		- elem.openEditWindow(this, newWindow); //, false);
4004		- System.out.println("edit : " + elem);
4005		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
4006	4690	}
4007	4691	}
4008	4692	}
..	..	@@ -4077,7 +4761,8 @@
4077	4761	//new Exception().printStackTrace();
4078	4762
4079	4763	freezemodel = true;
4080		-
	4764	+ ClearUnpinned();
	4765	+
4081	4766	/**/
4082	4767	//switch (event.id)
4083	4768	{
..	..	@@ -4085,7 +4770,6 @@
4085	4770	//case 702: // Event.LIST_DESELECT
4086	4771	group.deselectAll();
4087	4772	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4088		- objEditor.ClearInfo(); // .GetMaterial());
4089	4773	if (tps != null)
4090	4774	{
4091	4775	for (int i=0; i < tps.length; i++)
..	..	@@ -4094,10 +4778,8 @@
4094	4778
4095	4779	//if (child.parent != null)
4096	4780	//child.parent.addSelectee(child);
	4781	+ objEditor.SetMaterial(child);
4097	4782	group.addSelectee(child);
4098		- objEditor.SetMaterial(child); // .GetMaterial());
4099		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4100		- System.err.println("info : " + child.GetPath());
4101	4783	}
4102	4784	}
4103	4785	// else
..	..	@@ -4107,20 +4789,28 @@
4107	4789	// System.err.println("info : " + group.GetPath());
4108	4790	// }
4109	4791
4110		- objEditor.SetText(); // jan 2014
4111		-
4112		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4792	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4113	4793	CameraPane.flash = true;
4114	4794
4115		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4795	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4116	4796	// a camera
4117	4797	{
4118		- CameraPane.camerachangeframe = 0; // don't refuse it
4119		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4798	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4799	+ {
	4800	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4801	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4802	+ }
4120	4803	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4121	4804	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4122	4805	}
4123	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
4124	4814	refreshContents();
4125	4815	//return true;
4126	4816	}
..	..	@@ -4129,6 +4819,35 @@
4129	4819
4130	4820	freezemodel = false;
4131	4821	}
	4822	+
	4823	+ void SetPinStates(boolean enabled)
	4824	+ {
	4825	+ editButton.setEnabled(enabled);
	4826	+ uneditButton.setEnabled(enabled);
	4827	+ unselectButton.setEnabled(enabled);
	4828	+ flashSelectionButton.setEnabled(enabled);
	4829	+ }
	4830	+
	4831	+ void refreshContents(boolean cp)
	4832	+ {
	4833	+ if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	4834	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4835	+ {
	4836	+ objEditor.ClearInfo(); // .GetMaterial());
	4837	+
	4838	+ for (int i=0; i < group.selection.Size(); i++)
	4839	+ {
	4840	+ Object3D child = (Object3D) group.selection.get(i);
	4841	+
	4842	+ objEditor.AddInfo(child, this, true);
	4843	+ System.err.println("info : " + child.GetPath());
	4844	+ }
	4845	+
	4846	+ objEditor.SetText(); // jan 2014
	4847	+ }
	4848	+
	4849	+ super.refreshContents(cp);
	4850	+ }
4132	4851
4133	4852	void linkSomething(Object3D thing)
4134	4853	{
..	..	@@ -4200,16 +4919,19 @@
4200	4919	{
4201	4920	if (group.selection.isEmpty())
4202	4921	return;
4203		- GrafreeD.clipboardIsTempGroup = false;
	4922	+
	4923	+ Grafreed.clipboardIsTempGroup = false;
4204	4924	Composite tGroup = null;
4205	4925	if (group.selection.size() > 0) // 1)
4206	4926	{
4207	4927	tGroup = new cGroup();
4208		- GrafreeD.clipboardIsTempGroup = true;
	4928	+ Grafreed.clipboardIsTempGroup = true;
4209	4929	}
4210	4930
4211	4931	if (cut)
4212	4932	{
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4213	4935	//int indices[] = jList.getSelectedIndices();
4214	4936	//for (int i = indices.length - 1; i >= 0; i--)
4215	4937	//jList.remove(indices[i]);
..	..	@@ -4245,16 +4967,16 @@
4245	4967	//System.out.println("cut " + child);
4246	4968	//System.out.println("parent = " + child.parent);
4247	4969	// tmp.addChild(child);
4248		- if (GrafreeD.clipboardIsTempGroup)
	4970	+ if (Grafreed.clipboardIsTempGroup)
4249	4971	tGroup.add/Child/(tmp);
4250	4972	else
4251		- GrafreeD.clipboard = tmp;
	4973	+ Grafreed.clipboard = tmp;
4252	4974	}
4253	4975	else
4254		- if (GrafreeD.clipboardIsTempGroup)
	4976	+ if (Grafreed.clipboardIsTempGroup)
4255	4977	tGroup.add/Child/(child);
4256	4978	else
4257		- GrafreeD.clipboard = child;
	4979	+ Grafreed.clipboard = child;
4258	4980	}
4259	4981
4260	4982	//ResetModel();
..	..	@@ -4286,21 +5008,23 @@
4286	5008	//System.out.println("cut " + elem);
4287	5009	//System.out.println("parent = " + elem.parent);
4288	5010	// tmp.addChild(elem);
4289		- if (GrafreeD.clipboardIsTempGroup)
	5011	+ if (Grafreed.clipboardIsTempGroup)
4290	5012	tGroup.add/Child/(tmp);
4291	5013	else
4292		- GrafreeD.clipboard = tmp;
	5014	+ Grafreed.clipboard = tmp;
4293	5015	}
4294	5016	else
4295		- if (GrafreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4296	5018	tGroup.add/Child/(child);
4297	5019	else
4298		- GrafreeD.clipboard = child;
	5020	+ Grafreed.clipboard = child;
4299	5021	}
4300	5022
4301	5023	}
4302		- if (GrafreeD.clipboardIsTempGroup)
4303		- GrafreeD.clipboard = tGroup;
	5024	+
	5025	+ if (Grafreed.clipboardIsTempGroup)
	5026	+ Grafreed.clipboard = tGroup;
	5027	+
4304	5028	if (cut)
4305	5029	{
4306	5030	ResetModel();
..	..	@@ -4310,11 +5034,15 @@
4310	5034
4311	5035	void paste(boolean expand)
4312	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4313	5041	// if (GrafreeD.clipboard == null)
4314	5042	// return;
4315	5043	boolean first = true;
4316	5044
4317		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4318	5046	{
4319	5047	Composite temp;
4320	5048
..	..	@@ -4325,7 +5053,7 @@
4325	5053	temp = (Composite)Applet3D.clipboard.deepCopy();
4326	5054	*/
4327	5055	Object3D elem;
4328		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	5056	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4329	5057	{
4330	5058	Object3D child = (Object3D)e.nextElement();
4331	5059
..	..	@@ -4359,21 +5087,22 @@
4359	5087	//Object3D cb = Applet3D.clipboard;
4360	5088	//temp.addChild(cb);
4361	5089	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4362		- assert(GrafreeD.clipboard.parent == null);
4363		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4364		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4365		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4366		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	5090	+ assert(Grafreed.clipboard.parent == null);
	5091	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5092	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5093	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5094	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4367	5095	else
4368		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4369		- GrafreeD.clipboard.get(0).parent = keepparent;
	5096	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5097	+ Grafreed.clipboard.get(0).parent = keepparent;
4370	5098	}
4371	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4372	5101	ResetModel();
4373	5102	refreshContents();
4374	5103	}
4375	5104
4376		- void pasteInto(boolean copyit)
	5105	+ void pasteInto(boolean copyit, boolean clone)
4377	5106	{
4378	5107	// if (GrafreeD.clipboard == null)
4379	5108	// return;
..	..	@@ -4402,15 +5131,22 @@
4402	5131	if (copyit)
4403	5132	{
4404	5133	// paste(false);
4405		- CloneClipboard(false); // sept 2014
	5134	+ if (clone)
	5135	+ {
	5136	+ CloneClipboard(false); // sept 2014
	5137	+ }
	5138	+ else
	5139	+ {
	5140	+ paste(false);
	5141	+ }
4406	5142	}
4407	5143	else
4408	5144	{
4409	5145	boolean first = true;
4410	5146
4411		- if (GrafreeD.clipboardIsTempGroup)
	5147	+ if (Grafreed.clipboardIsTempGroup)
4412	5148	{
4413		- Composite temp = (Composite)GrafreeD.clipboard;
	5149	+ Composite temp = (Composite)Grafreed.clipboard;
4414	5150	Object3D copy;
4415	5151	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4416	5152	{
..	..	@@ -4420,7 +5156,7 @@
4420	5156	}
4421	5157	} else
4422	5158	{
4423		- linkSomething(GrafreeD.clipboard); //.get(0));
	5159	+ linkSomething(Grafreed.clipboard); //.get(0));
4424	5160	}
4425	5161	}
4426	5162	}
..	..	@@ -4497,6 +5233,10 @@
4497	5233
4498	5234	void group(Object3D csg, boolean grab)
4499	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4500	5240	if (//false) // why??
4501	5241	!group.selection.isEmpty())
4502	5242	{
..	..	@@ -4610,10 +5350,15 @@
4610	5350	//node.add(csg);
4611	5351	//makeSomething(node);
4612	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
4613	5354	}
4614	5355
4615	5356	void Ungroup(Object3D g)
4616	5357	{
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
4617	5362	if (g instanceof HiddenObject)
4618	5363	{
4619	5364	HiddenObject h = (HiddenObject) g;
..	..	@@ -4630,6 +5375,7 @@
4630	5375	objEditor.makeSomething(g.get(i), false);
4631	5376	}
4632	5377	}
	5378	+ Globals.REPLACEONMAKE = keep;
4633	5379	}
4634	5380
4635	5381	void ungroup()
..	..	@@ -4825,21 +5571,6 @@
4825	5571	}
4826	5572	*/
4827	5573
4828		- void ImportGFD()
4829		- {
4830		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4831		- browser.show();
4832		- String filename = browser.getFile();
4833		- if (filename != null && filename.length() > 0)
4834		- {
4835		- String fullname = browser.getDirectory() + filename;
4836		-
4837		- //Object3D readobj =
4838		- objEditor.ReadGFD(fullname, objEditor);
4839		- //makeSomething(readobj);
4840		- }
4841		- }
4842		-
4843	5574	/*
4844	5575	public void Callback(Object obj)
4845	5576	{
..	..	@@ -4863,26 +5594,9 @@
4863	5594	}
4864	5595	*/
4865	5596
4866		- void ImportVRMLX3D()
4867		- {
4868		- if (GrafreeD.standAlone)
4869		- {
4870		- /**/
4871		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4872		- browser.show();
4873		- String filename = browser.getFile();
4874		- if (filename != null && filename.length() > 0)
4875		- {
4876		- String fullname = browser.getDirectory() + filename;
4877		- LoadVRMLX3D(fullname);
4878		- }
4879		- /**/
4880		- }
4881		- }
4882		-
4883	5597	String GetFile(String dialogName)
4884	5598	{
4885		- if (GrafreeD.standAlone)
	5599	+ if (Grafreed.standAlone)
4886	5600	{
4887	5601	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4888	5602	browser.show();
..	..	@@ -4946,10 +5660,33 @@
4946	5660	cButton flashSelectionButton;
4947	5661	cButton editButton;
4948	5662	cButton uneditButton;
	5663	+ JCheckBox allParamsButton;
4949	5664	cButton clearpanelButton;
4950		- cButton allParamsButton;
4951	5665	cButton unselectButton;
4952	5666
	5667	+ cButton restoreCameraButton;
	5668	+
	5669	+ cButton saveButton;
	5670	+ cButton oneStepButton;
	5671	+
	5672	+ cButton groupButton;
	5673	+ cButton ungroupButton;
	5674	+ cButton compositeButton;
	5675	+ cButton switchButton;
	5676	+ cButton loopButton;
	5677	+ cButton textureButton;
	5678	+
	5679	+ cButton gridButton;
	5680	+ cButton boxButton;
	5681	+ cButton sphereButton;
	5682	+ cButton coneButton;
	5683	+ cButton torusButton;
	5684	+ cButton superButton;
	5685	+ cButton kleinButton;
	5686	+ cButton particlesButton;
	5687	+ cButton overlayButton;
	5688	+ cButton lightButton;
	5689	+
4953	5690	cButton screenfitButton;
4954	5691	cButton screenfitpointButton;
4955	5692	cButton snapobjectButton;
..	..	@@ -4961,14 +5698,6 @@
4961	5698
4962	5699	cButton setsupportButton;
4963	5700
4964		- cButton twoButton;
4965		- cButton sixButton;
4966		- cButton threeButton;
4967		- cButton sevenButton;
4968		- cButton fourButton; // full panel
4969		- cButton oneButton; // full XYZ
4970		- //cButton currentLayout;
4971		-
4972	5701	//
4973	5702	//Composite
4974	5703	Object3D // to do !!
..	..	@@ -4978,9 +5707,11 @@
4978	5707	//JTree jTree;
4979	5708	private MenuItem lookAtItem;
4980	5709	private MenuItem lookFromItem;
4981		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
4982	5711	private MenuItem cutItem;
4983		- private MenuItem duplicateItem;
	5712	+ private MenuItem undoItem;
	5713	+ private MenuItem redoItem;
	5714	+ private JMenuItem duplicateItem;
4984	5715	private MenuItem cloneItem;
4985	5716	private MenuItem cloneSupportItem;
4986	5717	private MenuItem overwriteGeoItem;
..	..	@@ -4993,7 +5724,7 @@
4993	5724	private MenuItem linkverticesItem;
4994	5725	private MenuItem relinkverticesItem;
4995	5726	private MenuItem setMasterItem;
4996		- private MenuItem resetMeshItem;
	5727	+ private MenuItem resetAllItem;
4997	5728	private MenuItem stepAllItem;
4998	5729	private MenuItem revertMeshItem;
4999	5730	private MenuItem poseMeshItem;
..	..	@@ -5004,10 +5735,11 @@
5004	5735	private MenuItem mergeGeometriesItem;
5005	5736	private MenuItem copyItem;
5006	5737	private MenuItem pasteItem;
	5738	+ private MenuItem pasteIntoItem;
5007	5739	private MenuItem pasteLinkItem;
5008	5740	private MenuItem pasteCloneItem;
5009	5741	private MenuItem pasteExpandItem;
5010		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
5011	5743	private MenuItem clearAllItem;
5012	5744	private MenuItem genUVItem;
5013	5745	private MenuItem genNormalsMESHItem;
..	..	@@ -5042,6 +5774,10 @@
5042	5774	private MenuItem showleavesItem;
5043	5775	private MenuItem markleavesItem;
5044	5776	private MenuItem unmarkleavesItem;
	5777	+ private MenuItem rewindleavesItem;
	5778	+ private MenuItem unrewindleavesItem;
	5779	+ private MenuItem randomleavesItem;
	5780	+ private MenuItem unrandomleavesItem;
5045	5781
5046	5782	private MenuItem flipVItem;
5047	5783	private MenuItem unflipVItem;
..	..	@@ -5053,15 +5789,17 @@
5053	5789	private MenuItem panoTexturesItem;
5054	5790
5055	5791	private MenuItem resetCentroidItem;
5056		- private MenuItem transformgeometryItem;
	5792	+ private MenuItem resetCentroidXZItem;
5057	5793	private MenuItem resetTransformItem;
	5794	+ private MenuItem transformGeometryItem;
	5795	+ private MenuItem transformChildrenItem;
5058	5796	private MenuItem hideItem;
5059	5797	private MenuItem grabItem;
5060	5798	private MenuItem backItem;
5061	5799	private MenuItem frontItem;
5062	5800	private MenuItem cameraItem;
5063	5801	private MenuItem compositeItem;
5064		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
5065	5803	private MenuItem physicsItem;
5066	5804	private MenuItem frameselectorItem;
5067	5805	private MenuItem scriptNodeItem;
..	..	@@ -5085,6 +5823,8 @@
5085	5823	private MenuItem attachBumpItem;
5086	5824	private MenuItem detachBumpItem;
5087	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
5088	5828
5089	5829	private MenuItem particleItem;
5090	5830	private MenuItem ragdollItem;
..	..	@@ -5101,7 +5841,7 @@
5101	5841	private MenuItem blobItem;
5102	5842	private MenuItem latheItem;
5103	5843	private MenuItem bezierItem;
5104		- private MenuItem checkerItem;
	5844	+ private MenuItem overlayItem;
5105	5845	private MenuItem meshItem;
5106	5846	// private MenuItem meshGroupItem;
5107	5847	private MenuItem springItem;
..	..	@@ -5123,11 +5863,6 @@
5123	5863	private MenuItem doubleItem;
5124	5864	private MenuItem tripleItem;
5125	5865
5126		- private MenuItem importGFDItem;
5127		- private MenuItem importVRMLX3DItem;
5128		- private MenuItem import3DSItem;
5129		- private MenuItem importOBJItem;
5130		-
5131	5866	private MenuItem computeAOItem;
5132	5867	private MenuItem recompileItem;
5133	5868	private MenuItem editScriptItem;
..	..	@@ -5137,4 +5872,8 @@
5137	5872	private MenuItem analyzeItem;
5138	5873	private MenuItem dumpItem;
5139	5874	//boolean freezemodel = false;
	5875	+
	5876	+ Menu cameraMenu;
	5877	+ MenuItem editCameraItem;
	5878	+ MenuItem restoreCameraItem;
5140	5879	}