~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);
..	..	@@ -83,7 +84,7 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ // Object3D keep = GrafreeD.clipboard;
87	88	//Object3D obj;
88	89	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	90	{
..	..	@@ -97,14 +98,14 @@
97	98
98	99	void CloneClipboard(boolean supports)
99	100	{
100		- assert(GraphreeD.clipboard.parent == null);
101		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
102		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
103		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
104		- makeSomething(CloneObject(GraphreeD.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(GraphreeD.clipboard, false));
107		- GraphreeD.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)GraphreeD.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,73 +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);
	321	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	322	+ relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
222	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	327	setMasterItem.addActionListener(this);
	328	+ }
224	329
225	330	oe.menuBar.add(menu = new Menu("Group"));
226		- grabItem = menu.add(new MenuItem("Grab"));
227		- grabItem.addActionListener(this);
228		- frontItem = menu.add(new MenuItem("Front"));
229		- frontItem.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		- compositeItem = menu.add(new MenuItem("Composite"));
233		- compositeItem.addActionListener(this);
234		- menu.add("-");
235		- randomItem = menu.add(new MenuItem("Random"));
236		- randomItem.addActionListener(this);
237		- physicsItem = menu.add(new MenuItem("Physics"));
238		- physicsItem.addActionListener(this);
239		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
240		- frameselectorItem.addActionListener(this);
	335	+ frontItem = menu.add(new MenuItem("Front"));
	336	+ frontItem.addActionListener(this);
	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"));
	343	+ hideItem.addActionListener(this);
	344	+ }
	345	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	346	+ ungroupItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
241	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	355	switchGeoItem.addActionListener(this);
243	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	357	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	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);
247	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	367	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	368	+ }
251	369
252	370	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
	373	+ billboardItem = menu.add(new MenuItem("Billboard"));
	374	+ billboardItem.addActionListener(this);
255	375	csgItem = menu.add(new MenuItem("CSG"));
256	376	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	378	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	380	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
263	386	linkerItem = menu.add(new MenuItem("Linker"));
264	387	linkerItem.addActionListener(this);
265		- templateItem = menu.add(new MenuItem("Template"));
266		- templateItem.addActionListener(this);
267	388	attributeItem = menu.add(new MenuItem("Attribute"));
268	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
269	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	393	pointflowItem.addActionListener(this);
	394	+ }
271	395	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	397	resetTransformItem.addActionListener(this);
276	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	399	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.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);
280	406
281	407	oe.menuBar.add(menu = new Menu("Geometry"));
282	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +411,13 @@
285	411	genNormalsORGANItem.addActionListener(this);
286	412	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	413	genNormalsCADItem.addActionListener(this);
	414	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	415	+ genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
	418	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	419	+ genNormalsMINEItem.addActionListener(this);
	420	+ }
288	421	stripifyItem = menu.add(new MenuItem("Stripify"));
289	422	stripifyItem.addActionListener(this);
290	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +439,34 @@
306	439	reduce34MeshItem.addActionListener(this);
307	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	441	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
313	450
314	451	oe.menuBar.add(menu = new Menu("Attributes"));
315	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	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);
317	458	menu.add("-");
318	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	460	liveleavesItem.addActionListener(this);
320	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
322	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	466	supportleavesItem.addActionListener(this);
324	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	468	unsupportleavesItem.addActionListener(this);
	469	+ }
326	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	471	hideleavesItem.addActionListener(this);
328	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +475,14 @@
331	475	markleavesItem.addActionListener(this);
332	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	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);
334	486	menu.add("-");
335	487	flipVItem = menu.add(new MenuItem("Flip V"));
336	488	flipVItem.addActionListener(this);
..	..	@@ -366,35 +518,40 @@
366	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	519	sortbynameItem.addActionListener(this);
368	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.
369	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	529	extractGeometriesItem.addActionListener(this);
371	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	531	cloneGeometriesItem.addActionListener(this);
373		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
374		- shareGeometriesItem.addActionListener(this);
375		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
376		- mergeGeometriesItem.addActionListener(this);
	532	+ }
377	533
378	534	oe.menuBar.add(menu = new Menu("Insert"));
379	535	buildCreateMenu(menu);
380	536
381		-
382		- oe.menuBar.add(menu = new Menu("Include"));
383		- importGFDItem = menu.add(new MenuItem("GraphreeD Object..."));
384		- importGFDItem.addActionListener(this);
385		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
386		- importVRMLX3DItem.addActionListener(this);
387		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
388		- importOBJItem.addActionListener(this);
389		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
390		- import3DSItem.addActionListener(this);
391		-
392	537	oe.menuBar.add(menu = new Menu("Tools"));
393	538	buildToolsMenu(menu);
394	539	}
395	540
396	541	void SetupUI2(ObjEditor oe)
397	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	+
398	555	//new Exception().printStackTrace();
399	556
400	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +580,214 @@
423	580	oe.radioPanel.add(dummyButton);
424	581	oe.buttonGroup.add(dummyButton);
425	582	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
429	586
430		- 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");
431	621	liveCB.addItemListener(this);
432	622
433		- oe.aConstraints.gridx += 1;
434		- oe.toolbarPanel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT), oe.aConstraints);
435		- supportCB.addItemListener(this);
436		-
437		- // oe.aConstraints.gridx += 1;
438		- // oe.toolbarPanel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), oe.aConstraints);
439		- // localCB.addItemListener(this);
440		-
441		- oe.aConstraints.gridx += 1;
442		- oe.toolbarPanel.add(crowdCB = new cCheckBox("Crowd", CameraPane.CROWD), oe.aConstraints);
443		- crowdCB.addItemListener(this);
444		-
445		- oe.aConstraints.gridx += 1;
446		- oe.toolbarPanel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA), oe.aConstraints);
447		- smoothCB.addItemListener(this);
448		-
449		- oe.aConstraints.gridx += 1;
450		- 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");
451	629	fastCB.addItemListener(this);
452		- oe.aConstraints.gridx += 1;
453		- oe.toolbarPanel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE), oe.aConstraints);
454		- slowCB.addItemListener(this);
455		- oe.aConstraints.gridx += 1;
456		- oe.toolbarPanel.add(boxCB = new cCheckBox("Box", CameraPane.FAST), oe.aConstraints);
457		- boxCB.addItemListener(this);
458		-
459		-// oe.aConstraints.gridx += 1;
460		-// oe.toolbarPanel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), oe.aConstraints);
461		-// speakerMocapCB.addItemListener(this);
462		-
463		- if (false)
464		- {
465		- // handled in scripts
466		- oe.aConstraints.gridx += 1;
467		- oe.toolbarPanel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA), oe.aConstraints);
468		- speakerCameraCB.addItemListener(this);
469		-
470		- oe.aConstraints.gridx += 1;
471		- oe.toolbarPanel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS), oe.aConstraints);
472		- speakerFocusCB.addItemListener(this);
473		-
474		- oe.aConstraints.gridx += 1;
475		- oe.toolbarPanel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS), oe.aConstraints);
476		- smoothfocusCB.addItemListener(this);
477		- }
478		-
479		-//oe.aConstraints.gridx += 1;
480		-//oe.toolbarPanel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), oe.aConstraints);
481		-// debugCB.addItemListener(this);
482		-
483		- oe.aConstraints.gridx += 1;
484		- oe.toolbarPanel.add(oeilCB = new cCheckBox("O", CameraPane.OEIL), oe.aConstraints);
485		- oeilCB.addItemListener(this);
486		-
487		- oe.aConstraints.gridx += 1;
488		- oe.toolbarPanel.add(lookAtCB = new cCheckBox("T", CameraPane.LOOKAT), oe.aConstraints);
489		- lookAtCB.addItemListener(this);
490		-
491		- oe.aConstraints.gridx += 1;
492		- oe.toolbarPanel.add(trackCB = new cCheckBox(":", CameraPane.TRACK), oe.aConstraints);
493		- trackCB.addItemListener(this);
494		-
495		- oe.aConstraints.gridx += 1;
496		- 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");
497	635	screenfitButton.addActionListener(this);
498		- 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	+
499	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	642	// screenfitpointButton.addActionListener(this);
501		-// oe.aConstraints.gridx += 1;
502		- oe.toolbarPanel.add(snapobjectButton = new cButton(" O+ ")); //, oe.aConstraints);
503		- snapobjectButton.addActionListener(this);
504		- oe.aConstraints.gridx += 1;
505	643
506		- //aConstraints.gridx = 0;
507		- //aConstraints.gridy += 1;
508		- oe.aConstraints.weighty = 0;
509		- oe.aConstraints.gridwidth = 1;
510		-
511		- oe.toolbarPanel.add(flashSelectionButton = new cButton(" ? ")); //, oe.aConstraints);
512		- flashSelectionButton.addActionListener(this);
513		- oe.aConstraints.gridx += 1;
514		- oe.aConstraints.weighty = 0;
515		- oe.aConstraints.gridwidth = 1;
	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));
516	652
517		- //
518		- 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");
519	655	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	659	fourButton.addActionListener(this);
522		- 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");
523	663	sixButton.addActionListener(this);
524		- 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");
525	666	threeButton.addActionListener(this);
526		- 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");
527	669	sevenButton.addActionListener(this);
528	670	//
529	671
530		- 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");
531	674	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- 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");
534	678	closeButton.addActionListener(this);
535	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	680	//clearButton.addActionListener(this);
537		- oe.aConstraints.gridx += 1;
538		-
539		- oe.aConstraints.gridx = 1; //
540		- oe.treePanel.add(editButton = new cButton("+"), oe.aConstraints);
541		- editButton.addActionListener(this);
542		- oe.aConstraints.gridx += 1;
543		- oe.aConstraints.weighty = 0;
544		- oe.aConstraints.gridwidth = 1;
545	681
546		- 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 = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
	763	+ editButton.addActionListener(this);
	764	+
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
547	767	uneditButton.addActionListener(this);
548	768
549		- oe.aConstraints.gridx += 1;
550		- oe.aConstraints.weighty = 0;
551		- oe.aConstraints.gridwidth = 1;
552		-
553		- oe.treePanel.add(clearPanelButton = new cButton("C"), oe.aConstraints);
554		- clearPanelButton.addActionListener(this);
555		-
556		- oe.aConstraints.gridx += 1;
557		- oe.aConstraints.weighty = 0;
558		- oe.aConstraints.gridwidth = 1;
559		-
560		- oe.treePanel.add(allParamsButton = new cButton("A"), oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
561	771	allParamsButton.addActionListener(this);
562	772
563		- oe.aConstraints.gridx += 1;
564		- oe.aConstraints.weighty = 0;
565		- oe.aConstraints.gridwidth = 1;
566		-
567		- 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");
568	779	unselectButton.addActionListener(this);
569	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	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
	790	+
570	791	// oe.aConstraints.gridx += 1;
571	792	// oe.aConstraints.weighty = 0;
572	793	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +799,22 @@
578	799	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	800	// gcButton.addActionListener(this);
580	801
581		- oe.aConstraints.gridx = 0;
582		- oe.aConstraints.gridy += 1;
583		-
584		- //ctrlPanel.add(objList = new List(5, true));
585		- oe.aConstraints.gridwidth = 100;
586		- // oe.aConstraints.gridheight = 100;
587		- oe.aConstraints.fill = GridBagConstraints.BOTH; // HORIZONTAL;
588		- oe.aConstraints.gridheight = 1;
589		- oe.aConstraints.weighty = 0.5;
590		- oe.aConstraints.gridx = 0;
591		- JScrollPane jSP;
	802	+ cGridBag jSPPanel = new cGridBag();
	803	+
	804	+ JScrollPane jSP;
592	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
593		- oe.treePanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null)), oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	807	ResetModel();
595		- oe.aConstraints.weighty = 0.5;
596		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
597		- oe.aConstraints.gridy += 1;
598		- oe.aConstraints.gridwidth = 1;
599		-
600		- oe.aConstraints.weighty = 0;
601		- oe.aConstraints.gridwidth = 2;
602		-
603		- oe.treePanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0), oe.aConstraints);
604		- colorCB.addItemListener(this);
605		- oe.aConstraints.gridx += 2;
606		- oe.treePanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0), oe.aConstraints);
607		- materialCB.addItemListener(this);
608		- oe.aConstraints.gridx += 2;
609		- oe.treePanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0), oe.aConstraints);
610		- textureCB.addItemListener(this);
611		-
612		- oe.aConstraints.gridx = 0;
613		- oe.aConstraints.gridy += 1;
614	808
	809	+ oe.treePanel.add(jSPPanel);
	810	+ oe.treePanel.Return();
	811	+
	812	+ oe.treePanel.add(copyOptionsPanel);
	813	+ oe.treePanel.Return();
	814	+
	815	+// mainPanel.setDividerLocation(0.5); //1.0);
	816	+// mainPanel.setResizeWeight(0.5);
	817	+
