~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -12,6 +12,7 @@
12	12	import com.jme.math.Vector3f;
13	13	import com.jme.renderer.ColorRGBA;
14	14
	15	+import grafeme.ui.*;
15	16	//import buoy.widget.BFileChooser;
16	17
17	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
..	..	@@ -59,6 +60,12 @@
59	60	this.copy = this.group = group;
60	61	//selectees = this.group.selectees;
61	62
	63	+ if (copy.versions == null)
	64	+ {
	65	+ copy.versions = new byte[100][];
	66	+ copy.versionindex = -1;
	67	+ }
	68	+
62	69	if(ui)
63	70	SetupUI(objEditor);
64	71	}
..	..	@@ -73,16 +80,28 @@
73	80	this.copy = this.group = copy;
74	81	//selectees = this.group.selectees;
75	82
76		- SetupMenu2(objEditor);
	83	+ SetupMenu2(this); //objEditor);
77	84	SetupUI2(objEditor);
78	85	objEditor.SetupUI(true);
79	86	SetupViews(objEditor);
80	87
81	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	+ }
82	97	}
83	98
84	99	void CloneSelection(boolean supports)
85	100	{
	101	+ if (Globals.REPLACEONMAKE)
	102	+ Save();
	103	+ boolean keep = Globals.REPLACEONMAKE;
	104	+ Globals.REPLACEONMAKE = false;
86	105	// Object3D keep = GrafreeD.clipboard;
87	106	//Object3D obj;
88	107	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -93,18 +112,19 @@
93	112
94	113	makeSomething(clone, i==group.selection.size()-1);
95	114	}
	115	+ Globals.REPLACEONMAKE = keep;
96	116	}
97	117
98	118	void CloneClipboard(boolean supports)
99	119	{
100		- assert(GrafreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
102		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	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));
105	125	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	126	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	127	+ Grafreed.clipboard.get(0).parent = keepparent;
108	128	}
109	129
110	130	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +138,7 @@
118	138	// obj.support = null;
119	139	if (!supports)
120	140	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	141	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	142	obj.parent = parent;
123	143	// obj.support = support;
124	144	// clone.support = support; // aout 2013
..	..	@@ -147,30 +167,29 @@
147	167
148	168	//JTextField nameField;
149	169
150		- void SetupMenu2(ObjEditor oe)
	170	+ void SetupMenu2(GroupEditor oe)
151	171	{
152		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
153		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
154		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
155		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
156		- oe.cameraMenu.add("-");
157		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
158		- openWindowItem.addActionListener(this);
159		- editLeafItem.addActionListener(this);
160		- lookAtItem.addActionListener(this);
161		- //lookFromItem.addActinoListener(this);
162		- //switchItem.addActionListener(this);
	172	+ oe.jTree = new cTree();
	173	+
163	174	Menu menu;
164	175	oe.menuBar.add(menu = new Menu("Edit"));
165	176	//editItem = menu.add(new MenuItem("Edit"));
166	177	//editItem.addActionListener(this);
167		- 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"));
168	185	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	186	cloneItem = menu.add(new MenuItem("Clone"));
171	187	cloneItem.addActionListener(this);
	188	+ if (Globals.ADVANCED)
	189	+ {
172	190	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	191	cloneSupportItem.addActionListener(this);
	192	+ }
174	193	menu.add("-");
175	194	cutItem = menu.add(new MenuItem("Cut"));
176	195	cutItem.addActionListener(this);
..	..	@@ -178,27 +197,123 @@
178	197	copyItem.addActionListener(this);
179	198	pasteItem = menu.add(new MenuItem("Paste"));
180	199	pasteItem.addActionListener(this);
	200	+
	201	+ menu.add("-");
	202	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	203	+ pasteIntoItem.addActionListener(this);
181	204	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	205	pasteLinkItem.addActionListener(this);
183	206	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	207	pasteCloneItem.addActionListener(this);
185	208	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	209	// pasteExpandItem.addActionListener(this);
187		- clearItem = menu.add(new MenuItem("Clear"));
188		- 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...
189	217	clearAllItem = menu.add(new MenuItem("Clear All"));
190	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());
191	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	+
192	308	oe.menuBar.add(menu = new Menu("Setting"));
193		- resetMeshItem = menu.add(new MenuItem("Reset All"));
194		- resetMeshItem.addActionListener(this);
195		- stepAllItem = menu.add(new MenuItem("Step All"));
196		- stepAllItem.addActionListener(this);
	309	+ if (Globals.ADVANCED)
	310	+ {
197	311	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	312	revertMeshItem.addActionListener(this);
199	313	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	314	resetreferencesItem.addActionListener(this);
201	315	menu.add("-");
	316	+ }
202	317	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	318	overwriteGeoItem.addActionListener(this);
204	319	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +325,104 @@
210	325	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	326	overwriteUVItem.addActionListener(this);
212	327	menu.add("-");
	328	+ if (Globals.ADVANCED)
	329	+ {
213	330	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	331	generateMeshItem.addActionListener(this);
215	332	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	333	poseMeshItem.addActionListener(this);
217	334	menu.add("-");
	335	+ }
218	336	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	337	resetsupportItem.addActionListener(this);
220	338	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	339	linkverticesItem.addActionListener(this);
	340	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	341	+ relinkverticesItem.addActionListener(this);
	342	+
	343	+ if (Globals.ADVANCED)
	344	+ {
222	345	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	346	setMasterItem.addActionListener(this);
	347	+ }
224	348
225	349	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
	350	+// grabItem = menu.add(new MenuItem("Grab"));
	351	+// grabItem.addActionListener(this);
228	352	backItem = menu.add(new MenuItem("Back"));
229	353	backItem.addActionListener(this);
230	354	frontItem = menu.add(new MenuItem("Front"));
231	355	frontItem.addActionListener(this);
232		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	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"));
	362	+ hideItem.addActionListener(this);
	363	+ }
	364	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	365	+ ungroupItem.addActionListener(this);
	366	+
	367	+// menu.add("-");
	368	+//
	369	+// switchItem = menu.add(new MenuItem("Switch node"));
	370	+// switchItem.addActionListener(this);
	371	+ if (Globals.ADVANCED)
	372	+ {
241	373	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	374	switchGeoItem.addActionListener(this);
243	375	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	376	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	377	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	378	morphItem.addActionListener(this);
	379	+
	380	+ menu.add("-");
	381	+ physicsItem = menu.add(new MenuItem("Physics"));
	382	+ physicsItem.addActionListener(this);
	383	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	384	+ frameselectorItem.addActionListener(this);
247	385	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	386	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	387	+ }
251	388
252	389	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	390	+// textureItem = menu.add(new MenuItem("Texture"));
	391	+// textureItem.addActionListener(this);
	392	+ billboardItem = menu.add(new MenuItem("Billboard"));
	393	+ billboardItem.addActionListener(this);
255	394	csgItem = menu.add(new MenuItem("CSG"));
256	395	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	396	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	397	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	398	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	399	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	400	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	401	shadowZItem.addActionListener(this);
	402	+ attributeItem = menu.add(new MenuItem("Attribute"));
	403	+ attributeItem.addActionListener(this);
	404	+
	405	+ if (Globals.ADVANCED)
	406	+ {
	407	+ menu.add("-");
263	408	linkerItem = menu.add(new MenuItem("Linker"));
264	409	linkerItem.addActionListener(this);
265	410	templateItem = menu.add(new MenuItem("Template"));
266	411	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	412	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	413	pointflowItem.addActionListener(this);
	414	+ }
271	415	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	416	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	417	resetTransformItem.addActionListener(this);
276	418	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	419	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.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);
280	426
281	427	oe.menuBar.add(menu = new Menu("Geometry"));
282	428	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -287,6 +433,11 @@
287	433	genNormalsCADItem.addActionListener(this);
288	434	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
289	435	genNormalsMESHItem.addActionListener(this);
	436	+ if (Globals.ADVANCED)
	437	+ {
	438	+ genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
	439	+ genNormalsMINEItem.addActionListener(this);
	440	+ }
290	441	stripifyItem = menu.add(new MenuItem("Stripify"));
291	442	stripifyItem.addActionListener(this);
292	443	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -308,23 +459,34 @@
308	459	reduce34MeshItem.addActionListener(this);
309	460	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
310	461	increaseMeshItem.addActionListener(this);
311		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
312		- smoothMeshItem.addActionListener(this);
313	462	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
314	463	clipMeshItem.addActionListener(this);
	464	+
	465	+ if (Globals.ADVANCED)
	466	+ {
	467	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	468	+ smoothMeshItem.addActionListener(this);
	469	+ }
315	470
316	471	oe.menuBar.add(menu = new Menu("Attributes"));
317	472	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
318	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);
319	478	menu.add("-");
320	479	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
321	480	liveleavesItem.addActionListener(this);
322	481	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
323	482	unliveleavesItem.addActionListener(this);
	483	+ if (Globals.ADVANCED)
	484	+ {
324	485	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
325	486	supportleavesItem.addActionListener(this);
326	487	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
327	488	unsupportleavesItem.addActionListener(this);
	489	+ }
328	490	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
329	491	hideleavesItem.addActionListener(this);
330	492	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -333,6 +495,14 @@
333	495	markleavesItem.addActionListener(this);
334	496	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
335	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);
336	506	menu.add("-");
337	507	flipVItem = menu.add(new MenuItem("Flip V"));
338	508	flipVItem.addActionListener(this);
..	..	@@ -358,45 +528,56 @@
358	528	attachBumpItem.addActionListener(this);
359	529	pigmentBumpItem = menu.add(new MenuItem("Pigment -> Bump"));
360	530	pigmentBumpItem.addActionListener(this);
	531	+ //embedTexturesItem
361	532	detachPigmentItem = menu.add(new MenuItem("Detach Pigment"));
362	533	detachPigmentItem.addActionListener(this);
363	534	detachBumpItem = menu.add(new MenuItem("Detach Bump"));
364	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);
365	540	menu.add("-");
366	541	sortbysizeItem = menu.add(new MenuItem("Sort by size"));
367	542	sortbysizeItem.addActionListener(this);
368	543	sortbynameItem = menu.add(new MenuItem("Sort by name"));
369	544	sortbynameItem.addActionListener(this);
370	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.
371	553	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
372	554	extractGeometriesItem.addActionListener(this);
373	555	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
374	556	cloneGeometriesItem.addActionListener(this);
375		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
376		- shareGeometriesItem.addActionListener(this);
377		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
378		- mergeGeometriesItem.addActionListener(this);
	557	+ }
379	558
380	559	oe.menuBar.add(menu = new Menu("Insert"));
381	560	buildCreateMenu(menu);
382	561
383		-
384		- oe.menuBar.add(menu = new Menu("Include"));
385		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
386		- importGFDItem.addActionListener(this);
387		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
388		- importVRMLX3DItem.addActionListener(this);
389		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
390		- importOBJItem.addActionListener(this);
391		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
392		- import3DSItem.addActionListener(this);
393		-
394	562	oe.menuBar.add(menu = new Menu("Tools"));
395	563	buildToolsMenu(menu);
396	564	}
397	565
	566	+
398	567	void SetupUI2(ObjEditor oe)
399	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	+
400	581	//new Exception().printStackTrace();
401	582
402	583	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -425,150 +606,231 @@
425	606	oe.radioPanel.add(dummyButton);
426	607	oe.buttonGroup.add(dummyButton);
427	608	*/
428		- aConstraints.gridy += 1;
429		- oe.aConstraints.gridwidth = 1;
430		- oe.aConstraints.gridx = 0;
	609	+ cGridBag copyOptionsPanel = new cGridBag();
	610	+
	611	+ copyOptionsPanel.preferredHeight = 1;
431	612
432		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	613	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	614	+
	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");
433	667	liveCB.addItemListener(this);
434	668
435		- oe.aConstraints.gridx += 1;
436		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
437		- supportCB.addItemListener(this);
438		-
439		- // oe.aConstraints.gridx += 1;
440		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
441		- // localCB.addItemListener(this);
442		-
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
445		- crowdCB.addItemListener(this);
446		-
447		- oe.aConstraints.gridx += 1;
448		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
449		- smoothCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	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);
	674	+ fastCB.setToolTipText("Fast mode");
453	675	fastCB.addItemListener(this);
454		- oe.aConstraints.gridx += 1;
455		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
456		- slowCB.addItemListener(this);
457		- oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
459		- boxCB.addItemListener(this);
	676	+
	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);
460	682
461		-// oe.aConstraints.gridx += 1;
462		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
463		-// speakerMocapCB.addItemListener(this);
464		-
465		- if (false)
466		- {
467		- // handled in scripts
468		- oe.aConstraints.gridx += 1;
469		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
470		- speakerCameraCB.addItemListener(this);
471		-
472		- oe.aConstraints.gridx += 1;
473		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
474		- speakerFocusCB.addItemListener(this);
475		-
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
478		- smoothfocusCB.addItemListener(this);
479		- }
480		-
481		-//oe.aConstraints.gridx += 1;
482		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
483		-// debugCB.addItemListener(this);
484		-
485		- oe.aConstraints.gridx += 1;
486		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
487		- oeilCB.addItemListener(this);
488		-
489		- oe.aConstraints.gridx += 1;
490		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
491		- lookAtCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
495		- trackCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
499		- screenfitButton.addActionListener(this);
500		- oe.aConstraints.gridx += 1;
501	683	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
502	684	// screenfitpointButton.addActionListener(this);
503		-// oe.aConstraints.gridx += 1;
504		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
505		- snapobjectButton.addActionListener(this);
506		- oe.aConstraints.gridx += 1;
507	685
508		- //aConstraints.gridx = 0;
509		- //aConstraints.gridy += 1;
510		- oe.aConstraints.weighty = 0;
511		- oe.aConstraints.gridwidth = 1;
512		-
513		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
514		- flashSelectionButton.addActionListener(this);
515		- oe.aConstraints.gridx += 1;
516		- oe.aConstraints.weighty = 0;
517		- oe.aConstraints.gridwidth = 1;
	686	+ if (Globals.ADVANCED)
	687	+ {
	688	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	689	+ snapobjectButton.addActionListener(this);
	690	+ snapobjectButton.setToolTipText("Snap Object");
	691	+ }
	692	+
	693	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
518	694
519		- //
520		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
521		- twoButton.addActionListener(this);
522		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	695	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
523	696	fourButton.addActionListener(this);
524		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	697	+ fourButton.setToolTipText("Show left panel only");
	698	+
	699	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ twoButton.setToolTipText("Show right view only");
	701	+ twoButton.addActionListener(this);
	702	+ this.fullscreenLayout = twoButton;
	703	+
	704	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	705	+ sixButton.setToolTipText("Show left and right");
525	706	sixButton.addActionListener(this);
526		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
527		- threeButton.addActionListener(this);
528		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
529		- sevenButton.addActionListener(this);
	707	+// oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+// threeButton.setToolTipText("2-column layout right");
	709	+// threeButton.addActionListener(this);
	710	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+// sevenButton.setToolTipText("3-column layout");
	712	+// sevenButton.addActionListener(this);
530	713	//
531	714
532		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	715	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	716	+ rootButton.setToolTipText("Open selection in new tab");
533	717	rootButton.addActionListener(this);
534		- oe.aConstraints.gridx += 1;
535		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	718	+
	719	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	720	+ closeButton.setToolTipText("Close tab");
