~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,
..	..	@@ -73,7 +74,7 @@
73	74	this.copy = this.group = copy;
74	75	//selectees = this.group.selectees;
75	76
76		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
77	78	SetupUI2(objEditor);
78	79	objEditor.SetupUI(true);
79	80	SetupViews(objEditor);
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
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));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	106	else
106		- makeSomething(CloneObject(GrafreeD.clipboard, false));
107		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
108	109	}
109	110
110	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +119,7 @@
118	119	// obj.support = null;
119	120	if (!supports)
120	121	obj.SaveSupports();
121		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	123	obj.parent = parent;
123	124	// obj.support = support;
124	125	// clone.support = support; // aout 2013
..	..	@@ -147,30 +148,29 @@
147	148
148	149	//JTextField nameField;
149	150
150		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
151	152	{
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);
	153	+ oe.jTree = new cTree();
	154	+
163	155	Menu menu;
164	156	oe.menuBar.add(menu = new Menu("Edit"));
165	157	//editItem = menu.add(new MenuItem("Edit"));
166	158	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	166	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	167	cloneItem = menu.add(new MenuItem("Clone"));
171	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
172	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	172	cloneSupportItem.addActionListener(this);
	173	+ }
174	174	menu.add("-");
175	175	cutItem = menu.add(new MenuItem("Cut"));
176	176	cutItem.addActionListener(this);
..	..	@@ -178,27 +178,123 @@
178	178	copyItem.addActionListener(this);
179	179	pasteItem = menu.add(new MenuItem("Paste"));
180	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
181	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	186	pasteLinkItem.addActionListener(this);
183	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	188	pasteCloneItem.addActionListener(this);
185	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
187	192	clearItem = menu.add(new MenuItem("Clear"));
188	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
189	198	clearAllItem = menu.add(new MenuItem("Clear All"));
190	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
191	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
192	289	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);
	290	+ if (Globals.ADVANCED)
	291	+ {
197	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	293	revertMeshItem.addActionListener(this);
199	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	295	resetreferencesItem.addActionListener(this);
201	296	menu.add("-");
	297	+ }
202	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	299	overwriteGeoItem.addActionListener(this);
204	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,79 +306,103 @@
210	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	307	overwriteUVItem.addActionListener(this);
212	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
213	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	312	generateMeshItem.addActionListener(this);
215	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	314	poseMeshItem.addActionListener(this);
217	315	menu.add("-");
	316	+ }
218	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	318	resetsupportItem.addActionListener(this);
220	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	320	linkverticesItem.addActionListener(this);
222	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
223	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
224	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
225	327	setMasterItem.addActionListener(this);
	328	+ }
226	329
227	330	oe.menuBar.add(menu = new Menu("Group"));
228		- grabItem = menu.add(new MenuItem("Grab"));
229		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
230	333	backItem = menu.add(new MenuItem("Back"));
231	334	backItem.addActionListener(this);
232	335	frontItem = menu.add(new MenuItem("Front"));
233	336	frontItem.addActionListener(this);
234		- compositeItem = menu.add(new MenuItem("Composite"));
235		- compositeItem.addActionListener(this);
236		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
237	343	hideItem.addActionListener(this);
	344	+ }
238	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
239	346	ungroupItem.addActionListener(this);
240		- menu.add("-");
241		- randomItem = menu.add(new MenuItem("Random"));
242		- randomItem.addActionListener(this);
243		- physicsItem = menu.add(new MenuItem("Physics"));
244		- physicsItem.addActionListener(this);
245		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
246		- frameselectorItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
247	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
248	355	switchGeoItem.addActionListener(this);
249	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
250	357	switchTransfoItem.addActionListener(this);
251		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
252	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
253	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
254	367	scriptNodeItem.addActionListener(this);
255		- cameraItem = menu.add(new MenuItem("Camera"));
256		- cameraItem.addActionListener(this);
	368	+ }
257	369
258	370	oe.menuBar.add(menu = new Menu("Object"));
259		- textureItem = menu.add(new MenuItem("Texture"));
260		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
261	373	billboardItem = menu.add(new MenuItem("Billboard"));
262	374	billboardItem.addActionListener(this);
263	375	csgItem = menu.add(new MenuItem("CSG"));
264	376	csgItem.addActionListener(this);
265		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
266	378	shadowXItem.addActionListener(this);
267		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
268	380	shadowYItem.addActionListener(this);
269		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
270	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
271	386	linkerItem = menu.add(new MenuItem("Linker"));
272	387	linkerItem.addActionListener(this);
273		- templateItem = menu.add(new MenuItem("Template"));
274		- templateItem.addActionListener(this);
275	388	attributeItem = menu.add(new MenuItem("Attribute"));
276	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
277	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
278	393	pointflowItem.addActionListener(this);
	394	+ }
279	395	menu.add("-");
280	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
281	397	resetTransformItem.addActionListener(this);
282	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
283	399	resetCentroidItem.addActionListener(this);
284		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
285		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
286	406
287	407	oe.menuBar.add(menu = new Menu("Geometry"));
288	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -293,8 +413,11 @@
293	413	genNormalsCADItem.addActionListener(this);
294	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
295	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
296	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
297	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
298	421	stripifyItem = menu.add(new MenuItem("Stripify"));
299	422	stripifyItem.addActionListener(this);
300	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -316,23 +439,34 @@
316	439	reduce34MeshItem.addActionListener(this);
317	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
318	441	increaseMeshItem.addActionListener(this);
319		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
320		- smoothMeshItem.addActionListener(this);
321	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
322	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
323	450
324	451	oe.menuBar.add(menu = new Menu("Attributes"));
325	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
326	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
327	458	menu.add("-");
328	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
329	460	liveleavesItem.addActionListener(this);
330	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
331	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
332	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
333	466	supportleavesItem.addActionListener(this);
334	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
335	468	unsupportleavesItem.addActionListener(this);
	469	+ }
336	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
337	471	hideleavesItem.addActionListener(this);
338	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -341,6 +475,14 @@
341	475	markleavesItem.addActionListener(this);
342	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
343	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
344	486	menu.add("-");
345	487	flipVItem = menu.add(new MenuItem("Flip V"));
346	488	flipVItem.addActionListener(this);
..	..	@@ -376,35 +518,40 @@
376	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
377	519	sortbynameItem.addActionListener(this);
378	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
379	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
380	529	extractGeometriesItem.addActionListener(this);
381	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
382	531	cloneGeometriesItem.addActionListener(this);
383		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
384		- shareGeometriesItem.addActionListener(this);
385		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
386		- mergeGeometriesItem.addActionListener(this);
	532	+ }
387	533
388	534	oe.menuBar.add(menu = new Menu("Insert"));
389	535	buildCreateMenu(menu);
390	536
391		-
392		- oe.menuBar.add(menu = new Menu("Include"));
393		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
394		- importGFDItem.addActionListener(this);
395		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
396		- importVRMLX3DItem.addActionListener(this);
397		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
398		- importOBJItem.addActionListener(this);
399		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
400		- import3DSItem.addActionListener(this);
401		-
402	537	oe.menuBar.add(menu = new Menu("Tools"));
403	538	buildToolsMenu(menu);
404	539	}
405	540
406	541	void SetupUI2(ObjEditor oe)
407	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
408	555	//new Exception().printStackTrace();
409	556
410	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -433,153 +580,213 @@
433	580	oe.radioPanel.add(dummyButton);
434	581	oe.buttonGroup.add(dummyButton);
435	582	*/
436		- aConstraints.gridy += 1;
437		- oe.aConstraints.gridwidth = 1;
438		- oe.aConstraints.gridx = 0;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
439	586
440		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	587	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	588	+
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
441	621	liveCB.addItemListener(this);
442	622
443		- oe.aConstraints.gridx += 1;
444		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
445		- supportCB.addItemListener(this);
446		-
447		- // oe.aConstraints.gridx += 1;
448		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
449		- // localCB.addItemListener(this);
450		-
451		- oe.aConstraints.gridx += 1;
452		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
453		- crowdCB.addItemListener(this);
454		-
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
457		- smoothCB.addItemListener(this);
458		-
459		- oe.aConstraints.gridx += 1;
460		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST), oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ oneStepButton.setToolTipText("Animate one step forward");
	625	+ oneStepButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	628	+ fastCB.setToolTipText("Fast mode");
461	629	fastCB.addItemListener(this);
462		- oe.aConstraints.gridx += 1;
463		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
464		- slowCB.addItemListener(this);
465		- oe.aConstraints.gridx += 1;
466		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
467		- boxCB.addItemListener(this);
468		-
469		-// oe.aConstraints.gridx += 1;
470		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
471		-// speakerMocapCB.addItemListener(this);
472		-
473		- if (false)
474		- {
475		- // handled in scripts
476		- oe.aConstraints.gridx += 1;
477		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
478		- speakerCameraCB.addItemListener(this);
479		-
480		- oe.aConstraints.gridx += 1;
481		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
482		- speakerFocusCB.addItemListener(this);
483		-
484		- oe.aConstraints.gridx += 1;
485		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
486		- smoothfocusCB.addItemListener(this);
487		- }
488		-
489		-//oe.aConstraints.gridx += 1;
490		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
491		-// debugCB.addItemListener(this);
492		-
493		- oe.aConstraints.gridx += 1;
494		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
495		- oeilCB.addItemListener(this);
496		-
497		- oe.aConstraints.gridx += 1;
498		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
499		- lookAtCB.addItemListener(this);
500		-
501		- oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
503		- trackCB.addItemListener(this);
504		-
505		- oe.aConstraints.gridx += 1;
506		- oe.toolbarPanel.add(screenfitButton = new cButton("@ ")); //, oe.aConstraints);
	630	+
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ screenfitButton.setToolTipText("Screen fit");
507	635	screenfitButton.addActionListener(this);
508		- oe.aConstraints.gridx += 1;
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
	640	+
509	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
510	642	// screenfitpointButton.addActionListener(this);
511		-// oe.aConstraints.gridx += 1;
512		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
513		- snapobjectButton.addActionListener(this);
514		- oe.aConstraints.gridx += 1;
515	643
516		- //aConstraints.gridx = 0;
517		- //aConstraints.gridy += 1;
518		- oe.aConstraints.weighty = 0;
519		- oe.aConstraints.gridwidth = 1;
520		-
521		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
522		- flashSelectionButton.addActionListener(this);
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ snapobjectButton.addActionListener(this);
	648	+ snapobjectButton.setToolTipText("Snap Object");
	649	+ }
	650	+
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	652
524		- oe.toolbarPanel.add(new cButton(" ", false));
525		-
526		- oe.aConstraints.gridx += 1;
527		- oe.aConstraints.weighty = 0;
528		- oe.aConstraints.gridwidth = 1;
529		-
530		- //
531		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ twoButton.setToolTipText("Show center view only");
532	655	twoButton.addActionListener(this);
533		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
534	659	fourButton.addActionListener(this);
535		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	660	+ fourButton.setToolTipText("Show left panel only");
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ sixButton.setToolTipText("2-column layout left");
536	663	sixButton.addActionListener(this);
537		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ threeButton.setToolTipText("2-column layout right");
538	666	threeButton.addActionListener(this);
539		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ sevenButton.setToolTipText("3-column layout");
540	669	sevenButton.addActionListener(this);
541	670	//
542	671
543		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	673	+ rootButton.setToolTipText("Edit selection in new tab");
544	674	rootButton.addActionListener(this);
545		- oe.aConstraints.gridx += 1;
546		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	675	+
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	677	+ closeButton.setToolTipText("Close tab");
547	678	closeButton.addActionListener(this);
548	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
549	680	//clearButton.addActionListener(this);
550		- oe.aConstraints.gridx += 1;
551		-
552		- oe.aConstraints.gridx = 1; //
553		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
554		- editButton.addActionListener(this);
555		- oe.aConstraints.gridx += 1;
556		- oe.aConstraints.weighty = 0;
557		- oe.aConstraints.gridwidth = 1;
558	681
559		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
	713	+
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Edit selection");
	763	+ editButton.addActionListener(this);
	764	+
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Unedit selection");
560	767	uneditButton.addActionListener(this);
561	768
562		- oe.aConstraints.gridx += 1;
563		- oe.aConstraints.weighty = 0;
564		- oe.aConstraints.gridwidth = 1;
565		-
566		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
567		- clearPanelButton.addActionListener(this);
568		-
569		- oe.aConstraints.gridx += 1;
570		- oe.aConstraints.weighty = 0;
571		- oe.aConstraints.gridwidth = 1;
572		-
573		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Edit all params");
574	771	allParamsButton.addActionListener(this);
575	772
576		- oe.aConstraints.gridx += 1;
577		- oe.aConstraints.weighty = 0;
578		- oe.aConstraints.gridwidth = 1;
579		-
580		- oe.treePanel.add(unselectButton = new cButton("U"), oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	774	+ clearPanelButton.setToolTipText("Clear edit panel");
	775	+ clearPanelButton.addActionListener(this);
	776	+
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	778	+ unselectButton.setToolTipText("Unselect");
581	779	unselectButton.addActionListener(this);
582	780
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
	784	+
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
	789	+
583	790	// oe.aConstraints.gridx += 1;
584	791	// oe.aConstraints.weighty = 0;
585	792	// oe.aConstraints.gridwidth = 1;
..	..	@@ -591,40 +798,22 @@
591	798	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
592	799	// gcButton.addActionListener(this);
593	800
594		- oe.aConstraints.gridx = 0;
595		- oe.aConstraints.gridy += 1;
596		-
597		- //ctrlPanel.add(objList = new List(5, true));
598		- oe.aConstraints.gridwidth = 100;
599		- // oe.aConstraints.gridheight = 100;
600		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
601		- oe.aConstraints.gridheight = 1;
602		- oe.aConstraints.weighty = 0.5;
603		- oe.aConstraints.gridx = 0;
604		- JScrollPane jSP;
	801	+ cGridBag jSPPanel = new cGridBag();
	802	+
	803	+ JScrollPane jSP;
605	804	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
606		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
607	806	ResetModel();
608		- oe.aConstraints.weighty = 0.5;
609		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
610		- oe.aConstraints.gridy += 1;
611		- oe.aConstraints.gridwidth = 1;
612		-
613		- oe.aConstraints.weighty = 0;
614		- oe.aConstraints.gridwidth = 2;
615		-
616		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
617		- colorCB.addItemListener(this);
618		- oe.aConstraints.gridx += 2;
619		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
620		- materialCB.addItemListener(this);
621		- oe.aConstraints.gridx += 2;
622		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
623		- textureCB.addItemListener(this);
624		-
625		- oe.aConstraints.gridx = 0;
626		- oe.aConstraints.gridy += 1;
627	807
	808	+ oe.treePanel.add(jSPPanel);
	809	+ oe.treePanel.Return();
	810	+
	811	+ oe.treePanel.add(copyOptionsPanel);
	812	+ oe.treePanel.Return();
	813	+
	814	+// mainPanel.setDividerLocation(0.5); //1.0);
	815	+// mainPanel.setResizeWeight(0.5);
	816	+
628	817	//jList.addListSelectionListener(this);
629	818	oe.jTree.addTreeSelectionListener(this);
630	819	//jTree.setRootVisible(false);
..	..	@@ -646,10 +835,140 @@
646	835	radio.layout = sevenButton;
647	836	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
648	837	}
	838	+
	839	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	840	+ {
	841	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	842	+ colorCB.setToolTipText("Copy color when dropped");
	843	+ colorCB.addItemListener(this);
	844	+
	845	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	846	+ materialCB.setToolTipText("Copy material when dropped");
	847	+ materialCB.addItemListener(this);
	848	+
	849	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	850	+ textureCB.setToolTipText("Copy texture when dropped");
	851	+ textureCB.addItemListener(this);
	852	+
	853	+ panel.Return();
	854	+
	855	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	856	+ boxCB.setToolTipText("Display bounding boxes");
	857	+ boxCB.addItemListener(this);
	858	+
	859	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	860	+ zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.addItemListener(this);
	862	+
	863	+ if (true) // Globals.ADVANCED)
	864	+ {
	865	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	866	+ supportCB.setToolTipText("Enable rigging");
	867	+ supportCB.addItemListener(this);
	868	+
	869	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	870	+ // localCB.addItemListener(this);
	871	+
	872	+ panel.Return();
	873	+
	874	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	875	+ crowdCB.setToolTipText("Used for crowds");
	876	+ crowdCB.addItemListener(this);
	877	+
	878	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	879	+ smoothCB.setToolTipText("Snapping delay");
	880	+ smoothCB.addItemListener(this);
	881	+
	882	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	883	+ slowCB.setToolTipText("Smooth interpolation");
	884	+ slowCB.addItemListener(this);
	885	+
	886	+// constraints.gridy += 1;
	887	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	888	+// speakerMocapCB.addItemListener(this);
	889	+
	890	+ panel.Return();
	891	+
	892	+ if (false)
	893	+ {
	894	+ // handled in scripts
	895	+ //constraints.gridy += 1;
	896	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	897	+ speakerCameraCB.addItemListener(this);
	898	+
	899	+ //constraints.gridy += 1;
	900	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	901	+ speakerFocusCB.addItemListener(this);
	902	+
	903	+ //constraints.gridy += 1;
	904	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	905	+ smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
	907	+ }
	908	+
	909	+//constraints.gridx += 1;
	910	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	911	+// debugCB.addItemListener(this);
	912	+
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
	917	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
	919	+ oeilCB.addItemListener(this);
	920	+
	921	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	922	+ shadowCB.setToolTipText("Compute shadows when live");
	923	+ shadowCB.addItemListener(this);
	924	+
	925	+ panel.Return();
	926	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	927	+ toggleTextureCB.setToolTipText("Load textures");
	928	+ toggleTextureCB.addItemListener(this);
	929	+
	930	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	931	+ toggleSwitchCB.setToolTipText("Use switch");
	932	+ toggleSwitchCB.addItemListener(this);
	933	+
	934	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	935	+ autosaveCB.setToolTipText("Auto-save on structure change");
	936	+ autosaveCB.addItemListener(this);
	937	+
	938	+ panel.Return();
	939	+ if (Globals.ADVANCED)
	940	+ {
	941	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	942	+ lookAtCB.setToolTipText("Look-at target");
	943	+ lookAtCB.addItemListener(this);
	944	+ }
	945	+
	946	+ }
	947	+
	948	+ cGridBag fill = new cGridBag();
	949	+ fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
	954	+
	955	+ panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
	958	+
	959	+ }