615	818	//jList.addListSelectionListener(this);
616	819	oe.jTree.addTreeSelectionListener(this);
617	820	//jTree.setRootVisible(false);
..	..	@@ -633,20 +836,153 @@
633	836	radio.layout = sevenButton;
634	837	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	838	}
	839	+
	840	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	841	+ {
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
	856	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	857	+ boxCB.setToolTipText("Display bounding boxes");
	858	+ boxCB.addItemListener(this);
	859	+
	860	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
	862	+ zoomBoxCB.addItemListener(this);
	863	+
	864	+ if (true) // Globals.ADVANCED)
	865	+ {
	866	+ panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	867	+ supportCB.setToolTipText("Enable rigging");
	868	+ supportCB.addItemListener(this);
	869	+
	870	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	871	+ // localCB.addItemListener(this);
	872	+
	873	+ panel.Return();
	874	+
	875	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	876	+ crowdCB.setToolTipText("Used for crowds");
	877	+ crowdCB.addItemListener(this);
	878	+
	879	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	880	+ smoothCB.setToolTipText("Snapping delay");
	881	+ smoothCB.addItemListener(this);
	882	+
	883	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	884	+ slowCB.setToolTipText("Smooth interpolation");
	885	+ slowCB.addItemListener(this);
	886	+
	887	+// constraints.gridy += 1;
	888	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	889	+// speakerMocapCB.addItemListener(this);
	890	+
	891	+ panel.Return();
	892	+
	893	+ if (false)
	894	+ {
	895	+ // handled in scripts
	896	+ //constraints.gridy += 1;
	897	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	898	+ speakerCameraCB.addItemListener(this);
	899	+
	900	+ //constraints.gridy += 1;
	901	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	902	+ speakerFocusCB.addItemListener(this);
	903	+
	904	+ //constraints.gridy += 1;
	905	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	906	+ smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
	908	+ }
	909	+
	910	+//constraints.gridx += 1;
	911	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	912	+// debugCB.addItemListener(this);
	913	+
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
	918	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
	920	+ oeilCB.addItemListener(this);
	921	+
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
	942	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	943	+ lookAtCB.setToolTipText("Look-at target");
	944	+ lookAtCB.addItemListener(this);
	945	+ }
	946	+
	947	+ }
	948	+
	949	+ cGridBag fill = new cGridBag();
	950	+ fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
	955	+
	956	+ panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
	959	+
	960	+ }
636	961
637	962	void EditObject(Object3D obj)
638	963	{
639		- cRadio dummyButton = new cRadio(obj.name);
640		- dummyButton.SetObject(obj);
641		- dummyButton.layout = sevenButton;
642		- dummyButton.SetCamera(cameraView.renderCamera, false);
643		- dummyButton.addActionListener(this);
644		- radioPanel.add(dummyButton);
645		- buttonGroup.add(dummyButton);
646		- dummyButton.doClick();
	964	+ cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
	973	+ radioButton.SetObject(obj);
	974	+ radioButton.layout = sevenButton;
	975	+ radioButton.SetCamera(cameraView.renderCamera, false);
	976	+ radioButton.addActionListener(this);
	977	+ radioPanel.add(radioButton);
	978	+ buttonGroup.add(radioButton);
	979	+ radioButton.doClick();
647	980	}
	981	+
648	982	void SetupViews(ObjEditor oe)
649	983	{
	984	+ theFrame = this;
	985	+
650	986	oe.SetupViews();
651	987
652	988	System.out.println("SetupViews");
..	..	@@ -655,22 +991,27 @@
655	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	992	}
657	993
658		- JCheckBox liveCB;
659		- JCheckBox supportCB;
660		- JCheckBox localCB;
661		- JCheckBox crowdCB;
662		- JCheckBox smoothCB;
663		- JCheckBox fastCB;
664		- JCheckBox slowCB;
665		- JCheckBox boxCB;
666		- JCheckBox trackCB;
667		- JCheckBox smoothfocusCB;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
668	1006	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
674	1015
675	1016	// static int COLOR = 1;
676	1017	// static int MATERIAL = 2;
..	..	@@ -678,9 +1019,9 @@
678	1019
679	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1021
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
684	1025
685	1026	public void itemStateChanged(ItemEvent e)
686	1027	{
..	..	@@ -705,10 +1046,10 @@
705	1046	dropAttributes \|= Object3D.TEXTURE;
706	1047	else
707	1048	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1049	+ } else if(e.getSource() == liveCB)
710	1050	{
711	1051	cameraView.ToggleLive();
	1052	+ refreshContents(false);
712	1053	}
713	1054	else if(e.getSource() == supportCB)
714	1055	{
..	..	@@ -744,6 +1085,10 @@
744	1085	cameraView.repaint();
745	1086	// refreshContents();
746	1087	}
	1088	+ else if(e.getSource() == zoomBoxCB)
	1089	+ {
	1090	+ cameraView.ToggleZoomBoxMode();
	1091	+ }