536	721	closeButton.addActionListener(this);
537	722	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
538	723	//clearButton.addActionListener(this);
539		- oe.aConstraints.gridx += 1;
540		-
541		- oe.aConstraints.gridx = 1; //
542		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
543		- editButton.addActionListener(this);
544		- oe.aConstraints.gridx += 1;
545		- oe.aConstraints.weighty = 0;
546		- oe.aConstraints.gridwidth = 1;
547	724
548		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	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	+ }
	756	+
	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");
	806	+ editButton.addActionListener(this);
	807	+
	808	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	809	+ uneditButton.setToolTipText("Remove selection controls");
549	810	uneditButton.addActionListener(this);
550	811
551		- oe.aConstraints.gridx += 1;
552		- oe.aConstraints.weighty = 0;
553		- oe.aConstraints.gridwidth = 1;
554		-
555		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
556		- clearPanelButton.addActionListener(this);
557		-
558		- oe.aConstraints.gridx += 1;
559		- oe.aConstraints.weighty = 0;
560		- oe.aConstraints.gridwidth = 1;
561		-
562		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	812	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	813	+ allParamsButton.setToolTipText("Show all controle");
563	814	allParamsButton.addActionListener(this);
564	815
565		- oe.aConstraints.gridx += 1;
566		- oe.aConstraints.weighty = 0;
567		- oe.aConstraints.gridwidth = 1;
568		-
569		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	816	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	817	+ clearPanelButton.setToolTipText("Clear edit panel");
	818	+ clearPanelButton.addActionListener(this);
	819	+
	820	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	821	+ unselectButton.setToolTipText("Unselect");
570	822	unselectButton.addActionListener(this);
571	823
	824	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	825	+ flashSelectionButton.setToolTipText("Highlight selection");
	826	+ flashSelectionButton.addActionListener(this);
	827	+
	828	+ editCommandsPanel.preferredHeight = 1;
	829	+
	830	+ SetPinStates(false);
	831	+// oe.treePanel.add(commandsPanel);
	832	+// oe.treePanel.Return();
	833	+
572	834	// oe.aConstraints.gridx += 1;
573	835	// oe.aConstraints.weighty = 0;
574	836	// oe.aConstraints.gridwidth = 1;
..	..	@@ -580,40 +842,25 @@
580	842	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
581	843	// gcButton.addActionListener(this);
582	844
583		- oe.aConstraints.gridx = 0;
584		- oe.aConstraints.gridy += 1;
585		-
586		- //ctrlPanel.add(objList = new List(5, true));
587		- oe.aConstraints.gridwidth = 100;
588		- // oe.aConstraints.gridheight = 100;
589		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
590		- oe.aConstraints.gridheight = 1;
591		- oe.aConstraints.weighty = 0.5;
592		- oe.aConstraints.gridx = 0;
593		- JScrollPane jSP;
	845	+ cGridBag jSPPanel = new cGridBag();
	846	+
	847	+ JScrollPane jSP;
594	848	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	849	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	850	ResetModel();
597		- oe.aConstraints.weighty = 0.5;
598		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
599		- oe.aConstraints.gridy += 1;
600		- oe.aConstraints.gridwidth = 1;
601		-
602		- oe.aConstraints.weighty = 0;
603		- oe.aConstraints.gridwidth = 2;
604		-
605		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
606		- colorCB.addItemListener(this);
607		- oe.aConstraints.gridx += 2;
608		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
609		- materialCB.addItemListener(this);
610		- oe.aConstraints.gridx += 2;
611		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
612		- textureCB.addItemListener(this);
613		-
614		- oe.aConstraints.gridx = 0;
615		- oe.aConstraints.gridy += 1;
616	851
	852	+ oe.treePanel.add(jSPPanel);
	853	+ oe.treePanel.Return();
	854	+
	855	+ oe.treePanel.add(copyOptionsPanel);
	856	+ oe.treePanel.Return();
	857	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	858	+ versionSlider = (cNumberSlider)sliderPane.getComponent(1);
	859	+ sliderPane.preferredHeight = 1;
	860	+
	861	+// mainPanel.setDividerLocation(0.5); //1.0);
	862	+// mainPanel.setResizeWeight(0.5);
	863	+
617	864	//jList.addListSelectionListener(this);
618	865	oe.jTree.addTreeSelectionListener(this);
619	866	//jTree.setRootVisible(false);
..	..	@@ -632,23 +879,160 @@
632	879	dgr.addDragGestureListener(this);
633	880	}catch(Exception e) {}
634	881	*/
635		- radio.layout = sevenButton;
	882	+ radio.layout = sixButton; // sevenButton;
636	883	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
637	884	}
	885	+
	886	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	887	+ {
	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);
	919	+
	920	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	921	+ // localCB.addItemListener(this);
	922	+
	923	+ panel.Return();
	924	+
	925	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	926	+ crowdCB.setToolTipText("Used for crowds");
	927	+ crowdCB.addItemListener(this);
	928	+
	929	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	930	+ smoothCB.setToolTipText("Snapping delay");
	931	+ smoothCB.addItemListener(this);
	932	+
	933	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	934	+ slowCB.setToolTipText("Smooth interpolation");
	935	+ slowCB.addItemListener(this);
	936	+
	937	+// constraints.gridy += 1;
	938	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	939	+// speakerMocapCB.addItemListener(this);
	940	+
	941	+ panel.Return();
	942	+
	943	+ if (false)
	944	+ {
	945	+ // handled in scripts
	946	+ //constraints.gridy += 1;
	947	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	948	+ speakerCameraCB.addItemListener(this);
	949	+
	950	+ //constraints.gridy += 1;
	951	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	952	+ speakerFocusCB.addItemListener(this);
	953	+
	954	+ //constraints.gridy += 1;
	955	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	956	+ smoothfocusCB.addItemListener(this);
	957	+ panel.Return();
	958	+ }
	959	+
	960	+//constraints.gridx += 1;
	961	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	962	+// debugCB.addItemListener(this);
	963	+
	964	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	965	+ trackCB.setToolTipText("Enable tracking target");
	966	+ trackCB.addItemListener(this);
	967	+
	968	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	969	+ oeilCB.setToolTipText("Move camera when tracking");
	970	+ oeilCB.addItemListener(this);
	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	+ {
	992	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	993	+ lookAtCB.setToolTipText("Look-at target");
	994	+ lookAtCB.addItemListener(this);
	995	+ }
	996	+
	997	+ }
	998	+
	999	+ cGridBag fill = new cGridBag();
	1000	+ fill.preferredHeight = 200;
	1001	+ cGridBag fill2 = new cGridBag();
	1002	+ fill2.preferredHeight = 200;
	1003	+ cGridBag fill3 = new cGridBag();
	1004	+ fill3.preferredHeight = 200;
	1005	+
	1006	+ panel.add(fill);
	1007	+ panel.add(fill2);
	1008	+ panel.add(fill3);
	1009	+
	1010	+ }
638	1011
639	1012	void EditObject(Object3D obj)
640	1013	{
641		- cRadio dummyButton = new cRadio(obj.name);
642		- dummyButton.SetObject(obj);
643		- dummyButton.layout = sevenButton;
644		- dummyButton.SetCamera(cameraView.renderCamera, false);
645		- dummyButton.addActionListener(this);
646		- radioPanel.add(dummyButton);
647		- buttonGroup.add(dummyButton);
648		- dummyButton.doClick();
	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	+
	1023	+ radioButton.SetObject(obj);
	1024	+ radioButton.layout = sixButton; // sevenButton;
	1025	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1026	+ radioButton.addActionListener(this);
	1027	+ radioPanel.add(radioButton);
	1028	+ buttonGroup.add(radioButton);
	1029	+ radioButton.doClick();
649	1030	}
	1031	+
650	1032	void SetupViews(ObjEditor oe)
651	1033	{
	1034	+ theFrame = this;
	1035	+
652	1036	oe.SetupViews();
653	1037
654	1038	System.out.println("SetupViews");
..	..	@@ -657,22 +1041,28 @@
657	1041	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
658	1042	}
659	1043
660		- JCheckBox liveCB;
661		- JCheckBox supportCB;
662		- JCheckBox localCB;
663		- JCheckBox crowdCB;
664		- JCheckBox smoothCB;
665		- JCheckBox fastCB;
666		- JCheckBox slowCB;
667		- JCheckBox boxCB;
668		- JCheckBox trackCB;
669		- 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;
670	1057	// JCheckBox speakerMocapCB;
671		- JCheckBox speakerCameraCB;
672		- JCheckBox speakerFocusCB;
673		- JCheckBox debugCB;
674		- JCheckBox oeilCB;
675		- JCheckBox lookAtCB;
	1058	+ cCheckBox speakerCameraCB;
	1059	+ cCheckBox speakerFocusCB;
	1060	+ cCheckBox debugCB;
	1061	+
	1062	+ cCheckBox oeilCB;
	1063	+ cCheckBox shadowCB;
	1064	+ cCheckBox autokeepCB;
	1065	+ cCheckBox lookAtCB;
676	1066
677	1067	// static int COLOR = 1;
678	1068	// static int MATERIAL = 2;
..	..	@@ -680,9 +1070,9 @@
680	1070
681	1071	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
682	1072
683		- JCheckBox colorCB;
684		- JCheckBox materialCB;
685		- JCheckBox textureCB;
	1073	+ cCheckBox colorCB;
	1074	+ cCheckBox materialCB;
	1075	+ cCheckBox textureCB;
686	1076
687	1077	public void itemStateChanged(ItemEvent e)
688	1078	{
..	..	@@ -707,10 +1097,10 @@
707	1097	dropAttributes \|= Object3D.TEXTURE;
708	1098	else
709	1099	dropAttributes &= ~Object3D.TEXTURE;
710		- }
711		- else if(e.getSource() == liveCB)
	1100	+ } else if(e.getSource() == liveCB)
712	1101	{
713	1102	cameraView.ToggleLive();
	1103	+ refreshContents(false);
714	1104	}
715	1105	else if(e.getSource() == supportCB)
716	1106	{
..	..	@@ -746,6 +1136,10 @@
746	1136	cameraView.repaint();
747	1137	// refreshContents();
748	1138	}
	1139	+ else if(e.getSource() == zoomBoxCB)
	1140	+ {
	1141	+ cameraView.ToggleZoomBoxMode();
	1142	+ }
749	1143	else if(e.getSource() == smoothfocusCB)
750	1144	{
751	1145	cameraView.ToggleSmoothFocus();
..	..	@@ -771,6 +1165,18 @@
771	1165	{
772	1166	cameraView.ToggleOeil();
773	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	+ }
774	1180	else if(e.getSource() == lookAtCB)
775	1181	{
776	1182	cameraView.ToggleLookAt();
..	..	@@ -787,7 +1193,8 @@
787	1193
788	1194	/**/
789	1195	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
790		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1196	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1197	+ TreePath path = objEditor.jTree.getSelectionPath();
791	1198	if ((path == null) \|\| (path.getPathCount() <= 1)) {
792	1199	// We can't move the root node or an empty selection
793	1200	return;
..	..	@@ -850,8 +1257,6 @@
850	1257	}
851	1258	}
852	1259
853		- String string = (String) object;
854		-
855	1260	System.out.println("Transfer = " + object + "; drop : " + target);
856	1261	// if( object instanceof java.io.File[])
857	1262	// {
..	..	@@ -859,7 +1264,11 @@
859	1264	// objEditor.DropFile((java.io.File[]) object, true);
860	1265	// return;
861	1266	// }
862		- 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) == ':')
863	1272	{
864	1273	// file(s)
865	1274	String[] names = string.split("\n");
..	..	@@ -886,7 +1295,7 @@
886	1295
887	1296	flashIt = false;
888	1297	CameraPane pane = (CameraPane) target;
889		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1298	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
890	1299	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
891	1300
892	1301	if (group.selection.size() == 1)
..	..	@@ -902,23 +1311,33 @@
902	1311
903	1312	assert target == objEditor.jTree;
904	1313	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1314	+ Object3D destinationLeaf;
905	1315	try {
906		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1316	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
907	1317	} catch (Exception e) {
908	1318	System.out.println("destinationPath : " + destinationPath);
909	1319	return;
910	1320	}
911	1321
912		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1322	+ for (int i=group.selection.size(); --i>=0;)
913	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	+// {
914	1333	loadClipboard(true);
915	1334	objEditor.jTree.setSelectionPath(destinationPath);
916		- pasteInto(false);
917		- } else {
918		- loadClipboard(false);
919		- objEditor.jTree.setSelectionPath(destinationPath);
920		- pasteInto(false); // true); // ???
921		- }
	1335	+ pasteInto(false, false);
	1336	+// } else {
	1337	+// loadClipboard(false);
	1338	+// objEditor.jTree.setSelectionPath(destinationPath);
	1339	+// pasteInto(false, false); // true); // ???
	1340	+// }