649	960
650	961	void EditObject(Object3D obj)
651	962	{
652	963	cRadio radioButton = new cRadio(obj.name);
	964	+
	965	+ // Patch to avoid bug with transparency.
	966	+ radioButton.hadMaterial = obj.material != null;
	967	+ if (!radioButton.hadMaterial)
	968	+ {
	969	+ obj.material = new cMaterial();
	970	+ }
	971	+
653	972	radioButton.SetObject(obj);
654	973	radioButton.layout = sevenButton;
655	974	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -658,8 +977,11 @@
658	977	buttonGroup.add(radioButton);
659	978	radioButton.doClick();
660	979	}
	980	+
661	981	void SetupViews(ObjEditor oe)
662	982	{
	983	+ theFrame = this;
	984	+
663	985	oe.SetupViews();
664	986
665	987	System.out.println("SetupViews");
..	..	@@ -668,22 +990,27 @@
668	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
669	991	}
670	992
671		- JCheckBox liveCB;
672		- JCheckBox supportCB;
673		- JCheckBox localCB;
674		- JCheckBox crowdCB;
675		- JCheckBox smoothCB;
676		- JCheckBox fastCB;
677		- JCheckBox slowCB;
678		- JCheckBox boxCB;
679		- JCheckBox trackCB;
680		- JCheckBox smoothfocusCB;
	993	+ cToggleButton liveCB;
	994	+ cCheckBox supportCB;
	995	+ cCheckBox localCB;
	996	+ cCheckBox crowdCB;
	997	+ cCheckBox smoothCB;
	998	+ cToggleButton fastCB;
	999	+ cCheckBox slowCB;
	1000	+ cCheckBox boxCB;
	1001	+ cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
	1004	+ cCheckBox smoothfocusCB;
681	1005	// JCheckBox speakerMocapCB;
682		- JCheckBox speakerCameraCB;
683		- JCheckBox speakerFocusCB;
684		- JCheckBox debugCB;
685		- JCheckBox oeilCB;
686		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
687	1014
688	1015	// static int COLOR = 1;
689	1016	// static int MATERIAL = 2;
..	..	@@ -691,9 +1018,9 @@
691	1018
692	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
693	1020
694		- JCheckBox colorCB;
695		- JCheckBox materialCB;
696		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
697	1024
698	1025	public void itemStateChanged(ItemEvent e)
699	1026	{
..	..	@@ -721,6 +1048,7 @@
721	1048	} else if(e.getSource() == liveCB)
722	1049	{
723	1050	cameraView.ToggleLive();
	1051	+ refreshContents(false);
724	1052	}
725	1053	else if(e.getSource() == supportCB)
726	1054	{
..	..	@@ -756,6 +1084,10 @@
756	1084	cameraView.repaint();
757	1085	// refreshContents();
758	1086	}
	1087	+ else if(e.getSource() == zoomBoxCB)
	1088	+ {
	1089	+ cameraView.ToggleZoomBoxMode();
	1090	+ }