747	1092	else if(e.getSource() == smoothfocusCB)
748	1093	{
749	1094	cameraView.ToggleSmoothFocus();
..	..	@@ -769,6 +1114,14 @@
769	1114	{
770	1115	cameraView.ToggleOeil();
771	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
772	1125	else if(e.getSource() == lookAtCB)
773	1126	{
774	1127	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1138,8 @@
785	1138
786	1139	/**/
787	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1144	// We can't move the root node or an empty selection
791	1145	return;
..	..	@@ -857,7 +1211,9 @@
857	1211	// objEditor.DropFile((java.io.File[]) object, true);
858	1212	// return;
859	1213	// }
860		- if (string.charAt(0) == '/')
	1214	+
	1215	+ // File path for Mac and Windows
	1216	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1217	{
862	1218	// file(s)
863	1219	String[] names = string.split("\n");
..	..	@@ -884,7 +1240,7 @@
884	1240
885	1241	flashIt = false;
886	1242	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1243	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1244	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1245
890	1246	if (group.selection.size() == 1)
..	..	@@ -900,23 +1256,33 @@
900	1256
901	1257	assert target == objEditor.jTree;
902	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
903	1260	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1262	} catch (Exception e) {
906	1263	System.out.println("destinationPath : " + destinationPath);
907	1264	return;
908	1265	}
909	1266
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
911	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
912	1278	loadClipboard(true);
913	1279	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1280	+ pasteInto(false, false);
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
920	1286	}
921	1287	public void dropActionChanged(DropTargetDragEvent dtde)
922	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1021,83 +1387,104 @@
1021	1387	{
1022	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1389	//heightFieldItem.addActionListener(this);
1024		- gridItem = menu.add(new MenuItem("Grid"));
1025		- gridItem.addActionListener(this);
1026		- rectoidItem = menu.add(new MenuItem("Box"));
1027		- rectoidItem.addActionListener(this);
1028		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1029		- ellipsoidItem.addActionListener(this);
1030		- coneItem = menu.add(new MenuItem("Cone"));
1031		- coneItem.addActionListener(this);
1032		- torusItem = menu.add(new MenuItem("Torus"));
1033		- torusItem.addActionListener(this);
1034		- superItem = menu.add(new MenuItem("Superellipsoid"));
1035		- superItem.addActionListener(this);
1036		- particleItem = menu.add(new MenuItem("Particle system"));
1037		- particleItem.addActionListener(this);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
	1408	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1409	+ kleinItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
	1414	+ if (Globals.ADVANCED)
	1415	+ {
1038	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1417	ragdollItem.addActionListener(this);
1040	1418	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1419	ragdoll2Item.addActionListener(this);
	1420	+ }
1042	1421	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1422	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1423	meshItem.addActionListener(this);
1045	1424	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1425	// meshGroupItem.addActionListener(this);
	1426	+ if (Globals.ADVANCED)
	1427	+ {
1047	1428	springItem = menu.add(new MenuItem("Spring"));
1048	1429	springItem.addActionListener(this);
1049	1430	flagItem = menu.add(new MenuItem("Flag"));
1050	1431	flagItem.addActionListener(this);
1051		- bezierItem = menu.add(new MenuItem("Patch"));
1052		- bezierItem.addActionListener(this);
1053		- checkerItem = menu.add(new MenuItem("Checker"));
1054		- checkerItem.addActionListener(this);
1055	1432	blobItem = menu.add(new MenuItem("Blob"));
1056	1433	blobItem.addActionListener(this);
1057	1434	latheItem = menu.add(new MenuItem("Lathe"));
1058	1435	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1436	+ }
	1437	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1438	+ bezierItem.addActionListener(this);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1061	1443	menu.add("-");
1062	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1445	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1066	1448	doubleItem = menu.add(new MenuItem("Fork"));
1067	1449	doubleItem.addActionListener(this);
	1450	+ if (Globals.ADVANCED)
	1451	+ {
1068	1452	tripleItem = menu.add(new MenuItem("Trident"));
1069	1453	tripleItem.addActionListener(this);
	1454	+ }
1070	1455	}
1071	1456
1072	1457	void buildToolsMenu(Menu menu)
1073	1458	{
1074	1459	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1460	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1461	+ animationItem.setState(Globals.ANIMATION);
1077	1462
1078	1463	menu.add("-");
1079	1464	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1465	parseverticesItem.addActionListener(this);
1081	1466	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1467	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1468	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1469	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1470	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1471	reduceMorphItem.addActionListener(this);
1089	1472	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1473	reduce34MorphItem.addActionListener(this);
1091		-
	1474	+ menu.add("-");
1092	1475	menu.add(computeAOItem = new MenuItem("Compute AO"));
1093	1476	computeAOItem.addActionListener(this);
1094		- menu.add("-");
1095	1477
	1478	+ if (Globals.ADVANCED)
	1479	+ {
	1480	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1481	+ mirrorItem.addActionListener(this);
	1482	+ menu.add("-");
1096	1483	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1484	memoryItem.addActionListener(this);
1098	1485	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1486	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1487	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1488	dumpItem.addActionListener(this);
1102	1489	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1490	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1493,8 @@
1106	1493	resetParentItem.addActionListener(this);
1107	1494	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1495	repairParentItem.addActionListener(this);
	1496	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1497	+ repairShadowItem.addActionListener(this);
1109	1498	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1499	invariantsItem.addActionListener(this);
1111	1500	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1502,7 @@
1113	1502	menu.add("-");
1114	1503	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1504	editScriptItem.addActionListener(this);
	1505	+ }
1116	1506	}
1117	1507
1118	1508	void ScreenFit()
..	..	@@ -1235,9 +1625,24 @@
1235	1625	shadow.material = new cMaterial(obj.material);
1236	1626	shadow.material.diffuse = 0.0001f;
1237	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1238	1629
1239	1630	makeSomething(shadow);
1240	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1241	1646
1242	1647	/**
1243	1648	* applyExample
..	..	@@ -1441,9 +1846,9 @@
1441	1846
1442	1847	void Overwrite(int mask)
1443	1848	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1849	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1850	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1851	+ Object3D content = Grafreed.clipboard.get(0);
1447	1852
1448	1853	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1854	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1871,7 @@
1466	1871	//
1467	1872	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1873	{
	1874	+ Object source = event.getSource();
1469	1875	/*
1470	1876	if (event.getSource() == nameField)
1471	1877	{
..	..	@@ -1477,11 +1883,11 @@
1477	1883	}
1478	1884	else
1479	1885	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1886	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1887	{
1482	1888	ScreenFit();
1483	1889	} else
1484		- if (event.getSource() == switchItem)
	1890	+ if (source == switchViewItem)
1485	1891	{
1486	1892	cVector v1 = new cVector();
1487	1893	cVector v2 = new cVector();
..	..	@@ -1490,11 +1896,11 @@
1490	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1897	objEditor.cameraView.repaint();
1492	1898	} else
1493		- if (event.getSource() == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1494	1900	{
1495	1901	makeSomething(new Box());
1496	1902	} else
1497		- if (event.getSource() == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1498	1904	{
1499	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1921,9 @@
1515	1921	applyExample(particleGeom, "SMOKE");
1516	1922	makeSomething(particleGeom);
1517	1923	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1924	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1925	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1926	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1927
1522	1928	ragdoll.toParent = LA.newMatrix();
1523	1929	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1941,7 @@
1535	1941	} else
1536	1942	/*
1537	1943	*/
1538		- if (event.getSource() == heightFieldItem)
	1944	+ if (source == heightFieldItem)
1539	1945	{
1540	1946	Object3D obj = new Object3D();
1541	1947
..	..	@@ -1573,27 +1979,31 @@
1573	1979
1574	1980	makeSomething(obj);
1575	1981	} else
1576		- if (event.getSource() == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1577	1983	{
1578	1984	makeSomething(new Grid());
1579	1985	} else
1580		- if (event.getSource() == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	1987	{
1582	1988	makeSomething(new Sphere());
1583	1989	} else
1584		- if (event.getSource() == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1585	1991	{
1586	1992	makeSomething(new Cone());
1587	1993	} else
1588		- if (event.getSource() == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1589	1995	{
1590	1996	makeSomething(new Torus());
1591	1997	} else
1592		- if (event.getSource() == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1593	1999	{
1594	2000	makeSomething(new Superellipsoid());
1595	2001	} else
1596		- if (event.getSource() == blobItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
	2003	+ {
	2004	+ makeSomething(new Klein());
	2005	+ } else
	2006	+ if (source == blobItem)
1597	2007	{
1598	2008	Blob blob = new Blob();
1599	2009	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2011,15 @@
1601	2011	//blob.retile();
1602	2012	makeSomething(blob);
1603	2013	} else
1604		- if (event.getSource() == latheItem)
	2014	+ if (source == latheItem)
1605	2015	{
1606	2016	makeSomething(new Lathe());
1607	2017	} else
1608		- if (event.getSource() == bezierItem)
	2018	+ if (source == bezierItem)
1609	2019	{
1610	2020	makeSomething(new BezierSurface());
1611	2021	} else
1612		- if (event.getSource() == checkerItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1613	2023	{
1614	2024	/*
1615	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2034,7 @@
1624	2034	*/
1625	2035	makeSomething(new Checker());
1626	2036	} else
1627		- if (event.getSource() == meshItem)
	2037	+ if (source == meshItem)
1628	2038	{
1629	2039	Object3D itemtomake = new Object3D();
1630	2040	Object3D child;
..	..	@@ -1645,35 +2055,35 @@
1645	2055	makeSomething(child);
1646	2056	}
1647	2057	} else
1648		- if (event.getSource() == springItem)
	2058	+ if (source == springItem)
1649	2059	{
1650	2060	cSpring s = new cSpring();
1651	2061	s.setup();
1652	2062	makeSomething(s);
1653	2063	} else
1654		- if (event.getSource() == flagItem)
	2064	+ if (source == flagItem)
1655	2065	{
1656	2066	cSpring s = new cFlag();
1657	2067	s.setup();
1658	2068	makeSomething(s);
1659	2069	} else
1660		- if (event.getSource() == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1661	2071	{
1662	2072	makeSomething(new Light());
1663	2073	} else
1664		- if (event.getSource() == csgItem)
	2074	+ if (source == csgItem)
1665	2075	{
1666	2076	group(new CSG());
1667	2077	} else
1668		- if (event.getSource() == templateItem)
	2078	+ if (source == templateItem)
1669	2079	{
1670	2080	group(new cTemplate());
1671	2081	} else
1672		- if (event.getSource() == attributeItem)
	2082	+ if (source == attributeItem)
1673	2083	{
1674	2084	makeSomething(new Attribute());
1675	2085	} else
1676		- if (event.getSource() == pointflowItem)
	2086	+ if (source == pointflowItem)
1677	2087	{
1678	2088	makeSomething(new PointFlow());
1679	2089	} else
..	..	@@ -1685,7 +2095,7 @@
1685	2095	} else
1686	2096	*/
1687	2097
1688		- if (event.getSource() == superLoopItem)
	2098	+ if (source == superLoopItem)
1689	2099	{
1690	2100	Composite g = new cGroup();
1691	2101	for (int i=0; i<15; i++)
..	..	@@ -1707,7 +2117,7 @@
1707	2117
1708	2118	group(g);
1709	2119	} else
1710		- if (event.getSource() == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1711	2121	{
1712	2122	Composite csg = new GroupLeaf();
1713	2123	csg.count = 5;
..	..	@@ -1716,7 +2126,7 @@
1716	2126	csg.addChild(child);
1717	2127	child.addChild(csg);
1718	2128	} else
1719		- if (event.getSource() == doubleItem)
	2129	+ if (source == doubleItem)
1720	2130	{
1721	2131	Composite csg = new GroupLeaf();
1722	2132	csg.count = 5;
..	..	@@ -1728,7 +2138,7 @@
1728	2138	csg.addChild(child);
1729	2139	child.addChild(csg);
1730	2140	} else
1731		- if (event.getSource() == tripleItem)
	2141	+ if (source == tripleItem)
1732	2142	{
1733	2143	Composite csg = new GroupLeaf();
1734	2144	csg.count = 4;
..	..	@@ -1743,71 +2153,83 @@
1743	2153	csg.addChild(child);
1744	2154	child.addChild(csg);
1745	2155	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2156	+ if (source == computeAOItem)
1748	2157	{
1749		- ImportGFD();
	2158	+ Globals.drawMode = CameraPane.OCCLUSION;
	2159	+ Globals.theRenderer.repaint();
1750	2160	} else
1751		- if (event.getSource() == importVRMLX3DItem)
1752		- {
1753		- ImportVRMLX3D();
1754		- } else
1755		- if (event.getSource() == import3DSItem)
1756		- {
1757		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1758		- } else
1759		- if (event.getSource() == importOBJItem)
1760		- {
1761		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1762		- } else
1763		- if (event.getSource() == computeAOItem)
1764		- {
1765		- CameraPane.drawMode = CameraPane.OCCLUSION;
1766		- CameraPane.theRenderer.repaint();
1767		- } else
1768		- if (event.getSource() == recompileItem)
	2161	+ if (source == recompileItem)
1769	2162	{
1770	2163	Recompile();
1771	2164	refreshContents();
1772	2165	} else
1773		- if (event.getSource() == editScriptItem)
	2166	+ if (source == editScriptItem)
1774	2167	{
1775	2168	OpenDialog();
1776	2169	refreshContents();
1777	2170	} else
1778		- if (event.getSource() == invariantsItem)
	2171	+ if (source == invariantsItem)
1779	2172	{
1780	2173	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2174	+ Grafreed.grafreeD.universe.invariants();
1782	2175	} else
1783		- if (event.getSource() == memoryItem)
	2176	+ if (source == memoryItem)
1784	2177	{
1785	2178	//System.out.println("Invariants:");
1786	2179	PrintMemory();
1787	2180	} else
1788		- if (event.getSource() == pathItem)
	2181	+ if (source == pathItem)
1789	2182	{
1790	2183	PrintPath();
1791	2184	} else
1792		- if (event.getSource() == analyzeItem)
	2185	+ if (source == analyzeItem)
1793	2186	{
1794	2187	AnalyzeObject();
1795	2188	} else
1796		- if (event.getSource() == dumpItem)
	2189	+ if (source == dumpItem)
1797	2190	{
1798	2191	DumpObject();
1799	2192	} else
1800		- if (event.getSource() == screenfitButton)
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
	2204	+ } else
	2205	+ if (source == undoButton)
	2206	+ {
	2207	+ Undo();
	2208	+ } else
	2209	+ if (source == redoButton)
	2210	+ {
	2211	+ Redo();
	2212	+ } else
	2213	+ if (source == saveButton)
	2214	+ {
	2215	+ Save();
	2216	+ } else
	2217	+ if (source == oneStepButton)
	2218	+ {
	2219	+ Globals.ONESTEP = true;
	2220	+ cameraView.repaint();
	2221	+ } else
	2222	+ if (source == screenfitButton)
1801	2223	{
1802	2224	//Reload(lastConverter, lastFilename, true);
1803	2225	ScreenFit();
1804	2226	} else
1805		- if (event.getSource() == screenfitpointButton)
	2227	+ if (source == screenfitpointButton)
1806	2228	{
1807	2229	//Reload(lastConverter, lastFilename, true);
1808	2230	ScreenFitPoint();
1809	2231	} else
1810		- if (event.getSource() == snapobjectButton)
	2232	+ if (source == snapobjectButton)
1811	2233	{
1812	2234	//Reload(lastConverter, lastFilename, true);
1813	2235	SnapObject();
..	..	@@ -1818,13 +2240,13 @@
1818	2240	// Recompile();
1819	2241	// refreshContents();
1820	2242	// } else
1821		- if (event.getSource() == gcButton)
	2243	+ if (source == gcButton)
1822	2244	{
1823	2245	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2246	System.gc();
1825	2247	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2248	} else
1827		- if (event.getSource() == editLeafItem)
	2249	+ if (source == editLeafItem)
1828	2250	{
1829	2251	Object3D obj;
1830	2252	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2260,78 @@
1838	2260	}
1839	2261	refreshContents(true);
1840	2262	} else
1841		- if (event.getSource() == openWindowItem)
	2263	+ if (source == openWindowItem)
1842	2264	{
1843	2265	EditSelection(true);
1844	2266	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2267	+ if (source == cutItem \|\| source == clearButton)
1846	2268	{
1847	2269	loadClipboard(true);
1848	2270	} else
1849		- if (event.getSource() == duplicateItem)
	2271	+ if (source == undoItem)
1850	2272	{
1851		- Object3D keep = GraphreeD.clipboard;
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == redoItem)
	2276	+ {
	2277	+ Redo();
	2278	+ } else
	2279	+ if (source == duplicateItem)
	2280	+ {
	2281	+ Object3D keep = Grafreed.clipboard;
1852	2282	loadClipboard(false);
1853	2283	paste(false);
1854		- GraphreeD.clipboard = keep;
	2284	+ Grafreed.clipboard = keep;
1855	2285	} else
1856		- if (event.getSource() == cloneItem)
	2286	+ if (source == cloneItem)
1857	2287	{
1858	2288	CloneSelection(false);
1859	2289	} else
1860		- if (event.getSource() == cloneSupportItem)
	2290	+ if (source == cloneSupportItem)
1861	2291	{
1862	2292	CloneSelection(true);
1863	2293	} else
1864		- if (event.getSource() == copyItem)
	2294	+ if (source == copyItem)
1865	2295	{
1866	2296	loadClipboard(false);
1867	2297	} else
1868		- if (event.getSource() == pasteItem)
	2298	+ if (source == pasteItem)
1869	2299	{
1870	2300	paste(false);
1871	2301	} else
1872		- if (event.getSource() == pasteLinkItem)
	2302	+ if (source == pasteIntoItem)
1873	2303	{
1874		- pasteInto(false);
	2304	+ pasteInto(true, false);
1875	2305	} else
1876		- if (event.getSource() == pasteCloneItem)
	2306	+ if (source == pasteLinkItem)
1877	2307	{
1878		- pasteInto(true);
	2308	+ pasteInto(false, false);
1879	2309	} else
1880		- if (event.getSource() == pasteExpandItem)
	2310	+ if (source == pasteCloneItem)
	2311	+ {
	2312	+ pasteInto(true, true);
	2313	+ } else
	2314	+ if (source == pasteExpandItem)
1881	2315	{
1882	2316	paste(true);
1883	2317	} else
1884		- if (event.getSource() == synchronizeItem)
	2318	+ if (source == synchronizeItem)
1885	2319	{
1886	2320	Overwrite(Object3D.TRANSFORM);
1887	2321	} else
1888		- if (event.getSource() == overwriteNameItem)
	2322	+ if (source == overwriteNameItem)
1889	2323	{
1890	2324	Overwrite(Object3D.NAME);
1891	2325	} else
1892		- if (event.getSource() == overwriteUVItem)
	2326	+ if (source == overwriteUVItem)
1893	2327	{
1894	2328	Overwrite(Object3D.UV);
1895	2329	} else
1896		- if (event.getSource() == overwriteMatItem)
	2330	+ if (source == overwriteMatItem)
1897	2331	{
	2332	+ /* july 2015
1898	2333	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2334	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2335	else
1901	2336	{
1902	2337	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2343,16 @@
1908	2343	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2344	}
1910	2345	}
	2346	+ */
	2347	+
	2348	+ Overwrite(dropAttributes);
1911	2349	}
1912		- if (event.getSource() == overwriteGeoItem)
	2350	+ if (source == overwriteGeoItem)
1913	2351	{
1914	2352	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2353	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2354	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2355	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2356	//
1919	2357	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2358	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2364,7 @@
1926	2364	// refreshContents();
1927	2365	// }
1928	2366	} else
1929		- if (event.getSource() == generateMeshItem)
	2367	+ if (source == generateMeshItem)
1930	2368	{
1931	2369	//if (group.selection.size() == 1)
1932	2370	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2375,7 @@
1937	2375	ResetModel();
1938	2376	refreshContents();
1939	2377	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2378	+ if (source == extractGeometriesItem)
1941	2379	{
1942	2380	boolean one = false;
1943	2381
..	..	@@ -1964,7 +2402,7 @@
1964	2402	ResetModel();
1965	2403	refreshContents();
1966	2404	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2405	+ if (source == cloneGeometriesItem)
1968	2406	{
1969	2407	boolean one = false;
1970	2408
..	..	@@ -1990,32 +2428,37 @@
1990	2428	ResetModel();
1991	2429	refreshContents();
1992	2430	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2431	+ if (source == shareGeometriesItem)
1994	2432	{
1995	2433	boolean one = false;
1996	2434
1997	2435	if (group.selection.size() == 1)
1998	2436	one = true;
1999	2437
	2438	+ Object3D merge = null;
	2439	+
2000	2440	Object3D content = new cGroup();
2001	2441
2002	2442	for (int i=0; i<group.selection.size(); i++)
2003	2443	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2444	+ merge = new Merge(group.selection.get(i));
2005	2445
2006	2446	if (one)
2007		- makeSomething(sel, false);
	2447	+ makeSomething(merge, false);
2008	2448	else
2009		- content.addChild(sel);
	2449	+ content.addChild(merge);
2010	2450	}
2011	2451
2012	2452	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2453	+ makeSomething(content, true);
	2454	+ else
	2455	+ {
	2456	+ ResetModel();
	2457	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2458	+ refreshContents();
	2459	+ }
2017	2460	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2461	+ if (source == mergeGeometriesItem)
2019	2462	{
2020	2463	boolean one = false;
2021	2464
..	..	@@ -2045,11 +2488,11 @@
2045	2488	ResetModel();
2046	2489	refreshContents();
2047	2490	} else
2048		- if (event.getSource() == linkverticesItem)
	2491	+ if (source == linkverticesItem)
2049	2492	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2493	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2494	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2495	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2496	//
2054	2497	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2498	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2501,48 @@
2058	2501	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2502	// refreshContents();
2060	2503	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2504	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2505	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2506	+ Object3D content = Grafreed.clipboard.get(0);
2064	2507
2065	2508	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2509	content = ((cGroup)content).get(0);
2067	2510
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2511	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2512	for (int i=0; i<group.selection.size(); i++)
2070	2513	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2514	+ boolean random = CameraPane.SWITCH;
	2515	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2516	group.selection.get(i).linkVerticesThis(content);
2074	2517	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2518	+ CameraPane.SWITCH = random;
2076	2519	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2520	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2521	refreshContents();
2079	2522	}
2080	2523	} else
2081		- if (event.getSource() == resetsupportItem)
	2524	+ if (source == resetsupportItem)
2082	2525	{
2083	2526	for (int i=0; i<group.selection.size(); i++)
2084	2527	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2528	+ boolean random = CameraPane.SWITCH;
	2529	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2530	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2531	+ CameraPane.SWITCH = random;
2089	2532	}
2090	2533
2091	2534	refreshContents();
2092	2535	} else
2093		- if (event.getSource() == resetreferencesItem)
	2536	+ if (source == relinkverticesItem)
	2537	+ {
	2538	+ boolean random = CameraPane.SWITCH;
	2539	+ CameraPane.SWITCH = false; // parse all random nodes
	2540	+ group.selection.RelinkToSupport();
	2541	+ CameraPane.SWITCH = random;
	2542	+
	2543	+ refreshContents();
	2544	+ } else
	2545	+ if (source == resetreferencesItem)
2094	2546	{
2095	2547	for (int i=0; i<group.selection.size(); i++)
2096	2548	{
..	..	@@ -2099,11 +2551,11 @@
2099	2551
2100	2552	refreshContents();
2101	2553	} else
2102		- if (event.getSource() == setMasterItem)
	2554	+ if (source == setMasterItem)
2103	2555	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2556	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2557	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2558	+ Object3D content = Grafreed.clipboard.get(0);
2107	2559
2108	2560	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2561	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2564,13 @@
2112	2564	refreshContents();
2113	2565	}
2114	2566	} else
2115		- if (event.getSource() == poseMeshItem)
	2567	+ if (source == poseMeshItem)
2116	2568	{
2117	2569	if (group.selection.size() == 1)
2118	2570	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2571	+ if (Grafreed.clipboard.size() == 1)
2120	2572	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2573	+ Object3D content = Grafreed.clipboard.get(0);
2122	2574
2123	2575	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2576	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2583,19 @@
2131	2583	}
2132	2584
2133	2585	} else
2134		- if (event.getSource() == revertMeshItem)
	2586	+ if (source == revertMeshItem)
2135	2587	{
2136	2588	RevertMeshes();
2137	2589	} else
2138		- if (event.getSource() == resetMeshItem)
	2590	+ if (source == resetAllItem)
2139	2591	{
2140	2592	ResetAll();
2141	2593	} else
2142		- if (event.getSource() == stepAllItem)
	2594	+ if (source == stepAllItem)
2143	2595	{
2144	2596	StepAll();
2145	2597	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2598	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2599	{
2148	2600	//int indices[] = jList.getSelectedIndices();
2149	2601	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2603,46 @@
2151	2603
2152	2604	ClearSelection(false);
2153	2605	} else
2154		- if (event.getSource() == clearAllItem)
	2606	+ if (source == clearAllItem)
2155	2607	{
2156	2608	ClearSelection(true);
2157	2609	} else
2158		- if (event.getSource() == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2159	2611	{
2160		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2161	2613	} else
2162		- if (event.getSource() == frontItem)
	2614	+ if (source == hideItem)
	2615	+ {
	2616	+ group(new HiddenObject());
	2617	+ } else
	2618	+ if (source == frontItem)
2163	2619	{
2164	2620	front();
2165	2621	} else
2166		- if (event.getSource() == backItem)
	2622	+ if (source == backItem)
2167	2623	{
2168	2624	back();
2169	2625	} else
2170		- if (event.getSource() == cameraItem)
	2626	+ if (source == cameraItem)
2171	2627	{
2172	2628	makeSomething(new Camera());
2173	2629	} else
2174		- if (event.getSource() == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2175	2631	{
2176	2632	group(new Composite());
2177	2633	} else
2178		- if (event.getSource() == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2179	2635	{
2180	2636	RandomNode random = new RandomNode();
2181	2637	group(random);
2182	2638	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2639	+ random.name = random.get(0).name + "Switch";
2184	2640	} else
2185		- if (event.getSource() == physicsItem)
	2641	+ if (source == physicsItem)
2186	2642	{
2187	2643	group(new PhysicsNode());
2188	2644	} else
2189		- if (event.getSource() == frameselectorItem)
	2645	+ if (source == frameselectorItem)
2190	2646	{
2191	2647	for (int i=0; i<group.selection.size(); i++)
2192	2648	{
..	..	@@ -2198,7 +2654,7 @@
2198	2654	ResetModel();
2199	2655	refreshContents();
2200	2656	} else
2201		- if (event.getSource() == switchGeoItem)
	2657	+ if (source == switchGeoItem)
2202	2658	{
2203	2659	for (int i=0; i<group.selection.size(); i++)
2204	2660	{
..	..	@@ -2210,7 +2666,7 @@
2210	2666	ResetModel();
2211	2667	refreshContents();
2212	2668	} else
2213		- if (event.getSource() == switchTransfoItem)
	2669	+ if (source == switchTransfoItem)
2214	2670	{
2215	2671	for (int i=0; i<group.selection.size(); i++)
2216	2672	{
..	..	@@ -2222,7 +2678,7 @@
2222	2678	ResetModel();
2223	2679	refreshContents();
2224	2680	} else
2225		- if (event.getSource() == morphItem)
	2681	+ if (source == morphItem)
2226	2682	{
2227	2683	for (int i=0; i<group.selection.size(); i++)
2228	2684	{
..	..	@@ -2234,7 +2690,7 @@
2234	2690	ResetModel();
2235	2691	refreshContents();
2236	2692	} else
2237		- if (event.getSource() == scriptNodeItem)
	2693	+ if (source == scriptNodeItem)
2238	2694	{
2239	2695	boolean atleastone = false;
2240	2696
..	..	@@ -2273,195 +2729,239 @@
2273	2729	}
2274	2730	}
2275	2731	} else
2276		- if (event.getSource() == linkerItem)
	2732	+ if (source == linkerItem)
2277	2733	{
2278	2734	group(new cLinker());
2279	2735	} else
2280		- if (event.getSource() == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2281	2737	{
2282	2738	group(new TextureNode());
2283	2739	} else
2284		- if (event.getSource() == shadowXItem)
	2740	+ if (source == billboardItem)
	2741	+ {
	2742	+ group(new BillboardNode());
	2743	+ } else
	2744	+ if (source == shadowXItem)
2285	2745	{
2286	2746	CastShadow(0);
2287	2747	} else
2288		- if (event.getSource() == shadowYItem)
	2748	+ if (source == shadowYItem)
2289	2749	{
2290	2750	CastShadow(1);
2291	2751	} else
2292		- if (event.getSource() == shadowZItem)
	2752	+ if (source == shadowZItem)
2293	2753	{
2294	2754	CastShadow(2);
2295	2755	} else
2296		- if (event.getSource() == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	2757	{
2298		- ungroup();
	2758	+ //ungroup();
	2759	+ for (int i=0; i<group.selection.size(); i++)
	2760	+ {
	2761	+ Ungroup(group.selection.get(i));
	2762	+ }
	2763	+
	2764	+ ClearSelection(false);
	2765	+
	2766	+ refreshContents();
2299	2767	} else
2300		- if (event.getSource() == genUVItem)
	2768	+ if (source == genUVItem)
2301	2769	{
2302	2770	GenUV();
2303	2771	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2772	+ if (source == genNormalsCADItem)
2305	2773	{
2306	2774	GenNormals(true);
2307	2775	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2776	+ if (source == genNormalsMESHItem)
	2777	+ {
	2778	+ GenNormalsMESH();
	2779	+ } else
	2780	+ if (source == genNormalsORGANItem)
2309	2781	{
2310	2782	GenNormals(false);
2311	2783	} else
2312		- if (event.getSource() == stripifyItem)
	2784	+ if (source == genNormalsMINEItem)
	2785	+ {
	2786	+ GenNormalsMINE();
	2787	+ } else
	2788	+ if (source == stripifyItem)
2313	2789	{
2314	2790	Stripify();
2315	2791	} else
2316		- if (event.getSource() == unstripifyItem)
	2792	+ if (source == unstripifyItem)
2317	2793	{
2318	2794	Unstripify();
2319	2795	} else
2320		- if (event.getSource() == trimItem)
	2796	+ if (source == trimItem)
2321	2797	{
2322	2798	Trim();
2323	2799	} else
2324		- if (event.getSource() == untrimItem)
	2800	+ if (source == untrimItem)
2325	2801	{
2326	2802	Untrim();
2327	2803	} else
2328		- if (event.getSource() == clearColorsItem)
	2804	+ if (source == clearColorsItem)
2329	2805	{
2330	2806	ClearColors();
2331	2807	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2808	+ if (source == clearMaterialsItem)
2333	2809	{
2334	2810	ClearMaterials();
2335	2811	} else
2336		- if (event.getSource() == liveleavesItem)
	2812	+ if (source == liveleavesItem)
2337	2813	{
2338	2814	LiveLeaves(true);
2339	2815	} else
2340		- if (event.getSource() == unliveleavesItem)
	2816	+ if (source == unliveleavesItem)
2341	2817	{
2342	2818	LiveLeaves(false);
2343	2819	} else
2344		- if (event.getSource() == supportleavesItem)
	2820	+ if (source == supportleavesItem)
2345	2821	{
2346	2822	SupportLeaves(true);
2347	2823	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2824	+ if (source == unsupportleavesItem)
2349	2825	{
2350	2826	SupportLeaves(false);
2351	2827	} else
2352		- if (event.getSource() == hideleavesItem)
	2828	+ if (source == hideleavesItem)
2353	2829	{
2354	2830	HideLeaves(true);
2355	2831	} else
2356		- if (event.getSource() == showleavesItem)
	2832	+ if (source == showleavesItem)
2357	2833	{
2358	2834	HideLeaves(false);
2359	2835	} else
2360		- if (event.getSource() == markleavesItem)
	2836	+ if (source == markleavesItem)
2361	2837	{
2362	2838	MarkLeaves(true);
2363	2839	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2840	+ if (source == unmarkleavesItem)
2365	2841	{
2366	2842	MarkLeaves(false);
2367	2843	} else
2368		- if (event.getSource() == flipVItem)
	2844	+ if (source == rewindleavesItem)
	2845	+ {
	2846	+ RewindLeaves(true);
	2847	+ } else
	2848	+ if (source == unrewindleavesItem)
	2849	+ {
	2850	+ RewindLeaves(false);
	2851	+ } else
	2852	+ if (source == randomleavesItem)
	2853	+ {
	2854	+ RandomLeaves(true);
	2855	+ } else
	2856	+ if (source == unrandomleavesItem)
	2857	+ {
	2858	+ RandomLeaves(false);
	2859	+ } else
	2860	+ if (source == flipVItem)
2369	2861	{
2370	2862	FlipV(true);
2371	2863	} else
2372		- if (event.getSource() == unflipVItem)
	2864	+ if (source == unflipVItem)
2373	2865	{
2374	2866	FlipV(false);
2375	2867	} else
2376		- if (event.getSource() == lowTexturesItem)
	2868	+ if (source == lowTexturesItem)
2377	2869	{
2378	2870	SetTexRes(0);
2379	2871	} else
2380		- if (event.getSource() == normalTexturesItem)
	2872	+ if (source == normalTexturesItem)
2381	2873	{
2382	2874	SetTexRes(1);
2383	2875	} else
2384		- if (event.getSource() == highTexturesItem)
	2876	+ if (source == highTexturesItem)
2385	2877	{
2386	2878	SetTexRes(2);
2387	2879	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2880	+ if (source == veryhighTexturesItem)
2389	2881	{
2390	2882	SetTexRes(3);
2391	2883	} else
2392		- if (event.getSource() == maxTexturesItem)
	2884	+ if (source == maxTexturesItem)
2393	2885	{
2394	2886	SetTexRes(4);
2395	2887	} else
2396		- if (event.getSource() == panoTexturesItem)
	2888	+ if (source == panoTexturesItem)
2397	2889	{
2398	2890	SetTexRes(5);
2399	2891	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2892	+ if (source == reverseNormalsItem)
2401	2893	{
2402	2894	ReverseNormals();
2403	2895	} else
2404		- if (event.getSource() == parseverticesItem)
	2896	+ if (source == parseverticesItem)
2405	2897	{
2406	2898	ParseVertices();
2407	2899	} else
2408		- if (event.getSource() == textureFieldItem)
	2900	+ if (source == textureFieldItem)
2409	2901	{
2410	2902	TextureVertices();
2411	2903	} else
2412		- if (event.getSource() == alignItem)
	2904	+ if (source == alignItem)
2413	2905	{
2414	2906	Align();
2415	2907	} else
2416		- if (event.getSource() == mirrorItem)
	2908	+ if (source == mirrorItem)
2417	2909	{
2418	2910	MirrorPoses();
2419	2911	} else
2420		- if (event.getSource() == reduceMorphItem)
	2912	+ if (source == reduceMorphItem)
2421	2913	{
2422	2914	MeshReduction(false);
2423	2915	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2916	+ if (source == reduce34MorphItem)
2425	2917	{
2426	2918	MeshReduction(true);
2427	2919	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2920	+ if (source == reverseTrianglesItem)
2429	2921	{
2430	2922	ReverseTriangles();
2431	2923	} else
2432		- if (event.getSource() == reduceMeshItem)
	2924	+ if (source == reduceMeshItem)
2433	2925	{
2434	2926	ReduceMesh(false);
2435	2927	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2928	+ if (source == reduce34MeshItem)
2437	2929	{
2438	2930	ReduceMesh(true);
2439	2931	} else
2440		- if (event.getSource() == increaseMeshItem)
	2932	+ if (source == increaseMeshItem)
2441	2933	{
2442	2934	IncreaseMesh();
2443	2935	} else
2444		- if (event.getSource() == clipMeshItem)
	2936	+ if (source == clipMeshItem)
2445	2937	{
2446	2938	ClipMesh();
2447	2939	} else
2448		- if (event.getSource() == smoothMeshItem)
	2940	+ if (source == smoothMeshItem)
2449	2941	{
2450	2942	SmoothMesh();
2451	2943	} else
2452		- if (event.getSource() == transformgeometryItem)
	2944	+ if (source == transformGeometryItem)
2453	2945	{
2454	2946	TransformGeometry();
2455	2947	} else
2456		- if (event.getSource() == resetTransformItem)
	2948	+ if (source == transformChildrenItem)
	2949	+ {
	2950	+ TransformChildren();
	2951	+ } else
	2952	+ if (source == resetTransformItem)
2457	2953	{
2458	2954	ResetTransform();
2459	2955	} else
2460		- if (event.getSource() == resetCentroidItem)
	2956	+ if (source == resetCentroidItem)
2461	2957	{
2462		- ResetCentroid();
	2958	+ ResetCentroid(true);
2463	2959	} else
2464		- if (event.getSource() == resetParentItem)
	2960	+ if (source == resetCentroidXZItem)
	2961	+ {
	2962	+ ResetCentroid(false);
	2963	+ } else
	2964	+ if (source == resetParentItem)
2465	2965	{
2466	2966	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	2967	{
..	..	@@ -2471,7 +2971,7 @@
2471	2971
2472	2972	refreshContents();
2473	2973	} else
2474		- if (event.getSource() == repairParentItem)
	2974	+ if (source == repairParentItem)
2475	2975	{
2476	2976	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	2977	{
..	..	@@ -2485,7 +2985,21 @@
2485	2985
2486	2986	refreshContents();
2487	2987	} else
2488		- if (event.getSource() == sortbysizeItem)
	2988	+ if (source == repairShadowItem)
	2989	+ {
	2990	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	2991	+ {
	2992	+ Object3D obj = (Object3D)e.nextElement();
	2993	+ obj.RepairShadow();
	2994	+// for (int i=0; i<obj.size(); i++)
	2995	+// {
	2996	+// obj.get(i).parent = obj;
	2997	+// }
	2998	+ }
	2999	+
	3000	+ refreshContents();
	3001	+ } else
	3002	+ if (source == sortbysizeItem)
2489	3003	{
2490	3004	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3005	{
..	..	@@ -2497,7 +3011,7 @@
2497	3011	ResetModel();
2498	3012	refreshContents();
2499	3013	} else
2500		- if (event.getSource() == sortbynameItem)
	3014	+ if (source == sortbynameItem)
2501	3015	{
2502	3016	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3017	{
..	..	@@ -2509,7 +3023,7 @@
2509	3023	ResetModel();
2510	3024	refreshContents();
2511	3025	} else
2512		- if (event.getSource() == attachPigmentItem)
	3026	+ if (source == attachPigmentItem)
2513	3027	{
2514	3028	String texture = GetFile("Attach pigment");
2515	3029	Object3D obj;
..	..	@@ -2521,7 +3035,7 @@
2521	3035
2522	3036	refreshContents();
2523	3037	} else
2524		- if (event.getSource() == detachPigmentItem)
	3038	+ if (source == detachPigmentItem)
2525	3039	{
2526	3040	Object3D obj;
2527	3041	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3046,7 @@
2532	3046
2533	3047	refreshContents();
2534	3048	} else
2535		- if (event.getSource() == attachBumpItem)
	3049	+ if (source == attachBumpItem)
2536	3050	{
2537	3051	String texture = GetFile("Attach bump");
2538	3052	Object3D obj;
..	..	@@ -2544,7 +3058,7 @@
2544	3058
2545	3059	refreshContents();
2546	3060	} else
2547		- if (event.getSource() == detachBumpItem)
	3061	+ if (source == detachBumpItem)
2548	3062	{
2549	3063	Object3D obj;
2550	3064	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +3069,7 @@
2555	3069
2556	3070	refreshContents();
2557	3071	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3072	+ if (source == pigmentBumpItem)
2559	3073	{
2560	3074	Object3D obj;
2561	3075	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +3080,237 @@
2566	3080
2567	3081	refreshContents();
2568	3082	} else
2569		- if (event.getSource() == flashSelectionButton)
	3083	+ if (source == flashSelectionButton)
2570	3084	{
2571	3085	CameraPane.flash = true;
2572	3086	refreshContents();
2573	3087	} else
2574		- if (event.getSource() == oneButton)
	3088	+ if (source == oneButton)
2575	3089	{
2576	3090	} else
2577		- if (event.getSource() == twoButton)
	3091	+ if (source == twoButton)
2578	3092	{
2579	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2580	3098	// bug
2581	3099	//gridPanel.setDividerLocation(1.0);
2582	3100	//bigPanel.setDividerLocation(0.0);
2583		- bigThree.remove(jtp);
2584		- bigThree.remove(cameraPanel);
2585		- bigThree.remove(XYZPanel);
2586		- aWindowConstraints.gridx = 0;
2587		- aWindowConstraints.gridy = 0;
2588		- aWindowConstraints.gridwidth = 1;
2589		- // aConstraints.gridheight = 3;
2590		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2591		- aWindowConstraints.weightx = 0;
2592		- aWindowConstraints.weighty = 1;
2593		- //bigThree.add(jtp, aWindowConstraints);
2594		- aWindowConstraints.weightx = 1;
2595		- aWindowConstraints.gridwidth = 3;
2596		- // aConstraints.gridheight = 3;
2597		- aWindowConstraints.gridx = 1;
2598		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2599		- bigThree.add(cameraPanel, aWindowConstraints);
2600		- aWindowConstraints.weightx = 0;
2601		- aWindowConstraints.gridx = 4;
2602		- aWindowConstraints.gridwidth = 1;
2603		- // aConstraints.gridheight = 3;
2604		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2605		- //bigThree.add(XYZPanel, aWindowConstraints);
2606		- bigThree.revalidate();
	3101	+// bigThree.remove(scenePanel);
	3102	+// bigThree.remove(centralPanel);
	3103	+// bigThree.remove(XYZPanel);
	3104	+// aWindowConstraints.gridx = 0;
	3105	+// aWindowConstraints.gridy = 0;
	3106	+// aWindowConstraints.gridwidth = 1;
	3107	+// // aConstraints.gridheight = 3;
	3108	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3109	+// aWindowConstraints.weightx = 0;
	3110	+// aWindowConstraints.weighty = 1;
	3111	+// //bigThree.add(jtp, aWindowConstraints);
	3112	+// aWindowConstraints.weightx = 1;
	3113	+// aWindowConstraints.gridwidth = 3;
	3114	+// // aConstraints.gridheight = 3;
	3115	+// aWindowConstraints.gridx = 1;
	3116	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3117	+// bigThree.add(centralPanel, aWindowConstraints);
	3118	+// aWindowConstraints.weightx = 0;
	3119	+// aWindowConstraints.gridx = 4;
	3120	+// aWindowConstraints.gridwidth = 1;
	3121	+// // aConstraints.gridheight = 3;
	3122	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3123	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3124	+// scenePanel.setVisible(false);
	3125	+// centralPanel.setVisible(true);
	3126	+// XYZPanel.setVisible(false);
	3127	+ bigThree.ClearUI();
	3128	+ bigThree.add(centralPanel);
	3129	+ bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2607	3148	} else
2608		- if (event.getSource() == threeButton)
	3149	+ if (source == threeButton)
2609	3150	{
2610	3151	radio.layout = threeButton;
2611		- bigThree.remove(jtp);
2612		- bigThree.remove(cameraPanel);
2613		- bigThree.remove(XYZPanel);
2614		- aWindowConstraints.gridx = 0;
2615		- aWindowConstraints.gridy = 0;
2616		- aWindowConstraints.gridwidth = 1;
2617		- // aConstraints.gridheight = 3;
2618		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2619		- aWindowConstraints.weightx = 0;
2620		- aWindowConstraints.weighty = 1;
2621		- //bigThree.add(jtp, aWindowConstraints);
2622		- aWindowConstraints.weightx = 1;
2623		- aWindowConstraints.gridwidth = 3;
2624		- // aConstraints.gridheight = 3;
2625		- aWindowConstraints.gridx = 1;
2626		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2627		- bigThree.add(cameraPanel, aWindowConstraints);
2628		- aWindowConstraints.weightx = 0;
2629		- aWindowConstraints.gridx = 4;
2630		- aWindowConstraints.gridwidth = 1;
2631		- // aConstraints.gridheight = 3;
2632		- aConstraints.fill = GridBagConstraints.VERTICAL;
2633		- bigThree.add(XYZPanel, aWindowConstraints);
2634		- bigThree.revalidate();
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
	3155	+
	3156	+// bigThree.remove(scenePanel);
	3157	+// bigThree.remove(centralPanel);
	3158	+// bigThree.remove(XYZPanel);
	3159	+// aWindowConstraints.gridx = 0;
	3160	+// aWindowConstraints.gridy = 0;
	3161	+// aWindowConstraints.gridwidth = 1;
	3162	+// // aConstraints.gridheight = 3;
	3163	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3164	+// aWindowConstraints.weightx = 0;
	3165	+// aWindowConstraints.weighty = 1;
	3166	+// //bigThree.add(jtp, aWindowConstraints);
	3167	+// aWindowConstraints.weightx = 1;
	3168	+// aWindowConstraints.gridwidth = 3;
	3169	+// // aConstraints.gridheight = 3;
	3170	+// aWindowConstraints.gridx = 1;
	3171	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3172	+// bigThree.add(centralPanel, aWindowConstraints);
	3173	+// aWindowConstraints.weightx = 0;
	3174	+// aWindowConstraints.gridx = 4;
	3175	+// aWindowConstraints.gridwidth = 1;
	3176	+// // aConstraints.gridheight = 3;
	3177	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3178	+// bigThree.add(XYZPanel, aWindowConstraints);
	3179	+// bigThree.validate();
	3180	+// scenePanel.setVisible(false);
	3181	+// centralPanel.setVisible(true);
	3182	+// XYZPanel.setVisible(true);
	3183	+ bigThree.ClearUI();
	3184	+ bigThree.add(centralPanel);
	3185	+ bigThree.add(XYZPanel);
	3186	+ bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2635	3189	} else
2636		- if (event.getSource() == fourButton)
	3190	+ if (source == fourButton)
2637	3191	{
2638	3192	radio.layout = fourButton;
2639		- bigThree.remove(jtp);
2640		- bigThree.remove(cameraPanel);
2641		- bigThree.remove(XYZPanel);
2642		- aWindowConstraints.gridx = 0;
2643		- aWindowConstraints.gridy = 0;
2644		- aWindowConstraints.gridwidth = 1;
2645		- // aWindowConstraints.gridheight = 3;
2646		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2647		- aWindowConstraints.weightx = 1;
2648		- aWindowConstraints.weighty = 1;
2649		- bigThree.add(jtp, aWindowConstraints);
2650		- aWindowConstraints.weightx = 1;
2651		- aWindowConstraints.gridwidth = 3;
2652		- // aConstraints.gridheight = 3;
2653		- aWindowConstraints.gridx = 1;
2654		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2655		- //bigThree.add(cameraPanel, aWindowConstraints);
2656		- aWindowConstraints.weightx = 0;
2657		- aWindowConstraints.gridx = 4;
2658		- aWindowConstraints.gridwidth = 1;
2659		- // aWindowConstraints.gridheight = 3;
2660		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2661		- //bigThree.add(XYZPanel, aWindowConstraints);
2662		- bigThree.revalidate();
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
	3196	+
	3197	+// bigThree.remove(scenePanel);
	3198	+// bigThree.remove(centralPanel);
	3199	+// bigThree.remove(XYZPanel);
	3200	+// aWindowConstraints.gridx = 0;
	3201	+// aWindowConstraints.gridy = 0;
	3202	+// aWindowConstraints.gridwidth = 1;
	3203	+// // aWindowConstraints.gridheight = 3;
	3204	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3205	+// aWindowConstraints.weightx = 1;
	3206	+// aWindowConstraints.weighty = 1;
	3207	+// bigThree.add(scenePanel, aWindowConstraints);
	3208	+// aWindowConstraints.weightx = 1;
	3209	+// aWindowConstraints.gridwidth = 3;
	3210	+// // aConstraints.gridheight = 3;
	3211	+// aWindowConstraints.gridx = 1;
	3212	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3213	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3214	+// aWindowConstraints.weightx = 0;
	3215	+// aWindowConstraints.gridx = 4;
	3216	+// aWindowConstraints.gridwidth = 1;
	3217	+// // aWindowConstraints.gridheight = 3;
	3218	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3219	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3220	+// bigThree.validate();
	3221	+// scenePanel.setVisible(true);
	3222	+// centralPanel.setVisible(false);
	3223	+// XYZPanel.setVisible(false);
	3224	+ bigThree.ClearUI();
	3225	+ bigThree.add(scenePanel);
	3226	+ bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2663	3229	} else
2664		- if (event.getSource() == sixButton)
	3230	+ if (source == sixButton)
2665	3231	{
2666	3232	radio.layout = sixButton;
2667		- bigThree.remove(jtp);
2668		- bigThree.remove(cameraPanel);
2669		- bigThree.remove(XYZPanel);
2670		- aWindowConstraints.gridx = 0;
2671		- aWindowConstraints.gridy = 0;
2672		- aWindowConstraints.gridwidth = 1;
2673		- // aConstraints.gridheight = 3;
2674		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2675		- aWindowConstraints.weightx = 0;
2676		- aWindowConstraints.weighty = 1;
2677		- bigThree.add(jtp, aWindowConstraints);
2678		- aWindowConstraints.weightx = 1;
2679		- aWindowConstraints.gridwidth = 3;
2680		- // aWindowConstraints.gridheight = 3;
2681		- aWindowConstraints.gridx = 1;
2682		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2683		- bigThree.add(cameraPanel, aWindowConstraints);
2684		- aWindowConstraints.weightx = 0;
2685		- aWindowConstraints.gridx = 4;
2686		- aWindowConstraints.gridwidth = 1;
2687		- // aWindowConstraints.gridheight = 3;
2688		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2689		- //bigThree.add(XYZPanel, aConstraints);
2690		- bigThree.revalidate();
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
	3236	+
	3237	+// bigThree.remove(scenePanel);
	3238	+// bigThree.remove(centralPanel);
	3239	+// bigThree.remove(XYZPanel);
	3240	+// aWindowConstraints.gridx = 0;
	3241	+// aWindowConstraints.gridy = 0;
	3242	+// aWindowConstraints.gridwidth = 1;
	3243	+// // aConstraints.gridheight = 3;
	3244	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3245	+// aWindowConstraints.weightx = 0;
	3246	+// aWindowConstraints.weighty = 1;
	3247	+// bigThree.add(scenePanel, aWindowConstraints);
	3248	+// aWindowConstraints.weightx = 1;
	3249	+// aWindowConstraints.gridwidth = 3;
	3250	+// // aWindowConstraints.gridheight = 3;
	3251	+// aWindowConstraints.gridx = 1;
	3252	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3253	+// bigThree.add(centralPanel, aWindowConstraints);
	3254	+// aWindowConstraints.weightx = 0;
	3255	+// aWindowConstraints.gridx = 4;
	3256	+// aWindowConstraints.gridwidth = 1;
	3257	+// // aWindowConstraints.gridheight = 3;
	3258	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3259	+// //bigThree.add(XYZPanel, aConstraints);
	3260	+// bigThree.validate();
	3261	+// scenePanel.setVisible(true);
	3262	+// centralPanel.setVisible(true);
	3263	+// XYZPanel.setVisible(false);
	3264	+ bigThree.ClearUI();
	3265	+ bigThree.add(scenePanel);
	3266	+ bigThree.add(centralPanel);
	3267	+ bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
2691	3270	} else
2692		- if (event.getSource() == sevenButton)
	3271	+ if (source == sevenButton)
2693	3272	{
2694	3273	radio.layout = sevenButton;
2695		- bigThree.remove(jtp);
2696		- bigThree.remove(cameraPanel);
2697		- bigThree.remove(XYZPanel);
2698		- aWindowConstraints.gridx = 0;
2699		- aWindowConstraints.gridy = 0;
2700		- aWindowConstraints.gridwidth = 1;
2701		- // aWindowConstraints.gridheight = 3;
2702		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2703		- aWindowConstraints.weightx = 0;
2704		- aWindowConstraints.weighty = 1;
2705		- bigThree.add(jtp, aWindowConstraints);
2706		- aWindowConstraints.weightx = 1;
2707		- aWindowConstraints.gridwidth = 3;
2708		- // aWindowConstraints.gridheight = 3;
2709		- aWindowConstraints.gridx = 1;
2710		- aWindowConstraints.fill = GridBagConstraints.BOTH;
2711		- bigThree.add(cameraPanel, aWindowConstraints);
2712		- aWindowConstraints.weightx = 0;
2713		- aWindowConstraints.gridx = 4;
2714		- aWindowConstraints.gridwidth = 1;
2715		- // aConstraints.gridheight = 3;
2716		- aWindowConstraints.fill = GridBagConstraints.VERTICAL;
2717		- bigThree.add(XYZPanel, aWindowConstraints);
2718		- bigThree.revalidate();
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
	3277	+
	3278	+// bigThree.remove(scenePanel);
	3279	+// bigThree.remove(centralPanel);
	3280	+// bigThree.remove(XYZPanel);
	3281	+// aWindowConstraints.gridx = 0;
	3282	+// aWindowConstraints.gridy = 0;
	3283	+// aWindowConstraints.gridwidth = 1;
	3284	+// // aWindowConstraints.gridheight = 3;
	3285	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3286	+// aWindowConstraints.weightx = 0;
	3287	+// aWindowConstraints.weighty = 1;
	3288	+// bigThree.add(scenePanel, aWindowConstraints);
	3289	+// aWindowConstraints.weightx = 1;
	3290	+// aWindowConstraints.gridwidth = 3;
	3291	+// // aWindowConstraints.gridheight = 3;
	3292	+// aWindowConstraints.gridx = 1;
	3293	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3294	+// bigThree.add(centralPanel, aWindowConstraints);
	3295	+// aWindowConstraints.weightx = 0;
	3296	+// aWindowConstraints.gridx = 4;
	3297	+// aWindowConstraints.gridwidth = 1;
	3298	+// // aConstraints.gridheight = 3;
	3299	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3300	+// bigThree.add(XYZPanel, aWindowConstraints);
	3301	+// bigThree.validate();
	3302	+// scenePanel.setVisible(true);
	3303	+// centralPanel.setVisible(true);
	3304	+// XYZPanel.setVisible(true);
	3305	+ bigThree.ClearUI();
	3306	+ bigThree.add(scenePanel);
	3307	+ bigThree.add(centralPanel);
	3308	+ bigThree.add(XYZPanel);
	3309	+ bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
2719	3312	} else
2720		- if (event.getSource() == rootButton)
	3313	+ if (source == rootButton)
2721	3314	{
2722	3315	Object3D obj;
2723	3316	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,66 +3320,84 @@
2727	3320	EditObject(obj);
2728	3321	}
2729	3322
	3323	+ cameraView.requestFocusInWindow();
2730	3324	refreshContents(true);
2731	3325	} else
2732		- if (event.getSource() == closeButton)
	3326	+ if (source == closeButton)
2733	3327	{
2734	3328	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3329	cRadio ab;
2736	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3331	{
2738	3332	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
2741	3341	buttonGroup.remove(ab);
2742	3342	radioPanel.remove(ab);
2743	3343
2744		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
2745	3346	// ab.GetObject().objectUI = null; // ?????????
2746	3347
2747	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3349	break;
2749	3350	}
2750	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
2751	3354	refreshContents(true);
2752	3355	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3356	+ if (source == editItem \|\| source == editButton)
2754	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
2755	3364	EditSelection(false);
2756	3365	} else
2757		- if (event.getSource() == uneditButton)
	3366	+ if (source == uneditButton)
2758	3367	{
2759	3368	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3369	{
2761	3370	Object3D child = (Object3D)e.nextElement();
2762	3371	if(child.editWindow != null)
2763	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
2764	3374	child.CloseUI();
2765	3375	listUI.remove(child);
2766	3376
2767		- child.editWindow = null; // ???????????
	3377	+ //child.editWindow = null; // ???????????
2768	3378	}
2769		- objEditor.ctrlPanel.revalidate();
	3379	+ objEditor.ctrlPanel.FlushUI();
2770	3380	//objEditor.jTree.clearSelection();
2771	3381	//objEditor.ResetSliders();
2772	3382	refreshContents(true);
2773	3383	} else
2774		- if (event.getSource() == clearPanelButton)
	3384	+ if (source == clearPanelButton)
2775	3385	{
2776	3386	assert(copy == group);
2777	3387	//copy.ClearUI();
2778	3388	for (Object3D obj : listUI)
2779	3389	{
	3390	+ obj.pinned = false;
2780	3391	obj.CloseUI();
2781	3392	}
2782	3393	listUI.clear();
2783	3394	refreshContents(true);
2784	3395	} else
2785		- if (event.getSource() == allParamsButton)
	3396	+ if (source == allParamsButton)
2786	3397	{
2787	3398	assert(copy == group);
2788	3399
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	3401
2791	3402	for (Object3D obj : listUI)
2792	3403	{
..	..	@@ -2803,19 +3414,19 @@
2803	3414
2804	3415	refreshContents(true);
2805	3416	} else
2806		- if (event.getSource() == unselectButton)
	3417	+ if (source == unselectButton)
2807	3418	{
2808	3419	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3420	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3421	objEditor.ResetSliders();
2811	3422	refreshContents(true);
2812	3423	} else
2813		- if(event.getSource() instanceof cRadio)
	3424	+ if(source instanceof cRadio)
2814	3425	{
2815	3426	group.parent = keepparent;
2816	3427	group.attributes = 0;
2817	3428	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3429	+ /cRadio/ radio = (cRadio)source;
2819	3430	Object3D obj = radio.GetObject();
2820	3431	System.out.println("Edit " + obj);
2821	3432	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3446,7 @@
2835	3446	}
2836	3447
2837	3448	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3449	+ //Globals.theRenderer.object = group;
2839	3450	if(!useclient)
2840	3451	{
2841	3452	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +3455,50 @@
2844	3455	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3456	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3457	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3458	+ //cameraView.lighttouched = true;
	3459	+ Globals.lighttouched = true;
2848	3460	topView.object = group;
2849	3461	frontView.object = group;
2850	3462	sideView.object = group;
2851	3463	}
2852		- group.editWindow = this;
	3464	+
	3465	+// fix "+" issue
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
	3468	+
2853	3469	/*
2854	3470	currentLayout = radio.layout;
2855	3471	if (currentLayout == null)
2856	3472	currentLayout = sevenButton;
2857	3473	*/
2858	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
2859	3480	keepparent = group.parent;
2860	3481	// PARENT = NULL or not???
2861	3482	//group.parent = null; // ROOT
2862	3483	//group.attributes = -1;
2863	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
2864	3487	refreshContents(true);
2865		- }
	3488	+ } else if (event.getSource() == editCameraItem)
	3489	+ {
	3490	+ cameraView.ProtectCamera();
	3491	+ cameraView.repaint();
	3492	+ return;
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3494	+ {
	3495	+ cameraView.RevertCamera();
	3496	+ cameraView.repaint();
	3497	+ return;
	3498	+ // } else if (event.getSource() == textureButton)
	3499	+ // {
	3500	+ // return; // true;
	3501	+ }
2866	3502	else
2867	3503	{
2868	3504	//return super.action(event, arg);
..	..	@@ -2871,7 +3507,6 @@
2871	3507	}
2872	3508
2873	3509	boolean useclient = false;
2874		- cRadio radio;
2875	3510
2876	3511	void ToggleRoot()
2877	3512	{
..	..	@@ -2880,7 +3515,7 @@
2880	3515	if (useclient)
2881	3516	{
2882	3517	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3518	+ Globals.lighttouched = true;
2884	3519	//topView.object = client;
2885	3520	//frontView.object = client;
2886	3521	//sideView.object = client;
..	..	@@ -2888,7 +3523,7 @@
2888	3523	else
2889	3524	{
2890	3525	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3526	+ Globals.lighttouched = true;
2892	3527	//topView.object = group;
2893	3528	//frontView.object = group;
2894	3529	//sideView.object = group;
..	..	@@ -2923,6 +3558,28 @@
2923	3558	refreshContents();
2924	3559	}
2925	3560
	3561	+ void TransformChildren()
	3562	+ {
	3563	+ Object3D obj;
	3564	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3565	+ {
	3566	+ obj = (Object3D)e.nextElement();
	3567	+ obj.KeepTextureMatrices();
	3568	+ obj.TransformChildren();
	3569	+ obj.RestoreTextureMatrices();
	3570	+
	3571	+// if (obj.parent == null)
	3572	+// {
	3573	+// System.out.println("NULL PARENT!");
	3574	+// new Exception().printStackTrace();
	3575	+// }
	3576	+// else
	3577	+// TouchTransform(obj);
	3578	+// //obj.parent.Touch();
	3579	+ }
	3580	+
	3581	+ refreshContents();
	3582	+ }
2926	3583
2927	3584	void ResetTransform()
2928	3585	{
..	..	@@ -3035,7 +3692,7 @@
3035	3692	refreshContents();
3036	3693	}
3037	3694
3038		- void ResetCentroid()
	3695	+ void ResetCentroid(boolean full)
3039	3696	{
3040	3697	Object3D obj;
3041	3698	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3707,16 @@
3050	3707	LA.matIdentity(Object3D.mat);
3051	3708	obj.getBounds(minima, maxima, false);
3052	3709	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3710	+ if (full)
	3711	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3712	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3713	obj.TransformMesh(Object3D.mat);
	3714	+
3056	3715	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3716	+ if (full)
	3717	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3718	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3719	+
3059	3720	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3721	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3722	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3745,8 @@
3084	3745
3085	3746	int size = obj.MemorySize();
3086	3747
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	3748	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3749	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	3750	}
3089	3751	}
3090	3752	catch (Exception e)
..	..	@@ -3121,9 +3783,9 @@
3121	3783	obj = (Object3D)e.nextElement();
3122	3784
3123	3785	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3786	+ Grafreed.AnalyzeObject(obj);
3125	3787	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3788	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3789
3128	3790	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3791	}
..	..	@@ -3165,6 +3827,20 @@
3165	3827	void GenNormals(boolean crease)
3166	3828	{
3167	3829	group.GenNormalsS(crease);
	3830	+
	3831	+ refreshContents();
	3832	+ }
	3833	+
	3834	+ void GenNormalsMESH()
	3835	+ {
	3836	+ group.GenNormalsMeshS();
	3837	+
	3838	+ refreshContents();
	3839	+ }
	3840	+
	3841	+ void GenNormalsMINE()
	3842	+ {
	3843	+ group.selection.GenNormalsMINE();
3168	3844
3169	3845	refreshContents();
3170	3846	}
..	..	@@ -3250,7 +3926,7 @@
3250	3926	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3927	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3928	//
3253		-// g.add(GraphreeD.clipboard);
	3929	+// g.add(GrafreeD.clipboard);
3254	3930	//
3255	3931	// buffer.add(g);
3256	3932	// }
..	..	@@ -3269,8 +3945,8 @@
3269	3945	// nodes = new Object3D();
3270	3946	// vertices = new Vector<Vertex>();
3271	3947	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	3948	+// boolean epsequal = GrafreeD.epsequal;
	3949	+// GrafreeD.epsequal = true;
3274	3950	//
3275	3951	// for (int i=0; i<group.selection.size(); i++)
3276	3952	// {
..	..	@@ -3311,7 +3987,7 @@
3311	3987	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	3988	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	3989	//
3314		-// g.add(GraphreeD.clipboard);
	3990	+// g.add(GrafreeD.clipboard);
3315	3991	//
3316	3992	// buffer.add(g);
3317	3993	// }
..	..	@@ -3319,7 +3995,7 @@
3319	3995	// makeSomething(buffer, i==group.selection.size()-1);
3320	3996	// }
3321	3997	//
3322		-// GraphreeD.epsequal = epsequal;
	3998	+// GrafreeD.epsequal = epsequal;
3323	3999	//
3324	4000	// //buffer = null;
3325	4001	// temprep = null;
..	..	@@ -3330,8 +4006,8 @@
3330	4006
3331	4007	void ParseVertices()
3332	4008	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4009	+ boolean epsequal = Grafreed.epsequal;
	4010	+ Grafreed.epsequal = true;
3335	4011
3336	4012	for (int i=0; i<group.selection.size(); i++)
3337	4013	{
..	..	@@ -3356,7 +4032,7 @@
3356	4032	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4033	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4034
3359		- g.add(GraphreeD.clipboard);
	4035	+ g.add(Grafreed.clipboard);
3360	4036
3361	4037	buffer.add(g);
3362	4038	}
..	..	@@ -3371,7 +4047,7 @@
3371	4047	makeSomething(buffer, i==group.selection.size()-1);
3372	4048	}
3373	4049
3374		- GraphreeD.epsequal = epsequal;
	4050	+ Grafreed.epsequal = epsequal;
3375	4051
3376	4052	refreshContents();
3377	4053	}
..	..	@@ -3389,7 +4065,16 @@
3389	4065	String pigment = Object3D.GetPigment(tex);
3390	4066	//String bump = Object3D.GetBump(tex);
3391	4067
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4068	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4069	+
	4070	+ try
	4071	+ {
	4072	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4073	+ }
	4074	+ catch (Exception e)
	4075	+ {
	4076	+ System.err.println("FAIL: " + node);
	4077	+ }
3393	4078
3394	4079	double s = v.s;
3395	4080
..	..	@@ -3416,7 +4101,7 @@
3416	4101	scale /= 3;
3417	4102
3418	4103	scale /= 0xFF;
3419		- scale /= 4;
	4104	+ // c'est quoi ca? scale /= 4;
3420	4105
3421	4106	//v.AO = scale;
3422	4107
..	..	@@ -3437,12 +4122,26 @@
3437	4122
3438	4123	void Align()
3439	4124	{
	4125	+ if (group.selection.size() == 0)
	4126	+ return;
	4127	+
	4128	+ cVector bbmin = new cVector();
	4129	+ cVector bbmax = new cVector();
	4130	+
	4131	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4132	+
	4133	+ double dx = bbmax.x - bbmin.x;
	4134	+ double dy = bbmax.y - bbmin.y;
	4135	+ double dz = bbmax.z - bbmin.z;
	4136	+
	4137	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4138	+
3440	4139	for (int i=0; i<group.selection.size(); i++)
3441	4140	{
3442	4141	Object3D obj = group.selection.get(i);
3443	4142
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4143	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4144	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4145	}
3447	4146
3448	4147	refreshContents();
..	..	@@ -3455,7 +4154,7 @@
3455	4154	// ref.SaveSupports();
3456	4155	// Object3D par = ref.parent;
3457	4156	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4157	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4158	// ref.parent = par;
3460	4159	// ref.RestoreSupports();
3461	4160
..	..	@@ -3463,11 +4162,11 @@
3463	4162
3464	4163	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4164
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4165	+ boolean random = CameraPane.SWITCH;
	4166	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4167	lowres.linkVerticesThis(null);
3469	4168	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4169	+ CameraPane.SWITCH = random;
3471	4170
3472	4171	System.err.flush();
3473	4172
..	..	@@ -3485,7 +4184,7 @@
3485	4184	// lowres.SaveSupports();
3486	4185	// par = lowres.parent;
3487	4186	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4187	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4188	Object3D newlow = CloneObject(lowres, false);
3490	4189	newlow.name = sn.switchobject.get(i).name;
3491	4190	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4206,7 @@
3507	4206	return;
3508	4207
3509	4208	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4209	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4210
3512	4211	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4212
..	..	@@ -3676,7 +4375,7 @@
3676	4375	group.selection.RelinkToSupport(); // july 2014
3677	4376	System.out.println("DONE.");
3678	4377	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4378	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4379	}
3681	4380
3682	4381	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4400,20 @@
3701	4400
3702	4401	void ClipMesh()
3703	4402	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4403	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4404	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4405	+ Object3D content = Grafreed.clipboard.get(0);
3707	4406
3708	4407	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4408	content = ((cGroup)content).get(0);
3710	4409
3711	4410	// for (int i=0; i<group.selection.size(); i++)
3712	4411	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4412	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4413	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4414	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4415	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4416	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4417	System.out.println("DONE.");
3719	4418	refreshContents();
3720	4419	}
..	..	@@ -3759,6 +4458,18 @@
3759	4458	void MarkLeaves(boolean hide)
3760	4459	{
3761	4460	group.selection.MarkLeaves(hide);
	4461	+ refreshContents();
	4462	+ }
	4463	+
	4464	+ void RewindLeaves(boolean hide)
	4465	+ {
	4466	+ group.selection.RewindLeaves(hide);
	4467	+ refreshContents();
	4468	+ }
	4469	+
	4470	+ void RandomLeaves(boolean hide)
	4471	+ {
	4472	+ group.selection.RandomLeaves(hide);
3762	4473	refreshContents();
3763	4474	}
3764	4475
..	..	@@ -3833,10 +4544,6 @@
3833	4544	// }
3834	4545	// }
3835	4546
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	4547	void EditSelection(boolean newWindow)
3841	4548	{
3842	4549	// aConstraints.gridy = 0;
..	..	@@ -3844,10 +4551,10 @@
3844	4551	{
3845	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4555
3849	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4557	+ if(elem != group \|\| !newWindow)
3851	4558	{
3852	4559	// if (!(elem instanceof Composite))
3853	4560	// newWindow = false;
..	..	@@ -3929,7 +4636,8 @@
3929	4636	//new Exception().printStackTrace();
3930	4637
3931	4638	freezemodel = true;
3932		-
	4639	+ ClearUnpinned();
	4640	+
3933	4641	/**/
3934	4642	//switch (event.id)
3935	4643	{
..	..	@@ -3937,7 +4645,6 @@
3937	4645	//case 702: // Event.LIST_DESELECT
3938	4646	group.deselectAll();
3939	4647	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	4648	if (tps != null)
3942	4649	{
3943	4650	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +4653,39 @@
3946	4653
3947	4654	//if (child.parent != null)
3948	4655	//child.parent.addSelectee(child);
	4656	+ objEditor.SetMaterial(child);
3949	4657	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	4658	}
3954	4659	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4660	+// else
	4661	+// {
	4662	+// objEditor.SetMaterial(group); // .GetMaterial());
	4663	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4664	+// System.err.println("info : " + group.GetPath());
	4665	+// }
3961	4666
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4667	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	4668	CameraPane.flash = true;
3966	4669
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4670	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4671	// a camera
3969	4672	{
3970		- CameraPane.camerachangeframe = 0; // don't refuse it
3971		- CameraPane.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
3972		- // CameraPane.theRenderer.renderCamera = CameraPane.theRenderer.manipCamera;
3973		- // CameraPane.theRenderer.eyeCamera = CameraPane.theRenderer.manipCamera;
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4674	+ {
	4675	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4676	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4677	+ }
	4678	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4679	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4680	}
3975	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
3976	4689	refreshContents();
3977	4690	//return true;
3978	4691	}
..	..	@@ -3981,6 +4694,35 @@
3981	4694
3982	4695	freezemodel = false;
3983	4696	}
	4697	+
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
	4706	+ void refreshContents(boolean cp)
	4707	+ {
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4710	+ {
	4711	+ objEditor.ClearInfo(); // .GetMaterial());
	4712	+
	4713	+ for (int i=0; i < group.selection.Size(); i++)
	4714	+ {
	4715	+ Object3D child = (Object3D) group.selection.get(i);
	4716	+
	4717	+ objEditor.AddInfo(child, this, true);
	4718	+ System.err.println("info : " + child.GetPath());
	4719	+ }
	4720	+
	4721	+ objEditor.SetText(); // jan 2014
	4722	+ }
	4723	+
	4724	+ super.refreshContents(cp);
	4725	+ }
3984	4726
3985	4727	void linkSomething(Object3D thing)
3986	4728	{
..	..	@@ -4052,16 +4794,19 @@
4052	4794	{
4053	4795	if (group.selection.isEmpty())
4054	4796	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4797	+
	4798	+ Grafreed.clipboardIsTempGroup = false;
4056	4799	Composite tGroup = null;
4057	4800	if (group.selection.size() > 0) // 1)
4058	4801	{
4059	4802	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4803	+ Grafreed.clipboardIsTempGroup = true;
4061	4804	}
4062	4805
4063	4806	if (cut)
4064	4807	{
	4808	+ if (Globals.SAVEONMAKE)
	4809	+ Save();
4065	4810	//int indices[] = jList.getSelectedIndices();
4066	4811	//for (int i = indices.length - 1; i >= 0; i--)
4067	4812	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4842,16 @@
4097	4842	//System.out.println("cut " + child);
4098	4843	//System.out.println("parent = " + child.parent);
4099	4844	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4845	+ if (Grafreed.clipboardIsTempGroup)
4101	4846	tGroup.add/Child/(tmp);
4102	4847	else
4103		- GraphreeD.clipboard = tmp;
	4848	+ Grafreed.clipboard = tmp;
4104	4849	}
4105	4850	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4851	+ if (Grafreed.clipboardIsTempGroup)
4107	4852	tGroup.add/Child/(child);
4108	4853	else
4109		- GraphreeD.clipboard = child;
	4854	+ Grafreed.clipboard = child;
4110	4855	}
4111	4856
4112	4857	//ResetModel();
..	..	@@ -4138,21 +4883,23 @@
4138	4883	//System.out.println("cut " + elem);
4139	4884	//System.out.println("parent = " + elem.parent);
4140	4885	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4886	+ if (Grafreed.clipboardIsTempGroup)
4142	4887	tGroup.add/Child/(tmp);
4143	4888	else
4144		- GraphreeD.clipboard = tmp;
	4889	+ Grafreed.clipboard = tmp;
4145	4890	}
4146	4891	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4892	+ if (Grafreed.clipboardIsTempGroup)
4148	4893	tGroup.add/Child/(child);
4149	4894	else
4150		- GraphreeD.clipboard = child;
	4895	+ Grafreed.clipboard = child;
4151	4896	}
4152	4897
4153	4898	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4899	+
	4900	+ if (Grafreed.clipboardIsTempGroup)
	4901	+ Grafreed.clipboard = tGroup;
	4902	+
4156	4903	if (cut)
4157	4904	{
4158	4905	ResetModel();
..	..	@@ -4162,11 +4909,11 @@
4162	4909
4163	4910	void paste(boolean expand)
4164	4911	{
4165		- // if (GraphreeD.clipboard == null)
	4912	+ // if (GrafreeD.clipboard == null)
4166	4913	// return;
4167	4914	boolean first = true;
4168	4915
4169		- if (GraphreeD.clipboardIsTempGroup)
	4916	+ if (Grafreed.clipboardIsTempGroup)
4170	4917	{
4171	4918	Composite temp;
4172	4919
..	..	@@ -4177,7 +4924,7 @@
4177	4924	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4925	*/
4179	4926	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4927	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4928	{
4182	4929	Object3D child = (Object3D)e.nextElement();
4183	4930
..	..	@@ -4191,7 +4938,7 @@
4191	4938	else
4192	4939	elem = child.deepCopy(); // ?
4193	4940	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	4941	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	4942	// elem = elem.get(0);
4196	4943	makeSomething(elem, true); // ?? first);
4197	4944	//group.addChild(elem);
..	..	@@ -4211,23 +4958,23 @@
4211	4958	//Object3D cb = Applet3D.clipboard;
4212	4959	//temp.addChild(cb);
4213	4960	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4214		- assert(GraphreeD.clipboard.parent == null);
4215		- Object3D /Composite/ keepparent = GraphreeD.clipboard.get(0).parent;
4216		- GraphreeD.clipboard.get(0).parent = null; // Avoid copy?
4217		- if (LA.isIdentity(GraphreeD.clipboard.toParent))
4218		- makeSomething(expand?GraphreeD.clipboard.get(0).copyExpand():GraphreeD.clipboard.get(0).deepCopy());
	4961	+ assert(Grafreed.clipboard.parent == null);
	4962	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4963	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4964	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4965	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	4966	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	4967	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4968	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	4969	}
4223	4970
4224	4971	ResetModel();
4225	4972	refreshContents();
4226	4973	}
4227	4974
4228		- void pasteInto(boolean copyit)
	4975	+ void pasteInto(boolean copyit, boolean clone)
4229	4976	{
4230		-// if (GraphreeD.clipboard == null)
	4977	+// if (GrafreeD.clipboard == null)
4231	4978	// return;
4232	4979
4233	4980	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5001,22 @@
4254	5001	if (copyit)
4255	5002	{
4256	5003	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5004	+ if (clone)
	5005	+ {
	5006	+ CloneClipboard(false); // sept 2014
	5007	+ }
	5008	+ else
	5009	+ {
	5010	+ paste(false);
	5011	+ }
4258	5012	}
4259	5013	else
4260	5014	{
4261	5015	boolean first = true;
4262	5016
4263		- if (GraphreeD.clipboardIsTempGroup)
	5017	+ if (Grafreed.clipboardIsTempGroup)
4264	5018	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5019	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5020	Object3D copy;
4267	5021	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5022	{
..	..	@@ -4272,7 +5026,7 @@
4272	5026	}
4273	5027	} else
4274	5028	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5029	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5030	}
4277	5031	}
4278	5032	}
..	..	@@ -4464,6 +5218,26 @@
4464	5218	makeSomething(csg);
4465	5219	}
4466	5220
	5221	+ void Ungroup(Object3D g)
	5222	+ {
	5223	+ if (g instanceof HiddenObject)
	5224	+ {
	5225	+ HiddenObject h = (HiddenObject) g;
	5226	+
	5227	+ for (int i=0; i<h.ActualSize(); i++)
	5228	+ {
	5229	+ objEditor.makeSomething(h.get(i), false);
	5230	+ }
	5231	+ }
	5232	+ else
	5233	+ {
	5234	+ for (int i=0; i<g.Size(); i++)
	5235	+ {
	5236	+ objEditor.makeSomething(g.get(i), false);
	5237	+ }
	5238	+ }
	5239	+ }
	5240	+
4467	5241	void ungroup()
4468	5242	{
4469	5243	/*
..	..	@@ -4657,21 +5431,6 @@
4657	5431	}
4658	5432	*/
4659	5433
4660		- void ImportGFD()
4661		- {
4662		- FileDialog browser = new FileDialog(objEditor.frame, "Import GraphreeD", FileDialog.LOAD);
4663		- browser.show();
4664		- String filename = browser.getFile();
4665		- if (filename != null && filename.length() > 0)
4666		- {
4667		- String fullname = browser.getDirectory() + filename;
4668		-
4669		- //Object3D readobj =
4670		- objEditor.ReadGFD(fullname, objEditor);
4671		- //makeSomething(readobj);
4672		- }
4673		- }
4674		-
4675	5434	/*
4676	5435	public void Callback(Object obj)
4677	5436	{
..	..	@@ -4695,26 +5454,9 @@
4695	5454	}
4696	5455	*/
4697	5456
4698		- void ImportVRMLX3D()
4699		- {
4700		- if (GraphreeD.standAlone)
4701		- {
4702		- /**/
4703		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4704		- browser.show();
4705		- String filename = browser.getFile();
4706		- if (filename != null && filename.length() > 0)
4707		- {
4708		- String fullname = browser.getDirectory() + filename;
4709		- LoadVRMLX3D(fullname);
4710		- }
4711		- /**/
4712		- }
4713		- }
4714		-
4715	5457	String GetFile(String dialogName)
4716	5458	{
4717		- if (GraphreeD.standAlone)
	5459	+ if (Grafreed.standAlone)
4718	5460	{
4719	5461	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5462	browser.show();
..	..	@@ -4778,10 +5520,36 @@
4778	5520	cButton flashSelectionButton;
4779	5521	cButton editButton;
4780	5522	cButton uneditButton;
	5523	+ JCheckBox allParamsButton;
4781	5524	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5525	cButton unselectButton;
4784	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
	5532	+ cButton saveButton;
	5533	+ cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
	5552	+
4785	5553	cButton screenfitButton;
4786	5554	cButton screenfitpointButton;
4787	5555	cButton snapobjectButton;
..	..	@@ -4793,14 +5561,6 @@
4793	5561
4794	5562	cButton setsupportButton;
4795	5563
4796		- cButton twoButton;
4797		- cButton sixButton;
4798		- cButton threeButton;
4799		- cButton sevenButton;
4800		- cButton fourButton; // full panel
4801		- cButton oneButton; // full XYZ
4802		- //cButton currentLayout;
4803		-
4804	5564	//
4805	5565	//Composite
4806	5566	Object3D // to do !!
..	..	@@ -4810,9 +5570,11 @@
4810	5570	//JTree jTree;
4811	5571	private MenuItem lookAtItem;
4812	5572	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
4814	5574	private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
	5575	+ private MenuItem undoItem;
	5576	+ private MenuItem redoItem;
	5577	+ private JMenuItem duplicateItem;
4816	5578	private MenuItem cloneItem;
4817	5579	private MenuItem cloneSupportItem;
4818	5580	private MenuItem overwriteGeoItem;
..	..	@@ -4823,8 +5585,9 @@
4823	5585	private MenuItem resetsupportItem;
4824	5586	private MenuItem resetreferencesItem;
4825	5587	private MenuItem linkverticesItem;
	5588	+ private MenuItem relinkverticesItem;
4826	5589	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5590	+ private MenuItem resetAllItem;
4828	5591	private MenuItem stepAllItem;
4829	5592	private MenuItem revertMeshItem;
4830	5593	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5598,17 @@
4835	5598	private MenuItem mergeGeometriesItem;
4836	5599	private MenuItem copyItem;
4837	5600	private MenuItem pasteItem;
	5601	+ private MenuItem pasteIntoItem;
4838	5602	private MenuItem pasteLinkItem;
4839	5603	private MenuItem pasteCloneItem;
4840	5604	private MenuItem pasteExpandItem;
4841	5605	private MenuItem clearItem;
4842	5606	private MenuItem clearAllItem;
4843	5607	private MenuItem genUVItem;
	5608	+ private MenuItem genNormalsMESHItem;
4844	5609	private MenuItem genNormalsCADItem;
4845	5610	private MenuItem genNormalsORGANItem;
	5611	+ private MenuItem genNormalsMINEItem;
4846	5612	private MenuItem stripifyItem;
4847	5613	private MenuItem unstripifyItem;
4848	5614	private MenuItem trimItem;
..	..	@@ -4871,6 +5637,10 @@
4871	5637	private MenuItem showleavesItem;
4872	5638	private MenuItem markleavesItem;
4873	5639	private MenuItem unmarkleavesItem;
	5640	+ private MenuItem rewindleavesItem;
	5641	+ private MenuItem unrewindleavesItem;
	5642	+ private MenuItem randomleavesItem;
	5643	+ private MenuItem unrandomleavesItem;
4874	5644
4875	5645	private MenuItem flipVItem;
4876	5646	private MenuItem unflipVItem;
..	..	@@ -4882,14 +5652,17 @@
4882	5652	private MenuItem panoTexturesItem;
4883	5653
4884	5654	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5655	+ private MenuItem resetCentroidXZItem;
4886	5656	private MenuItem resetTransformItem;
	5657	+ private MenuItem transformGeometryItem;
	5658	+ private MenuItem transformChildrenItem;
	5659	+ private MenuItem hideItem;
4887	5660	private MenuItem grabItem;
4888	5661	private MenuItem backItem;
4889	5662	private MenuItem frontItem;
4890	5663	private MenuItem cameraItem;
4891	5664	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
4893	5666	private MenuItem physicsItem;
4894	5667	private MenuItem frameselectorItem;
4895	5668	private MenuItem scriptNodeItem;
..	..	@@ -4904,6 +5677,7 @@
4904	5677
4905	5678	private MenuItem resetParentItem;
4906	5679	private MenuItem repairParentItem;
	5680	+ private MenuItem repairShadowItem;
4907	5681	private MenuItem sortbysizeItem;
4908	5682	private MenuItem sortbynameItem;
4909	5683
..	..	@@ -4924,10 +5698,11 @@
4924	5698	private MenuItem coneItem;
4925	5699	private MenuItem torusItem;
4926	5700	private MenuItem superItem;
	5701	+ private MenuItem kleinItem;
4927	5702	private MenuItem blobItem;
4928	5703	private MenuItem latheItem;
4929	5704	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5705	+ private MenuItem overlayItem;
4931	5706	private MenuItem meshItem;
4932	5707	// private MenuItem meshGroupItem;
4933	5708	private MenuItem springItem;
..	..	@@ -4936,6 +5711,7 @@
4936	5711	private MenuItem csgItem;
4937	5712	private MenuItem templateItem;
4938	5713	private MenuItem textureItem;
	5714	+ private MenuItem billboardItem;
4939	5715	private MenuItem shadowXItem;
4940	5716	private MenuItem shadowYItem;
4941	5717	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5724,6 @@
4948	5724	private MenuItem doubleItem;
4949	5725	private MenuItem tripleItem;
4950	5726
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5727	private MenuItem computeAOItem;
4957	5728	private MenuItem recompileItem;
4958	5729	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5733,8 @@
4962	5733	private MenuItem analyzeItem;
4963	5734	private MenuItem dumpItem;
4964	5735	//boolean freezemodel = false;
	5736	+
	5737	+ Menu cameraMenu;
	5738	+ MenuItem editCameraItem;
	5739	+ MenuItem restoreCameraItem;
4965	5740	}