922	1341	}
923	1342	public void dropActionChanged(DropTargetDragEvent dtde)
924	1343	// Called if the user has modified the current drop gesture
..	..	@@ -1023,83 +1442,107 @@
1023	1442	{
1024	1443	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1025	1444	//heightFieldItem.addActionListener(this);
1026		- gridItem = menu.add(new MenuItem("Grid"));
1027		- gridItem.addActionListener(this);
1028		- rectoidItem = menu.add(new MenuItem("Box"));
1029		- rectoidItem.addActionListener(this);
1030		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1031		- ellipsoidItem.addActionListener(this);
1032		- coneItem = menu.add(new MenuItem("Cone"));
1033		- coneItem.addActionListener(this);
1034		- torusItem = menu.add(new MenuItem("Torus"));
1035		- torusItem.addActionListener(this);
1036		- superItem = menu.add(new MenuItem("Superellipsoid"));
1037		- superItem.addActionListener(this);
1038		- particleItem = menu.add(new MenuItem("Particle system"));
1039		- particleItem.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	+ {
	1463	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1464	+ kleinItem.addActionListener(this);
	1465	+ }
	1466	+
	1467	+// particleItem = menu.add(new MenuItem("Particle system"));
	1468	+// particleItem.addActionListener(this);
	1469	+ if (Globals.ADVANCED)
	1470	+ {
1040	1471	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1041	1472	ragdollItem.addActionListener(this);
1042	1473	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1043	1474	ragdoll2Item.addActionListener(this);
	1475	+ }
1044	1476	menu.add("-");
1045		- meshItem = menu.add(new MenuItem("Mesh"));
	1477	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1046	1478	meshItem.addActionListener(this);
1047	1479	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1048	1480	// meshGroupItem.addActionListener(this);
	1481	+ if (Globals.ADVANCED)
	1482	+ {
1049	1483	springItem = menu.add(new MenuItem("Spring"));
1050	1484	springItem.addActionListener(this);
1051	1485	flagItem = menu.add(new MenuItem("Flag"));
1052	1486	flagItem.addActionListener(this);
1053		- bezierItem = menu.add(new MenuItem("Patch"));
1054		- bezierItem.addActionListener(this);
1055		- checkerItem = menu.add(new MenuItem("Checker"));
1056		- checkerItem.addActionListener(this);
1057	1487	blobItem = menu.add(new MenuItem("Blob"));
1058	1488	blobItem.addActionListener(this);
1059	1489	latheItem = menu.add(new MenuItem("Lathe"));
1060	1490	latheItem.addActionListener(this);
1061		- lightItem = menu.add(new MenuItem("Light"));
1062		- 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);
1063	1498	menu.add("-");
1064	1499	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1065	1500	//superLoopItem.addActionListener(this);
1066		- loopItem = menu.add(new MenuItem("Loop"));
1067		- loopItem.addActionListener(this);
	1501	+// loopItem = menu.add(new MenuItem("Loop"));
	1502	+// loopItem.addActionListener(this);
1068	1503	doubleItem = menu.add(new MenuItem("Fork"));
1069	1504	doubleItem.addActionListener(this);
	1505	+ if (Globals.ADVANCED)
	1506	+ {
1070	1507	tripleItem = menu.add(new MenuItem("Trident"));
1071	1508	tripleItem.addActionListener(this);
	1509	+ }
1072	1510	}
1073	1511
1074	1512	void buildToolsMenu(Menu menu)
1075	1513	{
1076	1514	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1077	1515	animationItem.addItemListener(this);
1078		- animationItem.setState(CameraPane.ANIMATION);
	1516	+ animationItem.setState(Globals.ANIMATION);
	1517	+
	1518	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1519	+ archiveItem.addActionListener(this);
1079	1520
1080	1521	menu.add("-");
1081	1522	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1082	1523	parseverticesItem.addActionListener(this);
1083	1524	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1084	1525	textureFieldItem.addActionListener(this);
1085		- alignItem = menu.add(new MenuItem("Align"));
	1526	+ alignItem = menu.add(new MenuItem("Align Objects"));
1086	1527	alignItem.addActionListener(this);
1087		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1088		- mirrorItem.addActionListener(this);
1089	1528	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1090	1529	reduceMorphItem.addActionListener(this);
1091	1530	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1092	1531	reduce34MorphItem.addActionListener(this);
1093		-
1094		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1095		- computeAOItem.addActionListener(this);
1096	1532	menu.add("-");
1097		-
1098	1533	menu.add(memoryItem = new MenuItem("Memory Usage"));
1099	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("-");
1100	1543	menu.add(analyzeItem = new MenuItem("Analyze"));
1101	1544	analyzeItem.addActionListener(this);
1102		- menu.add(dumpItem = new MenuItem("Dump"));
	1545	+ menu.add(dumpItem = new MenuItem("Print"));
1103	1546	dumpItem.addActionListener(this);
1104	1547	// menu.add(pathItem = new MenuItem("From-to path"));
1105	1548	// pathItem.addActionListener(this);
..	..	@@ -1108,6 +1551,8 @@
1108	1551	resetParentItem.addActionListener(this);
1109	1552	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1110	1553	repairParentItem.addActionListener(this);
	1554	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1555	+ repairShadowItem.addActionListener(this);
1111	1556	menu.add(invariantsItem = new MenuItem("Invariants"));
1112	1557	invariantsItem.addActionListener(this);
1113	1558	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1115,6 +1560,7 @@
1115	1560	menu.add("-");
1116	1561	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1117	1562	editScriptItem.addActionListener(this);
	1563	+ }
1118	1564	}
1119	1565
1120	1566	void ScreenFit()
..	..	@@ -1237,9 +1683,34 @@
1237	1683	shadow.material = new cMaterial(obj.material);
1238	1684	shadow.material.diffuse = 0.0001f;
1239	1685	shadow.material.specular = 0.0001f;
	1686	+ //shadow.projectedVertices[1].x = 300;
1240	1687
1241	1688	makeSomething(shadow);
1242	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	+ }
1243	1714
1244	1715	/**
1245	1716	* applyExample
..	..	@@ -1443,9 +1914,9 @@
1443	1914
1444	1915	void Overwrite(int mask)
1445	1916	{
1446		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1917	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1447	1918	{
1448		- Object3D content = GrafreeD.clipboard.get(0);
	1919	+ Object3D content = Grafreed.clipboard.get(0);
1449	1920
1450	1921	if (content instanceof cGroup && ((cGroup)content).transientlink )
1451	1922	content = ((cGroup)content).get(0);
..	..	@@ -1468,6 +1939,7 @@
1468	1939	//
1469	1940	public void actionPerformed(ActionEvent event) // , Object arg)
1470	1941	{
	1942	+ Object source = event.getSource();
1471	1943	/*
1472	1944	if (event.getSource() == nameField)
1473	1945	{
..	..	@@ -1479,11 +1951,11 @@
1479	1951	}
1480	1952	else
1481	1953	*/
1482		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1954	+ if (source == lookAtItem \|\| source == lookFromItem)
1483	1955	{
1484	1956	ScreenFit();
1485	1957	} else
1486		- if (event.getSource() == switchItem)
	1958	+ if (source == switchViewItem)
1487	1959	{
1488	1960	cVector v1 = new cVector();
1489	1961	cVector v2 = new cVector();
..	..	@@ -1492,11 +1964,11 @@
1492	1964	objEditor.cameraView.renderCamera.setAim(v2, v1);
1493	1965	objEditor.cameraView.repaint();
1494	1966	} else
1495		- if (event.getSource() == rectoidItem)
	1967	+ if (source == rectoidItem \|\| source == boxButton)
1496	1968	{
1497	1969	makeSomething(new Box());
1498	1970	} else
1499		- if (event.getSource() == particleItem)
	1971	+ if (source == particleItem \|\| source == particlesButton)
1500	1972	{
1501	1973	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1502	1974	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1517,9 +1989,9 @@
1517	1989	applyExample(particleGeom, "SMOKE");
1518	1990	makeSomething(particleGeom);
1519	1991	} else
1520		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1992	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1521	1993	{
1522		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1994	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1523	1995
1524	1996	ragdoll.toParent = LA.newMatrix();
1525	1997	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1537,7 +2009,7 @@
1537	2009	} else
1538	2010	/*
1539	2011	*/
1540		- if (event.getSource() == heightFieldItem)
	2012	+ if (source == heightFieldItem)
1541	2013	{
1542	2014	Object3D obj = new Object3D();
1543	2015
..	..	@@ -1575,27 +2047,31 @@
1575	2047
1576	2048	makeSomething(obj);
1577	2049	} else
1578		- if (event.getSource() == gridItem)
	2050	+ if (source == gridItem \|\| source == gridButton)
1579	2051	{
1580	2052	makeSomething(new Grid());
1581	2053	} else
1582		- if (event.getSource() == ellipsoidItem)
	2054	+ if (source == ellipsoidItem \|\| source == sphereButton)
1583	2055	{
1584	2056	makeSomething(new Sphere());
1585	2057	} else
1586		- if (event.getSource() == coneItem)
	2058	+ if (source == coneItem \|\| source == coneButton)
1587	2059	{
1588	2060	makeSomething(new Cone());
1589	2061	} else
1590		- if (event.getSource() == torusItem)
	2062	+ if (source == torusItem \|\| source == torusButton)
1591	2063	{
1592	2064	makeSomething(new Torus());
1593	2065	} else
1594		- if (event.getSource() == superItem)
	2066	+ if (source == superItem \|\| source == superButton)
1595	2067	{
1596	2068	makeSomething(new Superellipsoid());
1597	2069	} else
1598		- if (event.getSource() == blobItem)
	2070	+ if (source == kleinItem \|\| source == kleinButton)
	2071	+ {
	2072	+ makeSomething(new Klein());
	2073	+ } else
	2074	+ if (source == blobItem)
1599	2075	{
1600	2076	Blob blob = new Blob();
1601	2077	BlobComponent comp = new BlobComponent();
..	..	@@ -1603,15 +2079,15 @@
1603	2079	//blob.retile();
1604	2080	makeSomething(blob);
1605	2081	} else
1606		- if (event.getSource() == latheItem)
	2082	+ if (source == latheItem)
1607	2083	{
1608	2084	makeSomething(new Lathe());
1609	2085	} else
1610		- if (event.getSource() == bezierItem)
	2086	+ if (source == bezierItem)
1611	2087	{
1612	2088	makeSomething(new BezierSurface());
1613	2089	} else
1614		- if (event.getSource() == checkerItem)
	2090	+ if (source == overlayItem \|\| source == overlayButton)
1615	2091	{
1616	2092	/*
1617	2093	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1626,7 +2102,7 @@
1626	2102	*/
1627	2103	makeSomething(new Checker());
1628	2104	} else
1629		- if (event.getSource() == meshItem)
	2105	+ if (source == meshItem)
1630	2106	{
1631	2107	Object3D itemtomake = new Object3D();
1632	2108	Object3D child;
..	..	@@ -1647,35 +2123,35 @@
1647	2123	makeSomething(child);
1648	2124	}
1649	2125	} else
1650		- if (event.getSource() == springItem)
	2126	+ if (source == springItem)
1651	2127	{
1652	2128	cSpring s = new cSpring();
1653	2129	s.setup();
1654	2130	makeSomething(s);
1655	2131	} else
1656		- if (event.getSource() == flagItem)
	2132	+ if (source == flagItem)
1657	2133	{
1658	2134	cSpring s = new cFlag();
1659	2135	s.setup();
1660	2136	makeSomething(s);
1661	2137	} else
1662		- if (event.getSource() == lightItem)
	2138	+ if (source == lightItem \|\| source == lightButton)
1663	2139	{
1664	2140	makeSomething(new Light());
1665	2141	} else
1666		- if (event.getSource() == csgItem)
	2142	+ if (source == csgItem)
1667	2143	{
1668	2144	group(new CSG());
1669	2145	} else
1670		- if (event.getSource() == templateItem)
	2146	+ if (source == templateItem)
1671	2147	{
1672	2148	group(new cTemplate());
1673	2149	} else
1674		- if (event.getSource() == attributeItem)
	2150	+ if (source == attributeItem)
1675	2151	{
1676	2152	makeSomething(new Attribute());
1677	2153	} else
1678		- if (event.getSource() == pointflowItem)
	2154	+ if (source == pointflowItem)
1679	2155	{
1680	2156	makeSomething(new PointFlow());
1681	2157	} else
..	..	@@ -1687,7 +2163,7 @@
1687	2163	} else
1688	2164	*/
1689	2165
1690		- if (event.getSource() == superLoopItem)
	2166	+ if (source == superLoopItem)
1691	2167	{
1692	2168	Composite g = new cGroup();
1693	2169	for (int i=0; i<15; i++)
..	..	@@ -1709,30 +2185,30 @@
1709	2185
1710	2186	group(g);
1711	2187	} else
1712		- if (event.getSource() == loopItem)
	2188	+ if (source == loopItem \|\| source == loopButton)
1713	2189	{
1714	2190	Composite csg = new GroupLeaf();
1715	2191	csg.count = 5;
1716	2192	group(csg);
1717		- Composite child = new cGroup();
	2193	+ Composite child = new cGroup("Branch");
1718	2194	csg.addChild(child);
1719	2195	child.addChild(csg);
1720	2196	} else
1721		- if (event.getSource() == doubleItem)
	2197	+ if (source == doubleItem)
1722	2198	{
1723		- Composite csg = new GroupLeaf();
	2199	+ Composite csg = new GroupLeaf("Fork");
1724	2200	csg.count = 5;
1725	2201	group(csg);
1726		- Composite child = new cGroup();
	2202	+ Composite child = new cGroup("Branch A");
1727	2203	csg.addChild(child);
1728	2204	child.addChild(csg);
1729		- child = new cGroup();
	2205	+ child = new cGroup("Branch B");
1730	2206	csg.addChild(child);
1731	2207	child.addChild(csg);
1732	2208	} else
1733		- if (event.getSource() == tripleItem)
	2209	+ if (source == tripleItem)
1734	2210	{
1735		- Composite csg = new GroupLeaf();
	2211	+ Composite csg = new GroupLeaf("Trident");
1736	2212	csg.count = 4;
1737	2213	group(csg);
1738	2214	Composite child = new cGroup();
..	..	@@ -1745,73 +2221,98 @@
1745	2221	csg.addChild(child);
1746	2222	child.addChild(csg);
1747	2223	} else
1748		-
1749		- if (event.getSource() == importGFDItem)
	2224	+ if (source == computeAOItem)
1750	2225	{
1751		- ImportGFD();
	2226	+ Globals.drawMode = CameraPane.OCCLUSION;
	2227	+ Globals.theRenderer.repaint();
1752	2228	} else
1753		- if (event.getSource() == importVRMLX3DItem)
1754		- {
1755		- ImportVRMLX3D();
1756		- } else
1757		- if (event.getSource() == import3DSItem)
1758		- {
1759		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1760		- } else
1761		- if (event.getSource() == importOBJItem)
1762		- {
1763		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1764		- } else
1765		- if (event.getSource() == computeAOItem)
1766		- {
1767		- CameraPane.drawMode = CameraPane.OCCLUSION;
1768		- CameraPane.theRenderer.repaint();
1769		- } else
1770		- if (event.getSource() == recompileItem)
	2229	+ if (source == recompileItem)
1771	2230	{
1772	2231	Recompile();
1773	2232	refreshContents();
1774	2233	} else
1775		- if (event.getSource() == editScriptItem)
	2234	+ if (source == editScriptItem)
1776	2235	{
1777	2236	OpenDialog();
1778	2237	refreshContents();
1779	2238	} else
1780		- if (event.getSource() == invariantsItem)
	2239	+ if (source == invariantsItem)
1781	2240	{
1782	2241	System.out.println("Invariants:");
1783		- GrafreeD.theApplet3D.universe.invariants();
	2242	+ Grafreed.grafreeD.universe.invariants();
1784	2243	} else
1785		- if (event.getSource() == memoryItem)
	2244	+ if (source == memoryItem)
1786	2245	{
1787	2246	//System.out.println("Invariants:");
1788	2247	PrintMemory();
1789	2248	} else
1790		- if (event.getSource() == pathItem)
	2249	+ if (source == pathItem)
1791	2250	{
1792	2251	PrintPath();
1793	2252	} else
1794		- if (event.getSource() == analyzeItem)
	2253	+ if (source == analyzeItem)
1795	2254	{
1796	2255	AnalyzeObject();
1797	2256	} else
1798		- if (event.getSource() == dumpItem)
	2257	+ if (source == dumpItem)
1799	2258	{
1800	2259	DumpObject();
1801	2260	} else
1802		- if (event.getSource() == screenfitButton)
	2261	+ if (source == minButton)
1803	2262	{
1804		- //Reload(lastConverter, lastFilename, true);
	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
	2306	+ if (source == screenfitButton)
	2307	+ {
1805	2308	ScreenFit();
1806	2309	} else
1807		- if (event.getSource() == screenfitpointButton)
	2310	+ if (source == screenfitpointButton)
1808	2311	{
1809		- //Reload(lastConverter, lastFilename, true);
1810	2312	ScreenFitPoint();
1811	2313	} else
1812		- if (event.getSource() == snapobjectButton)
	2314	+ if (source == snapobjectButton)
1813	2315	{
1814		- //Reload(lastConverter, lastFilename, true);
1815	2316	SnapObject();
1816	2317	} else
1817	2318	// if (event.getSource() == recompileButton)
..	..	@@ -1820,13 +2321,13 @@
1820	2321	// Recompile();
1821	2322	// refreshContents();
1822	2323	// } else
1823		- if (event.getSource() == gcButton)
	2324	+ if (source == gcButton)
1824	2325	{
1825	2326	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2327	System.gc();
1827	2328	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1828	2329	} else
1829		- if (event.getSource() == editLeafItem)
	2330	+ if (source == editLeafItem)
1830	2331	{
1831	2332	Object3D obj;
1832	2333	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1840,62 +2341,74 @@
1840	2341	}
1841	2342	refreshContents(true);
1842	2343	} else
1843		- if (event.getSource() == openWindowItem)
	2344	+ if (source == openWindowItem)