759	1091	else if(e.getSource() == smoothfocusCB)
760	1092	{
761	1093	cameraView.ToggleSmoothFocus();
..	..	@@ -781,6 +1113,14 @@
781	1113	{
782	1114	cameraView.ToggleOeil();
783	1115	}
	1116	+ else if(e.getSource() == shadowCB)
	1117	+ {
	1118	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1119	+ }
	1120	+ else if(e.getSource() == autosaveCB)
	1121	+ {
	1122	+ Globals.SAVEONMAKE ^= true;
	1123	+ }
784	1124	else if(e.getSource() == lookAtCB)
785	1125	{
786	1126	cameraView.ToggleLookAt();
..	..	@@ -797,7 +1137,8 @@
797	1137
798	1138	/**/
799	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
800		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
801	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
802	1143	// We can't move the root node or an empty selection
803	1144	return;
..	..	@@ -869,7 +1210,9 @@
869	1210	// objEditor.DropFile((java.io.File[]) object, true);
870	1211	// return;
871	1212	// }
872		- if (string.charAt(0) == '/')
	1213	+
	1214	+ // File path for Mac and Windows
	1215	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
873	1216	{
874	1217	// file(s)
875	1218	String[] names = string.split("\n");
..	..	@@ -896,7 +1239,7 @@
896	1239
897	1240	flashIt = false;
898	1241	CameraPane pane = (CameraPane) target;
899		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1242	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
900	1243	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
901	1244
902	1245	if (group.selection.size() == 1)
..	..	@@ -912,23 +1255,33 @@
912	1255
913	1256	assert target == objEditor.jTree;
914	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
915	1259	try {
916		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
917	1261	} catch (Exception e) {
918	1262	System.out.println("destinationPath : " + destinationPath);
919	1263	return;
920	1264	}
921	1265
922		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
923	1267	{
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
	1275	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+// {
924	1277	loadClipboard(true);
925	1278	objEditor.jTree.setSelectionPath(destinationPath);
926		- pasteInto(false);
927		- } else {
928		- loadClipboard(false);
929		- objEditor.jTree.setSelectionPath(destinationPath);
930		- pasteInto(false); // true); // ???
931		- }
	1279	+ pasteInto(false, false);
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
932	1285	}
933	1286	public void dropActionChanged(DropTargetDragEvent dtde)
934	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1033,85 +1386,104 @@
1033	1386	{
1034	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1035	1388	//heightFieldItem.addActionListener(this);
1036		- gridItem = menu.add(new MenuItem("Grid"));
1037		- gridItem.addActionListener(this);
1038		- rectoidItem = menu.add(new MenuItem("Box"));
1039		- rectoidItem.addActionListener(this);
1040		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1041		- ellipsoidItem.addActionListener(this);
1042		- coneItem = menu.add(new MenuItem("Cone"));
1043		- coneItem.addActionListener(this);
1044		- torusItem = menu.add(new MenuItem("Torus"));
1045		- torusItem.addActionListener(this);
1046		- superItem = menu.add(new MenuItem("Superellipsoid"));
1047		- superItem.addActionListener(this);
	1389	+// gridItem = menu.add(new MenuItem("Grid"));
	1390	+// gridItem.addActionListener(this);
	1391	+// rectoidItem = menu.add(new MenuItem("Box"));
	1392	+// rectoidItem.addActionListener(this);
	1393	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1394	+// ellipsoidItem.addActionListener(this);
	1395	+// coneItem = menu.add(new MenuItem("Cone"));
	1396	+// coneItem.addActionListener(this);
	1397	+// torusItem = menu.add(new MenuItem("Torus"));
	1398	+// torusItem.addActionListener(this);
	1399	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1400	+// superItem.addActionListener(this);
	1401	+
	1402	+ cameraItem = menu.add(new MenuItem("Camera"));
	1403	+ cameraItem.addActionListener(this);
	1404	+
	1405	+ if (!Globals.ADVANCED)
	1406	+ {
1048	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1049	1408	kleinItem.addActionListener(this);
1050		- particleItem = menu.add(new MenuItem("Particle system"));
1051		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
	1413	+ if (Globals.ADVANCED)
	1414	+ {
1052	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1053	1416	ragdollItem.addActionListener(this);
1054	1417	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1055	1418	ragdoll2Item.addActionListener(this);
	1419	+ }
1056	1420	menu.add("-");
1057		- meshItem = menu.add(new MenuItem("Mesh"));
	1421	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1058	1422	meshItem.addActionListener(this);
1059	1423	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1060	1424	// meshGroupItem.addActionListener(this);
	1425	+ if (Globals.ADVANCED)
	1426	+ {
1061	1427	springItem = menu.add(new MenuItem("Spring"));
1062	1428	springItem.addActionListener(this);
1063	1429	flagItem = menu.add(new MenuItem("Flag"));
1064	1430	flagItem.addActionListener(this);
1065		- bezierItem = menu.add(new MenuItem("Patch"));
1066		- bezierItem.addActionListener(this);
1067		- checkerItem = menu.add(new MenuItem("Checker"));
1068		- checkerItem.addActionListener(this);
1069	1431	blobItem = menu.add(new MenuItem("Blob"));
1070	1432	blobItem.addActionListener(this);
1071	1433	latheItem = menu.add(new MenuItem("Lathe"));
1072	1434	latheItem.addActionListener(this);
1073		- lightItem = menu.add(new MenuItem("Light"));
1074		- lightItem.addActionListener(this);
	1435	+ }
	1436	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1437	+ bezierItem.addActionListener(this);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1075	1442	menu.add("-");
1076	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1077	1444	//superLoopItem.addActionListener(this);
1078		- loopItem = menu.add(new MenuItem("Loop"));
1079		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1080	1447	doubleItem = menu.add(new MenuItem("Fork"));
1081	1448	doubleItem.addActionListener(this);
	1449	+ if (Globals.ADVANCED)
	1450	+ {
1082	1451	tripleItem = menu.add(new MenuItem("Trident"));
1083	1452	tripleItem.addActionListener(this);
	1453	+ }
1084	1454	}
1085	1455
1086	1456	void buildToolsMenu(Menu menu)
1087	1457	{
1088	1458	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1089	1459	animationItem.addItemListener(this);
1090		- animationItem.setState(CameraPane.ANIMATION);
	1460	+ animationItem.setState(Globals.ANIMATION);
1091	1461
1092	1462	menu.add("-");
1093	1463	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1094	1464	parseverticesItem.addActionListener(this);
1095	1465	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1096	1466	textureFieldItem.addActionListener(this);
1097		- alignItem = menu.add(new MenuItem("Align"));
	1467	+ alignItem = menu.add(new MenuItem("Align Objects"));
1098	1468	alignItem.addActionListener(this);
1099		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1100		- mirrorItem.addActionListener(this);
1101	1469	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1102	1470	reduceMorphItem.addActionListener(this);
1103	1471	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1104	1472	reduce34MorphItem.addActionListener(this);
1105		-
	1473	+ menu.add("-");
1106	1474	menu.add(computeAOItem = new MenuItem("Compute AO"));
1107	1475	computeAOItem.addActionListener(this);
1108		- menu.add("-");
1109	1476
	1477	+ if (Globals.ADVANCED)
	1478	+ {
	1479	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1480	+ mirrorItem.addActionListener(this);
	1481	+ menu.add("-");
1110	1482	menu.add(memoryItem = new MenuItem("Memory Usage"));
1111	1483	memoryItem.addActionListener(this);
1112	1484	menu.add(analyzeItem = new MenuItem("Analyze"));
1113	1485	analyzeItem.addActionListener(this);
1114		- menu.add(dumpItem = new MenuItem("Dump"));
	1486	+ menu.add(dumpItem = new MenuItem("Print"));
1115	1487	dumpItem.addActionListener(this);
1116	1488	// menu.add(pathItem = new MenuItem("From-to path"));
1117	1489	// pathItem.addActionListener(this);
..	..	@@ -1120,6 +1492,8 @@
1120	1492	resetParentItem.addActionListener(this);
1121	1493	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1122	1494	repairParentItem.addActionListener(this);
	1495	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1496	+ repairShadowItem.addActionListener(this);
1123	1497	menu.add(invariantsItem = new MenuItem("Invariants"));
1124	1498	invariantsItem.addActionListener(this);
1125	1499	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1127,6 +1501,7 @@
1127	1501	menu.add("-");
1128	1502	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1129	1503	editScriptItem.addActionListener(this);
	1504	+ }
1130	1505	}
1131	1506
1132	1507	void ScreenFit()
..	..	@@ -1249,6 +1624,7 @@
1249	1624	shadow.material = new cMaterial(obj.material);
1250	1625	shadow.material.diffuse = 0.0001f;
1251	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1252	1628
1253	1629	makeSomething(shadow);
1254	1630	}
..	..	@@ -1455,9 +1831,9 @@
1455	1831
1456	1832	void Overwrite(int mask)
1457	1833	{
1458		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1834	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1459	1835	{
1460		- Object3D content = GrafreeD.clipboard.get(0);
	1836	+ Object3D content = Grafreed.clipboard.get(0);
1461	1837
1462	1838	if (content instanceof cGroup && ((cGroup)content).transientlink )
1463	1839	content = ((cGroup)content).get(0);
..	..	@@ -1480,6 +1856,7 @@
1480	1856	//
1481	1857	public void actionPerformed(ActionEvent event) // , Object arg)
1482	1858	{
	1859	+ Object source = event.getSource();
1483	1860	/*
1484	1861	if (event.getSource() == nameField)
1485	1862	{
..	..	@@ -1491,11 +1868,11 @@
1491	1868	}
1492	1869	else
1493	1870	*/
1494		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1871	+ if (source == lookAtItem \|\| source == lookFromItem)
1495	1872	{
1496	1873	ScreenFit();
1497	1874	} else
1498		- if (event.getSource() == switchItem)
	1875	+ if (source == switchViewItem)
1499	1876	{
1500	1877	cVector v1 = new cVector();
1501	1878	cVector v2 = new cVector();
..	..	@@ -1504,11 +1881,11 @@
1504	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1505	1882	objEditor.cameraView.repaint();
1506	1883	} else
1507		- if (event.getSource() == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1508	1885	{
1509	1886	makeSomething(new Box());
1510	1887	} else
1511		- if (event.getSource() == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1512	1889	{
1513	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1514	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1529,9 +1906,9 @@
1529	1906	applyExample(particleGeom, "SMOKE");
1530	1907	makeSomething(particleGeom);
1531	1908	} else
1532		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1909	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1533	1910	{
1534		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1911	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1535	1912
1536	1913	ragdoll.toParent = LA.newMatrix();
1537	1914	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1549,7 +1926,7 @@
1549	1926	} else
1550	1927	/*
1551	1928	*/
1552		- if (event.getSource() == heightFieldItem)
	1929	+ if (source == heightFieldItem)
1553	1930	{
1554	1931	Object3D obj = new Object3D();
1555	1932
..	..	@@ -1587,31 +1964,31 @@
1587	1964
1588	1965	makeSomething(obj);
1589	1966	} else
1590		- if (event.getSource() == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1591	1968	{
1592	1969	makeSomething(new Grid());
1593	1970	} else
1594		- if (event.getSource() == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1595	1972	{
1596	1973	makeSomething(new Sphere());
1597	1974	} else
1598		- if (event.getSource() == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1599	1976	{
1600	1977	makeSomething(new Cone());
1601	1978	} else
1602		- if (event.getSource() == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1603	1980	{
1604	1981	makeSomething(new Torus());
1605	1982	} else
1606		- if (event.getSource() == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1607	1984	{
1608	1985	makeSomething(new Superellipsoid());
1609	1986	} else
1610		- if (event.getSource() == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1611	1988	{
1612	1989	makeSomething(new Klein());
1613	1990	} else
1614		- if (event.getSource() == blobItem)
	1991	+ if (source == blobItem)
1615	1992	{
1616	1993	Blob blob = new Blob();
1617	1994	BlobComponent comp = new BlobComponent();
..	..	@@ -1619,15 +1996,15 @@
1619	1996	//blob.retile();
1620	1997	makeSomething(blob);
1621	1998	} else
1622		- if (event.getSource() == latheItem)
	1999	+ if (source == latheItem)
1623	2000	{
1624	2001	makeSomething(new Lathe());
1625	2002	} else
1626		- if (event.getSource() == bezierItem)
	2003	+ if (source == bezierItem)
1627	2004	{
1628	2005	makeSomething(new BezierSurface());
1629	2006	} else
1630		- if (event.getSource() == checkerItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1631	2008	{
1632	2009	/*
1633	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1642,7 +2019,7 @@
1642	2019	*/
1643	2020	makeSomething(new Checker());
1644	2021	} else
1645		- if (event.getSource() == meshItem)
	2022	+ if (source == meshItem)
1646	2023	{
1647	2024	Object3D itemtomake = new Object3D();
1648	2025	Object3D child;
..	..	@@ -1663,35 +2040,35 @@
1663	2040	makeSomething(child);
1664	2041	}
1665	2042	} else
1666		- if (event.getSource() == springItem)
	2043	+ if (source == springItem)
1667	2044	{
1668	2045	cSpring s = new cSpring();
1669	2046	s.setup();
1670	2047	makeSomething(s);
1671	2048	} else
1672		- if (event.getSource() == flagItem)
	2049	+ if (source == flagItem)
1673	2050	{
1674	2051	cSpring s = new cFlag();
1675	2052	s.setup();
1676	2053	makeSomething(s);
1677	2054	} else
1678		- if (event.getSource() == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1679	2056	{
1680	2057	makeSomething(new Light());
1681	2058	} else
1682		- if (event.getSource() == csgItem)
	2059	+ if (source == csgItem)
1683	2060	{
1684	2061	group(new CSG());
1685	2062	} else
1686		- if (event.getSource() == templateItem)
	2063	+ if (source == templateItem)
1687	2064	{
1688	2065	group(new cTemplate());
1689	2066	} else
1690		- if (event.getSource() == attributeItem)
	2067	+ if (source == attributeItem)
1691	2068	{
1692	2069	makeSomething(new Attribute());
1693	2070	} else
1694		- if (event.getSource() == pointflowItem)
	2071	+ if (source == pointflowItem)
1695	2072	{
1696	2073	makeSomething(new PointFlow());
1697	2074	} else
..	..	@@ -1703,7 +2080,7 @@
1703	2080	} else
1704	2081	*/
1705	2082
1706		- if (event.getSource() == superLoopItem)
	2083	+ if (source == superLoopItem)
1707	2084	{
1708	2085	Composite g = new cGroup();
1709	2086	for (int i=0; i<15; i++)
..	..	@@ -1725,7 +2102,7 @@
1725	2102
1726	2103	group(g);
1727	2104	} else
1728		- if (event.getSource() == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1729	2106	{
1730	2107	Composite csg = new GroupLeaf();
1731	2108	csg.count = 5;
..	..	@@ -1734,7 +2111,7 @@
1734	2111	csg.addChild(child);
1735	2112	child.addChild(csg);
1736	2113	} else
1737		- if (event.getSource() == doubleItem)
	2114	+ if (source == doubleItem)
1738	2115	{
1739	2116	Composite csg = new GroupLeaf();
1740	2117	csg.count = 5;
..	..	@@ -1746,7 +2123,7 @@
1746	2123	csg.addChild(child);
1747	2124	child.addChild(csg);
1748	2125	} else
1749		- if (event.getSource() == tripleItem)
	2126	+ if (source == tripleItem)
1750	2127	{
1751	2128	Composite csg = new GroupLeaf();
1752	2129	csg.count = 4;
..	..	@@ -1761,71 +2138,83 @@
1761	2138	csg.addChild(child);
1762	2139	child.addChild(csg);
1763	2140	} else
1764		-
1765		- if (event.getSource() == importGFDItem)
	2141	+ if (source == computeAOItem)
1766	2142	{
1767		- ImportGFD();
	2143	+ Globals.drawMode = CameraPane.OCCLUSION;
	2144	+ Globals.theRenderer.repaint();
1768	2145	} else
1769		- if (event.getSource() == importVRMLX3DItem)
1770		- {
1771		- ImportVRMLX3D();
1772		- } else
1773		- if (event.getSource() == import3DSItem)
1774		- {
1775		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1776		- } else
1777		- if (event.getSource() == importOBJItem)
1778		- {
1779		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1780		- } else
1781		- if (event.getSource() == computeAOItem)
1782		- {
1783		- CameraPane.drawMode = CameraPane.OCCLUSION;
1784		- CameraPane.theRenderer.repaint();
1785		- } else
1786		- if (event.getSource() == recompileItem)
	2146	+ if (source == recompileItem)
1787	2147	{
1788	2148	Recompile();
1789	2149	refreshContents();
1790	2150	} else
1791		- if (event.getSource() == editScriptItem)
	2151	+ if (source == editScriptItem)
1792	2152	{
1793	2153	OpenDialog();
1794	2154	refreshContents();
1795	2155	} else
1796		- if (event.getSource() == invariantsItem)
	2156	+ if (source == invariantsItem)
1797	2157	{
1798	2158	System.out.println("Invariants:");
1799		- GrafreeD.grafreeD.universe.invariants();
	2159	+ Grafreed.grafreeD.universe.invariants();
1800	2160	} else
1801		- if (event.getSource() == memoryItem)
	2161	+ if (source == memoryItem)
1802	2162	{
1803	2163	//System.out.println("Invariants:");
1804	2164	PrintMemory();
1805	2165	} else
1806		- if (event.getSource() == pathItem)
	2166	+ if (source == pathItem)
1807	2167	{
1808	2168	PrintPath();
1809	2169	} else
1810		- if (event.getSource() == analyzeItem)
	2170	+ if (source == analyzeItem)
1811	2171	{
1812	2172	AnalyzeObject();
1813	2173	} else
1814		- if (event.getSource() == dumpItem)
	2174	+ if (source == dumpItem)
1815	2175	{
1816	2176	DumpObject();
1817	2177	} else
1818		- if (event.getSource() == screenfitButton)
	2178	+ if (source == minButton)
	2179	+ {
	2180	+ Minimize();
	2181	+ } else
	2182	+ if (source == maxButton)
	2183	+ {
	2184	+ Maximize();
	2185	+ } else
	2186	+ if (source == fullButton)
	2187	+ {
	2188	+ ToggleFullScreen();
	2189	+ } else
	2190	+ if (source == undoButton)
	2191	+ {
	2192	+ Undo();
	2193	+ } else
	2194	+ if (source == redoButton)
	2195	+ {
	2196	+ Redo();
	2197	+ } else
	2198	+ if (source == saveButton)
	2199	+ {
	2200	+ Save();
	2201	+ } else
	2202	+ if (source == oneStepButton)
	2203	+ {
	2204	+ Globals.ONESTEP = true;
	2205	+ cameraView.repaint();
	2206	+ } else
	2207	+ if (source == screenfitButton)
1819	2208	{
1820	2209	//Reload(lastConverter, lastFilename, true);
1821	2210	ScreenFit();
1822	2211	} else
1823		- if (event.getSource() == screenfitpointButton)
	2212	+ if (source == screenfitpointButton)
1824	2213	{
1825	2214	//Reload(lastConverter, lastFilename, true);
1826	2215	ScreenFitPoint();
1827	2216	} else
1828		- if (event.getSource() == snapobjectButton)
	2217	+ if (source == snapobjectButton)
1829	2218	{
1830	2219	//Reload(lastConverter, lastFilename, true);
1831	2220	SnapObject();
..	..	@@ -1836,13 +2225,13 @@
1836	2225	// Recompile();
1837	2226	// refreshContents();
1838	2227	// } else
1839		- if (event.getSource() == gcButton)
	2228	+ if (source == gcButton)
1840	2229	{
1841	2230	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1842	2231	System.gc();
1843	2232	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1844	2233	} else
1845		- if (event.getSource() == editLeafItem)
	2234	+ if (source == editLeafItem)
1846	2235	{
1847	2236	Object3D obj;
1848	2237	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1856,62 +2245,74 @@
1856	2245	}
1857	2246	refreshContents(true);
1858	2247	} else
1859		- if (event.getSource() == openWindowItem)
	2248	+ if (source == openWindowItem)
1860	2249	{
1861	2250	EditSelection(true);
1862	2251	} else
1863		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2252	+ if (source == cutItem \|\| source == clearButton)
1864	2253	{
1865	2254	loadClipboard(true);
1866	2255	} else
1867		- if (event.getSource() == duplicateItem)
	2256	+ if (source == undoItem)
1868	2257	{
1869		- Object3D keep = GrafreeD.clipboard;
	2258	+ Undo();
	2259	+ } else
	2260	+ if (source == redoItem)
	2261	+ {
	2262	+ Redo();
	2263	+ } else
	2264	+ if (source == duplicateItem)
	2265	+ {
	2266	+ Object3D keep = Grafreed.clipboard;
1870	2267	loadClipboard(false);
1871	2268	paste(false);
1872		- GrafreeD.clipboard = keep;
	2269	+ Grafreed.clipboard = keep;
1873	2270	} else
1874		- if (event.getSource() == cloneItem)
	2271	+ if (source == cloneItem)
1875	2272	{
1876	2273	CloneSelection(false);
1877	2274	} else
1878		- if (event.getSource() == cloneSupportItem)
	2275	+ if (source == cloneSupportItem)
1879	2276	{
1880	2277	CloneSelection(true);
1881	2278	} else
1882		- if (event.getSource() == copyItem)
	2279	+ if (source == copyItem)
1883	2280	{
1884	2281	loadClipboard(false);
1885	2282	} else
1886		- if (event.getSource() == pasteItem)
	2283	+ if (source == pasteItem)
1887	2284	{
1888	2285	paste(false);
1889	2286	} else
1890		- if (event.getSource() == pasteLinkItem)
	2287	+ if (source == pasteIntoItem)
1891	2288	{
1892		- pasteInto(false);
	2289	+ pasteInto(true, false);
1893	2290	} else
1894		- if (event.getSource() == pasteCloneItem)
	2291	+ if (source == pasteLinkItem)
1895	2292	{
1896		- pasteInto(true);
	2293	+ pasteInto(false, false);
1897	2294	} else
1898		- if (event.getSource() == pasteExpandItem)
	2295	+ if (source == pasteCloneItem)
	2296	+ {
	2297	+ pasteInto(true, true);
	2298	+ } else
	2299	+ if (source == pasteExpandItem)
1899	2300	{
1900	2301	paste(true);
1901	2302	} else
1902		- if (event.getSource() == synchronizeItem)
	2303	+ if (source == synchronizeItem)
1903	2304	{
1904	2305	Overwrite(Object3D.TRANSFORM);
1905	2306	} else
1906		- if (event.getSource() == overwriteNameItem)
	2307	+ if (source == overwriteNameItem)
1907	2308	{
1908	2309	Overwrite(Object3D.NAME);
1909	2310	} else
1910		- if (event.getSource() == overwriteUVItem)
	2311	+ if (source == overwriteUVItem)
1911	2312	{
1912	2313	Overwrite(Object3D.UV);
1913	2314	} else
1914		- if (event.getSource() == overwriteMatItem)
	2315	+ if (source == overwriteMatItem)
1915	2316	{
1916	2317	/* july 2015
1917	2318	if ((dropAttributes & Object3D.TEXTURE) == 0)
..	..	@@ -1931,7 +2332,7 @@
1931	2332
1932	2333	Overwrite(dropAttributes);
1933	2334	}
1934		- if (event.getSource() == overwriteGeoItem)
	2335	+ if (source == overwriteGeoItem)
1935	2336	{
1936	2337	Overwrite(Object3D.GEOMETRY);
1937	2338	// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
..	..	@@ -1948,7 +2349,7 @@
1948	2349	// refreshContents();
1949	2350	// }
1950	2351	} else
1951		- if (event.getSource() == generateMeshItem)
	2352	+ if (source == generateMeshItem)
1952	2353	{
1953	2354	//if (group.selection.size() == 1)
1954	2355	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1959,7 +2360,7 @@
1959	2360	ResetModel();
1960	2361	refreshContents();
1961	2362	} else
1962		- if (event.getSource() == extractGeometriesItem)
	2363	+ if (source == extractGeometriesItem)
1963	2364	{
1964	2365	boolean one = false;
1965	2366
..	..	@@ -1986,7 +2387,7 @@
1986	2387	ResetModel();
1987	2388	refreshContents();
1988	2389	} else
1989		- if (event.getSource() == cloneGeometriesItem)
	2390	+ if (source == cloneGeometriesItem)
1990	2391	{
1991	2392	boolean one = false;
1992	2393
..	..	@@ -2012,7 +2413,7 @@
2012	2413	ResetModel();
2013	2414	refreshContents();
2014	2415	} else
2015		- if (event.getSource() == shareGeometriesItem)
	2416	+ if (source == shareGeometriesItem)
2016	2417	{
2017	2418	boolean one = false;
2018	2419
..	..	@@ -2042,7 +2443,7 @@
2042	2443	refreshContents();
2043	2444	}
2044	2445	} else
2045		- if (event.getSource() == mergeGeometriesItem)
	2446	+ if (source == mergeGeometriesItem)
2046	2447	{
2047	2448	boolean one = false;
2048	2449
..	..	@@ -2072,7 +2473,7 @@
2072	2473	ResetModel();
2073	2474	refreshContents();
2074	2475	} else
2075		- if (event.getSource() == linkverticesItem)
	2476	+ if (source == linkverticesItem)
2076	2477	{
2077	2478	// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2078	2479	// {
..	..	@@ -2085,48 +2486,48 @@
2085	2486	// group.selection.get(0).setMasterThis(content); // should be identity
2086	2487	// refreshContents();
2087	2488	// }
2088		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2489	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2089	2490	{
2090		- Object3D content = GrafreeD.clipboard.get(0);
	2491	+ Object3D content = Grafreed.clipboard.get(0);
2091	2492
2092	2493	if (content instanceof cGroup && ((cGroup)content).transientlink )
2093	2494	content = ((cGroup)content).get(0);
2094	2495
2095		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2496	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2096	2497	for (int i=0; i<group.selection.size(); i++)
2097	2498	{
2098		- boolean random = CameraPane.RANDOM;
2099		- CameraPane.RANDOM = false; // parse all random nodes
	2499	+ boolean random = CameraPane.SWITCH;
	2500	+ CameraPane.SWITCH = false; // parse all random nodes
2100	2501	group.selection.get(i).linkVerticesThis(content);
2101	2502	// group.selection.get(i).setMasterThis(content); // should be identity
2102		- CameraPane.RANDOM = random;
	2503	+ CameraPane.SWITCH = random;
2103	2504	}
2104		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2505	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2105	2506	refreshContents();
2106	2507	}
2107	2508	} else
2108		- if (event.getSource() == resetsupportItem)
	2509	+ if (source == resetsupportItem)
2109	2510	{
2110	2511	for (int i=0; i<group.selection.size(); i++)
2111	2512	{
2112		- boolean random = CameraPane.RANDOM;
2113		- CameraPane.RANDOM = false; // parse all random nodes
	2513	+ boolean random = CameraPane.SWITCH;
	2514	+ CameraPane.SWITCH = false; // parse all random nodes
2114	2515	group.selection.get(i).linkVerticesThis(null);
2115		- CameraPane.RANDOM = random;
	2516	+ CameraPane.SWITCH = random;
2116	2517	}
2117	2518
2118	2519	refreshContents();
2119	2520	} else
2120		- if (event.getSource() == relinkverticesItem)
	2521	+ if (source == relinkverticesItem)
2121	2522	{
2122		- boolean random = CameraPane.RANDOM;
2123		- CameraPane.RANDOM = false; // parse all random nodes
	2523	+ boolean random = CameraPane.SWITCH;
	2524	+ CameraPane.SWITCH = false; // parse all random nodes
2124	2525	group.selection.RelinkToSupport();
2125		- CameraPane.RANDOM = random;
	2526	+ CameraPane.SWITCH = random;
2126	2527
2127	2528	refreshContents();
2128	2529	} else
2129		- if (event.getSource() == resetreferencesItem)
	2530	+ if (source == resetreferencesItem)
2130	2531	{
2131	2532	for (int i=0; i<group.selection.size(); i++)
2132	2533	{
..	..	@@ -2135,11 +2536,11 @@
2135	2536
2136	2537	refreshContents();
2137	2538	} else
2138		- if (event.getSource() == setMasterItem)
	2539	+ if (source == setMasterItem)
2139	2540	{
2140		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2541	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2141	2542	{
2142		- Object3D content = GrafreeD.clipboard.get(0);
	2543	+ Object3D content = Grafreed.clipboard.get(0);
2143	2544
2144	2545	if (content instanceof cGroup && ((cGroup)content).transientlink )
2145	2546	content = ((cGroup)content).get(0);
..	..	@@ -2148,13 +2549,13 @@
2148	2549	refreshContents();
2149	2550	}
2150	2551	} else
2151		- if (event.getSource() == poseMeshItem)
	2552	+ if (source == poseMeshItem)
2152	2553	{
2153	2554	if (group.selection.size() == 1)
2154	2555	{
2155		- if (GrafreeD.clipboard.size() == 1)
	2556	+ if (Grafreed.clipboard.size() == 1)
2156	2557	{
2157		- Object3D content = GrafreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2158	2559
2159	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2160	2561	content = ((cGroup)content).get(0);
..	..	@@ -2167,19 +2568,19 @@
2167	2568	}
2168	2569
2169	2570	} else
2170		- if (event.getSource() == revertMeshItem)
	2571	+ if (source == revertMeshItem)
2171	2572	{
2172	2573	RevertMeshes();
2173	2574	} else
2174		- if (event.getSource() == resetMeshItem)
	2575	+ if (source == resetAllItem)
2175	2576	{
2176	2577	ResetAll();
2177	2578	} else
2178		- if (event.getSource() == stepAllItem)
	2579	+ if (source == stepAllItem)
2179	2580	{
2180	2581	StepAll();
2181	2582	} else
2182		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2583	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2183	2584	{
2184	2585	//int indices[] = jList.getSelectedIndices();
2185	2586	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2187,46 +2588,46 @@
2187	2588
2188	2589	ClearSelection(false);
2189	2590	} else
2190		- if (event.getSource() == clearAllItem)
	2591	+ if (source == clearAllItem)
2191	2592	{
2192	2593	ClearSelection(true);
2193	2594	} else
2194		- if (event.getSource() == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2195	2596	{
2196		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2197	2598	} else
2198		- if (event.getSource() == hideItem)
	2599	+ if (source == hideItem)
2199	2600	{
2200	2601	group(new HiddenObject());
2201	2602	} else
2202		- if (event.getSource() == frontItem)
	2603	+ if (source == frontItem)
2203	2604	{
2204	2605	front();
2205	2606	} else
2206		- if (event.getSource() == backItem)
	2607	+ if (source == backItem)
2207	2608	{
2208	2609	back();
2209	2610	} else
2210		- if (event.getSource() == cameraItem)
	2611	+ if (source == cameraItem)
2211	2612	{
2212	2613	makeSomething(new Camera());
2213	2614	} else
2214		- if (event.getSource() == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2215	2616	{
2216	2617	group(new Composite());
2217	2618	} else
2218		- if (event.getSource() == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2219	2620	{
2220	2621	RandomNode random = new RandomNode();
2221	2622	group(random);
2222	2623	if (random.size() > 0)
2223		- random.name = random.get(0).name + "Rnd";
	2624	+ random.name = random.get(0).name + "Switch";
2224	2625	} else
2225		- if (event.getSource() == physicsItem)
	2626	+ if (source == physicsItem)
2226	2627	{
2227	2628	group(new PhysicsNode());
2228	2629	} else
2229		- if (event.getSource() == frameselectorItem)
	2630	+ if (source == frameselectorItem)
2230	2631	{
2231	2632	for (int i=0; i<group.selection.size(); i++)
2232	2633	{
..	..	@@ -2238,7 +2639,7 @@
2238	2639	ResetModel();
2239	2640	refreshContents();
2240	2641	} else
2241		- if (event.getSource() == switchGeoItem)
	2642	+ if (source == switchGeoItem)
2242	2643	{
2243	2644	for (int i=0; i<group.selection.size(); i++)
2244	2645	{
..	..	@@ -2250,7 +2651,7 @@
2250	2651	ResetModel();
2251	2652	refreshContents();
2252	2653	} else
2253		- if (event.getSource() == switchTransfoItem)
	2654	+ if (source == switchTransfoItem)
2254	2655	{
2255	2656	for (int i=0; i<group.selection.size(); i++)
2256	2657	{
..	..	@@ -2262,7 +2663,7 @@
2262	2663	ResetModel();
2263	2664	refreshContents();
2264	2665	} else
2265		- if (event.getSource() == morphItem)
	2666	+ if (source == morphItem)
2266	2667	{
2267	2668	for (int i=0; i<group.selection.size(); i++)
2268	2669	{
..	..	@@ -2274,7 +2675,7 @@
2274	2675	ResetModel();
2275	2676	refreshContents();
2276	2677	} else
2277		- if (event.getSource() == scriptNodeItem)
	2678	+ if (source == scriptNodeItem)
2278	2679	{
2279	2680	boolean atleastone = false;
2280	2681
..	..	@@ -2313,31 +2714,31 @@
2313	2714	}
2314	2715	}
2315	2716	} else
2316		- if (event.getSource() == linkerItem)
	2717	+ if (source == linkerItem)
2317	2718	{
2318	2719	group(new cLinker());
2319	2720	} else
2320		- if (event.getSource() == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2321	2722	{
2322	2723	group(new TextureNode());
2323	2724	} else
2324		- if (event.getSource() == billboardItem)
	2725	+ if (source == billboardItem)
2325	2726	{
2326	2727	group(new BillboardNode());
2327	2728	} else
2328		- if (event.getSource() == shadowXItem)
	2729	+ if (source == shadowXItem)
2329	2730	{
2330	2731	CastShadow(0);
2331	2732	} else
2332		- if (event.getSource() == shadowYItem)
	2733	+ if (source == shadowYItem)
2333	2734	{
2334	2735	CastShadow(1);
2335	2736	} else
2336		- if (event.getSource() == shadowZItem)
	2737	+ if (source == shadowZItem)
2337	2738	{
2338	2739	CastShadow(2);
2339	2740	} else
2340		- if (event.getSource() == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2341	2742	{
2342	2743	//ungroup();
2343	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2349,179 +2750,203 @@
2349	2750
2350	2751	refreshContents();
2351	2752	} else
2352		- if (event.getSource() == genUVItem)
	2753	+ if (source == genUVItem)
2353	2754	{
2354	2755	GenUV();
2355	2756	} else
2356		- if (event.getSource() == genNormalsCADItem)
	2757	+ if (source == genNormalsCADItem)
2357	2758	{
2358	2759	GenNormals(true);
2359	2760	} else
2360		- if (event.getSource() == genNormalsMESHItem)
	2761	+ if (source == genNormalsMESHItem)
2361	2762	{
2362		- GenNormals(true); // TODO
	2763	+ GenNormalsMESH();
2363	2764	} else
2364		- if (event.getSource() == genNormalsORGANItem)
	2765	+ if (source == genNormalsORGANItem)
2365	2766	{
2366	2767	GenNormals(false);
2367	2768	} else
2368		- if (event.getSource() == genNormalsMINEItem)
	2769	+ if (source == genNormalsMINEItem)
2369	2770	{
2370	2771	GenNormalsMINE();
2371	2772	} else
2372		- if (event.getSource() == stripifyItem)
	2773	+ if (source == stripifyItem)
2373	2774	{
2374	2775	Stripify();
2375	2776	} else
2376		- if (event.getSource() == unstripifyItem)
	2777	+ if (source == unstripifyItem)
2377	2778	{
2378	2779	Unstripify();
2379	2780	} else
2380		- if (event.getSource() == trimItem)
	2781	+ if (source == trimItem)
2381	2782	{
2382	2783	Trim();
2383	2784	} else
2384		- if (event.getSource() == untrimItem)
	2785	+ if (source == untrimItem)
2385	2786	{
2386	2787	Untrim();
2387	2788	} else
2388		- if (event.getSource() == clearColorsItem)
	2789	+ if (source == clearColorsItem)
2389	2790	{
2390	2791	ClearColors();
2391	2792	} else
2392		- if (event.getSource() == clearMaterialsItem)
	2793	+ if (source == clearMaterialsItem)
2393	2794	{
2394	2795	ClearMaterials();
2395	2796	} else
2396		- if (event.getSource() == liveleavesItem)
	2797	+ if (source == liveleavesItem)
2397	2798	{
2398	2799	LiveLeaves(true);
2399	2800	} else
2400		- if (event.getSource() == unliveleavesItem)
	2801	+ if (source == unliveleavesItem)
2401	2802	{
2402	2803	LiveLeaves(false);
2403	2804	} else
2404		- if (event.getSource() == supportleavesItem)
	2805	+ if (source == supportleavesItem)
2405	2806	{
2406	2807	SupportLeaves(true);
2407	2808	} else
2408		- if (event.getSource() == unsupportleavesItem)
	2809	+ if (source == unsupportleavesItem)
2409	2810	{
2410	2811	SupportLeaves(false);
2411	2812	} else
2412		- if (event.getSource() == hideleavesItem)
	2813	+ if (source == hideleavesItem)
2413	2814	{
2414	2815	HideLeaves(true);
2415	2816	} else
2416		- if (event.getSource() == showleavesItem)
	2817	+ if (source == showleavesItem)
2417	2818	{
2418	2819	HideLeaves(false);
2419	2820	} else
2420		- if (event.getSource() == markleavesItem)
	2821	+ if (source == markleavesItem)
2421	2822	{
2422	2823	MarkLeaves(true);
2423	2824	} else
2424		- if (event.getSource() == unmarkleavesItem)
	2825	+ if (source == unmarkleavesItem)
2425	2826	{
2426	2827	MarkLeaves(false);
2427	2828	} else
2428		- if (event.getSource() == flipVItem)
	2829	+ if (source == rewindleavesItem)
	2830	+ {
	2831	+ RewindLeaves(true);
	2832	+ } else
	2833	+ if (source == unrewindleavesItem)
	2834	+ {
	2835	+ RewindLeaves(false);
	2836	+ } else
	2837	+ if (source == randomleavesItem)
	2838	+ {
	2839	+ RandomLeaves(true);
	2840	+ } else
	2841	+ if (source == unrandomleavesItem)
	2842	+ {
	2843	+ RandomLeaves(false);
	2844	+ } else
	2845	+ if (source == flipVItem)
2429	2846	{
2430	2847	FlipV(true);
2431	2848	} else
2432		- if (event.getSource() == unflipVItem)
	2849	+ if (source == unflipVItem)
2433	2850	{
2434	2851	FlipV(false);
2435	2852	} else
2436		- if (event.getSource() == lowTexturesItem)
	2853	+ if (source == lowTexturesItem)
2437	2854	{
2438	2855	SetTexRes(0);
2439	2856	} else
2440		- if (event.getSource() == normalTexturesItem)
	2857	+ if (source == normalTexturesItem)
2441	2858	{
2442	2859	SetTexRes(1);
2443	2860	} else
2444		- if (event.getSource() == highTexturesItem)
	2861	+ if (source == highTexturesItem)
2445	2862	{
2446	2863	SetTexRes(2);
2447	2864	} else
2448		- if (event.getSource() == veryhighTexturesItem)
	2865	+ if (source == veryhighTexturesItem)
2449	2866	{
2450	2867	SetTexRes(3);
2451	2868	} else
2452		- if (event.getSource() == maxTexturesItem)
	2869	+ if (source == maxTexturesItem)
2453	2870	{
2454	2871	SetTexRes(4);
2455	2872	} else
2456		- if (event.getSource() == panoTexturesItem)
	2873	+ if (source == panoTexturesItem)
2457	2874	{
2458	2875	SetTexRes(5);
2459	2876	} else
2460		- if (event.getSource() == reverseNormalsItem)
	2877	+ if (source == reverseNormalsItem)
2461	2878	{
2462	2879	ReverseNormals();
2463	2880	} else
2464		- if (event.getSource() == parseverticesItem)
	2881	+ if (source == parseverticesItem)
2465	2882	{
2466	2883	ParseVertices();
2467	2884	} else
2468		- if (event.getSource() == textureFieldItem)
	2885	+ if (source == textureFieldItem)
2469	2886	{
2470	2887	TextureVertices();
2471	2888	} else
2472		- if (event.getSource() == alignItem)
	2889	+ if (source == alignItem)
2473	2890	{
2474	2891	Align();
2475	2892	} else
2476		- if (event.getSource() == mirrorItem)
	2893	+ if (source == mirrorItem)
2477	2894	{
2478	2895	MirrorPoses();
2479	2896	} else
2480		- if (event.getSource() == reduceMorphItem)
	2897	+ if (source == reduceMorphItem)
2481	2898	{
2482	2899	MeshReduction(false);
2483	2900	} else
2484		- if (event.getSource() == reduce34MorphItem)
	2901	+ if (source == reduce34MorphItem)
2485	2902	{
2486	2903	MeshReduction(true);
2487	2904	} else
2488		- if (event.getSource() == reverseTrianglesItem)
	2905	+ if (source == reverseTrianglesItem)
2489	2906	{
2490	2907	ReverseTriangles();
2491	2908	} else
2492		- if (event.getSource() == reduceMeshItem)
	2909	+ if (source == reduceMeshItem)
2493	2910	{
2494	2911	ReduceMesh(false);
2495	2912	} else
2496		- if (event.getSource() == reduce34MeshItem)
	2913	+ if (source == reduce34MeshItem)
2497	2914	{
2498	2915	ReduceMesh(true);
2499	2916	} else
2500		- if (event.getSource() == increaseMeshItem)
	2917	+ if (source == increaseMeshItem)
2501	2918	{
2502	2919	IncreaseMesh();
2503	2920	} else
2504		- if (event.getSource() == clipMeshItem)
	2921	+ if (source == clipMeshItem)
2505	2922	{
2506	2923	ClipMesh();
2507	2924	} else
2508		- if (event.getSource() == smoothMeshItem)
	2925	+ if (source == smoothMeshItem)
2509	2926	{
2510	2927	SmoothMesh();
2511	2928	} else
2512		- if (event.getSource() == transformgeometryItem)
	2929	+ if (source == transformGeometryItem)
2513	2930	{
2514	2931	TransformGeometry();
2515	2932	} else
2516		- if (event.getSource() == resetTransformItem)
	2933	+ if (source == transformChildrenItem)
	2934	+ {
	2935	+ TransformChildren();
	2936	+ } else
	2937	+ if (source == resetTransformItem)
2517	2938	{
2518	2939	ResetTransform();
2519	2940	} else
2520		- if (event.getSource() == resetCentroidItem)
	2941	+ if (source == resetCentroidItem)
2521	2942	{
2522		- ResetCentroid();
	2943	+ ResetCentroid(true);
2523	2944	} else
2524		- if (event.getSource() == resetParentItem)
	2945	+ if (source == resetCentroidXZItem)
	2946	+ {
	2947	+ ResetCentroid(false);
	2948	+ } else
	2949	+ if (source == resetParentItem)
2525	2950	{
2526	2951	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2527	2952	{
..	..	@@ -2531,7 +2956,7 @@
2531	2956
2532	2957	refreshContents();
2533	2958	} else
2534		- if (event.getSource() == repairParentItem)
	2959	+ if (source == repairParentItem)
2535	2960	{
2536	2961	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2537	2962	{
..	..	@@ -2545,7 +2970,21 @@
2545	2970
2546	2971	refreshContents();
2547	2972	} else
2548		- if (event.getSource() == sortbysizeItem)
	2973	+ if (source == repairShadowItem)
	2974	+ {
	2975	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2976	+ {
	2977	+ Object3D obj = (Object3D)e.nextElement();
	2978	+ obj.RepairShadow();
	2979	+// for (int i=0; i<obj.size(); i++)
	2980	+// {
	2981	+// obj.get(i).parent = obj;
	2982	+// }
	2983	+ }
	2984	+
	2985	+ refreshContents();
	2986	+ } else
	2987	+ if (source == sortbysizeItem)
2549	2988	{
2550	2989	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2551	2990	{
..	..	@@ -2557,7 +2996,7 @@
2557	2996	ResetModel();
2558	2997	refreshContents();
2559	2998	} else
2560		- if (event.getSource() == sortbynameItem)
	2999	+ if (source == sortbynameItem)
2561	3000	{
2562	3001	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2563	3002	{
..	..	@@ -2569,7 +3008,7 @@
2569	3008	ResetModel();
2570	3009	refreshContents();
2571	3010	} else
2572		- if (event.getSource() == attachPigmentItem)
	3011	+ if (source == attachPigmentItem)
2573	3012	{
2574	3013	String texture = GetFile("Attach pigment");
2575	3014	Object3D obj;
..	..	@@ -2581,7 +3020,7 @@
2581	3020
2582	3021	refreshContents();
2583	3022	} else
2584		- if (event.getSource() == detachPigmentItem)
	3023	+ if (source == detachPigmentItem)
2585	3024	{
2586	3025	Object3D obj;
2587	3026	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2592,7 +3031,7 @@
2592	3031
2593	3032	refreshContents();
2594	3033	} else
2595		- if (event.getSource() == attachBumpItem)
	3034	+ if (source == attachBumpItem)
2596	3035	{
2597	3036	String texture = GetFile("Attach bump");
2598	3037	Object3D obj;
..	..	@@ -2604,7 +3043,7 @@
2604	3043
2605	3044	refreshContents();
2606	3045	} else
2607		- if (event.getSource() == detachBumpItem)
	3046	+ if (source == detachBumpItem)
2608	3047	{
2609	3048	Object3D obj;
2610	3049	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2615,7 +3054,7 @@
2615	3054
2616	3055	refreshContents();
2617	3056	} else
2618		- if (event.getSource() == pigmentBumpItem)
	3057	+ if (source == pigmentBumpItem)
2619	3058	{
2620	3059	Object3D obj;
2621	3060	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2626,158 +3065,237 @@
2626	3065
2627	3066	refreshContents();
2628	3067	} else
2629		- if (event.getSource() == flashSelectionButton)
	3068	+ if (source == flashSelectionButton)
2630	3069	{
2631	3070	CameraPane.flash = true;
2632	3071	refreshContents();
2633	3072	} else
2634		- if (event.getSource() == oneButton)
	3073	+ if (source == oneButton)
2635	3074	{
2636	3075	} else
2637		- if (event.getSource() == twoButton)
	3076	+ if (source == twoButton)
2638	3077	{
2639	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2640	3083	// bug
2641	3084	//gridPanel.setDividerLocation(1.0);
2642	3085	//bigPanel.setDividerLocation(0.0);
2643		- bigThree.remove(scenePanel);
2644		- bigThree.remove(centralPanel);
2645		- bigThree.remove(XYZPanel);
2646		- aWindowConstraints.gridx = 0;
2647		- aWindowConstraints.gridy = 0;
2648		- aWindowConstraints.gridwidth = 1;
2649		- // aConstraints.gridheight = 3;
2650		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2651		- aWindowConstraints.weightx = 0;
2652		- aWindowConstraints.weighty = 1;
2653		- //bigThree.add(jtp, aWindowConstraints);
2654		- aWindowConstraints.weightx = 1;
2655		- aWindowConstraints.gridwidth = 3;
2656		- // aConstraints.gridheight = 3;
2657		- aWindowConstraints.gridx = 1;
2658		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2659		- bigThree.add(centralPanel, aWindowConstraints);
2660		- aWindowConstraints.weightx = 0;
2661		- aWindowConstraints.gridx = 4;
2662		- aWindowConstraints.gridwidth = 1;
2663		- // aConstraints.gridheight = 3;
2664		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2665		- //bigThree.add(XYZPanel, aWindowConstraints);
2666		- bigThree.revalidate();
	3086	+// bigThree.remove(scenePanel);
	3087	+// bigThree.remove(centralPanel);
	3088	+// bigThree.remove(XYZPanel);
	3089	+// aWindowConstraints.gridx = 0;
	3090	+// aWindowConstraints.gridy = 0;
	3091	+// aWindowConstraints.gridwidth = 1;
	3092	+// // aConstraints.gridheight = 3;
	3093	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3094	+// aWindowConstraints.weightx = 0;
	3095	+// aWindowConstraints.weighty = 1;
	3096	+// //bigThree.add(jtp, aWindowConstraints);
	3097	+// aWindowConstraints.weightx = 1;
	3098	+// aWindowConstraints.gridwidth = 3;
	3099	+// // aConstraints.gridheight = 3;
	3100	+// aWindowConstraints.gridx = 1;
	3101	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3102	+// bigThree.add(centralPanel, aWindowConstraints);
	3103	+// aWindowConstraints.weightx = 0;
	3104	+// aWindowConstraints.gridx = 4;
	3105	+// aWindowConstraints.gridwidth = 1;
	3106	+// // aConstraints.gridheight = 3;
	3107	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3108	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3109	+// scenePanel.setVisible(false);
	3110	+// centralPanel.setVisible(true);
	3111	+// XYZPanel.setVisible(false);
	3112	+ bigThree.ClearUI();
	3113	+ bigThree.add(centralPanel);
	3114	+ bigThree.FlushUI();
	3115	+
	3116	+ cameraView.requestFocusInWindow();
	3117	+
	3118	+// refreshContents(true);
	3119	+//
	3120	+// try
	3121	+// {
	3122	+// java.awt.Robot bot = new java.awt.Robot();
	3123	+// int mask = InputEvent.BUTTON1_MASK;
	3124	+// bot.mouseMove(100, 100);
	3125	+// bot.mousePress(mask);
	3126	+// bot.mouseRelease(mask);
	3127	+// }
	3128	+// catch (Exception e)
	3129	+// {
	3130	+//
	3131	+// }
	3132	+
2667	3133	} else
2668		- if (event.getSource() == threeButton)
	3134	+ if (source == threeButton)
2669	3135	{
2670	3136	radio.layout = threeButton;
2671		- bigThree.remove(scenePanel);
2672		- bigThree.remove(centralPanel);
2673		- bigThree.remove(XYZPanel);
2674		- aWindowConstraints.gridx = 0;
2675		- aWindowConstraints.gridy = 0;
2676		- aWindowConstraints.gridwidth = 1;
2677		- // aConstraints.gridheight = 3;
2678		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2679		- aWindowConstraints.weightx = 0;
2680		- aWindowConstraints.weighty = 1;
2681		- //bigThree.add(jtp, aWindowConstraints);
2682		- aWindowConstraints.weightx = 1;
2683		- aWindowConstraints.gridwidth = 3;
2684		- // aConstraints.gridheight = 3;
2685		- aWindowConstraints.gridx = 1;
2686		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2687		- bigThree.add(centralPanel, aWindowConstraints);
2688		- aWindowConstraints.weightx = 0;
2689		- aWindowConstraints.gridx = 4;
2690		- aWindowConstraints.gridwidth = 1;
2691		- // aConstraints.gridheight = 3;
2692		- aConstraints.fill = GridBagConstraints.VERTICAL;
2693		- bigThree.add(XYZPanel, aWindowConstraints);
2694		- bigThree.revalidate();
	3137	+
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
	3140	+
	3141	+// bigThree.remove(scenePanel);
	3142	+// bigThree.remove(centralPanel);
	3143	+// bigThree.remove(XYZPanel);
	3144	+// aWindowConstraints.gridx = 0;
	3145	+// aWindowConstraints.gridy = 0;
	3146	+// aWindowConstraints.gridwidth = 1;
	3147	+// // aConstraints.gridheight = 3;
	3148	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3149	+// aWindowConstraints.weightx = 0;
	3150	+// aWindowConstraints.weighty = 1;
	3151	+// //bigThree.add(jtp, aWindowConstraints);
	3152	+// aWindowConstraints.weightx = 1;
	3153	+// aWindowConstraints.gridwidth = 3;
	3154	+// // aConstraints.gridheight = 3;
	3155	+// aWindowConstraints.gridx = 1;
	3156	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3157	+// bigThree.add(centralPanel, aWindowConstraints);
	3158	+// aWindowConstraints.weightx = 0;
	3159	+// aWindowConstraints.gridx = 4;
	3160	+// aWindowConstraints.gridwidth = 1;
	3161	+// // aConstraints.gridheight = 3;
	3162	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3163	+// bigThree.add(XYZPanel, aWindowConstraints);
	3164	+// bigThree.validate();
	3165	+// scenePanel.setVisible(false);
	3166	+// centralPanel.setVisible(true);
	3167	+// XYZPanel.setVisible(true);
	3168	+ bigThree.ClearUI();
	3169	+ bigThree.add(centralPanel);
	3170	+ bigThree.add(XYZPanel);
	3171	+ bigThree.FlushUI();
	3172	+
	3173	+ cameraView.requestFocusInWindow();
2695	3174	} else
2696		- if (event.getSource() == fourButton)
	3175	+ if (source == fourButton)
2697	3176	{
2698	3177	radio.layout = fourButton;
2699		- bigThree.remove(scenePanel);
2700		- bigThree.remove(centralPanel);
2701		- bigThree.remove(XYZPanel);
2702		- aWindowConstraints.gridx = 0;
2703		- aWindowConstraints.gridy = 0;
2704		- aWindowConstraints.gridwidth = 1;
2705		- // aWindowConstraints.gridheight = 3;
2706		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2707		- aWindowConstraints.weightx = 1;
2708		- aWindowConstraints.weighty = 1;
2709		- bigThree.add(scenePanel, aWindowConstraints);
2710		- aWindowConstraints.weightx = 1;
2711		- aWindowConstraints.gridwidth = 3;
2712		- // aConstraints.gridheight = 3;
2713		- aWindowConstraints.gridx = 1;
2714		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2715		- //bigThree.add(cameraPanel, aWindowConstraints);
2716		- aWindowConstraints.weightx = 0;
2717		- aWindowConstraints.gridx = 4;
2718		- aWindowConstraints.gridwidth = 1;
2719		- // aWindowConstraints.gridheight = 3;
2720		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2721		- //bigThree.add(XYZPanel, aWindowConstraints);
2722		- bigThree.revalidate();
	3178	+
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
	3181	+
	3182	+// bigThree.remove(scenePanel);
	3183	+// bigThree.remove(centralPanel);
	3184	+// bigThree.remove(XYZPanel);
	3185	+// aWindowConstraints.gridx = 0;
	3186	+// aWindowConstraints.gridy = 0;
	3187	+// aWindowConstraints.gridwidth = 1;
	3188	+// // aWindowConstraints.gridheight = 3;
	3189	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3190	+// aWindowConstraints.weightx = 1;
	3191	+// aWindowConstraints.weighty = 1;
	3192	+// bigThree.add(scenePanel, aWindowConstraints);
	3193	+// aWindowConstraints.weightx = 1;
	3194	+// aWindowConstraints.gridwidth = 3;
	3195	+// // aConstraints.gridheight = 3;
	3196	+// aWindowConstraints.gridx = 1;
	3197	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3198	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3199	+// aWindowConstraints.weightx = 0;
	3200	+// aWindowConstraints.gridx = 4;
	3201	+// aWindowConstraints.gridwidth = 1;
	3202	+// // aWindowConstraints.gridheight = 3;
	3203	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3204	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3205	+// bigThree.validate();
	3206	+// scenePanel.setVisible(true);
	3207	+// centralPanel.setVisible(false);
	3208	+// XYZPanel.setVisible(false);
	3209	+ bigThree.ClearUI();
	3210	+ bigThree.add(scenePanel);
	3211	+ bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2723	3214	} else
2724		- if (event.getSource() == sixButton)
	3215	+ if (source == sixButton)
2725	3216	{
2726	3217	radio.layout = sixButton;
2727		- bigThree.remove(scenePanel);
2728		- bigThree.remove(centralPanel);
2729		- bigThree.remove(XYZPanel);
2730		- aWindowConstraints.gridx = 0;
2731		- aWindowConstraints.gridy = 0;
2732		- aWindowConstraints.gridwidth = 1;
2733		- // aConstraints.gridheight = 3;
2734		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2735		- aWindowConstraints.weightx = 0;
2736		- aWindowConstraints.weighty = 1;
2737		- bigThree.add(scenePanel, aWindowConstraints);
2738		- aWindowConstraints.weightx = 1;
2739		- aWindowConstraints.gridwidth = 3;
2740		- // aWindowConstraints.gridheight = 3;
2741		- aWindowConstraints.gridx = 1;
2742		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2743		- bigThree.add(centralPanel, aWindowConstraints);
2744		- aWindowConstraints.weightx = 0;
2745		- aWindowConstraints.gridx = 4;
2746		- aWindowConstraints.gridwidth = 1;
2747		- // aWindowConstraints.gridheight = 3;
2748		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2749		- //bigThree.add(XYZPanel, aConstraints);
2750		- bigThree.revalidate();
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
	3221	+
	3222	+// bigThree.remove(scenePanel);
	3223	+// bigThree.remove(centralPanel);
	3224	+// bigThree.remove(XYZPanel);
	3225	+// aWindowConstraints.gridx = 0;
	3226	+// aWindowConstraints.gridy = 0;
	3227	+// aWindowConstraints.gridwidth = 1;
	3228	+// // aConstraints.gridheight = 3;
	3229	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3230	+// aWindowConstraints.weightx = 0;
	3231	+// aWindowConstraints.weighty = 1;
	3232	+// bigThree.add(scenePanel, aWindowConstraints);
	3233	+// aWindowConstraints.weightx = 1;
	3234	+// aWindowConstraints.gridwidth = 3;
	3235	+// // aWindowConstraints.gridheight = 3;
	3236	+// aWindowConstraints.gridx = 1;
	3237	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3238	+// bigThree.add(centralPanel, aWindowConstraints);
	3239	+// aWindowConstraints.weightx = 0;
	3240	+// aWindowConstraints.gridx = 4;
	3241	+// aWindowConstraints.gridwidth = 1;
	3242	+// // aWindowConstraints.gridheight = 3;
	3243	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3244	+// //bigThree.add(XYZPanel, aConstraints);
	3245	+// bigThree.validate();
	3246	+// scenePanel.setVisible(true);
	3247	+// centralPanel.setVisible(true);
	3248	+// XYZPanel.setVisible(false);
	3249	+ bigThree.ClearUI();
	3250	+ bigThree.add(scenePanel);
	3251	+ bigThree.add(centralPanel);
	3252	+ bigThree.FlushUI();
	3253	+
	3254	+ cameraView.requestFocusInWindow();
2751	3255	} else
2752		- if (event.getSource() == sevenButton)
	3256	+ if (source == sevenButton)
2753	3257	{
2754	3258	radio.layout = sevenButton;
2755		- bigThree.remove(scenePanel);
2756		- bigThree.remove(centralPanel);
2757		- bigThree.remove(XYZPanel);
2758		- aWindowConstraints.gridx = 0;
2759		- aWindowConstraints.gridy = 0;
2760		- aWindowConstraints.gridwidth = 1;
2761		- // aWindowConstraints.gridheight = 3;
2762		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2763		- aWindowConstraints.weightx = 0;
2764		- aWindowConstraints.weighty = 1;
2765		- bigThree.add(scenePanel, aWindowConstraints);
2766		- aWindowConstraints.weightx = 1;
2767		- aWindowConstraints.gridwidth = 3;
2768		- // aWindowConstraints.gridheight = 3;
2769		- aWindowConstraints.gridx = 1;
2770		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2771		- bigThree.add(centralPanel, aWindowConstraints);
2772		- aWindowConstraints.weightx = 0;
2773		- aWindowConstraints.gridx = 4;
2774		- aWindowConstraints.gridwidth = 1;
2775		- // aConstraints.gridheight = 3;
2776		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2777		- bigThree.add(XYZPanel, aWindowConstraints);
2778		- bigThree.revalidate();
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
	3262	+
	3263	+// bigThree.remove(scenePanel);
	3264	+// bigThree.remove(centralPanel);
	3265	+// bigThree.remove(XYZPanel);
	3266	+// aWindowConstraints.gridx = 0;
	3267	+// aWindowConstraints.gridy = 0;
	3268	+// aWindowConstraints.gridwidth = 1;
	3269	+// // aWindowConstraints.gridheight = 3;
	3270	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3271	+// aWindowConstraints.weightx = 0;
	3272	+// aWindowConstraints.weighty = 1;
	3273	+// bigThree.add(scenePanel, aWindowConstraints);
	3274	+// aWindowConstraints.weightx = 1;
	3275	+// aWindowConstraints.gridwidth = 3;
	3276	+// // aWindowConstraints.gridheight = 3;
	3277	+// aWindowConstraints.gridx = 1;
	3278	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3279	+// bigThree.add(centralPanel, aWindowConstraints);
	3280	+// aWindowConstraints.weightx = 0;
	3281	+// aWindowConstraints.gridx = 4;
	3282	+// aWindowConstraints.gridwidth = 1;
	3283	+// // aConstraints.gridheight = 3;
	3284	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3285	+// bigThree.add(XYZPanel, aWindowConstraints);
	3286	+// bigThree.validate();
	3287	+// scenePanel.setVisible(true);
	3288	+// centralPanel.setVisible(true);
	3289	+// XYZPanel.setVisible(true);
	3290	+ bigThree.ClearUI();
	3291	+ bigThree.add(scenePanel);
	3292	+ bigThree.add(centralPanel);
	3293	+ bigThree.add(XYZPanel);
	3294	+ bigThree.FlushUI();
	3295	+
	3296	+ cameraView.requestFocusInWindow();
2779	3297	} else
2780		- if (event.getSource() == rootButton)
	3298	+ if (source == rootButton)
2781	3299	{
2782	3300	Object3D obj;
2783	3301	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2787,66 +3305,84 @@
2787	3305	EditObject(obj);
2788	3306	}
2789	3307
	3308	+ cameraView.requestFocusInWindow();
2790	3309	refreshContents(true);
2791	3310	} else
2792		- if (event.getSource() == closeButton)
	3311	+ if (source == closeButton)
2793	3312	{
2794	3313	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2795	3314	cRadio ab;
2796	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2797	3316	{
2798	3317	ab = (cRadio)e.nextElement();
2799		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2800	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
2801	3326	buttonGroup.remove(ab);
2802	3327	radioPanel.remove(ab);
2803	3328
2804		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
2805	3331	// ab.GetObject().objectUI = null; // ?????????
2806	3332
2807	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2808	3334	break;
2809	3335	}
2810	3336	}
	3337	+
	3338	+ cameraView.requestFocusInWindow();
2811	3339	refreshContents(true);
2812	3340	} else
2813		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3341	+ if (source == editItem \|\| source == editButton)
2814	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
2815	3349	EditSelection(false);
2816	3350	} else
2817		- if (event.getSource() == uneditButton)
	3351	+ if (source == uneditButton)
2818	3352	{
2819	3353	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2820	3354	{
2821	3355	Object3D child = (Object3D)e.nextElement();
2822	3356	if(child.editWindow != null)
2823	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
2824	3359	child.CloseUI();
2825	3360	listUI.remove(child);
2826	3361
2827		- child.editWindow = null; // ???????????
	3362	+ //child.editWindow = null; // ???????????
2828	3363	}
2829		- objEditor.ctrlPanel.revalidate();
	3364	+ objEditor.ctrlPanel.FlushUI();
2830	3365	//objEditor.jTree.clearSelection();
2831	3366	//objEditor.ResetSliders();
2832	3367	refreshContents(true);
2833	3368	} else
2834		- if (event.getSource() == clearPanelButton)
	3369	+ if (source == clearPanelButton)
2835	3370	{
2836	3371	assert(copy == group);
2837	3372	//copy.ClearUI();
2838	3373	for (Object3D obj : listUI)
2839	3374	{
	3375	+ obj.pinned = true;
2840	3376	obj.CloseUI();
2841	3377	}
2842	3378	listUI.clear();
2843	3379	refreshContents(true);
2844	3380	} else
2845		- if (event.getSource() == allParamsButton)
	3381	+ if (source == allParamsButton)
2846	3382	{
2847	3383	assert(copy == group);
2848	3384
2849		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2850	3386
2851	3387	for (Object3D obj : listUI)
2852	3388	{
..	..	@@ -2863,19 +3399,19 @@
2863	3399
2864	3400	refreshContents(true);
2865	3401	} else
2866		- if (event.getSource() == unselectButton)
	3402	+ if (source == unselectButton)
2867	3403	{
2868	3404	objEditor.jTree.clearSelection();
2869	3405	// ?? oct 2012 GrafreeD.clipboard.clear();
2870	3406	objEditor.ResetSliders();
2871	3407	refreshContents(true);
2872	3408	} else
2873		- if(event.getSource() instanceof cRadio)
	3409	+ if(source instanceof cRadio)
2874	3410	{
2875	3411	group.parent = keepparent;
2876	3412	group.attributes = 0;
2877	3413	//group.editWindow = null;
2878		- /cRadio/ radio = (cRadio)event.getSource();
	3414	+ /cRadio/ radio = (cRadio)source;
2879	3415	Object3D obj = radio.GetObject();
2880	3416	System.out.println("Edit " + obj);
2881	3417	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2895,7 +3431,7 @@
2895	3431	}
2896	3432
2897	3433	copy = group;
2898		- //CameraPane.theRenderer.object = group;
	3434	+ //Globals.theRenderer.object = group;
2899	3435	if(!useclient)
2900	3436	{
2901	3437	cameraView.renderCamera = radio.camera;
..	..	@@ -2904,12 +3440,17 @@
2904	3440	cameraView.cameras[cameraView.cameracount] = radio.camera;
2905	3441	cameraView.targetLookAt.set(radio.camera.lookAt);
2906	3442	cameraView.object = group;
2907		- cameraView.lighttouched = true;
	3443	+ //cameraView.lighttouched = true;
	3444	+ Globals.lighttouched = true;
2908	3445	topView.object = group;
2909	3446	frontView.object = group;
2910	3447	sideView.object = group;
2911	3448	}
2912		- group.editWindow = this;
	3449	+
	3450	+// fix "+" issue
	3451	+ //group.editWindow = this;
	3452	+ group.manipWindow = this;
	3453	+
2913	3454	/*
2914	3455	currentLayout = radio.layout;
2915	3456	if (currentLayout == null)
..	..	@@ -2921,8 +3462,23 @@
2921	3462	//group.parent = null; // ROOT
2922	3463	//group.attributes = -1;
2923	3464	ResetModel();
	3465	+
	3466	+ cameraView.requestFocusInWindow();
2924	3467	refreshContents(true);
2925		- }
	3468	+ } else if (event.getSource() == editCameraItem)
	3469	+ {
	3470	+ cameraView.ProtectCamera();
	3471	+ cameraView.repaint();
	3472	+ return;
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3474	+ {
	3475	+ cameraView.RevertCamera();
	3476	+ cameraView.repaint();
	3477	+ return;
	3478	+ // } else if (event.getSource() == textureButton)
	3479	+ // {
	3480	+ // return; // true;
	3481	+ }
2926	3482	else
2927	3483	{
2928	3484	//return super.action(event, arg);
..	..	@@ -2931,7 +3487,6 @@
2931	3487	}
2932	3488
2933	3489	boolean useclient = false;
2934		- cRadio radio;
2935	3490
2936	3491	void ToggleRoot()
2937	3492	{
..	..	@@ -2940,7 +3495,7 @@
2940	3495	if (useclient)
2941	3496	{
2942	3497	cameraView.object = client;
2943		- cameraView.lighttouched = true;
	3498	+ Globals.lighttouched = true;
2944	3499	//topView.object = client;
2945	3500	//frontView.object = client;
2946	3501	//sideView.object = client;
..	..	@@ -2948,7 +3503,7 @@
2948	3503	else
2949	3504	{
2950	3505	cameraView.object = group;
2951		- cameraView.lighttouched = true;
	3506	+ Globals.lighttouched = true;
2952	3507	//topView.object = group;
2953	3508	//frontView.object = group;
2954	3509	//sideView.object = group;
..	..	@@ -2983,6 +3538,28 @@
2983	3538	refreshContents();
2984	3539	}
2985	3540
	3541	+ void TransformChildren()
	3542	+ {
	3543	+ Object3D obj;
	3544	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3545	+ {
	3546	+ obj = (Object3D)e.nextElement();
	3547	+ obj.KeepTextureMatrices();
	3548	+ obj.TransformChildren();
	3549	+ obj.RestoreTextureMatrices();
	3550	+
	3551	+// if (obj.parent == null)
	3552	+// {
	3553	+// System.out.println("NULL PARENT!");
	3554	+// new Exception().printStackTrace();
	3555	+// }
	3556	+// else
	3557	+// TouchTransform(obj);
	3558	+// //obj.parent.Touch();
	3559	+ }
	3560	+
	3561	+ refreshContents();
	3562	+ }
2986	3563
2987	3564	void ResetTransform()
2988	3565	{
..	..	@@ -3095,7 +3672,7 @@
3095	3672	refreshContents();
3096	3673	}
3097	3674
3098		- void ResetCentroid()
	3675	+ void ResetCentroid(boolean full)
3099	3676	{
3100	3677	Object3D obj;
3101	3678	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3110,12 +3687,16 @@
3110	3687	LA.matIdentity(Object3D.mat);
3111	3688	obj.getBounds(minima, maxima, false);
3112	3689	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3113		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3690	+ if (full)
	3691	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3114	3692	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3115	3693	obj.TransformMesh(Object3D.mat);
	3694	+
3116	3695	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3117		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3696	+ if (full)
	3697	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3118	3698	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3699	+
3119	3700	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3120	3701	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3121	3702	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3144,7 +3725,8 @@
3144	3725
3145	3726	int size = obj.MemorySize();
3146	3727
3147		- System.err.println((size/1024) + " KB is the size of " + obj);
	3728	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3729	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3148	3730	}
3149	3731	}
3150	3732	catch (Exception e)
..	..	@@ -3181,9 +3763,9 @@
3181	3763	obj = (Object3D)e.nextElement();
3182	3764
3183	3765	System.out.println("Object is: " + obj);
3184		- GrafreeD.AnalyzeObject(obj);
	3766	+ Grafreed.AnalyzeObject(obj);
3185	3767	System.out.println("Boundary rep: " + obj.bRep);
3186		- GrafreeD.AnalyzeObject(obj.bRep);
	3768	+ Grafreed.AnalyzeObject(obj.bRep);
3187	3769
3188	3770	// System.err.println((size/1024) + " KB is the size of " + obj);
3189	3771	}
..	..	@@ -3225,6 +3807,13 @@
3225	3807	void GenNormals(boolean crease)
3226	3808	{
3227	3809	group.GenNormalsS(crease);
	3810	+
	3811	+ refreshContents();
	3812	+ }
	3813	+
	3814	+ void GenNormalsMESH()
	3815	+ {
	3816	+ group.GenNormalsMeshS();
3228	3817
3229	3818	refreshContents();
3230	3819	}
..	..	@@ -3397,8 +3986,8 @@
3397	3986
3398	3987	void ParseVertices()
3399	3988	{
3400		- boolean epsequal = GrafreeD.epsequal;
3401		- GrafreeD.epsequal = true;
	3989	+ boolean epsequal = Grafreed.epsequal;
	3990	+ Grafreed.epsequal = true;
3402	3991
3403	3992	for (int i=0; i<group.selection.size(); i++)
3404	3993	{
..	..	@@ -3423,7 +4012,7 @@
3423	4012	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3424	4013	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3425	4014
3426		- g.add(GrafreeD.clipboard);
	4015	+ g.add(Grafreed.clipboard);
3427	4016
3428	4017	buffer.add(g);
3429	4018	}
..	..	@@ -3438,7 +4027,7 @@
3438	4027	makeSomething(buffer, i==group.selection.size()-1);
3439	4028	}
3440	4029
3441		- GrafreeD.epsequal = epsequal;
	4030	+ Grafreed.epsequal = epsequal;
3442	4031
3443	4032	refreshContents();
3444	4033	}
..	..	@@ -3456,7 +4045,16 @@
3456	4045	String pigment = Object3D.GetPigment(tex);
3457	4046	//String bump = Object3D.GetBump(tex);
3458	4047
3459		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4048	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4049	+
	4050	+ try
	4051	+ {
	4052	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4053	+ }
	4054	+ catch (Exception e)
	4055	+ {
	4056	+ System.err.println("FAIL: " + node);
	4057	+ }
3460	4058
3461	4059	double s = v.s;
3462	4060
..	..	@@ -3544,11 +4142,11 @@
3544	4142
3545	4143	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3546	4144
3547		- boolean random = CameraPane.RANDOM;
3548		- CameraPane.RANDOM = false; // parse all random nodes
	4145	+ boolean random = CameraPane.SWITCH;
	4146	+ CameraPane.SWITCH = false; // parse all random nodes
3549	4147	lowres.linkVerticesThis(null);
3550	4148	lowres.linkVerticesThis(sn);
3551		- CameraPane.RANDOM = random;
	4149	+ CameraPane.SWITCH = random;
3552	4150
3553	4151	System.err.flush();
3554	4152
..	..	@@ -3588,7 +4186,7 @@
3588	4186	return;
3589	4187
3590	4188	Object3D poses = group.selection.get(0);
3591		- Object3D ref = GrafreeD.clipboard.get(0);
	4189	+ Object3D ref = Grafreed.clipboard.get(0);
3592	4190
3593	4191	Object3D newgroup = new Object3D("Po:" + poses.name);
3594	4192
..	..	@@ -3757,7 +4355,7 @@
3757	4355	group.selection.RelinkToSupport(); // july 2014
3758	4356	System.out.println("DONE.");
3759	4357	refreshContents();
3760		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4358	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3761	4359	}
3762	4360
3763	4361	void ReduceMesh(boolean reduction34)
..	..	@@ -3782,9 +4380,9 @@
3782	4380
3783	4381	void ClipMesh()
3784	4382	{
3785		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4383	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3786	4384	{
3787		- Object3D content = GrafreeD.clipboard.get(0);
	4385	+ Object3D content = Grafreed.clipboard.get(0);
3788	4386
3789	4387	if (content instanceof cGroup && ((cGroup)content).transientlink )
3790	4388	content = ((cGroup)content).get(0);
..	..	@@ -3793,7 +4391,7 @@
3793	4391	// {
3794	4392	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3795	4393	// }
3796		- group.selection.ClipMesh(GrafreeD.clipboard);
	4394	+ group.selection.ClipMesh(Grafreed.clipboard);
3797	4395	}
3798	4396	// group.selection.ClipMesh(GrafreeD.clipboard);
3799	4397	System.out.println("DONE.");
..	..	@@ -3840,6 +4438,18 @@
3840	4438	void MarkLeaves(boolean hide)
3841	4439	{
3842	4440	group.selection.MarkLeaves(hide);
	4441	+ refreshContents();
	4442	+ }
	4443	+
	4444	+ void RewindLeaves(boolean hide)
	4445	+ {
	4446	+ group.selection.RewindLeaves(hide);
	4447	+ refreshContents();
	4448	+ }
	4449	+
	4450	+ void RandomLeaves(boolean hide)
	4451	+ {
	4452	+ group.selection.RandomLeaves(hide);
3843	4453	refreshContents();
3844	4454	}
3845	4455
..	..	@@ -3914,10 +4524,6 @@
3914	4524	// }
3915	4525	// }
3916	4526
3917		- static boolean allparams = true;
3918		-
3919		- static Vector<Object3D> listUI = new Vector<Object3D>();
3920		-
3921	4527	void EditSelection(boolean newWindow)
3922	4528	{
3923	4529	// aConstraints.gridy = 0;
..	..	@@ -3925,10 +4531,10 @@
3925	4531	{
3926	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3927	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3928		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3929	4535
3930	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
3931		- if(elem != group)
	4537	+ if(elem != group \|\| !newWindow)
3932	4538	{
3933	4539	// if (!(elem instanceof Composite))
3934	4540	// newWindow = false;
..	..	@@ -4011,6 +4617,17 @@
4011	4617
4012	4618	freezemodel = true;
4013	4619
	4620	+ //for (Object3D obj : listUI)
	4621	+ for (int i=listUI.size(); --i>=0;)
	4622	+ {
	4623	+ Object3D obj = listUI.elementAt(i);
	4624	+ if (!obj.pinned)
	4625	+ {
	4626	+ obj.CloseUI();
	4627	+ listUI.remove(i);
	4628	+ }
	4629	+ }
	4630	+
4014	4631	/**/
4015	4632	//switch (event.id)
4016	4633	{
..	..	@@ -4018,7 +4635,6 @@
4018	4635	//case 702: // Event.LIST_DESELECT
4019	4636	group.deselectAll();
4020	4637	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4021		- objEditor.ClearInfo(); // .GetMaterial());
4022	4638	if (tps != null)
4023	4639	{
4024	4640	for (int i=0; i < tps.length; i++)
..	..	@@ -4027,33 +4643,39 @@
4027	4643
4028	4644	//if (child.parent != null)
4029	4645	//child.parent.addSelectee(child);
	4646	+ objEditor.SetMaterial(child);
4030	4647	group.addSelectee(child);
4031		- objEditor.SetMaterial(child); // .GetMaterial());
4032		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4033		- System.err.println("info : " + child.GetPath());
4034	4648	}
4035	4649	}
4036		- else
4037		- {
4038		- objEditor.SetMaterial(group); // .GetMaterial());
4039		- objEditor.AddInfo(group, this, true); // .GetMaterial());
4040		- System.err.println("info : " + group.GetPath());
4041		- }
	4650	+// else
	4651	+// {
	4652	+// objEditor.SetMaterial(group); // .GetMaterial());
	4653	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4654	+// System.err.println("info : " + group.GetPath());
	4655	+// }
4042	4656
4043		- objEditor.SetText(); // jan 2014
4044		-
4045		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4657	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4046	4658	CameraPane.flash = true;
4047	4659
4048		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4660	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4049	4661	// a camera
4050	4662	{
4051		- CameraPane.camerachangeframe = 0; // don't refuse it
4052		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
4053		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
4054		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4664	+ {
	4665	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4666	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4667	+ }
	4668	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4669	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4055	4670	}
4056	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4057	4679	refreshContents();
4058	4680	//return true;
4059	4681	}
..	..	@@ -4062,6 +4684,33 @@
4062	4684
4063	4685	freezemodel = false;
4064	4686	}
	4687	+
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
	4694	+ void refreshContents(boolean cp)
	4695	+ {
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4698	+ {
	4699	+ objEditor.ClearInfo(); // .GetMaterial());
	4700	+
	4701	+ for (int i=0; i < group.selection.Size(); i++)
	4702	+ {
	4703	+ Object3D child = (Object3D) group.selection.get(i);
	4704	+
	4705	+ objEditor.AddInfo(child, this, true);
	4706	+ System.err.println("info : " + child.GetPath());
	4707	+ }
	4708	+
	4709	+ objEditor.SetText(); // jan 2014
	4710	+ }
	4711	+
	4712	+ super.refreshContents(cp);
	4713	+ }
4065	4714
4066	4715	void linkSomething(Object3D thing)
4067	4716	{
..	..	@@ -4133,16 +4782,19 @@
4133	4782	{
4134	4783	if (group.selection.isEmpty())
4135	4784	return;
4136		- GrafreeD.clipboardIsTempGroup = false;
	4785	+
	4786	+ Grafreed.clipboardIsTempGroup = false;
4137	4787	Composite tGroup = null;
4138	4788	if (group.selection.size() > 0) // 1)
4139	4789	{
4140	4790	tGroup = new cGroup();
4141		- GrafreeD.clipboardIsTempGroup = true;
	4791	+ Grafreed.clipboardIsTempGroup = true;
4142	4792	}
4143	4793
4144	4794	if (cut)
4145	4795	{
	4796	+ if (Globals.SAVEONMAKE)
	4797	+ Save();
4146	4798	//int indices[] = jList.getSelectedIndices();
4147	4799	//for (int i = indices.length - 1; i >= 0; i--)
4148	4800	//jList.remove(indices[i]);
..	..	@@ -4178,16 +4830,16 @@
4178	4830	//System.out.println("cut " + child);
4179	4831	//System.out.println("parent = " + child.parent);
4180	4832	// tmp.addChild(child);
4181		- if (GrafreeD.clipboardIsTempGroup)
	4833	+ if (Grafreed.clipboardIsTempGroup)
4182	4834	tGroup.add/Child/(tmp);
4183	4835	else
4184		- GrafreeD.clipboard = tmp;
	4836	+ Grafreed.clipboard = tmp;
4185	4837	}
4186	4838	else
4187		- if (GrafreeD.clipboardIsTempGroup)
	4839	+ if (Grafreed.clipboardIsTempGroup)
4188	4840	tGroup.add/Child/(child);
4189	4841	else
4190		- GrafreeD.clipboard = child;
	4842	+ Grafreed.clipboard = child;
4191	4843	}
4192	4844
4193	4845	//ResetModel();
..	..	@@ -4219,21 +4871,23 @@
4219	4871	//System.out.println("cut " + elem);
4220	4872	//System.out.println("parent = " + elem.parent);
4221	4873	// tmp.addChild(elem);
4222		- if (GrafreeD.clipboardIsTempGroup)
	4874	+ if (Grafreed.clipboardIsTempGroup)
4223	4875	tGroup.add/Child/(tmp);
4224	4876	else
4225		- GrafreeD.clipboard = tmp;
	4877	+ Grafreed.clipboard = tmp;
4226	4878	}
4227	4879	else
4228		- if (GrafreeD.clipboardIsTempGroup)
	4880	+ if (Grafreed.clipboardIsTempGroup)
4229	4881	tGroup.add/Child/(child);
4230	4882	else
4231		- GrafreeD.clipboard = child;
	4883	+ Grafreed.clipboard = child;
4232	4884	}
4233	4885
4234	4886	}
4235		- if (GrafreeD.clipboardIsTempGroup)
4236		- GrafreeD.clipboard = tGroup;
	4887	+
	4888	+ if (Grafreed.clipboardIsTempGroup)
	4889	+ Grafreed.clipboard = tGroup;
	4890	+
4237	4891	if (cut)
4238	4892	{
4239	4893	ResetModel();
..	..	@@ -4247,7 +4901,7 @@
4247	4901	// return;
4248	4902	boolean first = true;
4249	4903
4250		- if (GrafreeD.clipboardIsTempGroup)
	4904	+ if (Grafreed.clipboardIsTempGroup)
4251	4905	{
4252	4906	Composite temp;
4253	4907
..	..	@@ -4258,7 +4912,7 @@
4258	4912	temp = (Composite)Applet3D.clipboard.deepCopy();
4259	4913	*/
4260	4914	Object3D elem;
4261		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4915	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4262	4916	{
4263	4917	Object3D child = (Object3D)e.nextElement();
4264	4918
..	..	@@ -4292,21 +4946,21 @@
4292	4946	//Object3D cb = Applet3D.clipboard;
4293	4947	//temp.addChild(cb);
4294	4948	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4295		- assert(GrafreeD.clipboard.parent == null);
4296		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4297		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4298		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4299		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4949	+ assert(Grafreed.clipboard.parent == null);
	4950	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4951	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4952	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4953	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4300	4954	else
4301		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4302		- GrafreeD.clipboard.get(0).parent = keepparent;
	4955	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4956	+ Grafreed.clipboard.get(0).parent = keepparent;
4303	4957	}
4304	4958
4305	4959	ResetModel();
4306	4960	refreshContents();
4307	4961	}
4308	4962
4309		- void pasteInto(boolean copyit)
	4963	+ void pasteInto(boolean copyit, boolean clone)
4310	4964	{
4311	4965	// if (GrafreeD.clipboard == null)
4312	4966	// return;
..	..	@@ -4335,15 +4989,22 @@
4335	4989	if (copyit)
4336	4990	{
4337	4991	// paste(false);
4338		- CloneClipboard(false); // sept 2014
	4992	+ if (clone)
	4993	+ {
	4994	+ CloneClipboard(false); // sept 2014
	4995	+ }
	4996	+ else
	4997	+ {
	4998	+ paste(false);
	4999	+ }
4339	5000	}
4340	5001	else
4341	5002	{
4342	5003	boolean first = true;
4343	5004
4344		- if (GrafreeD.clipboardIsTempGroup)
	5005	+ if (Grafreed.clipboardIsTempGroup)
4345	5006	{
4346		- Composite temp = (Composite)GrafreeD.clipboard;
	5007	+ Composite temp = (Composite)Grafreed.clipboard;
4347	5008	Object3D copy;
4348	5009	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4349	5010	{
..	..	@@ -4353,7 +5014,7 @@
4353	5014	}
4354	5015	} else
4355	5016	{
4356		- linkSomething(GrafreeD.clipboard); //.get(0));
	5017	+ linkSomething(Grafreed.clipboard); //.get(0));
4357	5018	}
4358	5019	}
4359	5020	}
..	..	@@ -4758,21 +5419,6 @@
4758	5419	}
4759	5420	*/
4760	5421
4761		- void ImportGFD()
4762		- {
4763		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4764		- browser.show();
4765		- String filename = browser.getFile();
4766		- if (filename != null && filename.length() > 0)
4767		- {
4768		- String fullname = browser.getDirectory() + filename;
4769		-
4770		- //Object3D readobj =
4771		- objEditor.ReadGFD(fullname, objEditor);
4772		- //makeSomething(readobj);
4773		- }
4774		- }
4775		-
4776	5422	/*
4777	5423	public void Callback(Object obj)
4778	5424	{
..	..	@@ -4796,26 +5442,9 @@
4796	5442	}
4797	5443	*/
4798	5444
4799		- void ImportVRMLX3D()
4800		- {
4801		- if (GrafreeD.standAlone)
4802		- {
4803		- /**/
4804		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4805		- browser.show();
4806		- String filename = browser.getFile();
4807		- if (filename != null && filename.length() > 0)
4808		- {
4809		- String fullname = browser.getDirectory() + filename;
4810		- LoadVRMLX3D(fullname);
4811		- }
4812		- /**/
4813		- }
4814		- }
4815		-
4816	5445	String GetFile(String dialogName)
4817	5446	{
4818		- if (GrafreeD.standAlone)
	5447	+ if (Grafreed.standAlone)
4819	5448	{
4820	5449	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4821	5450	browser.show();
..	..	@@ -4879,10 +5508,36 @@
4879	5508	cButton flashSelectionButton;
4880	5509	cButton editButton;
4881	5510	cButton uneditButton;
	5511	+ JCheckBox allParamsButton;
4882	5512	cButton clearpanelButton;
4883		- cButton allParamsButton;
4884	5513	cButton unselectButton;
4885	5514
	5515	+ cButton restoreCameraButton;
	5516	+
	5517	+ cButton minButton;
	5518	+ cButton maxButton;
	5519	+ cButton fullButton;
	5520	+ cButton saveButton;
	5521	+ cButton oneStepButton;
	5522	+
	5523	+ cButton groupButton;
	5524	+ cButton ungroupButton;
	5525	+ cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
	5529	+
	5530	+ cButton gridButton;
	5531	+ cButton boxButton;
	5532	+ cButton sphereButton;
	5533	+ cButton coneButton;
	5534	+ cButton torusButton;
	5535	+ cButton superButton;
	5536	+ cButton kleinButton;
	5537	+ cButton particlesButton;
	5538	+ cButton overlayButton;
	5539	+ cButton lightButton;
	5540	+
4886	5541	cButton screenfitButton;
4887	5542	cButton screenfitpointButton;
4888	5543	cButton snapobjectButton;
..	..	@@ -4894,14 +5549,6 @@
4894	5549
4895	5550	cButton setsupportButton;
4896	5551
4897		- cButton twoButton;
4898		- cButton sixButton;
4899		- cButton threeButton;
4900		- cButton sevenButton;
4901		- cButton fourButton; // full panel
4902		- cButton oneButton; // full XYZ
4903		- //cButton currentLayout;
4904		-
4905	5552	//
4906	5553	//Composite
4907	5554	Object3D // to do !!
..	..	@@ -4911,9 +5558,11 @@
4911	5558	//JTree jTree;
4912	5559	private MenuItem lookAtItem;
4913	5560	private MenuItem lookFromItem;
4914		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
4915	5562	private MenuItem cutItem;
4916		- private MenuItem duplicateItem;
	5563	+ private MenuItem undoItem;
	5564	+ private MenuItem redoItem;
	5565	+ private JMenuItem duplicateItem;
4917	5566	private MenuItem cloneItem;
4918	5567	private MenuItem cloneSupportItem;
4919	5568	private MenuItem overwriteGeoItem;
..	..	@@ -4926,7 +5575,7 @@
4926	5575	private MenuItem linkverticesItem;
4927	5576	private MenuItem relinkverticesItem;
4928	5577	private MenuItem setMasterItem;
4929		- private MenuItem resetMeshItem;
	5578	+ private MenuItem resetAllItem;
4930	5579	private MenuItem stepAllItem;
4931	5580	private MenuItem revertMeshItem;
4932	5581	private MenuItem poseMeshItem;
..	..	@@ -4937,6 +5586,7 @@
4937	5586	private MenuItem mergeGeometriesItem;
4938	5587	private MenuItem copyItem;
4939	5588	private MenuItem pasteItem;
	5589	+ private MenuItem pasteIntoItem;
4940	5590	private MenuItem pasteLinkItem;
4941	5591	private MenuItem pasteCloneItem;
4942	5592	private MenuItem pasteExpandItem;
..	..	@@ -4975,6 +5625,10 @@
4975	5625	private MenuItem showleavesItem;
4976	5626	private MenuItem markleavesItem;
4977	5627	private MenuItem unmarkleavesItem;
	5628	+ private MenuItem rewindleavesItem;
	5629	+ private MenuItem unrewindleavesItem;
	5630	+ private MenuItem randomleavesItem;
	5631	+ private MenuItem unrandomleavesItem;
4978	5632
4979	5633	private MenuItem flipVItem;
4980	5634	private MenuItem unflipVItem;
..	..	@@ -4986,15 +5640,17 @@
4986	5640	private MenuItem panoTexturesItem;
4987	5641
4988	5642	private MenuItem resetCentroidItem;
4989		- private MenuItem transformgeometryItem;
	5643	+ private MenuItem resetCentroidXZItem;
4990	5644	private MenuItem resetTransformItem;
	5645	+ private MenuItem transformGeometryItem;
	5646	+ private MenuItem transformChildrenItem;
4991	5647	private MenuItem hideItem;
4992	5648	private MenuItem grabItem;
4993	5649	private MenuItem backItem;
4994	5650	private MenuItem frontItem;
4995	5651	private MenuItem cameraItem;
4996	5652	private MenuItem compositeItem;
4997		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
4998	5654	private MenuItem physicsItem;
4999	5655	private MenuItem frameselectorItem;
5000	5656	private MenuItem scriptNodeItem;
..	..	@@ -5009,6 +5665,7 @@
5009	5665
5010	5666	private MenuItem resetParentItem;
5011	5667	private MenuItem repairParentItem;
	5668	+ private MenuItem repairShadowItem;
5012	5669	private MenuItem sortbysizeItem;
5013	5670	private MenuItem sortbynameItem;
5014	5671
..	..	@@ -5033,7 +5690,7 @@
5033	5690	private MenuItem blobItem;
5034	5691	private MenuItem latheItem;
5035	5692	private MenuItem bezierItem;
5036		- private MenuItem checkerItem;
	5693	+ private MenuItem overlayItem;
5037	5694	private MenuItem meshItem;
5038	5695	// private MenuItem meshGroupItem;
5039	5696	private MenuItem springItem;
..	..	@@ -5055,11 +5712,6 @@
5055	5712	private MenuItem doubleItem;
5056	5713	private MenuItem tripleItem;
5057	5714
5058		- private MenuItem importGFDItem;
5059		- private MenuItem importVRMLX3DItem;
5060		- private MenuItem import3DSItem;
5061		- private MenuItem importOBJItem;
5062		-
5063	5715	private MenuItem computeAOItem;
5064	5716	private MenuItem recompileItem;
5065	5717	private MenuItem editScriptItem;
..	..	@@ -5069,4 +5721,8 @@
5069	5721	private MenuItem analyzeItem;
5070	5722	private MenuItem dumpItem;
5071	5723	//boolean freezemodel = false;
	5724	+
	5725	+ Menu cameraMenu;
	5726	+ MenuItem editCameraItem;
	5727	+ MenuItem restoreCameraItem;
5072	5728	}