1844	2345	{
1845	2346	EditSelection(true);
1846	2347	} else
1847		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2348	+ if (source == cutItem \|\| source == clearButton)
1848	2349	{
1849	2350	loadClipboard(true);
1850	2351	} else
1851		- if (event.getSource() == duplicateItem)
	2352	+ if (source == undoItem)
1852	2353	{
1853		- Object3D keep = GrafreeD.clipboard;
	2354	+ Undo();
	2355	+ } else
	2356	+ if (source == redoItem)
	2357	+ {
	2358	+ Redo();
	2359	+ } else
	2360	+ if (source == duplicateItem)
	2361	+ {
	2362	+ Object3D keep = Grafreed.clipboard;
1854	2363	loadClipboard(false);
1855	2364	paste(false);
1856		- GrafreeD.clipboard = keep;
	2365	+ Grafreed.clipboard = keep;
1857	2366	} else
1858		- if (event.getSource() == cloneItem)
	2367	+ if (source == cloneItem)
1859	2368	{
1860	2369	CloneSelection(false);
1861	2370	} else
1862		- if (event.getSource() == cloneSupportItem)
	2371	+ if (source == cloneSupportItem)
1863	2372	{
1864	2373	CloneSelection(true);
1865	2374	} else
1866		- if (event.getSource() == copyItem)
	2375	+ if (source == copyItem)
1867	2376	{
1868	2377	loadClipboard(false);
1869	2378	} else
1870		- if (event.getSource() == pasteItem)
	2379	+ if (source == pasteItem)
1871	2380	{
1872	2381	paste(false);
1873	2382	} else
1874		- if (event.getSource() == pasteLinkItem)
	2383	+ if (source == pasteIntoItem)
1875	2384	{
1876		- pasteInto(false);
	2385	+ pasteInto(true, false);
1877	2386	} else
1878		- if (event.getSource() == pasteCloneItem)
	2387	+ if (source == pasteLinkItem)
1879	2388	{
1880		- pasteInto(true);
	2389	+ pasteInto(false, false);
1881	2390	} else
1882		- if (event.getSource() == pasteExpandItem)
	2391	+ if (source == pasteCloneItem)
	2392	+ {
	2393	+ pasteInto(true, true);
	2394	+ } else
	2395	+ if (source == pasteExpandItem)
1883	2396	{
1884	2397	paste(true);
1885	2398	} else
1886		- if (event.getSource() == synchronizeItem)
	2399	+ if (source == synchronizeItem)
1887	2400	{
1888	2401	Overwrite(Object3D.TRANSFORM);
1889	2402	} else
1890		- if (event.getSource() == overwriteNameItem)
	2403	+ if (source == overwriteNameItem)
1891	2404	{
1892	2405	Overwrite(Object3D.NAME);
1893	2406	} else
1894		- if (event.getSource() == overwriteUVItem)
	2407	+ if (source == overwriteUVItem)
1895	2408	{
1896	2409	Overwrite(Object3D.UV);
1897	2410	} else
1898		- if (event.getSource() == overwriteMatItem)
	2411	+ if (source == overwriteMatItem)
1899	2412	{
1900	2413	/* july 2015
1901	2414	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1915,7 +2428,7 @@
1915	2428
1916	2429	Overwrite(dropAttributes);
1917	2430	}
1918		- if (event.getSource() == overwriteGeoItem)
	2431	+ if (source == overwriteGeoItem)
1919	2432	{
1920	2433	Overwrite(Object3D.GEOMETRY);
1921	2434	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1932,7 +2445,7 @@
1932	2445	// refreshContents();
1933	2446	// }
1934	2447	} else
1935		- if (event.getSource() == generateMeshItem)
	2448	+ if (source == generateMeshItem)
1936	2449	{
1937	2450	//if (group.selection.size() == 1)
1938	2451	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1943,7 +2456,7 @@
1943	2456	ResetModel();
1944	2457	refreshContents();
1945	2458	} else
1946		- if (event.getSource() == extractGeometriesItem)
	2459	+ if (source == extractGeometriesItem)
1947	2460	{
1948	2461	boolean one = false;
1949	2462
..	..	@@ -1970,7 +2483,7 @@
1970	2483	ResetModel();
1971	2484	refreshContents();
1972	2485	} else
1973		- if (event.getSource() == cloneGeometriesItem)
	2486	+ if (source == cloneGeometriesItem)
1974	2487	{
1975	2488	boolean one = false;
1976	2489
..	..	@@ -1996,32 +2509,37 @@
1996	2509	ResetModel();
1997	2510	refreshContents();
1998	2511	} else
1999		- if (event.getSource() == shareGeometriesItem)
	2512	+ if (source == shareGeometriesItem)
2000	2513	{
2001	2514	boolean one = false;
2002	2515
2003	2516	if (group.selection.size() == 1)
2004	2517	one = true;
2005	2518
	2519	+ Object3D merge = null;
	2520	+
2006	2521	Object3D content = new cGroup();
2007	2522
2008	2523	for (int i=0; i<group.selection.size(); i++)
2009	2524	{
2010		- Object3D sel = new Merge(group.selection.get(i));
	2525	+ merge = new Merge(group.selection.get(i));
2011	2526
2012	2527	if (one)
2013		- makeSomething(sel, false);
	2528	+ makeSomething(merge, false);
2014	2529	else
2015		- content.addChild(sel);
	2530	+ content.addChild(merge);
2016	2531	}
2017	2532
2018	2533	if (!one)
2019		- makeSomething(content, false);
2020		-
2021		- ResetModel();
2022		- refreshContents();
	2534	+ makeSomething(content, true);
	2535	+ else
	2536	+ {
	2537	+ ResetModel();
	2538	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2539	+ refreshContents();
	2540	+ }
2023	2541	} else
2024		- if (event.getSource() == mergeGeometriesItem)
	2542	+ if (source == mergeGeometriesItem)
2025	2543	{
2026	2544	boolean one = false;
2027	2545
..	..	@@ -2051,7 +2569,7 @@
2051	2569	ResetModel();
2052	2570	refreshContents();
2053	2571	} else
2054		- if (event.getSource() == linkverticesItem)
	2572	+ if (source == linkverticesItem)
2055	2573	{
2056	2574	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2057	2575	// {
..	..	@@ -2064,39 +2582,48 @@
2064	2582	// group.selection.get(0).setMasterThis(content); // should be identity
2065	2583	// refreshContents();
2066	2584	// }
2067		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2585	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2068	2586	{
2069		- Object3D content = GrafreeD.clipboard.get(0);
	2587	+ Object3D content = Grafreed.clipboard.get(0);
2070	2588
2071	2589	if (content instanceof cGroup && ((cGroup)content).transientlink )
2072	2590	content = ((cGroup)content).get(0);
2073	2591
2074		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2592	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2075	2593	for (int i=0; i<group.selection.size(); i++)
2076	2594	{
2077		- boolean random = CameraPane.RANDOM;
2078		- CameraPane.RANDOM = false; // parse all random nodes
	2595	+ boolean random = CameraPane.SWITCH;
	2596	+ CameraPane.SWITCH = false; // parse all random nodes
2079	2597	group.selection.get(i).linkVerticesThis(content);
2080	2598	// group.selection.get(i).setMasterThis(content); // should be identity
2081		- CameraPane.RANDOM = random;
	2599	+ CameraPane.SWITCH = random;
2082	2600	}
2083		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2601	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2084	2602	refreshContents();
2085	2603	}
2086	2604	} else
2087		- if (event.getSource() == resetsupportItem)
	2605	+ if (source == resetsupportItem)
2088	2606	{
2089	2607	for (int i=0; i<group.selection.size(); i++)
2090	2608	{
2091		- boolean random = CameraPane.RANDOM;
2092		- CameraPane.RANDOM = false; // parse all random nodes
	2609	+ boolean random = CameraPane.SWITCH;
	2610	+ CameraPane.SWITCH = false; // parse all random nodes
2093	2611	group.selection.get(i).linkVerticesThis(null);
2094		- CameraPane.RANDOM = random;
	2612	+ CameraPane.SWITCH = random;
2095	2613	}
2096	2614
2097	2615	refreshContents();
2098	2616	} else
2099		- if (event.getSource() == resetreferencesItem)
	2617	+ if (source == relinkverticesItem)
	2618	+ {
	2619	+ boolean random = CameraPane.SWITCH;
	2620	+ CameraPane.SWITCH = false; // parse all random nodes
	2621	+ group.selection.RelinkToSupport();
	2622	+ CameraPane.SWITCH = random;
	2623	+
	2624	+ refreshContents();
	2625	+ } else
	2626	+ if (source == resetreferencesItem)
2100	2627	{
2101	2628	for (int i=0; i<group.selection.size(); i++)
2102	2629	{
..	..	@@ -2105,11 +2632,11 @@
2105	2632
2106	2633	refreshContents();
2107	2634	} else
2108		- if (event.getSource() == setMasterItem)
	2635	+ if (source == setMasterItem)
2109	2636	{
2110		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2637	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2111	2638	{
2112		- Object3D content = GrafreeD.clipboard.get(0);
	2639	+ Object3D content = Grafreed.clipboard.get(0);
2113	2640
2114	2641	if (content instanceof cGroup && ((cGroup)content).transientlink )
2115	2642	content = ((cGroup)content).get(0);
..	..	@@ -2118,13 +2645,13 @@
2118	2645	refreshContents();
2119	2646	}
2120	2647	} else
2121		- if (event.getSource() == poseMeshItem)
	2648	+ if (source == poseMeshItem)
2122	2649	{
2123	2650	if (group.selection.size() == 1)
2124	2651	{
2125		- if (GrafreeD.clipboard.size() == 1)
	2652	+ if (Grafreed.clipboard.size() == 1)
2126	2653	{
2127		- Object3D content = GrafreeD.clipboard.get(0);
	2654	+ Object3D content = Grafreed.clipboard.get(0);
2128	2655
2129	2656	if (content instanceof cGroup && ((cGroup)content).transientlink )
2130	2657	content = ((cGroup)content).get(0);
..	..	@@ -2137,19 +2664,19 @@
2137	2664	}
2138	2665
2139	2666	} else
2140		- if (event.getSource() == revertMeshItem)
	2667	+ if (source == revertMeshItem)
2141	2668	{
2142	2669	RevertMeshes();
2143	2670	} else
2144		- if (event.getSource() == resetMeshItem)
	2671	+ if (source == resetAllItem)
2145	2672	{
2146	2673	ResetAll();
2147	2674	} else
2148		- if (event.getSource() == stepAllItem)
	2675	+ if (source == stepAllItem)
2149	2676	{
2150	2677	StepAll();
2151	2678	} else
2152		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2679	+ if (source == deleteItem) // \|\| event.getSource() == clearButton)
2153	2680	{
2154	2681	//int indices[] = jList.getSelectedIndices();
2155	2682	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2157,42 +2684,46 @@
2157	2684
2158	2685	ClearSelection(false);
2159	2686	} else
2160		- if (event.getSource() == clearAllItem)
	2687	+ if (source == clearAllItem)
2161	2688	{
2162	2689	ClearSelection(true);
2163	2690	} else
2164		- if (event.getSource() == grabItem)
	2691	+ if (source == grabItem \|\| source == groupButton)
2165	2692	{
2166		- group(new cGroup(), true);
	2693	+ group(new cGroup(), false); // true);
2167	2694	} else
2168		- if (event.getSource() == frontItem)
	2695	+ if (source == hideItem)
	2696	+ {
	2697	+ group(new HiddenObject());
	2698	+ } else
	2699	+ if (source == frontItem)
2169	2700	{
2170	2701	front();
2171	2702	} else
2172		- if (event.getSource() == backItem)
	2703	+ if (source == backItem)
2173	2704	{
2174	2705	back();
2175	2706	} else
2176		- if (event.getSource() == cameraItem)
	2707	+ if (source == cameraItem)
2177	2708	{
2178	2709	makeSomething(new Camera());
2179	2710	} else
2180		- if (event.getSource() == compositeItem)
	2711	+ if (source == compositeItem \|\| source == compositeButton)
2181	2712	{
2182	2713	group(new Composite());
2183	2714	} else
2184		- if (event.getSource() == randomItem)
	2715	+ if (source == switchItem \|\| source == switchButton)
2185	2716	{
2186	2717	RandomNode random = new RandomNode();
2187	2718	group(random);
2188	2719	if (random.size() > 0)
2189		- random.name = random.get(0).name + "Rnd";
	2720	+ random.name = random.get(0).name + "Switch";
2190	2721	} else
2191		- if (event.getSource() == physicsItem)
	2722	+ if (source == physicsItem)
2192	2723	{
2193	2724	group(new PhysicsNode());
2194	2725	} else
2195		- if (event.getSource() == frameselectorItem)
	2726	+ if (source == frameselectorItem)
2196	2727	{
2197	2728	for (int i=0; i<group.selection.size(); i++)
2198	2729	{
..	..	@@ -2204,7 +2735,7 @@
2204	2735	ResetModel();
2205	2736	refreshContents();
2206	2737	} else
2207		- if (event.getSource() == switchGeoItem)
	2738	+ if (source == switchGeoItem)
2208	2739	{
2209	2740	for (int i=0; i<group.selection.size(); i++)
2210	2741	{
..	..	@@ -2216,7 +2747,7 @@
2216	2747	ResetModel();
2217	2748	refreshContents();
2218	2749	} else
2219		- if (event.getSource() == switchTransfoItem)
	2750	+ if (source == switchTransfoItem)
2220	2751	{
2221	2752	for (int i=0; i<group.selection.size(); i++)
2222	2753	{
..	..	@@ -2228,7 +2759,7 @@
2228	2759	ResetModel();
2229	2760	refreshContents();
2230	2761	} else
2231		- if (event.getSource() == morphItem)
	2762	+ if (source == morphItem)
2232	2763	{
2233	2764	for (int i=0; i<group.selection.size(); i++)
2234	2765	{
..	..	@@ -2240,7 +2771,7 @@
2240	2771	ResetModel();
2241	2772	refreshContents();
2242	2773	} else
2243		- if (event.getSource() == scriptNodeItem)
	2774	+ if (source == scriptNodeItem)
2244	2775	{
2245	2776	boolean atleastone = false;
2246	2777
..	..	@@ -2279,199 +2810,252 @@
2279	2810	}
2280	2811	}
2281	2812	} else
2282		- if (event.getSource() == linkerItem)
	2813	+ if (source == linkerItem)
2283	2814	{
2284	2815	group(new cLinker());
2285	2816	} else
2286		- if (event.getSource() == textureItem)
	2817	+ if (source == textureItem \|\| source == textureButton)
2287	2818	{
2288	2819	group(new TextureNode());
2289	2820	} else
2290		- if (event.getSource() == shadowXItem)
	2821	+ if (source == billboardItem)
	2822	+ {
	2823	+ group(new BillboardNode());
	2824	+ } else
	2825	+ if (source == shadowXItem)
2291	2826	{
2292	2827	CastShadow(0);
2293	2828	} else
2294		- if (event.getSource() == shadowYItem)
	2829	+ if (source == shadowYItem)
2295	2830	{
2296	2831	CastShadow(1);
2297	2832	} else
2298		- if (event.getSource() == shadowZItem)
	2833	+ if (source == shadowZItem)
2299	2834	{
2300	2835	CastShadow(2);
2301	2836	} else
2302		- if (event.getSource() == ungroupItem)
	2837	+ if (source == ungroupItem \|\| source == ungroupButton)
2303	2838	{
2304		- ungroup();
	2839	+ boolean hasRoot = false;
	2840	+
	2841	+ for (int i=0; i<group.selection.size(); i++)
	2842	+ {
	2843	+ if (group.selection.get(i) == group)
	2844	+ {
	2845	+ hasRoot = true;
	2846	+ break;
	2847	+ }
	2848	+ }
	2849	+
	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	+ }
2305	2861	} else
2306		- if (event.getSource() == genUVItem)
	2862	+ if (source == genUVItem)
2307	2863	{
2308	2864	GenUV();
2309	2865	} else
2310		- if (event.getSource() == genNormalsCADItem)
	2866	+ if (source == genNormalsCADItem)
2311	2867	{
2312	2868	GenNormals(true);
2313	2869	} else
2314		- if (event.getSource() == genNormalsMESHItem)
	2870	+ if (source == genNormalsMESHItem)
2315	2871	{
2316		- GenNormals(true); // TODO
	2872	+ GenNormalsMESH();
2317	2873	} else
2318		- if (event.getSource() == genNormalsORGANItem)
	2874	+ if (source == genNormalsORGANItem)
2319	2875	{
2320	2876	GenNormals(false);
2321	2877	} else
2322		- if (event.getSource() == stripifyItem)
	2878	+ if (source == genNormalsMINEItem)
	2879	+ {
	2880	+ GenNormalsMINE();
	2881	+ } else
	2882	+ if (source == stripifyItem)
2323	2883	{
2324	2884	Stripify();
2325	2885	} else
2326		- if (event.getSource() == unstripifyItem)
	2886	+ if (source == unstripifyItem)
2327	2887	{
2328	2888	Unstripify();
2329	2889	} else
2330		- if (event.getSource() == trimItem)
	2890	+ if (source == trimItem)
2331	2891	{
2332	2892	Trim();
2333	2893	} else
2334		- if (event.getSource() == untrimItem)
	2894	+ if (source == untrimItem)
2335	2895	{
2336	2896	Untrim();
2337	2897	} else
2338		- if (event.getSource() == clearColorsItem)
	2898	+ if (source == clearColorsItem)
2339	2899	{
2340	2900	ClearColors();
2341	2901	} else
2342		- if (event.getSource() == clearMaterialsItem)
	2902	+ if (source == clearMaterialsItem)
2343	2903	{
2344	2904	ClearMaterials();
2345	2905	} else
2346		- if (event.getSource() == liveleavesItem)
	2906	+ if (source == liveleavesItem)
2347	2907	{
2348	2908	LiveLeaves(true);
2349	2909	} else
2350		- if (event.getSource() == unliveleavesItem)
	2910	+ if (source == unliveleavesItem)
2351	2911	{
2352	2912	LiveLeaves(false);
2353	2913	} else
2354		- if (event.getSource() == supportleavesItem)
	2914	+ if (source == supportleavesItem)
2355	2915	{
2356	2916	SupportLeaves(true);
2357	2917	} else
2358		- if (event.getSource() == unsupportleavesItem)
	2918	+ if (source == unsupportleavesItem)
2359	2919	{
2360	2920	SupportLeaves(false);
2361	2921	} else
2362		- if (event.getSource() == hideleavesItem)
	2922	+ if (source == hideleavesItem)
2363	2923	{
2364	2924	HideLeaves(true);
2365	2925	} else
2366		- if (event.getSource() == showleavesItem)
	2926	+ if (source == showleavesItem)
2367	2927	{
2368	2928	HideLeaves(false);
2369	2929	} else
2370		- if (event.getSource() == markleavesItem)
	2930	+ if (source == markleavesItem)
2371	2931	{
2372	2932	MarkLeaves(true);
2373	2933	} else
2374		- if (event.getSource() == unmarkleavesItem)
	2934	+ if (source == unmarkleavesItem)
2375	2935	{
2376	2936	MarkLeaves(false);
2377	2937	} else
2378		- if (event.getSource() == flipVItem)
	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);
	2953	+ } else
	2954	+ if (source == flipVItem)
2379	2955	{
2380	2956	FlipV(true);
2381	2957	} else
2382		- if (event.getSource() == unflipVItem)
	2958	+ if (source == unflipVItem)
2383	2959	{
2384	2960	FlipV(false);
2385	2961	} else
2386		- if (event.getSource() == lowTexturesItem)
	2962	+ if (source == lowTexturesItem)
2387	2963	{
2388	2964	SetTexRes(0);
2389	2965	} else
2390		- if (event.getSource() == normalTexturesItem)
	2966	+ if (source == normalTexturesItem)
2391	2967	{
2392	2968	SetTexRes(1);
2393	2969	} else
2394		- if (event.getSource() == highTexturesItem)
	2970	+ if (source == highTexturesItem)
2395	2971	{
2396	2972	SetTexRes(2);
2397	2973	} else
2398		- if (event.getSource() == veryhighTexturesItem)
	2974	+ if (source == veryhighTexturesItem)
2399	2975	{
2400	2976	SetTexRes(3);
2401	2977	} else
2402		- if (event.getSource() == maxTexturesItem)
	2978	+ if (source == maxTexturesItem)
2403	2979	{
2404	2980	SetTexRes(4);
2405	2981	} else
2406		- if (event.getSource() == panoTexturesItem)
	2982	+ if (source == panoTexturesItem)
2407	2983	{
2408	2984	SetTexRes(5);
2409	2985	} else
2410		- if (event.getSource() == reverseNormalsItem)
	2986	+ if (source == reverseNormalsItem)
2411	2987	{
2412	2988	ReverseNormals();
2413	2989	} else
2414		- if (event.getSource() == parseverticesItem)
	2990	+ if (source == parseverticesItem)
2415	2991	{
2416	2992	ParseVertices();
2417	2993	} else
2418		- if (event.getSource() == textureFieldItem)
	2994	+ if (source == textureFieldItem)
2419	2995	{
2420	2996	TextureVertices();
2421	2997	} else
2422		- if (event.getSource() == alignItem)
	2998	+ if (source == alignItem)
2423	2999	{
2424	3000	Align();
2425	3001	} else
2426		- if (event.getSource() == mirrorItem)
	3002	+ if (source == mirrorItem)
2427	3003	{
2428	3004	MirrorPoses();
2429	3005	} else
2430		- if (event.getSource() == reduceMorphItem)
	3006	+ if (source == reduceMorphItem)
2431	3007	{
2432	3008	MeshReduction(false);
2433	3009	} else
2434		- if (event.getSource() == reduce34MorphItem)
	3010	+ if (source == reduce34MorphItem)
2435	3011	{
2436	3012	MeshReduction(true);
2437	3013	} else
2438		- if (event.getSource() == reverseTrianglesItem)
	3014	+ if (source == reverseTrianglesItem)
2439	3015	{
2440	3016	ReverseTriangles();
2441	3017	} else
2442		- if (event.getSource() == reduceMeshItem)
	3018	+ if (source == reduceMeshItem)
2443	3019	{
2444	3020	ReduceMesh(false);
2445	3021	} else
2446		- if (event.getSource() == reduce34MeshItem)
	3022	+ if (source == reduce34MeshItem)
2447	3023	{
2448	3024	ReduceMesh(true);
2449	3025	} else
2450		- if (event.getSource() == increaseMeshItem)
	3026	+ if (source == increaseMeshItem)
2451	3027	{
2452	3028	IncreaseMesh();
2453	3029	} else
2454		- if (event.getSource() == clipMeshItem)
	3030	+ if (source == clipMeshItem)
2455	3031	{
2456	3032	ClipMesh();
2457	3033	} else
2458		- if (event.getSource() == smoothMeshItem)
	3034	+ if (source == smoothMeshItem)
2459	3035	{
2460	3036	SmoothMesh();
2461	3037	} else
2462		- if (event.getSource() == transformgeometryItem)
	3038	+ if (source == transformGeometryItem)
2463	3039	{
2464	3040	TransformGeometry();
2465	3041	} else
2466		- if (event.getSource() == resetTransformItem)
	3042	+ if (source == transformChildrenItem)
	3043	+ {
	3044	+ TransformChildren();
	3045	+ } else
	3046	+ if (source == resetTransformItem)
2467	3047	{
2468	3048	ResetTransform();
2469	3049	} else
2470		- if (event.getSource() == resetCentroidItem)
	3050	+ if (source == resetCentroidItem)
2471	3051	{
2472		- ResetCentroid();
	3052	+ ResetCentroid(true);
2473	3053	} else
2474		- if (event.getSource() == resetParentItem)
	3054	+ if (source == resetCentroidXZItem)
	3055	+ {
	3056	+ ResetCentroid(false);
	3057	+ } else
	3058	+ if (source == resetParentItem)
2475	3059	{
2476	3060	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3061	{
..	..	@@ -2481,7 +3065,7 @@
2481	3065
2482	3066	refreshContents();
2483	3067	} else
2484		- if (event.getSource() == repairParentItem)
	3068	+ if (source == repairParentItem)
2485	3069	{
2486	3070	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2487	3071	{
..	..	@@ -2495,7 +3079,21 @@
2495	3079
2496	3080	refreshContents();
2497	3081	} else
2498		- if (event.getSource() == sortbysizeItem)
	3082	+ if (source == repairShadowItem)
	3083	+ {
	3084	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3085	+ {
	3086	+ Object3D obj = (Object3D)e.nextElement();
	3087	+ obj.RepairShadow();
	3088	+// for (int i=0; i<obj.size(); i++)
	3089	+// {
	3090	+// obj.get(i).parent = obj;
	3091	+// }
	3092	+ }
	3093	+
	3094	+ refreshContents();
	3095	+ } else
	3096	+ if (source == sortbysizeItem)
2499	3097	{
2500	3098	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2501	3099	{
..	..	@@ -2507,7 +3105,7 @@
2507	3105	ResetModel();
2508	3106	refreshContents();
2509	3107	} else
2510		- if (event.getSource() == sortbynameItem)
	3108	+ if (source == sortbynameItem)
2511	3109	{
2512	3110	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2513	3111	{
..	..	@@ -2519,7 +3117,7 @@
2519	3117	ResetModel();
2520	3118	refreshContents();
2521	3119	} else
2522		- if (event.getSource() == attachPigmentItem)
	3120	+ if (source == attachPigmentItem)
2523	3121	{
2524	3122	String texture = GetFile("Attach pigment");
2525	3123	Object3D obj;
..	..	@@ -2531,7 +3129,7 @@
2531	3129
2532	3130	refreshContents();
2533	3131	} else
2534		- if (event.getSource() == detachPigmentItem)
	3132	+ if (source == detachPigmentItem)
2535	3133	{
2536	3134	Object3D obj;
2537	3135	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2542,7 +3140,7 @@
2542	3140
2543	3141	refreshContents();
2544	3142	} else
2545		- if (event.getSource() == attachBumpItem)
	3143	+ if (source == attachBumpItem)
2546	3144	{
2547	3145	String texture = GetFile("Attach bump");
2548	3146	Object3D obj;
..	..	@@ -2554,18 +3152,18 @@
2554	3152
2555	3153	refreshContents();
2556	3154	} else
2557		- if (event.getSource() == detachBumpItem)
	3155	+ if (source == detachBumpItem)
2558	3156	{
2559	3157	Object3D obj;
2560	3158	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2561	3159	{
2562	3160	obj = (Object3D)e.nextElement();
2563		- obj.SetBumpTexture(null);
	3161	+ obj.ResetBumpTexture();
2564	3162	}
2565	3163
2566	3164	refreshContents();
2567	3165	} else
2568		- if (event.getSource() == pigmentBumpItem)
	3166	+ if (source == pigmentBumpItem)
2569	3167	{
2570	3168	Object3D obj;
2571	3169	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2576,158 +3174,262 @@
2576	3174
2577	3175	refreshContents();
2578	3176	} else
2579		- if (event.getSource() == flashSelectionButton)
	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
	3202	+ if (source == flashSelectionButton)
2580	3203	{
2581	3204	CameraPane.flash = true;
2582	3205	refreshContents();
2583	3206	} else
2584		- if (event.getSource() == oneButton)
	3207	+ if (source == oneButton)
2585	3208	{
2586	3209	} else
2587		- if (event.getSource() == twoButton)
	3210	+ if (source == twoButton)
2588	3211	{
2589	3212	radio.layout = twoButton;
	3213	+
	3214	+ if (CameraPane.FULLSCREEN)
	3215	+ fullscreenLayout = radio.layout;
	3216	+
2590	3217	// bug
2591	3218	//gridPanel.setDividerLocation(1.0);
2592	3219	//bigPanel.setDividerLocation(0.0);
2593		- bigThree.remove(jtp);
2594		- bigThree.remove(cameraPanel);
2595		- bigThree.remove(XYZPanel);
2596		- aWindowConstraints.gridx = 0;
2597		- aWindowConstraints.gridy = 0;
2598		- aWindowConstraints.gridwidth = 1;
2599		- // aConstraints.gridheight = 3;
2600		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2601		- aWindowConstraints.weightx = 0;
2602		- aWindowConstraints.weighty = 1;
2603		- //bigThree.add(jtp, aWindowConstraints);
2604		- aWindowConstraints.weightx = 1;
2605		- aWindowConstraints.gridwidth = 3;
2606		- // aConstraints.gridheight = 3;
2607		- aWindowConstraints.gridx = 1;
2608		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2609		- bigThree.add(cameraPanel, aWindowConstraints);
2610		- aWindowConstraints.weightx = 0;
2611		- aWindowConstraints.gridx = 4;
2612		- aWindowConstraints.gridwidth = 1;
2613		- // aConstraints.gridheight = 3;
2614		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2615		- //bigThree.add(XYZPanel, aWindowConstraints);
2616		- bigThree.revalidate();
	3220	+// bigThree.remove(scenePanel);
	3221	+// bigThree.remove(centralPanel);
	3222	+// bigThree.remove(XYZPanel);
	3223	+// aWindowConstraints.gridx = 0;
	3224	+// aWindowConstraints.gridy = 0;
	3225	+// aWindowConstraints.gridwidth = 1;
	3226	+// // aConstraints.gridheight = 3;
	3227	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3228	+// aWindowConstraints.weightx = 0;
	3229	+// aWindowConstraints.weighty = 1;
	3230	+// //bigThree.add(jtp, aWindowConstraints);
	3231	+// aWindowConstraints.weightx = 1;
	3232	+// aWindowConstraints.gridwidth = 3;
	3233	+// // aConstraints.gridheight = 3;
	3234	+// aWindowConstraints.gridx = 1;
	3235	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3236	+// bigThree.add(centralPanel, aWindowConstraints);
	3237	+// aWindowConstraints.weightx = 0;
	3238	+// aWindowConstraints.gridx = 4;
	3239	+// aWindowConstraints.gridwidth = 1;
	3240	+// // aConstraints.gridheight = 3;
	3241	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3242	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3243	+// scenePanel.setVisible(false);
	3244	+// centralPanel.setVisible(true);
	3245	+// XYZPanel.setVisible(false);
	3246	+ bigThree.ClearUI();
	3247	+ bigThree.add(centralPanel);
	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	+
2617	3267	} else
2618		- if (event.getSource() == threeButton)
	3268	+ if (source == threeButton)
2619	3269	{
2620	3270	radio.layout = threeButton;
2621		- bigThree.remove(jtp);
2622		- bigThree.remove(cameraPanel);
2623		- bigThree.remove(XYZPanel);
2624		- aWindowConstraints.gridx = 0;
2625		- aWindowConstraints.gridy = 0;
2626		- aWindowConstraints.gridwidth = 1;
2627		- // aConstraints.gridheight = 3;
2628		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2629		- aWindowConstraints.weightx = 0;
2630		- aWindowConstraints.weighty = 1;
2631		- //bigThree.add(jtp, aWindowConstraints);
2632		- aWindowConstraints.weightx = 1;
2633		- aWindowConstraints.gridwidth = 3;
2634		- // aConstraints.gridheight = 3;
2635		- aWindowConstraints.gridx = 1;
2636		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2637		- bigThree.add(cameraPanel, aWindowConstraints);
2638		- aWindowConstraints.weightx = 0;
2639		- aWindowConstraints.gridx = 4;
2640		- aWindowConstraints.gridwidth = 1;
2641		- // aConstraints.gridheight = 3;
2642		- aConstraints.fill = GridBagConstraints.VERTICAL;
2643		- bigThree.add(XYZPanel, aWindowConstraints);
2644		- bigThree.revalidate();
	3271	+
	3272	+ if (CameraPane.FULLSCREEN)
	3273	+ fullscreenLayout = radio.layout;
	3274	+
	3275	+// bigThree.remove(scenePanel);
	3276	+// bigThree.remove(centralPanel);
	3277	+// bigThree.remove(XYZPanel);
	3278	+// aWindowConstraints.gridx = 0;
	3279	+// aWindowConstraints.gridy = 0;
	3280	+// aWindowConstraints.gridwidth = 1;
	3281	+// // aConstraints.gridheight = 3;
	3282	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3283	+// aWindowConstraints.weightx = 0;
	3284	+// aWindowConstraints.weighty = 1;
	3285	+// //bigThree.add(jtp, aWindowConstraints);
	3286	+// aWindowConstraints.weightx = 1;
	3287	+// aWindowConstraints.gridwidth = 3;
	3288	+// // aConstraints.gridheight = 3;
	3289	+// aWindowConstraints.gridx = 1;
	3290	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3291	+// bigThree.add(centralPanel, aWindowConstraints);
	3292	+// aWindowConstraints.weightx = 0;
	3293	+// aWindowConstraints.gridx = 4;
	3294	+// aWindowConstraints.gridwidth = 1;
	3295	+// // aConstraints.gridheight = 3;
	3296	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3297	+// bigThree.add(XYZPanel, aWindowConstraints);
	3298	+// bigThree.validate();
	3299	+// scenePanel.setVisible(false);
	3300	+// centralPanel.setVisible(true);
	3301	+// XYZPanel.setVisible(true);
	3302	+ bigThree.ClearUI();
	3303	+ bigThree.add(centralPanel);
	3304	+ bigThree.add(XYZPanel);
	3305	+ bigThree.FlushUI();
	3306	+
	3307	+ cameraView.requestFocusInWindow();
2645	3308	} else
2646		- if (event.getSource() == fourButton)
	3309	+ if (source == fourButton)
2647	3310	{
2648	3311	radio.layout = fourButton;
2649		- bigThree.remove(jtp);
2650		- bigThree.remove(cameraPanel);
2651		- bigThree.remove(XYZPanel);
2652		- aWindowConstraints.gridx = 0;
2653		- aWindowConstraints.gridy = 0;
2654		- aWindowConstraints.gridwidth = 1;
2655		- // aWindowConstraints.gridheight = 3;
2656		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2657		- aWindowConstraints.weightx = 1;
2658		- aWindowConstraints.weighty = 1;
2659		- bigThree.add(jtp, aWindowConstraints);
2660		- aWindowConstraints.weightx = 1;
2661		- aWindowConstraints.gridwidth = 3;
2662		- // aConstraints.gridheight = 3;
2663		- aWindowConstraints.gridx = 1;
2664		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2665		- //bigThree.add(cameraPanel, aWindowConstraints);
2666		- aWindowConstraints.weightx = 0;
2667		- aWindowConstraints.gridx = 4;
2668		- aWindowConstraints.gridwidth = 1;
2669		- // aWindowConstraints.gridheight = 3;
2670		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2671		- //bigThree.add(XYZPanel, aWindowConstraints);
2672		- bigThree.revalidate();
	3312	+
	3313	+ if (CameraPane.FULLSCREEN)
	3314	+ fullscreenLayout = radio.layout;
	3315	+
	3316	+// bigThree.remove(scenePanel);
	3317	+// bigThree.remove(centralPanel);
	3318	+// bigThree.remove(XYZPanel);
	3319	+// aWindowConstraints.gridx = 0;
	3320	+// aWindowConstraints.gridy = 0;
	3321	+// aWindowConstraints.gridwidth = 1;
	3322	+// // aWindowConstraints.gridheight = 3;
	3323	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3324	+// aWindowConstraints.weightx = 1;
	3325	+// aWindowConstraints.weighty = 1;
	3326	+// bigThree.add(scenePanel, aWindowConstraints);
	3327	+// aWindowConstraints.weightx = 1;
	3328	+// aWindowConstraints.gridwidth = 3;
	3329	+// // aConstraints.gridheight = 3;
	3330	+// aWindowConstraints.gridx = 1;
	3331	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3332	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3333	+// aWindowConstraints.weightx = 0;
	3334	+// aWindowConstraints.gridx = 4;
	3335	+// aWindowConstraints.gridwidth = 1;
	3336	+// // aWindowConstraints.gridheight = 3;
	3337	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3338	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3339	+// bigThree.validate();
	3340	+// scenePanel.setVisible(true);
	3341	+// centralPanel.setVisible(false);
	3342	+// XYZPanel.setVisible(false);
	3343	+ bigThree.ClearUI();
	3344	+ bigThree.add(scenePanel);
	3345	+ bigThree.FlushUI();
	3346	+
	3347	+ cameraView.requestFocusInWindow();
2673	3348	} else
2674		- if (event.getSource() == sixButton)
	3349	+ if (source == sixButton)
2675	3350	{
2676	3351	radio.layout = sixButton;
2677		- bigThree.remove(jtp);
2678		- bigThree.remove(cameraPanel);
2679		- bigThree.remove(XYZPanel);
2680		- aWindowConstraints.gridx = 0;
2681		- aWindowConstraints.gridy = 0;
2682		- aWindowConstraints.gridwidth = 1;
2683		- // aConstraints.gridheight = 3;
2684		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2685		- aWindowConstraints.weightx = 0;
2686		- aWindowConstraints.weighty = 1;
2687		- bigThree.add(jtp, aWindowConstraints);
2688		- aWindowConstraints.weightx = 1;
2689		- aWindowConstraints.gridwidth = 3;
2690		- // aWindowConstraints.gridheight = 3;
2691		- aWindowConstraints.gridx = 1;
2692		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2693		- bigThree.add(cameraPanel, aWindowConstraints);
2694		- aWindowConstraints.weightx = 0;
2695		- aWindowConstraints.gridx = 4;
2696		- aWindowConstraints.gridwidth = 1;
2697		- // aWindowConstraints.gridheight = 3;
2698		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2699		- //bigThree.add(XYZPanel, aConstraints);
2700		- bigThree.revalidate();
	3352	+
	3353	+ if (CameraPane.FULLSCREEN)
	3354	+ fullscreenLayout = radio.layout;
	3355	+
	3356	+// bigThree.remove(scenePanel);
	3357	+// bigThree.remove(centralPanel);
	3358	+// bigThree.remove(XYZPanel);
	3359	+// aWindowConstraints.gridx = 0;
	3360	+// aWindowConstraints.gridy = 0;
	3361	+// aWindowConstraints.gridwidth = 1;
	3362	+// // aConstraints.gridheight = 3;
	3363	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3364	+// aWindowConstraints.weightx = 0;
	3365	+// aWindowConstraints.weighty = 1;
	3366	+// bigThree.add(scenePanel, aWindowConstraints);
	3367	+// aWindowConstraints.weightx = 1;
	3368	+// aWindowConstraints.gridwidth = 3;
	3369	+// // aWindowConstraints.gridheight = 3;
	3370	+// aWindowConstraints.gridx = 1;
	3371	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3372	+// bigThree.add(centralPanel, aWindowConstraints);
	3373	+// aWindowConstraints.weightx = 0;
	3374	+// aWindowConstraints.gridx = 4;
	3375	+// aWindowConstraints.gridwidth = 1;
	3376	+// // aWindowConstraints.gridheight = 3;
	3377	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3378	+// //bigThree.add(XYZPanel, aConstraints);
	3379	+// bigThree.validate();
	3380	+// scenePanel.setVisible(true);
	3381	+// centralPanel.setVisible(true);
	3382	+// XYZPanel.setVisible(false);
	3383	+ bigThree.ClearUI();
	3384	+ bigThree.add(scenePanel);
	3385	+ bigThree.add(centralPanel);
	3386	+ bigThree.FlushUI();
	3387	+
	3388	+ cameraView.requestFocusInWindow();
2701	3389	} else
2702		- if (event.getSource() == sevenButton)
	3390	+ if (source == sevenButton)
2703	3391	{
2704	3392	radio.layout = sevenButton;
2705		- bigThree.remove(jtp);
2706		- bigThree.remove(cameraPanel);
2707		- bigThree.remove(XYZPanel);
2708		- aWindowConstraints.gridx = 0;
2709		- aWindowConstraints.gridy = 0;
2710		- aWindowConstraints.gridwidth = 1;
2711		- // aWindowConstraints.gridheight = 3;
2712		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2713		- aWindowConstraints.weightx = 0;
2714		- aWindowConstraints.weighty = 1;
2715		- bigThree.add(jtp, aWindowConstraints);
2716		- aWindowConstraints.weightx = 1;
2717		- aWindowConstraints.gridwidth = 3;
2718		- // aWindowConstraints.gridheight = 3;
2719		- aWindowConstraints.gridx = 1;
2720		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2721		- bigThree.add(cameraPanel, aWindowConstraints);
2722		- aWindowConstraints.weightx = 0;
2723		- aWindowConstraints.gridx = 4;
2724		- aWindowConstraints.gridwidth = 1;
2725		- // aConstraints.gridheight = 3;
2726		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2727		- bigThree.add(XYZPanel, aWindowConstraints);
2728		- bigThree.revalidate();
	3393	+
	3394	+ if (CameraPane.FULLSCREEN)
	3395	+ fullscreenLayout = radio.layout;
	3396	+
	3397	+// bigThree.remove(scenePanel);
	3398	+// bigThree.remove(centralPanel);
	3399	+// bigThree.remove(XYZPanel);
	3400	+// aWindowConstraints.gridx = 0;
	3401	+// aWindowConstraints.gridy = 0;
	3402	+// aWindowConstraints.gridwidth = 1;
	3403	+// // aWindowConstraints.gridheight = 3;
	3404	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3405	+// aWindowConstraints.weightx = 0;
	3406	+// aWindowConstraints.weighty = 1;
	3407	+// bigThree.add(scenePanel, aWindowConstraints);
	3408	+// aWindowConstraints.weightx = 1;
	3409	+// aWindowConstraints.gridwidth = 3;
	3410	+// // aWindowConstraints.gridheight = 3;
	3411	+// aWindowConstraints.gridx = 1;
	3412	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3413	+// bigThree.add(centralPanel, aWindowConstraints);
	3414	+// aWindowConstraints.weightx = 0;
	3415	+// aWindowConstraints.gridx = 4;
	3416	+// aWindowConstraints.gridwidth = 1;
	3417	+// // aConstraints.gridheight = 3;
	3418	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3419	+// bigThree.add(XYZPanel, aWindowConstraints);
	3420	+// bigThree.validate();
	3421	+// scenePanel.setVisible(true);
	3422	+// centralPanel.setVisible(true);
	3423	+// XYZPanel.setVisible(true);
	3424	+ bigThree.ClearUI();
	3425	+ bigThree.add(scenePanel);
	3426	+ bigThree.add(centralPanel);
	3427	+ bigThree.add(XYZPanel);
	3428	+ bigThree.FlushUI();
	3429	+
	3430	+ cameraView.requestFocusInWindow();
2729	3431	} else
2730		- if (event.getSource() == rootButton)
	3432	+ if (source == rootButton)
2731	3433	{
2732	3434	Object3D obj;
2733	3435	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2737,66 +3439,84 @@
2737	3439	EditObject(obj);
2738	3440	}
2739	3441
	3442	+ cameraView.requestFocusInWindow();
2740	3443	refreshContents(true);
2741	3444	} else
2742		- if (event.getSource() == closeButton)
	3445	+ if (source == closeButton)
2743	3446	{
2744	3447	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2745	3448	cRadio ab;
2746	3449	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2747	3450	{
2748	3451	ab = (cRadio)e.nextElement();
2749		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3452	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2750	3453	{
	3454	+ // Patch to avoid bug with transparency.
	3455	+ if (!ab.hadMaterial)
	3456	+ {
	3457	+ ab.object.material = null;
	3458	+ }
	3459	+
2751	3460	buttonGroup.remove(ab);
2752	3461	radioPanel.remove(ab);
2753	3462
2754		- ab.GetObject().editWindow = null;
	3463	+ //ab.GetObject().editWindow = null;
	3464	+ ab.GetObject().manipWindow = null;
2755	3465	// ab.GetObject().objectUI = null; // ?????????
2756	3466
2757	3467	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2758	3468	break;
2759	3469	}
2760	3470	}
	3471	+
	3472	+ cameraView.requestFocusInWindow();
2761	3473	refreshContents(true);
2762	3474	} else
2763		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3475	+ if (source == editItem \|\| source == editButton)
2764	3476	{
	3477	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3478	+ {
	3479	+ Object3D child = (Object3D)e.nextElement();
	3480	+ child.pinned = true;
	3481	+ }
	3482	+
2765	3483	EditSelection(false);
2766	3484	} else
2767		- if (event.getSource() == uneditButton)
	3485	+ if (source == uneditButton)
2768	3486	{
2769	3487	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2770	3488	{
2771	3489	Object3D child = (Object3D)e.nextElement();
2772	3490	if(child.editWindow != null)
2773	3491	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3492	+ child.pinned = false;
2774	3493	child.CloseUI();
2775	3494	listUI.remove(child);
2776	3495
2777		- child.editWindow = null; // ???????????
	3496	+ //child.editWindow = null; // ???????????
2778	3497	}
2779		- objEditor.ctrlPanel.revalidate();
	3498	+ objEditor.ctrlPanel.FlushUI();
2780	3499	//objEditor.jTree.clearSelection();
2781	3500	//objEditor.ResetSliders();
2782	3501	refreshContents(true);
2783	3502	} else
2784		- if (event.getSource() == clearPanelButton)
	3503	+ if (source == clearPanelButton)
2785	3504	{
2786	3505	assert(copy == group);
2787	3506	//copy.ClearUI();
2788	3507	for (Object3D obj : listUI)
2789	3508	{
	3509	+ obj.pinned = false;
2790	3510	obj.CloseUI();
2791	3511	}
2792	3512	listUI.clear();
2793	3513	refreshContents(true);
2794	3514	} else
2795		- if (event.getSource() == allParamsButton)
	3515	+ if (source == allParamsButton)
2796	3516	{
2797	3517	assert(copy == group);
2798	3518
2799		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3519	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2800	3520
2801	3521	for (Object3D obj : listUI)
2802	3522	{
..	..	@@ -2813,19 +3533,19 @@
2813	3533
2814	3534	refreshContents(true);
2815	3535	} else
2816		- if (event.getSource() == unselectButton)
	3536	+ if (source == unselectButton)
2817	3537	{
2818	3538	objEditor.jTree.clearSelection();
2819	3539	// ?? oct 2012 GrafreeD.clipboard.clear();
2820	3540	objEditor.ResetSliders();
2821	3541	refreshContents(true);
2822	3542	} else
2823		- if(event.getSource() instanceof cRadio)
	3543	+ if(source instanceof cRadio)
2824	3544	{
2825	3545	group.parent = keepparent;
2826	3546	group.attributes = 0;
2827	3547	//group.editWindow = null;
2828		- /cRadio/ radio = (cRadio)event.getSource();
	3548	+ /cRadio/ radio = (cRadio)source;
2829	3549	Object3D obj = radio.GetObject();
2830	3550	System.out.println("Edit " + obj);
2831	3551	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2845,7 +3565,10 @@
2845	3565	}
2846	3566
2847	3567	copy = group;
2848		- //CameraPane.theRenderer.object = group;
	3568	+
	3569	+ SetUndoStates();
	3570	+
	3571	+ //Globals.theRenderer.object = group;
2849	3572	if(!useclient)
2850	3573	{
2851	3574	cameraView.renderCamera = radio.camera;
..	..	@@ -2854,25 +3577,52 @@
2854	3577	cameraView.cameras[cameraView.cameracount] = radio.camera;
2855	3578	cameraView.targetLookAt.set(radio.camera.lookAt);
2856	3579	cameraView.object = group;
2857		- cameraView.lighttouched = true;
	3580	+ //cameraView.lighttouched = true;
	3581	+ Globals.lighttouched = true;
2858	3582	topView.object = group;
2859	3583	frontView.object = group;
2860	3584	sideView.object = group;
2861	3585	}
2862		- group.editWindow = this;
	3586	+
	3587	+// fix "+" issue
	3588	+ //group.editWindow = this;
	3589	+ group.manipWindow = this;
	3590	+
2863	3591	/*
2864	3592	currentLayout = radio.layout;
2865	3593	if (currentLayout == null)
2866	3594	currentLayout = sevenButton;
2867	3595	*/
2868	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);
2869	3604	keepparent = group.parent;
2870	3605	// PARENT = NULL or not???
2871	3606	//group.parent = null; // ROOT
2872	3607	//group.attributes = -1;
2873	3608	ResetModel();
	3609	+
	3610	+ cameraView.requestFocusInWindow();
2874	3611	refreshContents(true);
2875		- }
	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	+ }
2876	3626	else
2877	3627	{
2878	3628	//return super.action(event, arg);
..	..	@@ -2881,7 +3631,6 @@
2881	3631	}
2882	3632
2883	3633	boolean useclient = false;
2884		- cRadio radio;
2885	3634
2886	3635	void ToggleRoot()
2887	3636	{
..	..	@@ -2890,7 +3639,7 @@
2890	3639	if (useclient)
2891	3640	{
2892	3641	cameraView.object = client;
2893		- cameraView.lighttouched = true;
	3642	+ Globals.lighttouched = true;
2894	3643	//topView.object = client;
2895	3644	//frontView.object = client;
2896	3645	//sideView.object = client;
..	..	@@ -2898,7 +3647,7 @@
2898	3647	else
2899	3648	{
2900	3649	cameraView.object = group;
2901		- cameraView.lighttouched = true;
	3650	+ Globals.lighttouched = true;
2902	3651	//topView.object = group;
2903	3652	//frontView.object = group;
2904	3653	//sideView.object = group;
..	..	@@ -2933,6 +3682,28 @@
2933	3682	refreshContents();
2934	3683	}
2935	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	+ }
2936	3707
2937	3708	void ResetTransform()
2938	3709	{
..	..	@@ -3045,7 +3816,7 @@
3045	3816	refreshContents();
3046	3817	}
3047	3818
3048		- void ResetCentroid()
	3819	+ void ResetCentroid(boolean full)
3049	3820	{
3050	3821	Object3D obj;
3051	3822	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3060,12 +3831,16 @@
3060	3831	LA.matIdentity(Object3D.mat);
3061	3832	obj.getBounds(minima, maxima, false);
3062	3833	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3063		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3834	+ if (full)
	3835	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3064	3836	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3065	3837	obj.TransformMesh(Object3D.mat);
	3838	+
3066	3839	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3067		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3840	+ if (full)
	3841	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3068	3842	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3843	+
3069	3844	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3070	3845	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3071	3846	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3094,7 +3869,8 @@
3094	3869
3095	3870	int size = obj.MemorySize();
3096	3871
3097		- 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)");
3098	3874	}
3099	3875	}
3100	3876	catch (Exception e)
..	..	@@ -3131,9 +3907,9 @@
3131	3907	obj = (Object3D)e.nextElement();
3132	3908
3133	3909	System.out.println("Object is: " + obj);
3134		- GrafreeD.AnalyzeObject(obj);
	3910	+ Grafreed.AnalyzeObject(obj);
3135	3911	System.out.println("Boundary rep: " + obj.bRep);
3136		- GrafreeD.AnalyzeObject(obj.bRep);
	3912	+ Grafreed.AnalyzeObject(obj.bRep);
3137	3913
3138	3914	// System.err.println((size/1024) + " KB is the size of " + obj);
3139	3915	}
..	..	@@ -3175,6 +3951,20 @@
3175	3951	void GenNormals(boolean crease)
3176	3952	{
3177	3953	group.GenNormalsS(crease);
	3954	+
	3955	+ refreshContents();
	3956	+ }
	3957	+
	3958	+ void GenNormalsMESH()
	3959	+ {
	3960	+ group.GenNormalsMeshS();
	3961	+
	3962	+ refreshContents();
	3963	+ }
	3964	+
	3965	+ void GenNormalsMINE()
	3966	+ {
	3967	+ group.selection.GenNormalsMINE();
3178	3968
3179	3969	refreshContents();
3180	3970	}
..	..	@@ -3340,8 +4130,8 @@
3340	4130
3341	4131	void ParseVertices()
3342	4132	{
3343		- boolean epsequal = GrafreeD.epsequal;
3344		- GrafreeD.epsequal = true;
	4133	+ boolean epsequal = Grafreed.epsequal;
	4134	+ Grafreed.epsequal = true;
3345	4135
3346	4136	for (int i=0; i<group.selection.size(); i++)
3347	4137	{
..	..	@@ -3366,7 +4156,7 @@
3366	4156	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3367	4157	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3368	4158
3369		- g.add(GrafreeD.clipboard);
	4159	+ g.add(Grafreed.clipboard);
3370	4160
3371	4161	buffer.add(g);
3372	4162	}
..	..	@@ -3381,7 +4171,7 @@
3381	4171	makeSomething(buffer, i==group.selection.size()-1);
3382	4172	}
3383	4173
3384		- GrafreeD.epsequal = epsequal;
	4174	+ Grafreed.epsequal = epsequal;
3385	4175
3386	4176	refreshContents();
3387	4177	}
..	..	@@ -3399,7 +4189,16 @@
3399	4189	String pigment = Object3D.GetPigment(tex);
3400	4190	//String bump = Object3D.GetBump(tex);
3401	4191
3402		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.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	+ }
3403	4202
3404	4203	double s = v.s;
3405	4204
..	..	@@ -3447,12 +4246,26 @@
3447	4246
3448	4247	void Align()
3449	4248	{
	4249	+ if (group.selection.size() == 0)
	4250	+ return;
	4251	+
	4252	+ cVector bbmin = new cVector();
	4253	+ cVector bbmax = new cVector();
	4254	+
	4255	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4256	+
	4257	+ double dx = bbmax.x - bbmin.x;
	4258	+ double dy = bbmax.y - bbmin.y;
	4259	+ double dz = bbmax.z - bbmin.z;
	4260	+
	4261	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4262	+
3450	4263	for (int i=0; i<group.selection.size(); i++)
3451	4264	{
3452	4265	Object3D obj = group.selection.get(i);
3453	4266
3454		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3455		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4267	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4268	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3456	4269	}
3457	4270
3458	4271	refreshContents();
..	..	@@ -3473,11 +4286,11 @@
3473	4286
3474	4287	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3475	4288
3476		- boolean random = CameraPane.RANDOM;
3477		- CameraPane.RANDOM = false; // parse all random nodes
	4289	+ boolean random = CameraPane.SWITCH;
	4290	+ CameraPane.SWITCH = false; // parse all random nodes
3478	4291	lowres.linkVerticesThis(null);
3479	4292	lowres.linkVerticesThis(sn);
3480		- CameraPane.RANDOM = random;
	4293	+ CameraPane.SWITCH = random;
3481	4294
3482	4295	System.err.flush();
3483	4296
..	..	@@ -3517,7 +4330,7 @@
3517	4330	return;
3518	4331
3519	4332	Object3D poses = group.selection.get(0);
3520		- Object3D ref = GrafreeD.clipboard.get(0);
	4333	+ Object3D ref = Grafreed.clipboard.get(0);
3521	4334
3522	4335	Object3D newgroup = new Object3D("Po:" + poses.name);
3523	4336
..	..	@@ -3686,7 +4499,7 @@
3686	4499	group.selection.RelinkToSupport(); // july 2014
3687	4500	System.out.println("DONE.");
3688	4501	refreshContents();
3689		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4502	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3690	4503	}
3691	4504
3692	4505	void ReduceMesh(boolean reduction34)
..	..	@@ -3711,9 +4524,9 @@
3711	4524
3712	4525	void ClipMesh()
3713	4526	{
3714		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4527	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3715	4528	{
3716		- Object3D content = GrafreeD.clipboard.get(0);
	4529	+ Object3D content = Grafreed.clipboard.get(0);
3717	4530
3718	4531	if (content instanceof cGroup && ((cGroup)content).transientlink )
3719	4532	content = ((cGroup)content).get(0);
..	..	@@ -3722,7 +4535,7 @@
3722	4535	// {
3723	4536	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3724	4537	// }
3725		- group.selection.ClipMesh(GrafreeD.clipboard);
	4538	+ group.selection.ClipMesh(Grafreed.clipboard);
3726	4539	}
3727	4540	// group.selection.ClipMesh(GrafreeD.clipboard);
3728	4541	System.out.println("DONE.");
..	..	@@ -3769,6 +4582,18 @@
3769	4582	void MarkLeaves(boolean hide)
3770	4583	{
3771	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);
3772	4597	refreshContents();
3773	4598	}
3774	4599
..	..	@@ -3843,28 +4668,25 @@
3843	4668	// }
3844	4669	// }
3845	4670
3846		- static boolean allparams = true;
3847		-
3848		- static Vector<Object3D> listUI = new Vector<Object3D>();
3849		-
3850	4671	void EditSelection(boolean newWindow)
3851	4672	{
	4673	+ if (group.selection == null)
	4674	+ {
	4675	+ EditElement(group, newWindow); // ? new
	4676	+ return;
	4677	+ }
	4678	+
3852	4679	// aConstraints.gridy = 0;
3853	4680	for (int i=0; i<group.selection.size(); i++)
3854	4681	{
3855	4682	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3856	4683	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3857		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4684	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3858	4685
3859	4686	Object3D elem = (Object3D)group.selection.elementAt(i);
3860		- if(elem != group)
	4687	+ if(elem != group \|\| !newWindow)
3861	4688	{
3862		- // if (!(elem instanceof Composite))
3863		- // newWindow = false;
3864		- listUI.add(elem);
3865		- elem.openEditWindow(this, newWindow); //, false);
3866		- System.out.println("edit : " + elem);
3867		- elem.editWindow.refreshContents(true); // ? new
	4689	+ EditElement(elem, newWindow); // ? new
3868	4690	}
3869	4691	}
3870	4692	}
..	..	@@ -3939,7 +4761,8 @@
3939	4761	//new Exception().printStackTrace();
3940	4762
3941	4763	freezemodel = true;
3942		-
	4764	+ ClearUnpinned();
	4765	+
3943	4766	/**/
3944	4767	//switch (event.id)
3945	4768	{
..	..	@@ -3947,7 +4770,6 @@
3947	4770	//case 702: // Event.LIST_DESELECT
3948	4771	group.deselectAll();
3949	4772	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3950		- objEditor.ClearInfo(); // .GetMaterial());
3951	4773	if (tps != null)
3952	4774	{
3953	4775	for (int i=0; i < tps.length; i++)
..	..	@@ -3956,33 +4778,39 @@
3956	4778
3957	4779	//if (child.parent != null)
3958	4780	//child.parent.addSelectee(child);
	4781	+ objEditor.SetMaterial(child);
3959	4782	group.addSelectee(child);
3960		- objEditor.SetMaterial(child); // .GetMaterial());
3961		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3962		- System.err.println("info : " + child.GetPath());
3963	4783	}
3964	4784	}
3965		- else
3966		- {
3967		- objEditor.SetMaterial(group); // .GetMaterial());
3968		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3969		- System.err.println("info : " + group.GetPath());
3970		- }
	4785	+// else
	4786	+// {
	4787	+// objEditor.SetMaterial(group); // .GetMaterial());
	4788	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4789	+// System.err.println("info : " + group.GetPath());
	4790	+// }
3971	4791
3972		- objEditor.SetText(); // jan 2014
3973		-
3974		- if (flashIt && !CameraPane.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))
3975	4793	CameraPane.flash = true;
3976	4794
3977		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4795	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3978	4796	// a camera
3979	4797	{
3980		- CameraPane.camerachangeframe = 0; // don't refuse it
3981		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3982		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3983		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	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	+ }
	4803	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4804	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3984	4805	}
3985	4806
	4807	+ if (tps != null && tps.length == 1)
	4808	+ {
	4809	+ EditSelection(false);
	4810	+ }
	4811	+
	4812	+ SetPinStates(tps != null && tps.length > 0);
	4813	+
3986	4814	refreshContents();
3987	4815	//return true;
3988	4816	}
..	..	@@ -3991,6 +4819,35 @@
3991	4819
3992	4820	freezemodel = false;
3993	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	+ }
3994	4851
3995	4852	void linkSomething(Object3D thing)
3996	4853	{
..	..	@@ -4062,16 +4919,19 @@
4062	4919	{
4063	4920	if (group.selection.isEmpty())
4064	4921	return;
4065		- GrafreeD.clipboardIsTempGroup = false;
	4922	+
	4923	+ Grafreed.clipboardIsTempGroup = false;
4066	4924	Composite tGroup = null;
4067	4925	if (group.selection.size() > 0) // 1)
4068	4926	{
4069	4927	tGroup = new cGroup();
4070		- GrafreeD.clipboardIsTempGroup = true;
	4928	+ Grafreed.clipboardIsTempGroup = true;
4071	4929	}
4072	4930
4073	4931	if (cut)
4074	4932	{
	4933	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4934	+// Save();
4075	4935	//int indices[] = jList.getSelectedIndices();
4076	4936	//for (int i = indices.length - 1; i >= 0; i--)
4077	4937	//jList.remove(indices[i]);
..	..	@@ -4107,16 +4967,16 @@
4107	4967	//System.out.println("cut " + child);
4108	4968	//System.out.println("parent = " + child.parent);
4109	4969	// tmp.addChild(child);
4110		- if (GrafreeD.clipboardIsTempGroup)
	4970	+ if (Grafreed.clipboardIsTempGroup)
4111	4971	tGroup.add/Child/(tmp);
4112	4972	else
4113		- GrafreeD.clipboard = tmp;
	4973	+ Grafreed.clipboard = tmp;
4114	4974	}
4115	4975	else
4116		- if (GrafreeD.clipboardIsTempGroup)
	4976	+ if (Grafreed.clipboardIsTempGroup)
4117	4977	tGroup.add/Child/(child);
4118	4978	else
4119		- GrafreeD.clipboard = child;
	4979	+ Grafreed.clipboard = child;
4120	4980	}
4121	4981
4122	4982	//ResetModel();
..	..	@@ -4148,21 +5008,23 @@
4148	5008	//System.out.println("cut " + elem);
4149	5009	//System.out.println("parent = " + elem.parent);
4150	5010	// tmp.addChild(elem);
4151		- if (GrafreeD.clipboardIsTempGroup)
	5011	+ if (Grafreed.clipboardIsTempGroup)
4152	5012	tGroup.add/Child/(tmp);
4153	5013	else
4154		- GrafreeD.clipboard = tmp;
	5014	+ Grafreed.clipboard = tmp;
4155	5015	}
4156	5016	else
4157		- if (GrafreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4158	5018	tGroup.add/Child/(child);
4159	5019	else
4160		- GrafreeD.clipboard = child;
	5020	+ Grafreed.clipboard = child;
4161	5021	}
4162	5022
4163	5023	}
4164		- if (GrafreeD.clipboardIsTempGroup)
4165		- GrafreeD.clipboard = tGroup;
	5024	+
	5025	+ if (Grafreed.clipboardIsTempGroup)
	5026	+ Grafreed.clipboard = tGroup;
	5027	+
4166	5028	if (cut)
4167	5029	{
4168	5030	ResetModel();
..	..	@@ -4172,11 +5034,15 @@
4172	5034
4173	5035	void paste(boolean expand)
4174	5036	{
	5037	+ if (Globals.REPLACEONMAKE)
	5038	+ Save();
	5039	+ boolean keep = Globals.REPLACEONMAKE;
	5040	+ Globals.REPLACEONMAKE = false;
4175	5041	// if (GrafreeD.clipboard == null)
4176	5042	// return;
4177	5043	boolean first = true;
4178	5044
4179		- if (GrafreeD.clipboardIsTempGroup)
	5045	+ if (Grafreed.clipboardIsTempGroup)
4180	5046	{
4181	5047	Composite temp;
4182	5048
..	..	@@ -4187,7 +5053,7 @@
4187	5053	temp = (Composite)Applet3D.clipboard.deepCopy();
4188	5054	*/
4189	5055	Object3D elem;
4190		- 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))
4191	5057	{
4192	5058	Object3D child = (Object3D)e.nextElement();
4193	5059
..	..	@@ -4221,21 +5087,22 @@
4221	5087	//Object3D cb = Applet3D.clipboard;
4222	5088	//temp.addChild(cb);
4223	5089	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4224		- assert(GrafreeD.clipboard.parent == null);
4225		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4226		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4227		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4228		- 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());
4229	5095	else
4230		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4231		- GrafreeD.clipboard.get(0).parent = keepparent;
	5096	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5097	+ Grafreed.clipboard.get(0).parent = keepparent;
4232	5098	}
4233	5099
	5100	+ Globals.REPLACEONMAKE = keep;
4234	5101	ResetModel();
4235	5102	refreshContents();
4236	5103	}
4237	5104
4238		- void pasteInto(boolean copyit)
	5105	+ void pasteInto(boolean copyit, boolean clone)
4239	5106	{
4240	5107	// if (GrafreeD.clipboard == null)
4241	5108	// return;
..	..	@@ -4264,15 +5131,22 @@
4264	5131	if (copyit)
4265	5132	{
4266	5133	// paste(false);
4267		- CloneClipboard(false); // sept 2014
	5134	+ if (clone)
	5135	+ {
	5136	+ CloneClipboard(false); // sept 2014
	5137	+ }
	5138	+ else
	5139	+ {
	5140	+ paste(false);
	5141	+ }
4268	5142	}
4269	5143	else
4270	5144	{
4271	5145	boolean first = true;
4272	5146
4273		- if (GrafreeD.clipboardIsTempGroup)
	5147	+ if (Grafreed.clipboardIsTempGroup)
4274	5148	{
4275		- Composite temp = (Composite)GrafreeD.clipboard;
	5149	+ Composite temp = (Composite)Grafreed.clipboard;
4276	5150	Object3D copy;
4277	5151	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4278	5152	{
..	..	@@ -4282,7 +5156,7 @@
4282	5156	}
4283	5157	} else
4284	5158	{
4285		- linkSomething(GrafreeD.clipboard); //.get(0));
	5159	+ linkSomething(Grafreed.clipboard); //.get(0));
4286	5160	}
4287	5161	}
4288	5162	}
..	..	@@ -4359,6 +5233,10 @@
4359	5233
4360	5234	void group(Object3D csg, boolean grab)
4361	5235	{
	5236	+ if (Globals.REPLACEONMAKE)
	5237	+ Save();
	5238	+ boolean keep = Globals.REPLACEONMAKE;
	5239	+ Globals.REPLACEONMAKE = false;
4362	5240	if (//false) // why??
4363	5241	!group.selection.isEmpty())
4364	5242	{
..	..	@@ -4472,8 +5350,34 @@
4472	5350	//node.add(csg);
4473	5351	//makeSomething(node);
4474	5352	makeSomething(csg);
	5353	+ Globals.REPLACEONMAKE = keep;
4475	5354	}
4476	5355
	5356	+ void Ungroup(Object3D g)
	5357	+ {
	5358	+ if (Globals.REPLACEONMAKE)
	5359	+ Save();
	5360	+ boolean keep = Globals.REPLACEONMAKE;
	5361	+ Globals.REPLACEONMAKE = false;
	5362	+ if (g instanceof HiddenObject)
	5363	+ {
	5364	+ HiddenObject h = (HiddenObject) g;
	5365	+
	5366	+ for (int i=0; i<h.ActualSize(); i++)
	5367	+ {
	5368	+ objEditor.makeSomething(h.get(i), false);
	5369	+ }
	5370	+ }
	5371	+ else
	5372	+ {
	5373	+ for (int i=0; i<g.Size(); i++)
	5374	+ {
	5375	+ objEditor.makeSomething(g.get(i), false);
	5376	+ }
	5377	+ }
	5378	+ Globals.REPLACEONMAKE = keep;
	5379	+ }
	5380	+
4477	5381	void ungroup()
4478	5382	{
4479	5383	/*
..	..	@@ -4667,21 +5571,6 @@
4667	5571	}
4668	5572	*/
4669	5573
4670		- void ImportGFD()
4671		- {
4672		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4673		- browser.show();
4674		- String filename = browser.getFile();
4675		- if (filename != null && filename.length() > 0)
4676		- {
4677		- String fullname = browser.getDirectory() + filename;
4678		-
4679		- //Object3D readobj =
4680		- objEditor.ReadGFD(fullname, objEditor);
4681		- //makeSomething(readobj);
4682		- }
4683		- }
4684		-
4685	5574	/*
4686	5575	public void Callback(Object obj)
4687	5576	{
..	..	@@ -4705,26 +5594,9 @@
4705	5594	}
4706	5595	*/
4707	5596
4708		- void ImportVRMLX3D()
4709		- {
4710		- if (GrafreeD.standAlone)
4711		- {
4712		- /**/
4713		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4714		- browser.show();
4715		- String filename = browser.getFile();
4716		- if (filename != null && filename.length() > 0)
4717		- {
4718		- String fullname = browser.getDirectory() + filename;
4719		- LoadVRMLX3D(fullname);
4720		- }
4721		- /**/
4722		- }
4723		- }
4724		-
4725	5597	String GetFile(String dialogName)
4726	5598	{
4727		- if (GrafreeD.standAlone)
	5599	+ if (Grafreed.standAlone)
4728	5600	{
4729	5601	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4730	5602	browser.show();
..	..	@@ -4788,10 +5660,33 @@
4788	5660	cButton flashSelectionButton;
4789	5661	cButton editButton;
4790	5662	cButton uneditButton;
	5663	+ JCheckBox allParamsButton;
4791	5664	cButton clearpanelButton;
4792		- cButton allParamsButton;
4793	5665	cButton unselectButton;
4794	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	+
4795	5690	cButton screenfitButton;
4796	5691	cButton screenfitpointButton;
4797	5692	cButton snapobjectButton;
..	..	@@ -4803,14 +5698,6 @@
4803	5698
4804	5699	cButton setsupportButton;
4805	5700
4806		- cButton twoButton;
4807		- cButton sixButton;
4808		- cButton threeButton;
4809		- cButton sevenButton;
4810		- cButton fourButton; // full panel
4811		- cButton oneButton; // full XYZ
4812		- //cButton currentLayout;
4813		-
4814	5701	//
4815	5702	//Composite
4816	5703	Object3D // to do !!
..	..	@@ -4820,9 +5707,11 @@
4820	5707	//JTree jTree;
4821	5708	private MenuItem lookAtItem;
4822	5709	private MenuItem lookFromItem;
4823		- private MenuItem switchItem;
	5710	+ private MenuItem switchViewItem;
4824	5711	private MenuItem cutItem;
4825		- private MenuItem duplicateItem;
	5712	+ private MenuItem undoItem;
	5713	+ private MenuItem redoItem;
	5714	+ private JMenuItem duplicateItem;
4826	5715	private MenuItem cloneItem;
4827	5716	private MenuItem cloneSupportItem;
4828	5717	private MenuItem overwriteGeoItem;
..	..	@@ -4833,8 +5722,9 @@
4833	5722	private MenuItem resetsupportItem;
4834	5723	private MenuItem resetreferencesItem;
4835	5724	private MenuItem linkverticesItem;
	5725	+ private MenuItem relinkverticesItem;
4836	5726	private MenuItem setMasterItem;
4837		- private MenuItem resetMeshItem;
	5727	+ private MenuItem resetAllItem;
4838	5728	private MenuItem stepAllItem;
4839	5729	private MenuItem revertMeshItem;
4840	5730	private MenuItem poseMeshItem;
..	..	@@ -4845,15 +5735,17 @@
4845	5735	private MenuItem mergeGeometriesItem;
4846	5736	private MenuItem copyItem;
4847	5737	private MenuItem pasteItem;
	5738	+ private MenuItem pasteIntoItem;
4848	5739	private MenuItem pasteLinkItem;
4849	5740	private MenuItem pasteCloneItem;
4850	5741	private MenuItem pasteExpandItem;
4851		- private MenuItem clearItem;
	5742	+ private MenuItem deleteItem;
4852	5743	private MenuItem clearAllItem;
4853	5744	private MenuItem genUVItem;
4854	5745	private MenuItem genNormalsMESHItem;
4855	5746	private MenuItem genNormalsCADItem;
4856	5747	private MenuItem genNormalsORGANItem;
	5748	+ private MenuItem genNormalsMINEItem;
4857	5749	private MenuItem stripifyItem;
4858	5750	private MenuItem unstripifyItem;
4859	5751	private MenuItem trimItem;
..	..	@@ -4882,6 +5774,10 @@
4882	5774	private MenuItem showleavesItem;
4883	5775	private MenuItem markleavesItem;
4884	5776	private MenuItem unmarkleavesItem;
	5777	+ private MenuItem rewindleavesItem;
	5778	+ private MenuItem unrewindleavesItem;
	5779	+ private MenuItem randomleavesItem;
	5780	+ private MenuItem unrandomleavesItem;
4885	5781
4886	5782	private MenuItem flipVItem;
4887	5783	private MenuItem unflipVItem;
..	..	@@ -4893,14 +5789,17 @@
4893	5789	private MenuItem panoTexturesItem;
4894	5790
4895	5791	private MenuItem resetCentroidItem;
4896		- private MenuItem transformgeometryItem;
	5792	+ private MenuItem resetCentroidXZItem;
4897	5793	private MenuItem resetTransformItem;
	5794	+ private MenuItem transformGeometryItem;
	5795	+ private MenuItem transformChildrenItem;
	5796	+ private MenuItem hideItem;
4898	5797	private MenuItem grabItem;
4899	5798	private MenuItem backItem;
4900	5799	private MenuItem frontItem;
4901	5800	private MenuItem cameraItem;
4902	5801	private MenuItem compositeItem;
4903		- private MenuItem randomItem;
	5802	+ private MenuItem switchItem;
4904	5803	private MenuItem physicsItem;
4905	5804	private MenuItem frameselectorItem;
4906	5805	private MenuItem scriptNodeItem;
..	..	@@ -4915,6 +5814,7 @@
4915	5814
4916	5815	private MenuItem resetParentItem;
4917	5816	private MenuItem repairParentItem;
	5817	+ private MenuItem repairShadowItem;
4918	5818	private MenuItem sortbysizeItem;
4919	5819	private MenuItem sortbynameItem;
4920	5820
..	..	@@ -4923,6 +5823,8 @@
4923	5823	private MenuItem attachBumpItem;
4924	5824	private MenuItem detachBumpItem;
4925	5825	private MenuItem pigmentBumpItem;
	5826	+ private MenuItem embedTexturesItem;
	5827	+ private MenuItem deEmbedTexturesItem;
4926	5828
4927	5829	private MenuItem particleItem;
4928	5830	private MenuItem ragdollItem;
..	..	@@ -4935,10 +5837,11 @@
4935	5837	private MenuItem coneItem;
4936	5838	private MenuItem torusItem;
4937	5839	private MenuItem superItem;
	5840	+ private MenuItem kleinItem;
4938	5841	private MenuItem blobItem;
4939	5842	private MenuItem latheItem;
4940	5843	private MenuItem bezierItem;
4941		- private MenuItem checkerItem;
	5844	+ private MenuItem overlayItem;
4942	5845	private MenuItem meshItem;
4943	5846	// private MenuItem meshGroupItem;
4944	5847	private MenuItem springItem;
..	..	@@ -4947,6 +5850,7 @@
4947	5850	private MenuItem csgItem;
4948	5851	private MenuItem templateItem;
4949	5852	private MenuItem textureItem;
	5853	+ private MenuItem billboardItem;
4950	5854	private MenuItem shadowXItem;
4951	5855	private MenuItem shadowYItem;
4952	5856	private MenuItem shadowZItem;
..	..	@@ -4959,11 +5863,6 @@
4959	5863	private MenuItem doubleItem;
4960	5864	private MenuItem tripleItem;
4961	5865
4962		- private MenuItem importGFDItem;
4963		- private MenuItem importVRMLX3DItem;
4964		- private MenuItem import3DSItem;
4965		- private MenuItem importOBJItem;
4966		-
4967	5866	private MenuItem computeAOItem;
4968	5867	private MenuItem recompileItem;
4969	5868	private MenuItem editScriptItem;
..	..	@@ -4973,4 +5872,8 @@
4973	5872	private MenuItem analyzeItem;
4974	5873	private MenuItem dumpItem;
4975	5874	//boolean freezemodel = false;
	5875	+
	5876	+ Menu cameraMenu;
	5877	+ MenuItem editCameraItem;
	5878	+ MenuItem restoreCameraItem;
4976	5879	}