~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,11 @@
83	84
84	85	void CloneSelection(boolean supports)
85	86	{
86		- // Object3D keep = GraphreeD.clipboard;
	87	+ if (Globals.REPLACEONMAKE)
	88	+ Save();
	89	+ boolean keep = Globals.REPLACEONMAKE;
	90	+ Globals.REPLACEONMAKE = false;
	91	+ // Object3D keep = GrafreeD.clipboard;
87	92	//Object3D obj;
88	93	for (int i=0; i<group.selection.size(); i++)// Enumeration e = group.selection.elements(); e.hasMoreElements();)
89	94	{
..	..	@@ -93,18 +98,19 @@
93	98
94	99	makeSomething(clone, i==group.selection.size()-1);
95	100	}
	101	+ Globals.REPLACEONMAKE = keep;
96	102	}
97	103
98	104	void CloneClipboard(boolean supports)
99	105	{
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));
	106	+ assert(Grafreed.clipboard.parent == null);
	107	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	108	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	109	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	110	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
105	111	else
106		- makeSomething(CloneObject(GraphreeD.clipboard, false));
107		- GraphreeD.clipboard.get(0).parent = keepparent;
	112	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	113	+ Grafreed.clipboard.get(0).parent = keepparent;
108	114	}
109	115
110	116	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -118,7 +124,7 @@
118	124	// obj.support = null;
119	125	if (!supports)
120	126	obj.SaveSupports();
121		- Object3D clone = (Object3D)GraphreeD.clone(obj);
	127	+ Object3D clone = (Object3D)Grafreed.clone(obj);
122	128	obj.parent = parent;
123	129	// obj.support = support;
124	130	// clone.support = support; // aout 2013
..	..	@@ -147,30 +153,29 @@
147	153
148	154	//JTextField nameField;
149	155
150		- void SetupMenu2(ObjEditor oe)
	156	+ void SetupMenu2(GroupEditor oe)
151	157	{
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);
	158	+ oe.jTree = new cTree();
	159	+
163	160	Menu menu;
164	161	oe.menuBar.add(menu = new Menu("Edit"));
165	162	//editItem = menu.add(new MenuItem("Edit"));
166	163	//editItem.addActionListener(this);
167		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	164	+
	165	+// undoItem = menu.add(new MenuItem("Undo"));
	166	+// undoItem.addActionListener(this);
	167	+// redoItem = menu.add(new MenuItem("Redo"));
	168	+// redoItem.addActionListener(this);
	169	+// menu.add("-");
	170	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
168	171	duplicateItem.addActionListener(this);
169		- menu.add("-");
170	172	cloneItem = menu.add(new MenuItem("Clone"));
171	173	cloneItem.addActionListener(this);
	174	+ if (Globals.ADVANCED)
	175	+ {
172	176	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
173	177	cloneSupportItem.addActionListener(this);
	178	+ }
174	179	menu.add("-");
175	180	cutItem = menu.add(new MenuItem("Cut"));
176	181	cutItem.addActionListener(this);
..	..	@@ -178,27 +183,123 @@
178	183	copyItem.addActionListener(this);
179	184	pasteItem = menu.add(new MenuItem("Paste"));
180	185	pasteItem.addActionListener(this);
	186	+
	187	+ menu.add("-");
	188	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	189	+ pasteIntoItem.addActionListener(this);
181	190	pasteLinkItem = menu.add(new MenuItem("Paste link"));
182	191	pasteLinkItem.addActionListener(this);
183	192	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
184	193	pasteCloneItem.addActionListener(this);
185	194	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
186	195	// pasteExpandItem.addActionListener(this);
	196	+ menu.add("-");
187	197	clearItem = menu.add(new MenuItem("Clear"));
188	198	clearItem.addActionListener(this);
	199	+
	200	+ if (Globals.ADVANCED)
	201	+ {
	202	+ // Deletes the cameras...
189	203	clearAllItem = menu.add(new MenuItem("Clear All"));
190	204	clearAllItem.addActionListener(this);
	205	+ }
	206	+
	207	+ menuBar.add(cameraMenu = new Menu("View"));
	208	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	209	+ //zBufferItem.addActionListener(this);
	210	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	211	+ //normalLensItem.addActionListener(this);
	212	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	213	+ restoreCameraItem.addActionListener(this);
	214	+
	215	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	216	+// toggleFullScreenItem.addItemListener(this);
	217	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	218	+// cameraMenu.add("-");
	219	+//
	220	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	221	+// toggleTextureItem.addItemListener(this);
	222	+// toggleTextureItem.setState(CameraPane.textureon);
	223	+//
	224	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	225	+// toggleSwitchItem.addItemListener(this);
	226	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	227	+
	228	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	229	+ toggleHandleItem.addItemListener(this);
	230	+ toggleHandleItem.setState(CameraPane.HANDLES);
	231	+
	232	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	233	+ togglePaintItem.addItemListener(this);
	234	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	235	+
	236	+ if (Globals.ADVANCED)
	237	+ {
	238	+ cameraMenu.add("-");
	239	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	240	+ toggleLiveItem.addItemListener(this);
	241	+ toggleLiveItem.setState(Globals.isLIVE());
191	242
	243	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	244	+ stepItem.addActionListener(this);
	245	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	246	+ // toggleDLItem.addItemListener(this);
	247	+ // toggleDLItem.setState(false);
	248	+
	249	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	250	+ toggleRenderItem.addItemListener(this);
	251	+ toggleRenderItem.setState(!CameraPane.frozen);
	252	+
	253	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	254	+ toggleDebugItem.addItemListener(this);
	255	+ toggleDebugItem.setState(Globals.DEBUG);
	256	+
	257	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	258	+ toggleFrustumItem.addItemListener(this);
	259	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	260	+
	261	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	262	+ toggleFootContactItem.addItemListener(this);
	263	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	264	+
	265	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	266	+ toggleTimelineItem.addItemListener(this);
	267	+ }
	268	+
	269	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	270	+// toggleRootItem.addItemListener(this);
	271	+// toggleRootItem.setState(false);
	272	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	273	+// animationItem.addItemListener(this);
	274	+// animationItem.setState(CameraPane.ANIMATION);
	275	+ cameraMenu.add("-");
	276	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	277	+ editCameraItem.addActionListener(this);
	278	+
	279	+ if (Globals.ADVANCED)
	280	+ {
	281	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	282	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	283	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	284	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	285	+ oe.cameraMenu.add("-");
	286	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	287	+ openWindowItem.addActionListener(this);
	288	+ editLeafItem.addActionListener(this);
	289	+ lookAtItem.addActionListener(this);
	290	+ //lookFromItem.addActinoListener(this);
	291	+ //switchViewItem.addActionListener(this);
	292	+ }
	293	+
192	294	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);
	295	+ if (Globals.ADVANCED)
	296	+ {
197	297	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
198	298	revertMeshItem.addActionListener(this);
199	299	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
200	300	resetreferencesItem.addActionListener(this);
201	301	menu.add("-");
	302	+ }
202	303	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
203	304	overwriteGeoItem.addActionListener(this);
204	305	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -210,73 +311,104 @@
210	311	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
211	312	overwriteUVItem.addActionListener(this);
212	313	menu.add("-");
	314	+ if (Globals.ADVANCED)
	315	+ {
213	316	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
214	317	generateMeshItem.addActionListener(this);
215	318	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
216	319	poseMeshItem.addActionListener(this);
217	320	menu.add("-");
	321	+ }
218	322	resetsupportItem = menu.add(new MenuItem("Reset support"));
219	323	resetsupportItem.addActionListener(this);
220	324	linkverticesItem = menu.add(new MenuItem("Link to Support"));
221	325	linkverticesItem.addActionListener(this);
	326	+ relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
	327	+ relinkverticesItem.addActionListener(this);
	328	+
	329	+ if (Globals.ADVANCED)
	330	+ {
222	331	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
223	332	setMasterItem.addActionListener(this);
	333	+ }
224	334
225	335	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);
	336	+// grabItem = menu.add(new MenuItem("Grab"));
	337	+// grabItem.addActionListener(this);
230	338	backItem = menu.add(new MenuItem("Back"));
231	339	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);
	340	+ frontItem = menu.add(new MenuItem("Front"));
	341	+ frontItem.addActionListener(this);
	342	+// compositeItem = menu.add(new MenuItem("Composite"));
	343	+// compositeItem.addActionListener(this);
	344	+
	345	+ if (Globals.ADVANCED)
	346	+ {
	347	+ hideItem = menu.add(new MenuItem("Hidden Group"));
	348	+ hideItem.addActionListener(this);
	349	+ }
	350	+ ungroupItem = menu.add(new MenuItem("Ungroup"));
	351	+ ungroupItem.addActionListener(this);
	352	+
	353	+// menu.add("-");
	354	+//
	355	+// switchItem = menu.add(new MenuItem("Switch node"));
	356	+// switchItem.addActionListener(this);
	357	+ if (Globals.ADVANCED)
	358	+ {
241	359	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
242	360	switchGeoItem.addActionListener(this);
243	361	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
244	362	switchTransfoItem.addActionListener(this);
245		- morphItem = menu.add(new MenuItem("Morph"));
	363	+ morphItem = menu.add(new MenuItem("Morph Group"));
246	364	morphItem.addActionListener(this);
	365	+
	366	+ menu.add("-");
	367	+ physicsItem = menu.add(new MenuItem("Physics"));
	368	+ physicsItem.addActionListener(this);
	369	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	370	+ frameselectorItem.addActionListener(this);
247	371	scriptNodeItem = menu.add(new MenuItem("Script Node"));
248	372	scriptNodeItem.addActionListener(this);
249		- cameraItem = menu.add(new MenuItem("Camera"));
250		- cameraItem.addActionListener(this);
	373	+ }
251	374
252	375	oe.menuBar.add(menu = new Menu("Object"));
253		- textureItem = menu.add(new MenuItem("Texture"));
254		- textureItem.addActionListener(this);
	376	+// textureItem = menu.add(new MenuItem("Texture"));
	377	+// textureItem.addActionListener(this);
	378	+ billboardItem = menu.add(new MenuItem("Billboard"));
	379	+ billboardItem.addActionListener(this);
255	380	csgItem = menu.add(new MenuItem("CSG"));
256	381	csgItem.addActionListener(this);
257		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	382	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
258	383	shadowXItem.addActionListener(this);
259		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	384	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
260	385	shadowYItem.addActionListener(this);
261		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	386	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
262	387	shadowZItem.addActionListener(this);
	388	+ attributeItem = menu.add(new MenuItem("Attribute"));
	389	+ attributeItem.addActionListener(this);
	390	+
	391	+ if (Globals.ADVANCED)
	392	+ {
	393	+ menu.add("-");
263	394	linkerItem = menu.add(new MenuItem("Linker"));
264	395	linkerItem.addActionListener(this);
265	396	templateItem = menu.add(new MenuItem("Template"));
266	397	templateItem.addActionListener(this);
267		- attributeItem = menu.add(new MenuItem("Attribute"));
268		- attributeItem.addActionListener(this);
269	398	pointflowItem = menu.add(new MenuItem("Point Flow"));
270	399	pointflowItem.addActionListener(this);
	400	+ }
271	401	menu.add("-");
272		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
273		- transformgeometryItem.addActionListener(this);
274	402	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
275	403	resetTransformItem.addActionListener(this);
276	404	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
277	405	resetCentroidItem.addActionListener(this);
278		- ungroupItem = menu.add(new MenuItem("Ungroup"));
279		- ungroupItem.addActionListener(this);
	406	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	407	+ resetCentroidXZItem.addActionListener(this);
	408	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	409	+ transformGeometryItem.addActionListener(this);
	410	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	411	+ transformChildrenItem.addActionListener(this);
280	412
281	413	oe.menuBar.add(menu = new Menu("Geometry"));
282	414	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -285,6 +417,13 @@
285	417	genNormalsORGANItem.addActionListener(this);
286	418	genNormalsCADItem = menu.add(new MenuItem("CAD Normals"));
287	419	genNormalsCADItem.addActionListener(this);
	420	+ genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
	421	+ genNormalsMESHItem.addActionListener(this);
	422	+ if (Globals.ADVANCED)
	423	+ {
	424	+ genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
	425	+ genNormalsMINEItem.addActionListener(this);
	426	+ }
288	427	stripifyItem = menu.add(new MenuItem("Stripify"));
289	428	stripifyItem.addActionListener(this);
290	429	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -306,23 +445,34 @@
306	445	reduce34MeshItem.addActionListener(this);
307	446	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
308	447	increaseMeshItem.addActionListener(this);
309		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
310		- smoothMeshItem.addActionListener(this);
311	448	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
312	449	clipMeshItem.addActionListener(this);
	450	+
	451	+ if (Globals.ADVANCED)
	452	+ {
	453	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	454	+ smoothMeshItem.addActionListener(this);
	455	+ }
313	456
314	457	oe.menuBar.add(menu = new Menu("Attributes"));
315	458	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
316	459	clearMaterialsItem.addActionListener(this);
	460	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	461	+ resetAllItem.addActionListener(this);
	462	+ stepAllItem = menu.add(new MenuItem("Step All"));
	463	+ stepAllItem.addActionListener(this);
317	464	menu.add("-");
318	465	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
319	466	liveleavesItem.addActionListener(this);
320	467	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
321	468	unliveleavesItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
322	471	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
323	472	supportleavesItem.addActionListener(this);
324	473	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
325	474	unsupportleavesItem.addActionListener(this);
	475	+ }
326	476	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
327	477	hideleavesItem.addActionListener(this);
328	478	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -331,6 +481,14 @@
331	481	markleavesItem.addActionListener(this);
332	482	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
333	483	unmarkleavesItem.addActionListener(this);
	484	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	485	+ rewindleavesItem.addActionListener(this);
	486	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	487	+ unrewindleavesItem.addActionListener(this);
	488	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	489	+ randomleavesItem.addActionListener(this);
	490	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	491	+ unrandomleavesItem.addActionListener(this);
334	492	menu.add("-");
335	493	flipVItem = menu.add(new MenuItem("Flip V"));
336	494	flipVItem.addActionListener(this);
..	..	@@ -366,35 +524,41 @@
366	524	sortbynameItem = menu.add(new MenuItem("Sort by name"));
367	525	sortbynameItem.addActionListener(this);
368	526	menu.add("-");
	527	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	528	+ shareGeometriesItem.addActionListener(this);
	529	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	530	+ mergeGeometriesItem.addActionListener(this);
	531	+ if (Globals.ADVANCED)
	532	+ {
	533	+ // Pretty much the same as duplicate and clone.
369	534	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
370	535	extractGeometriesItem.addActionListener(this);
371	536	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
372	537	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);
	538	+ }
377	539
378	540	oe.menuBar.add(menu = new Menu("Insert"));
379	541	buildCreateMenu(menu);
380	542
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	543	oe.menuBar.add(menu = new Menu("Tools"));
393	544	buildToolsMenu(menu);
394	545	}
395	546
	547	+
396	548	void SetupUI2(ObjEditor oe)
397	549	{
	550	+ // June 2019
	551	+ if (oe == null)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ //return;
	555	+ }
	556	+
	557	+ if (copy != group)
	558	+ {
	559	+ //super.SetupUI2(this);
	560	+ }
	561	+
398	562	//new Exception().printStackTrace();
399	563
400	564	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -423,150 +587,230 @@
423	587	oe.radioPanel.add(dummyButton);
424	588	oe.buttonGroup.add(dummyButton);
425	589	*/
426		- aConstraints.gridy += 1;
427		- oe.aConstraints.gridwidth = 1;
428		- oe.aConstraints.gridx = 0;
	590	+ cGridBag copyOptionsPanel = new cGridBag();
	591	+
	592	+ copyOptionsPanel.preferredHeight = 1;
429	593
430		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", CameraPane.isLIVE()), oe.aConstraints);
	594	+ //this.AddOptions(oe.toolbarPanel, oe.aConstraints);
	595	+
	596	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ //minButton.setToolTipText("Minimize window");
	598	+ //minButton.addActionListener(this);
	599	+
	600	+ if (Globals.ADVANCED)
	601	+ {
	602	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	603	+ maxButton.setToolTipText("Maximize window");
	604	+ maxButton.addActionListener(this);
	605	+ }
	606	+
	607	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	608	+ fullButton.setToolTipText("Full-screen window");
	609	+ fullButton.addActionListener(this);
	610	+
	611	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	612	+ screenfitButton.setToolTipText("Screen fit");
	613	+ screenfitButton.addActionListener(this);
	614	+
	615	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	617	+ restoreCameraButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	620	+ saveButton.setToolTipText("New version");
	621	+ saveButton.addActionListener(this);
	622	+
	623	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ undoButton.setToolTipText("Previous version");
	625	+ undoButton.addActionListener(this);
	626	+ undoButton.setEnabled(false);
	627	+
	628	+ cGridBag updown = new cGridBag().setVertical(true);
	629	+ updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	630	+ restoreButton.setToolTipText("Restore current");
	631	+ restoreButton.addActionListener(this);
	632	+ restoreButton.setEnabled(false);
	633	+
	634	+ updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	635	+ replaceButton.setToolTipText("Replace current");
	636	+ replaceButton.addActionListener(this);
	637	+ replaceButton.setEnabled(false);
	638	+
	639	+ copyOptionsPanel.add(updown);
	640	+
	641	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	642	+ redoButton.setToolTipText("Next version");
	643	+ redoButton.addActionListener(this);
	644	+ redoButton.setEnabled(false);
	645	+
	646	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	647	+ liveCB.setToolTipText("Enable animation");
431	648	liveCB.addItemListener(this);
432	649
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);
	650	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oneStepButton.setToolTipText("Animate one step forward");
	652	+ oneStepButton.addActionListener(this);
	653	+
	654	+ oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
	655	+ fastCB.setToolTipText("Fast mode");
451	656	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);
	657	+
	658	+ //oe.toolboxPanel.Return();
	659	+
	660	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	661	+// trackCB.setToolTipText("Enable tracking");
	662	+// trackCB.addItemListener(this);
458	663
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);
497		- screenfitButton.addActionListener(this);
498		- oe.aConstraints.gridx += 1;
499	664	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
500	665	// 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	666
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;
	667	+ if (Globals.ADVANCED)
	668	+ {
	669	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ snapobjectButton.addActionListener(this);
	671	+ snapobjectButton.setToolTipText("Snap Object");
	672	+ }
	673	+
	674	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
516	675
517		- //
518		- oe.toolbarPanel.add(twoButton = new cButton(" \|+\| ")); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	677	+ twoButton.setToolTipText("Show center view only");
519	678	twoButton.addActionListener(this);
520		- oe.toolbarPanel.add(fourButton = new cButton("+\|\| ")); //, oe.aConstraints);
	679	+ this.fullscreenLayout = twoButton;
	680	+
	681	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521	682	fourButton.addActionListener(this);
522		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\| ")); //, oe.aConstraints);
	683	+ fourButton.setToolTipText("Show left panel only");
	684	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	685	+ sixButton.setToolTipText("2-column layout left");
523	686	sixButton.addActionListener(this);
524		- oe.toolbarPanel.add(threeButton = new cButton(" \|+\|+")); //, oe.aConstraints);
	687	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ threeButton.setToolTipText("2-column layout right");
525	689	threeButton.addActionListener(this);
526		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+")); //, oe.aConstraints);
	690	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ sevenButton.setToolTipText("3-column layout");
527	692	sevenButton.addActionListener(this);
528	693	//
529	694
530		- oe.toolbarPanel.add(rootButton = new cButton(" o o o E ")); //, oe.aConstraints);
	695	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ rootButton.setToolTipText("Edit selection in new tab");
531	697	rootButton.addActionListener(this);
532		- oe.aConstraints.gridx += 1;
533		- oe.toolbarPanel.add(closeButton = new cButton(" X ")); //, oe.aConstraints);
	698	+
	699	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ closeButton.setToolTipText("Close tab");
534	701	closeButton.addActionListener(this);
535	702	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
536	703	//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	704
546		- oe.treePanel.add(uneditButton = new cButton("-"), oe.aConstraints);
	705	+ // INSERT
	706	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ gridButton.setToolTipText("Create grid");
	708	+ gridButton.addActionListener(this);
	709	+
	710	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	711	+ boxButton.setToolTipText("Create box");
	712	+ boxButton.addActionListener(this);
	713	+
	714	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ sphereButton.setToolTipText("Create sphere");
	716	+ sphereButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ coneButton.setToolTipText("Create cone");
	720	+ coneButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ torusButton.setToolTipText("Create torus");
	724	+ torusButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ superButton.setToolTipText("Create superellipsoid");
	728	+ superButton.addActionListener(this);
	729	+
	730	+ if (Globals.ADVANCED)
	731	+ {
	732	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ kleinButton.setToolTipText("Create Klein bottle");
	734	+ kleinButton.addActionListener(this);
	735	+ }
	736	+
	737	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	738	+ particlesButton.setToolTipText("Create particle system");
	739	+ particlesButton.addActionListener(this);
	740	+
	741	+ oe.toolboxPanel.Return();
	742	+
	743	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ groupButton.setToolTipText("Create group");
	745	+ groupButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ compositeButton.setToolTipText("Create composite");
	749	+ compositeButton.addActionListener(this);
	750	+
	751	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	752	+ switchButton.setToolTipText("Create item switcher");
	753	+ switchButton.addActionListener(this);
	754	+
	755	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	756	+ loopButton.setToolTipText("Create loop");
	757	+ loopButton.addActionListener(this);
	758	+
	759	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	760	+ textureButton.setToolTipText("Create texture");
	761	+ textureButton.addActionListener(this);
	762	+
	763	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	764	+ overlayButton.setToolTipText("Create overlay");
	765	+ overlayButton.addActionListener(this);
	766	+
	767	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ lightButton.setToolTipText("Create light");
	769	+ lightButton.addActionListener(this);
	770	+
	771	+ for (int i=6; --i>=0;)
	772	+ {
	773	+ oe.toolboxPanel.Return();
	774	+ oe.toolboxPanel.add(new cGridBag());
	775	+ oe.toolboxPanel.add(new cGridBag());
	776	+ oe.toolboxPanel.add(new cGridBag());
	777	+ oe.toolboxPanel.add(new cGridBag());
	778	+ oe.toolboxPanel.add(new cGridBag());
	779	+ oe.toolboxPanel.add(new cGridBag());
	780	+ oe.toolboxPanel.add(new cGridBag());
	781	+ }
	782	+
	783	+ // EDIT panel
	784	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ editButton.setToolTipText("Pin selection controls");
	786	+ editButton.addActionListener(this);
	787	+
	788	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	789	+ uneditButton.setToolTipText("Remove selection controls");
547	790	uneditButton.addActionListener(this);
548	791
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);
	792	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	793	+ allParamsButton.setToolTipText("Show all controle");
561	794	allParamsButton.addActionListener(this);
562	795
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);
	796	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	797	+ clearPanelButton.setToolTipText("Clear edit panel");
	798	+ clearPanelButton.addActionListener(this);
	799	+
	800	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	801	+ unselectButton.setToolTipText("Unselect");
568	802	unselectButton.addActionListener(this);
569	803
	804	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	805	+ flashSelectionButton.setToolTipText("Highlight selection");
	806	+ flashSelectionButton.addActionListener(this);
	807	+
	808	+ editCommandsPanel.preferredHeight = 1;
	809	+
	810	+ SetPinStates(false);
	811	+// oe.treePanel.add(commandsPanel);
	812	+// oe.treePanel.Return();
	813	+
570	814	// oe.aConstraints.gridx += 1;
571	815	// oe.aConstraints.weighty = 0;
572	816	// oe.aConstraints.gridwidth = 1;
..	..	@@ -578,40 +822,25 @@
578	822	// oe.treePanel.add(gcButton = new cButton("GC"), oe.aConstraints);
579	823	// gcButton.addActionListener(this);
580	824
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;
	825	+ cGridBag jSPPanel = new cGridBag();
	826	+
	827	+ JScrollPane jSP;
592	828	//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);
	829	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
594	830	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	831
	832	+ oe.treePanel.add(jSPPanel);
	833	+ oe.treePanel.Return();
	834	+
	835	+ oe.treePanel.add(copyOptionsPanel);
	836	+ oe.treePanel.Return();
	837	+ cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 10, 0);
	838	+ versionField = (cNumberSlider)sliderPane.getComponent(1);
	839	+ sliderPane.preferredHeight = 1;
	840	+
	841	+// mainPanel.setDividerLocation(0.5); //1.0);
	842	+// mainPanel.setResizeWeight(0.5);
	843	+
615	844	//jList.addListSelectionListener(this);
616	845	oe.jTree.addTreeSelectionListener(this);
617	846	//jTree.setRootVisible(false);
..	..	@@ -633,20 +862,157 @@
633	862	radio.layout = sevenButton;
634	863	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
635	864	}
	865	+
	866	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	867	+ {
	868	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	869	+ colorCB.setToolTipText("Copy color when dropped");
	870	+ colorCB.addItemListener(this);
	871	+
	872	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	873	+ materialCB.setToolTipText("Copy material when dropped");
	874	+ materialCB.addItemListener(this);
	875	+
	876	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	877	+ textureCB.setToolTipText("Copy texture when dropped");
	878	+ textureCB.addItemListener(this);
	879	+
	880	+ panel.Return();
	881	+
	882	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	883	+ boxCB.setToolTipText("Display bounding boxes");
	884	+ boxCB.addItemListener(this);
	885	+
	886	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	887	+ zoomBoxCB.setToolTipText("Display only for wheel");
	888	+ zoomBoxCB.addItemListener(this);
	889	+
	890	+ if (true) // Globals.ADVANCED)
	891	+ {
	892	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	893	+// supportCB.setToolTipText("Enable rigging");
	894	+// supportCB.addItemListener(this);
	895	+
	896	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	897	+ freezeCB.setToolTipText("Fast moving camera");
	898	+ freezeCB.addItemListener(this);
	899	+
	900	+ // panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
	901	+ // localCB.addItemListener(this);
	902	+
	903	+ panel.Return();
	904	+
	905	+ panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
	906	+ crowdCB.setToolTipText("Used for crowds");
	907	+ crowdCB.addItemListener(this);
	908	+
	909	+ panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
	910	+ smoothCB.setToolTipText("Snapping delay");
	911	+ smoothCB.addItemListener(this);
	912	+
	913	+ panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	914	+ slowCB.setToolTipText("Smooth interpolation");
	915	+ slowCB.addItemListener(this);
	916	+
	917	+// constraints.gridy += 1;
	918	+// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
	919	+// speakerMocapCB.addItemListener(this);
	920	+
	921	+ panel.Return();
	922	+
	923	+ if (false)
	924	+ {
	925	+ // handled in scripts
	926	+ //constraints.gridy += 1;
	927	+ panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
	928	+ speakerCameraCB.addItemListener(this);
	929	+
	930	+ //constraints.gridy += 1;
	931	+ panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
	932	+ speakerFocusCB.addItemListener(this);
	933	+
	934	+ //constraints.gridy += 1;
	935	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	936	+ smoothfocusCB.addItemListener(this);
	937	+ panel.Return();
	938	+ }
	939	+
	940	+//constraints.gridx += 1;
	941	+//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
	942	+// debugCB.addItemListener(this);
	943	+
	944	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	945	+ trackCB.setToolTipText("Enable tracking target");
	946	+ trackCB.addItemListener(this);
	947	+
	948	+ panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	949	+ oeilCB.setToolTipText("Move camera when tracking");
	950	+ oeilCB.addItemListener(this);
	951	+
	952	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	953	+ shadowCB.setToolTipText("When live compute shadows");
	954	+ shadowCB.addItemListener(this);
	955	+
	956	+ panel.Return();
	957	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	958	+ toggleTextureCB.setToolTipText("Load textures");
	959	+ toggleTextureCB.addItemListener(this);
	960	+
	961	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	962	+ toggleSwitchCB.setToolTipText("Choose a single item");
	963	+ toggleSwitchCB.addItemListener(this);
	964	+
	965	+ panel.add(autokeepCB = new cCheckBox("Auto-replace", Globals.REPLACEONMAKE)); //, constraints);
	966	+ autokeepCB.setToolTipText("On structure change");
	967	+ autokeepCB.addItemListener(this);
	968	+
	969	+ panel.Return();
	970	+ if (Globals.ADVANCED)
	971	+ {
	972	+ panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
	973	+ lookAtCB.setToolTipText("Look-at target");
	974	+ lookAtCB.addItemListener(this);
	975	+ }
	976	+
	977	+ }
	978	+
	979	+ cGridBag fill = new cGridBag();
	980	+ fill.preferredHeight = 200;
	981	+ cGridBag fill2 = new cGridBag();
	982	+ fill2.preferredHeight = 200;
	983	+ cGridBag fill3 = new cGridBag();
	984	+ fill3.preferredHeight = 200;
	985	+
	986	+ panel.add(fill);
	987	+ panel.add(fill2);
	988	+ panel.add(fill3);
	989	+
	990	+ }
636	991
637	992	void EditObject(Object3D obj)
638	993	{
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();
	994	+ cRadio radioButton = new cRadio(obj.name);
	995	+
	996	+ // June 2019. Patch to avoid bug with transparency.
	997	+ radioButton.hadMaterial = obj.material != null;
	998	+ if (!radioButton.hadMaterial)
	999	+ {
	1000	+ obj.material = new cMaterial();
	1001	+ }
	1002	+
	1003	+ radioButton.SetObject(obj);
	1004	+ radioButton.layout = sevenButton;
	1005	+ radioButton.SetCamera(cameraView.renderCamera, false);
	1006	+ radioButton.addActionListener(this);
	1007	+ radioPanel.add(radioButton);
	1008	+ buttonGroup.add(radioButton);
	1009	+ radioButton.doClick();
647	1010	}
	1011	+
648	1012	void SetupViews(ObjEditor oe)
649	1013	{
	1014	+ theFrame = this;
	1015	+
650	1016	oe.SetupViews();
651	1017
652	1018	System.out.println("SetupViews");
..	..	@@ -655,22 +1021,28 @@
655	1021	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
656	1022	}
657	1023
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;
	1024	+ cToggleButton liveCB;
	1025	+ cCheckBox supportCB;
	1026	+ cCheckBox localCB;
	1027	+ cCheckBox crowdCB;
	1028	+ cCheckBox smoothCB;
	1029	+ cToggleButton fastCB;
	1030	+ cCheckBox slowCB;
	1031	+ cCheckBox boxCB;
	1032	+ cCheckBox zoomBoxCB;
	1033	+ cCheckBox freezeCB;
	1034	+ //cToggleButton trackCB;
	1035	+ cCheckBox trackCB;
	1036	+ cCheckBox smoothfocusCB;
668	1037	// JCheckBox speakerMocapCB;
669		- JCheckBox speakerCameraCB;
670		- JCheckBox speakerFocusCB;
671		- JCheckBox debugCB;
672		- JCheckBox oeilCB;
673		- JCheckBox lookAtCB;
	1038	+ cCheckBox speakerCameraCB;
	1039	+ cCheckBox speakerFocusCB;
	1040	+ cCheckBox debugCB;
	1041	+
	1042	+ cCheckBox oeilCB;
	1043	+ cCheckBox shadowCB;
	1044	+ cCheckBox autokeepCB;
	1045	+ cCheckBox lookAtCB;
674	1046
675	1047	// static int COLOR = 1;
676	1048	// static int MATERIAL = 2;
..	..	@@ -678,9 +1050,9 @@
678	1050
679	1051	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
680	1052
681		- JCheckBox colorCB;
682		- JCheckBox materialCB;
683		- JCheckBox textureCB;
	1053	+ cCheckBox colorCB;
	1054	+ cCheckBox materialCB;
	1055	+ cCheckBox textureCB;
684	1056
685	1057	public void itemStateChanged(ItemEvent e)
686	1058	{
..	..	@@ -705,10 +1077,10 @@
705	1077	dropAttributes \|= Object3D.TEXTURE;
706	1078	else
707	1079	dropAttributes &= ~Object3D.TEXTURE;
708		- }
709		- else if(e.getSource() == liveCB)
	1080	+ } else if(e.getSource() == liveCB)
710	1081	{
711	1082	cameraView.ToggleLive();
	1083	+ refreshContents(false);
712	1084	}
713	1085	else if(e.getSource() == supportCB)
714	1086	{
..	..	@@ -744,6 +1116,10 @@
744	1116	cameraView.repaint();
745	1117	// refreshContents();
746	1118	}
	1119	+ else if(e.getSource() == zoomBoxCB)
	1120	+ {
	1121	+ cameraView.ToggleZoomBoxMode();
	1122	+ }
747	1123	else if(e.getSource() == smoothfocusCB)
748	1124	{
749	1125	cameraView.ToggleSmoothFocus();
..	..	@@ -769,6 +1145,18 @@
769	1145	{
770	1146	cameraView.ToggleOeil();
771	1147	}
	1148	+ else if(e.getSource() == shadowCB)
	1149	+ {
	1150	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1151	+ }
	1152	+ else if(e.getSource() == freezeCB)
	1153	+ {
	1154	+ Globals.FREEZEONMOVE ^= true;
	1155	+ }
	1156	+ else if(e.getSource() == autokeepCB)
	1157	+ {
	1158	+ Globals.REPLACEONMAKE ^= true;
	1159	+ }
772	1160	else if(e.getSource() == lookAtCB)
773	1161	{
774	1162	cameraView.ToggleLookAt();
..	..	@@ -785,7 +1173,8 @@
785	1173
786	1174	/**/
787	1175	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
788		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1176	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1177	+ TreePath path = objEditor.jTree.getSelectionPath();
789	1178	if ((path == null) \|\| (path.getPathCount() <= 1)) {
790	1179	// We can't move the root node or an empty selection
791	1180	return;
..	..	@@ -848,8 +1237,6 @@
848	1237	}
849	1238	}
850	1239
851		- String string = (String) object;
852		-
853	1240	System.out.println("Transfer = " + object + "; drop : " + target);
854	1241	// if( object instanceof java.io.File[])
855	1242	// {
..	..	@@ -857,7 +1244,11 @@
857	1244	// objEditor.DropFile((java.io.File[]) object, true);
858	1245	// return;
859	1246	// }
860		- if (string.charAt(0) == '/')
	1247	+
	1248	+ String string = object.toString();
	1249	+
	1250	+ // File path for Mac and Windows
	1251	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
861	1252	{
862	1253	// file(s)
863	1254	String[] names = string.split("\n");
..	..	@@ -884,7 +1275,7 @@
884	1275
885	1276	flashIt = false;
886	1277	CameraPane pane = (CameraPane) target;
887		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1278	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
888	1279	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
889	1280
890	1281	if (group.selection.size() == 1)
..	..	@@ -900,23 +1291,33 @@
900	1291
901	1292	assert target == objEditor.jTree;
902	1293	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1294	+ Object3D destinationLeaf;
903	1295	try {
904		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1296	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
905	1297	} catch (Exception e) {
906	1298	System.out.println("destinationPath : " + destinationPath);
907	1299	return;
908	1300	}
909	1301
910		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1302	+ for (int i=group.selection.size(); --i>=0;)
911	1303	{
	1304	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1305	+
	1306	+ // Cannot move into itself
	1307	+ if (child == destinationLeaf)
	1308	+ return;
	1309	+ }
	1310	+
	1311	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1312	+// {
912	1313	loadClipboard(true);
913	1314	objEditor.jTree.setSelectionPath(destinationPath);
914		- pasteInto(false);
915		- } else {
916		- loadClipboard(false);
917		- objEditor.jTree.setSelectionPath(destinationPath);
918		- pasteInto(false); // true); // ???
919		- }
	1315	+ pasteInto(false, false);
	1316	+// } else {
	1317	+// loadClipboard(false);
	1318	+// objEditor.jTree.setSelectionPath(destinationPath);
	1319	+// pasteInto(false, false); // true); // ???
	1320	+// }
920	1321	}
921	1322	public void dropActionChanged(DropTargetDragEvent dtde)
922	1323	// Called if the user has modified the current drop gesture
..	..	@@ -1021,83 +1422,107 @@
1021	1422	{
1022	1423	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1023	1424	//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);
	1425	+// gridItem = menu.add(new MenuItem("Grid"));
	1426	+// gridItem.addActionListener(this);
	1427	+// rectoidItem = menu.add(new MenuItem("Box"));
	1428	+// rectoidItem.addActionListener(this);
	1429	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1430	+// ellipsoidItem.addActionListener(this);
	1431	+// coneItem = menu.add(new MenuItem("Cone"));
	1432	+// coneItem.addActionListener(this);
	1433	+// torusItem = menu.add(new MenuItem("Torus"));
	1434	+// torusItem.addActionListener(this);
	1435	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1436	+// superItem.addActionListener(this);
	1437	+
	1438	+ cameraItem = menu.add(new MenuItem("Camera"));
	1439	+ cameraItem.addActionListener(this);
	1440	+
	1441	+ if (!Globals.ADVANCED)
	1442	+ {
	1443	+ kleinItem = menu.add(new MenuItem("Klein Bottle"));
	1444	+ kleinItem.addActionListener(this);
	1445	+ }
	1446	+
	1447	+// particleItem = menu.add(new MenuItem("Particle system"));
	1448	+// particleItem.addActionListener(this);
	1449	+ if (Globals.ADVANCED)
	1450	+ {
1038	1451	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1039	1452	ragdollItem.addActionListener(this);
1040	1453	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1041	1454	ragdoll2Item.addActionListener(this);
	1455	+ }
1042	1456	menu.add("-");
1043		- meshItem = menu.add(new MenuItem("Mesh"));
	1457	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1044	1458	meshItem.addActionListener(this);
1045	1459	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1046	1460	// meshGroupItem.addActionListener(this);
	1461	+ if (Globals.ADVANCED)
	1462	+ {
1047	1463	springItem = menu.add(new MenuItem("Spring"));
1048	1464	springItem.addActionListener(this);
1049	1465	flagItem = menu.add(new MenuItem("Flag"));
1050	1466	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	1467	blobItem = menu.add(new MenuItem("Blob"));
1056	1468	blobItem.addActionListener(this);
1057	1469	latheItem = menu.add(new MenuItem("Lathe"));
1058	1470	latheItem.addActionListener(this);
1059		- lightItem = menu.add(new MenuItem("Light"));
1060		- lightItem.addActionListener(this);
	1471	+ }
	1472	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1473	+ bezierItem.addActionListener(this);
	1474	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1475	+// overlayItem.addActionListener(this);
	1476	+// lightItem = menu.add(new MenuItem("Light"));
	1477	+// lightItem.addActionListener(this);
1061	1478	menu.add("-");
1062	1479	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1063	1480	//superLoopItem.addActionListener(this);
1064		- loopItem = menu.add(new MenuItem("Loop"));
1065		- loopItem.addActionListener(this);
	1481	+// loopItem = menu.add(new MenuItem("Loop"));
	1482	+// loopItem.addActionListener(this);
1066	1483	doubleItem = menu.add(new MenuItem("Fork"));
1067	1484	doubleItem.addActionListener(this);
	1485	+ if (Globals.ADVANCED)
	1486	+ {
1068	1487	tripleItem = menu.add(new MenuItem("Trident"));
1069	1488	tripleItem.addActionListener(this);
	1489	+ }
1070	1490	}
1071	1491
1072	1492	void buildToolsMenu(Menu menu)
1073	1493	{
1074	1494	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1075	1495	animationItem.addItemListener(this);
1076		- animationItem.setState(CameraPane.ANIMATION);
	1496	+ animationItem.setState(Globals.ANIMATION);
	1497	+
	1498	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1499	+ archiveItem.addActionListener(this);
1077	1500
1078	1501	menu.add("-");
1079	1502	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
1080	1503	parseverticesItem.addActionListener(this);
1081	1504	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1082	1505	textureFieldItem.addActionListener(this);
1083		- alignItem = menu.add(new MenuItem("Align"));
	1506	+ alignItem = menu.add(new MenuItem("Align Objects"));
1084	1507	alignItem.addActionListener(this);
1085		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1086		- mirrorItem.addActionListener(this);
1087	1508	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1088	1509	reduceMorphItem.addActionListener(this);
1089	1510	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1090	1511	reduce34MorphItem.addActionListener(this);
1091		-
1092		- menu.add(computeAOItem = new MenuItem("Compute AO"));
1093		- computeAOItem.addActionListener(this);
1094	1512	menu.add("-");
1095		-
1096	1513	menu.add(memoryItem = new MenuItem("Memory Usage"));
1097	1514	memoryItem.addActionListener(this);
	1515	+ menu.add(computeAOItem = new MenuItem("Compute AO"));
	1516	+ computeAOItem.addActionListener(this);
	1517	+
	1518	+ if (Globals.ADVANCED)
	1519	+ {
	1520	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1521	+ mirrorItem.addActionListener(this);
	1522	+ menu.add("-");
1098	1523	menu.add(analyzeItem = new MenuItem("Analyze"));
1099	1524	analyzeItem.addActionListener(this);
1100		- menu.add(dumpItem = new MenuItem("Dump"));
	1525	+ menu.add(dumpItem = new MenuItem("Print"));
1101	1526	dumpItem.addActionListener(this);
1102	1527	// menu.add(pathItem = new MenuItem("From-to path"));
1103	1528	// pathItem.addActionListener(this);
..	..	@@ -1106,6 +1531,8 @@
1106	1531	resetParentItem.addActionListener(this);
1107	1532	repairParentItem = menu.add(new MenuItem("Repair Parent"));
1108	1533	repairParentItem.addActionListener(this);
	1534	+ repairShadowItem = menu.add(new MenuItem("Repair Shadow"));
	1535	+ repairShadowItem.addActionListener(this);
1109	1536	menu.add(invariantsItem = new MenuItem("Invariants"));
1110	1537	invariantsItem.addActionListener(this);
1111	1538	menu.add(recompileItem = new MenuItem("Recompile"));
..	..	@@ -1113,6 +1540,7 @@
1113	1540	menu.add("-");
1114	1541	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1115	1542	editScriptItem.addActionListener(this);
	1543	+ }
1116	1544	}
1117	1545
1118	1546	void ScreenFit()
..	..	@@ -1235,9 +1663,24 @@
1235	1663	shadow.material = new cMaterial(obj.material);
1236	1664	shadow.material.diffuse = 0.0001f;
1237	1665	shadow.material.specular = 0.0001f;
	1666	+ //shadow.projectedVertices[1].x = 300;
1238	1667
1239	1668	makeSomething(shadow);
1240	1669	}
	1670	+
	1671	+ private void ClearUnpinned()
	1672	+ {
	1673	+ //for (Object3D obj : listUI)
	1674	+ for (int i=listUI.size(); --i>=0;)
	1675	+ {
	1676	+ Object3D obj = listUI.elementAt(i);
	1677	+ if (!obj.pinned)
	1678	+ {
	1679	+ obj.CloseUI();
	1680	+ listUI.remove(i);
	1681	+ }
	1682	+ }
	1683	+ }
1241	1684
1242	1685	/**
1243	1686	* applyExample
..	..	@@ -1441,9 +1884,9 @@
1441	1884
1442	1885	void Overwrite(int mask)
1443	1886	{
1444		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	1887	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1445	1888	{
1446		- Object3D content = GraphreeD.clipboard.get(0);
	1889	+ Object3D content = Grafreed.clipboard.get(0);
1447	1890
1448	1891	if (content instanceof cGroup && ((cGroup)content).transientlink )
1449	1892	content = ((cGroup)content).get(0);
..	..	@@ -1466,6 +1909,7 @@
1466	1909	//
1467	1910	public void actionPerformed(ActionEvent event) // , Object arg)
1468	1911	{
	1912	+ Object source = event.getSource();
1469	1913	/*
1470	1914	if (event.getSource() == nameField)
1471	1915	{
..	..	@@ -1477,11 +1921,11 @@
1477	1921	}
1478	1922	else
1479	1923	*/
1480		- if (event.getSource() == lookAtItem \|\| event.getSource() == lookFromItem)
	1924	+ if (source == lookAtItem \|\| source == lookFromItem)
1481	1925	{
1482	1926	ScreenFit();
1483	1927	} else
1484		- if (event.getSource() == switchItem)
	1928	+ if (source == switchViewItem)
1485	1929	{
1486	1930	cVector v1 = new cVector();
1487	1931	cVector v2 = new cVector();
..	..	@@ -1490,11 +1934,11 @@
1490	1934	objEditor.cameraView.renderCamera.setAim(v2, v1);
1491	1935	objEditor.cameraView.repaint();
1492	1936	} else
1493		- if (event.getSource() == rectoidItem)
	1937	+ if (source == rectoidItem \|\| source == boxButton)
1494	1938	{
1495	1939	makeSomething(new Box());
1496	1940	} else
1497		- if (event.getSource() == particleItem)
	1941	+ if (source == particleItem \|\| source == particlesButton)
1498	1942	{
1499	1943	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1500	1944	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1515,9 +1959,9 @@
1515	1959	applyExample(particleGeom, "SMOKE");
1516	1960	makeSomething(particleGeom);
1517	1961	} else
1518		- if (event.getSource() == ragdollItem \|\| event.getSource() == ragdoll2Item)
	1962	+ if (source == ragdollItem \|\| source == ragdoll2Item)
1519	1963	{
1520		- GenericJoint ragdoll = new GenericJoint(event.getSource() == ragdollItem);
	1964	+ GenericJoint ragdoll = new GenericJoint(source == ragdollItem);
1521	1965
1522	1966	ragdoll.toParent = LA.newMatrix();
1523	1967	ragdoll.fromParent = LA.newMatrix();
..	..	@@ -1535,7 +1979,7 @@
1535	1979	} else
1536	1980	/*
1537	1981	*/
1538		- if (event.getSource() == heightFieldItem)
	1982	+ if (source == heightFieldItem)
1539	1983	{
1540	1984	Object3D obj = new Object3D();
1541	1985
..	..	@@ -1573,27 +2017,31 @@
1573	2017
1574	2018	makeSomething(obj);
1575	2019	} else
1576		- if (event.getSource() == gridItem)
	2020	+ if (source == gridItem \|\| source == gridButton)
1577	2021	{
1578	2022	makeSomething(new Grid());
1579	2023	} else
1580		- if (event.getSource() == ellipsoidItem)
	2024	+ if (source == ellipsoidItem \|\| source == sphereButton)
1581	2025	{
1582	2026	makeSomething(new Sphere());
1583	2027	} else
1584		- if (event.getSource() == coneItem)
	2028	+ if (source == coneItem \|\| source == coneButton)
1585	2029	{
1586	2030	makeSomething(new Cone());
1587	2031	} else
1588		- if (event.getSource() == torusItem)
	2032	+ if (source == torusItem \|\| source == torusButton)
1589	2033	{
1590	2034	makeSomething(new Torus());
1591	2035	} else
1592		- if (event.getSource() == superItem)
	2036	+ if (source == superItem \|\| source == superButton)
1593	2037	{
1594	2038	makeSomething(new Superellipsoid());
1595	2039	} else
1596		- if (event.getSource() == blobItem)
	2040	+ if (source == kleinItem \|\| source == kleinButton)
	2041	+ {
	2042	+ makeSomething(new Klein());
	2043	+ } else
	2044	+ if (source == blobItem)
1597	2045	{
1598	2046	Blob blob = new Blob();
1599	2047	BlobComponent comp = new BlobComponent();
..	..	@@ -1601,15 +2049,15 @@
1601	2049	//blob.retile();
1602	2050	makeSomething(blob);
1603	2051	} else
1604		- if (event.getSource() == latheItem)
	2052	+ if (source == latheItem)
1605	2053	{
1606	2054	makeSomething(new Lathe());
1607	2055	} else
1608		- if (event.getSource() == bezierItem)
	2056	+ if (source == bezierItem)
1609	2057	{
1610	2058	makeSomething(new BezierSurface());
1611	2059	} else
1612		- if (event.getSource() == checkerItem)
	2060	+ if (source == overlayItem \|\| source == overlayButton)
1613	2061	{
1614	2062	/*
1615	2063	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1624,7 +2072,7 @@
1624	2072	*/
1625	2073	makeSomething(new Checker());
1626	2074	} else
1627		- if (event.getSource() == meshItem)
	2075	+ if (source == meshItem)
1628	2076	{
1629	2077	Object3D itemtomake = new Object3D();
1630	2078	Object3D child;
..	..	@@ -1645,35 +2093,35 @@
1645	2093	makeSomething(child);
1646	2094	}
1647	2095	} else
1648		- if (event.getSource() == springItem)
	2096	+ if (source == springItem)
1649	2097	{
1650	2098	cSpring s = new cSpring();
1651	2099	s.setup();
1652	2100	makeSomething(s);
1653	2101	} else
1654		- if (event.getSource() == flagItem)
	2102	+ if (source == flagItem)
1655	2103	{
1656	2104	cSpring s = new cFlag();
1657	2105	s.setup();
1658	2106	makeSomething(s);
1659	2107	} else
1660		- if (event.getSource() == lightItem)
	2108	+ if (source == lightItem \|\| source == lightButton)
1661	2109	{
1662	2110	makeSomething(new Light());
1663	2111	} else
1664		- if (event.getSource() == csgItem)
	2112	+ if (source == csgItem)
1665	2113	{
1666	2114	group(new CSG());
1667	2115	} else
1668		- if (event.getSource() == templateItem)
	2116	+ if (source == templateItem)
1669	2117	{
1670	2118	group(new cTemplate());
1671	2119	} else
1672		- if (event.getSource() == attributeItem)
	2120	+ if (source == attributeItem)
1673	2121	{
1674	2122	makeSomething(new Attribute());
1675	2123	} else
1676		- if (event.getSource() == pointflowItem)
	2124	+ if (source == pointflowItem)
1677	2125	{
1678	2126	makeSomething(new PointFlow());
1679	2127	} else
..	..	@@ -1685,7 +2133,7 @@
1685	2133	} else
1686	2134	*/
1687	2135
1688		- if (event.getSource() == superLoopItem)
	2136	+ if (source == superLoopItem)
1689	2137	{
1690	2138	Composite g = new cGroup();
1691	2139	for (int i=0; i<15; i++)
..	..	@@ -1707,30 +2155,30 @@
1707	2155
1708	2156	group(g);
1709	2157	} else
1710		- if (event.getSource() == loopItem)
	2158	+ if (source == loopItem \|\| source == loopButton)
1711	2159	{
1712	2160	Composite csg = new GroupLeaf();
1713	2161	csg.count = 5;
1714	2162	group(csg);
1715		- Composite child = new cGroup();
	2163	+ Composite child = new cGroup("Branch");
1716	2164	csg.addChild(child);
1717	2165	child.addChild(csg);
1718	2166	} else
1719		- if (event.getSource() == doubleItem)
	2167	+ if (source == doubleItem)
1720	2168	{
1721		- Composite csg = new GroupLeaf();
	2169	+ Composite csg = new GroupLeaf("Fork");
1722	2170	csg.count = 5;
1723	2171	group(csg);
1724		- Composite child = new cGroup();
	2172	+ Composite child = new cGroup("Branch A");
1725	2173	csg.addChild(child);
1726	2174	child.addChild(csg);
1727		- child = new cGroup();
	2175	+ child = new cGroup("Branch B");
1728	2176	csg.addChild(child);
1729	2177	child.addChild(csg);
1730	2178	} else
1731		- if (event.getSource() == tripleItem)
	2179	+ if (source == tripleItem)
1732	2180	{
1733		- Composite csg = new GroupLeaf();
	2181	+ Composite csg = new GroupLeaf("Trident");
1734	2182	csg.count = 4;
1735	2183	group(csg);
1736	2184	Composite child = new cGroup();
..	..	@@ -1743,73 +2191,98 @@
1743	2191	csg.addChild(child);
1744	2192	child.addChild(csg);
1745	2193	} else
1746		-
1747		- if (event.getSource() == importGFDItem)
	2194	+ if (source == computeAOItem)
1748	2195	{
1749		- ImportGFD();
	2196	+ Globals.drawMode = CameraPane.OCCLUSION;
	2197	+ Globals.theRenderer.repaint();
1750	2198	} 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)
	2199	+ if (source == recompileItem)
1769	2200	{
1770	2201	Recompile();
1771	2202	refreshContents();
1772	2203	} else
1773		- if (event.getSource() == editScriptItem)
	2204	+ if (source == editScriptItem)
1774	2205	{
1775	2206	OpenDialog();
1776	2207	refreshContents();
1777	2208	} else
1778		- if (event.getSource() == invariantsItem)
	2209	+ if (source == invariantsItem)
1779	2210	{
1780	2211	System.out.println("Invariants:");
1781		- GraphreeD.theApplet3D.universe.invariants();
	2212	+ Grafreed.grafreeD.universe.invariants();
1782	2213	} else
1783		- if (event.getSource() == memoryItem)
	2214	+ if (source == memoryItem)
1784	2215	{
1785	2216	//System.out.println("Invariants:");
1786	2217	PrintMemory();
1787	2218	} else
1788		- if (event.getSource() == pathItem)
	2219	+ if (source == pathItem)
1789	2220	{
1790	2221	PrintPath();
1791	2222	} else
1792		- if (event.getSource() == analyzeItem)
	2223	+ if (source == analyzeItem)
1793	2224	{
1794	2225	AnalyzeObject();
1795	2226	} else
1796		- if (event.getSource() == dumpItem)
	2227	+ if (source == dumpItem)
1797	2228	{
1798	2229	DumpObject();
1799	2230	} else
1800		- if (event.getSource() == screenfitButton)
	2231	+ if (source == minButton)
1801	2232	{
1802		- //Reload(lastConverter, lastFilename, true);
	2233	+ Minimize();
	2234	+ } else
	2235	+ if (source == maxButton)
	2236	+ {
	2237	+ Maximize();
	2238	+ } else
	2239	+ if (source == fullButton)
	2240	+ {
	2241	+ ToggleFullScreen();
	2242	+ } else
	2243	+ if (source == undoButton)
	2244	+ {
	2245	+ // Go to previous version
	2246	+ //if (!Undo())
	2247	+ //java.awt.Toolkit.getDefaultToolkit().beep();
	2248	+ Undo();
	2249	+ } else
	2250	+ if (source == restoreButton)
	2251	+ {
	2252	+ // Restore current version
	2253	+ Restore();
	2254	+ } else
	2255	+ if (source == replaceButton)
	2256	+ {
	2257	+ // Overwrite current version
	2258	+ Replace();
	2259	+ } else
	2260	+ if (source == redoButton)
	2261	+ {
	2262	+ // Go to next version
	2263	+ Redo();
	2264	+ } else
	2265	+ if (source == saveButton)
	2266	+ {
	2267	+ // Save a new version
	2268	+ if (!Save(true))
	2269	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2270	+ } else
	2271	+ if (source == oneStepButton)
	2272	+ {
	2273	+ Globals.ONESTEP = true;
	2274	+ cameraView.repaint();
	2275	+ } else
	2276	+ if (source == screenfitButton)
	2277	+ {
1803	2278	ScreenFit();
1804	2279	} else
1805		- if (event.getSource() == screenfitpointButton)
	2280	+ if (source == screenfitpointButton)
1806	2281	{
1807		- //Reload(lastConverter, lastFilename, true);
1808	2282	ScreenFitPoint();
1809	2283	} else
1810		- if (event.getSource() == snapobjectButton)
	2284	+ if (source == snapobjectButton)
1811	2285	{
1812		- //Reload(lastConverter, lastFilename, true);
1813	2286	SnapObject();
1814	2287	} else
1815	2288	// if (event.getSource() == recompileButton)
..	..	@@ -1818,13 +2291,13 @@
1818	2291	// Recompile();
1819	2292	// refreshContents();
1820	2293	// } else
1821		- if (event.getSource() == gcButton)
	2294	+ if (source == gcButton)
1822	2295	{
1823	2296	System.out.println("Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1824	2297	System.gc();
1825	2298	System.out.println("GC Memory (F/T/M) : " + Runtime.getRuntime().freeMemory() + "/" + Runtime.getRuntime().totalMemory() + "/" + Runtime.getRuntime().maxMemory());
1826	2299	} else
1827		- if (event.getSource() == editLeafItem)
	2300	+ if (source == editLeafItem)
1828	2301	{
1829	2302	Object3D obj;
1830	2303	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -1838,65 +2311,78 @@
1838	2311	}
1839	2312	refreshContents(true);
1840	2313	} else
1841		- if (event.getSource() == openWindowItem)
	2314	+ if (source == openWindowItem)
1842	2315	{
1843	2316	EditSelection(true);
1844	2317	} else
1845		- if (event.getSource() == cutItem \|\| event.getSource() == clearButton)
	2318	+ if (source == cutItem \|\| source == clearButton)
1846	2319	{
1847	2320	loadClipboard(true);
1848	2321	} else
1849		- if (event.getSource() == duplicateItem)
	2322	+ if (source == undoItem)
1850	2323	{
1851		- Object3D keep = GraphreeD.clipboard;
	2324	+ Undo();
	2325	+ } else
	2326	+ if (source == redoItem)
	2327	+ {
	2328	+ Redo();
	2329	+ } else
	2330	+ if (source == duplicateItem)
	2331	+ {
	2332	+ Object3D keep = Grafreed.clipboard;
1852	2333	loadClipboard(false);
1853	2334	paste(false);
1854		- GraphreeD.clipboard = keep;
	2335	+ Grafreed.clipboard = keep;
1855	2336	} else
1856		- if (event.getSource() == cloneItem)
	2337	+ if (source == cloneItem)
1857	2338	{
1858	2339	CloneSelection(false);
1859	2340	} else
1860		- if (event.getSource() == cloneSupportItem)
	2341	+ if (source == cloneSupportItem)
1861	2342	{
1862	2343	CloneSelection(true);
1863	2344	} else
1864		- if (event.getSource() == copyItem)
	2345	+ if (source == copyItem)
1865	2346	{
1866	2347	loadClipboard(false);
1867	2348	} else
1868		- if (event.getSource() == pasteItem)
	2349	+ if (source == pasteItem)
1869	2350	{
1870	2351	paste(false);
1871	2352	} else
1872		- if (event.getSource() == pasteLinkItem)
	2353	+ if (source == pasteIntoItem)
1873	2354	{
1874		- pasteInto(false);
	2355	+ pasteInto(true, false);
1875	2356	} else
1876		- if (event.getSource() == pasteCloneItem)
	2357	+ if (source == pasteLinkItem)
1877	2358	{
1878		- pasteInto(true);
	2359	+ pasteInto(false, false);
1879	2360	} else
1880		- if (event.getSource() == pasteExpandItem)
	2361	+ if (source == pasteCloneItem)
	2362	+ {
	2363	+ pasteInto(true, true);
	2364	+ } else
	2365	+ if (source == pasteExpandItem)
1881	2366	{
1882	2367	paste(true);
1883	2368	} else
1884		- if (event.getSource() == synchronizeItem)
	2369	+ if (source == synchronizeItem)
1885	2370	{
1886	2371	Overwrite(Object3D.TRANSFORM);
1887	2372	} else
1888		- if (event.getSource() == overwriteNameItem)
	2373	+ if (source == overwriteNameItem)
1889	2374	{
1890	2375	Overwrite(Object3D.NAME);
1891	2376	} else
1892		- if (event.getSource() == overwriteUVItem)
	2377	+ if (source == overwriteUVItem)
1893	2378	{
1894	2379	Overwrite(Object3D.UV);
1895	2380	} else
1896		- if (event.getSource() == overwriteMatItem)
	2381	+ if (source == overwriteMatItem)
1897	2382	{
	2383	+ /* july 2015
1898	2384	if ((dropAttributes & Object3D.TEXTURE) == 0)
1899		- Overwrite(Object3D.MATERIAL);
	2385	+ Overwrite(Object3D.MATERIAL \| Object3D.COLOR);
1900	2386	else
1901	2387	{
1902	2388	if ((dropAttributes & Object3D.COLOR) == 0 && (dropAttributes & Object3D.MATERIAL) == 0)
..	..	@@ -1908,13 +2394,16 @@
1908	2394	Overwrite(Object3D.MATERIAL \| Object3D.TEXTURE);
1909	2395	}
1910	2396	}
	2397	+ */
	2398	+
	2399	+ Overwrite(dropAttributes);
1911	2400	}
1912		- if (event.getSource() == overwriteGeoItem)
	2401	+ if (source == overwriteGeoItem)
1913	2402	{
1914	2403	Overwrite(Object3D.GEOMETRY);
1915		-// if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2404	+// if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
1916	2405	// {
1917		-// Object3D content = GraphreeD.clipboard.get(0);
	2406	+// Object3D content = GrafreeD.clipboard.get(0);
1918	2407	//
1919	2408	// if (content instanceof cGroup && ((cGroup)content).transientlink )
1920	2409	// content = ((cGroup)content).get(0);
..	..	@@ -1926,7 +2415,7 @@
1926	2415	// refreshContents();
1927	2416	// }
1928	2417	} else
1929		- if (event.getSource() == generateMeshItem)
	2418	+ if (source == generateMeshItem)
1930	2419	{
1931	2420	//if (group.selection.size() == 1)
1932	2421	// for (int i=0; i<group.selection.size(); i++)
..	..	@@ -1937,7 +2426,7 @@
1937	2426	ResetModel();
1938	2427	refreshContents();
1939	2428	} else
1940		- if (event.getSource() == extractGeometriesItem)
	2429	+ if (source == extractGeometriesItem)
1941	2430	{
1942	2431	boolean one = false;
1943	2432
..	..	@@ -1964,7 +2453,7 @@
1964	2453	ResetModel();
1965	2454	refreshContents();
1966	2455	} else
1967		- if (event.getSource() == cloneGeometriesItem)
	2456	+ if (source == cloneGeometriesItem)
1968	2457	{
1969	2458	boolean one = false;
1970	2459
..	..	@@ -1990,32 +2479,37 @@
1990	2479	ResetModel();
1991	2480	refreshContents();
1992	2481	} else
1993		- if (event.getSource() == shareGeometriesItem)
	2482	+ if (source == shareGeometriesItem)
1994	2483	{
1995	2484	boolean one = false;
1996	2485
1997	2486	if (group.selection.size() == 1)
1998	2487	one = true;
1999	2488
	2489	+ Object3D merge = null;
	2490	+
2000	2491	Object3D content = new cGroup();
2001	2492
2002	2493	for (int i=0; i<group.selection.size(); i++)
2003	2494	{
2004		- Object3D sel = new Merge(group.selection.get(i));
	2495	+ merge = new Merge(group.selection.get(i));
2005	2496
2006	2497	if (one)
2007		- makeSomething(sel, false);
	2498	+ makeSomething(merge, false);
2008	2499	else
2009		- content.addChild(sel);
	2500	+ content.addChild(merge);
2010	2501	}
2011	2502
2012	2503	if (!one)
2013		- makeSomething(content, false);
2014		-
2015		- ResetModel();
2016		- refreshContents();
	2504	+ makeSomething(content, true);
	2505	+ else
	2506	+ {
	2507	+ ResetModel();
	2508	+ Select(merge.GetTreePath(), true, false); // unselect... false);
	2509	+ refreshContents();
	2510	+ }
2017	2511	} else
2018		- if (event.getSource() == mergeGeometriesItem)
	2512	+ if (source == mergeGeometriesItem)
2019	2513	{
2020	2514	boolean one = false;
2021	2515
..	..	@@ -2045,11 +2539,11 @@
2045	2539	ResetModel();
2046	2540	refreshContents();
2047	2541	} else
2048		- if (event.getSource() == linkverticesItem)
	2542	+ if (source == linkverticesItem)
2049	2543	{
2050		-// if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2544	+// if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
2051	2545	// {
2052		-// Object3D content = GraphreeD.clipboard.get(0);
	2546	+// Object3D content = GrafreeD.clipboard.get(0);
2053	2547	//
2054	2548	// if (content instanceof cGroup && ((cGroup)content).transientlink )
2055	2549	// content = ((cGroup)content).get(0);
..	..	@@ -2058,39 +2552,48 @@
2058	2552	// group.selection.get(0).setMasterThis(content); // should be identity
2059	2553	// refreshContents();
2060	2554	// }
2061		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	2555	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2062	2556	{
2063		- Object3D content = GraphreeD.clipboard.get(0);
	2557	+ Object3D content = Grafreed.clipboard.get(0);
2064	2558
2065	2559	if (content instanceof cGroup && ((cGroup)content).transientlink )
2066	2560	content = ((cGroup)content).get(0);
2067	2561
2068		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
	2562	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2069	2563	for (int i=0; i<group.selection.size(); i++)
2070	2564	{
2071		- boolean random = CameraPane.RANDOM;
2072		- CameraPane.RANDOM = false; // parse all random nodes
	2565	+ boolean random = CameraPane.SWITCH;
	2566	+ CameraPane.SWITCH = false; // parse all random nodes
2073	2567	group.selection.get(i).linkVerticesThis(content);
2074	2568	// group.selection.get(i).setMasterThis(content); // should be identity
2075		- CameraPane.RANDOM = random;
	2569	+ CameraPane.SWITCH = random;
2076	2570	}
2077		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	2571	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2078	2572	refreshContents();
2079	2573	}
2080	2574	} else
2081		- if (event.getSource() == resetsupportItem)
	2575	+ if (source == resetsupportItem)
2082	2576	{
2083	2577	for (int i=0; i<group.selection.size(); i++)
2084	2578	{
2085		- boolean random = CameraPane.RANDOM;
2086		- CameraPane.RANDOM = false; // parse all random nodes
	2579	+ boolean random = CameraPane.SWITCH;
	2580	+ CameraPane.SWITCH = false; // parse all random nodes
2087	2581	group.selection.get(i).linkVerticesThis(null);
2088		- CameraPane.RANDOM = random;
	2582	+ CameraPane.SWITCH = random;
2089	2583	}
2090	2584
2091	2585	refreshContents();
2092	2586	} else
2093		- if (event.getSource() == resetreferencesItem)
	2587	+ if (source == relinkverticesItem)
	2588	+ {
	2589	+ boolean random = CameraPane.SWITCH;
	2590	+ CameraPane.SWITCH = false; // parse all random nodes
	2591	+ group.selection.RelinkToSupport();
	2592	+ CameraPane.SWITCH = random;
	2593	+
	2594	+ refreshContents();
	2595	+ } else
	2596	+ if (source == resetreferencesItem)
2094	2597	{
2095	2598	for (int i=0; i<group.selection.size(); i++)
2096	2599	{
..	..	@@ -2099,11 +2602,11 @@
2099	2602
2100	2603	refreshContents();
2101	2604	} else
2102		- if (event.getSource() == setMasterItem)
	2605	+ if (source == setMasterItem)
2103	2606	{
2104		- if (group.selection.size() == 1 && GraphreeD.clipboard.size() == 1)
	2607	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2105	2608	{
2106		- Object3D content = GraphreeD.clipboard.get(0);
	2609	+ Object3D content = Grafreed.clipboard.get(0);
2107	2610
2108	2611	if (content instanceof cGroup && ((cGroup)content).transientlink )
2109	2612	content = ((cGroup)content).get(0);
..	..	@@ -2112,13 +2615,13 @@
2112	2615	refreshContents();
2113	2616	}
2114	2617	} else
2115		- if (event.getSource() == poseMeshItem)
	2618	+ if (source == poseMeshItem)
2116	2619	{
2117	2620	if (group.selection.size() == 1)
2118	2621	{
2119		- if (GraphreeD.clipboard.size() == 1)
	2622	+ if (Grafreed.clipboard.size() == 1)
2120	2623	{
2121		- Object3D content = GraphreeD.clipboard.get(0);
	2624	+ Object3D content = Grafreed.clipboard.get(0);
2122	2625
2123	2626	if (content instanceof cGroup && ((cGroup)content).transientlink )
2124	2627	content = ((cGroup)content).get(0);
..	..	@@ -2131,19 +2634,19 @@
2131	2634	}
2132	2635
2133	2636	} else
2134		- if (event.getSource() == revertMeshItem)
	2637	+ if (source == revertMeshItem)
2135	2638	{
2136	2639	RevertMeshes();
2137	2640	} else
2138		- if (event.getSource() == resetMeshItem)
	2641	+ if (source == resetAllItem)
2139	2642	{
2140	2643	ResetAll();
2141	2644	} else
2142		- if (event.getSource() == stepAllItem)
	2645	+ if (source == stepAllItem)
2143	2646	{
2144	2647	StepAll();
2145	2648	} else
2146		- if (event.getSource() == clearItem) // \|\| event.getSource() == clearButton)
	2649	+ if (source == clearItem) // \|\| event.getSource() == clearButton)
2147	2650	{
2148	2651	//int indices[] = jList.getSelectedIndices();
2149	2652	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -2151,42 +2654,46 @@
2151	2654
2152	2655	ClearSelection(false);
2153	2656	} else
2154		- if (event.getSource() == clearAllItem)
	2657	+ if (source == clearAllItem)
2155	2658	{
2156	2659	ClearSelection(true);
2157	2660	} else
2158		- if (event.getSource() == grabItem)
	2661	+ if (source == grabItem \|\| source == groupButton)
2159	2662	{
2160		- group(new cGroup(), true);
	2663	+ group(new cGroup(), false); // true);
2161	2664	} else
2162		- if (event.getSource() == frontItem)
	2665	+ if (source == hideItem)
	2666	+ {
	2667	+ group(new HiddenObject());
	2668	+ } else
	2669	+ if (source == frontItem)
2163	2670	{
2164	2671	front();
2165	2672	} else
2166		- if (event.getSource() == backItem)
	2673	+ if (source == backItem)
2167	2674	{
2168	2675	back();
2169	2676	} else
2170		- if (event.getSource() == cameraItem)
	2677	+ if (source == cameraItem)
2171	2678	{
2172	2679	makeSomething(new Camera());
2173	2680	} else
2174		- if (event.getSource() == compositeItem)
	2681	+ if (source == compositeItem \|\| source == compositeButton)
2175	2682	{
2176	2683	group(new Composite());
2177	2684	} else
2178		- if (event.getSource() == randomItem)
	2685	+ if (source == switchItem \|\| source == switchButton)
2179	2686	{
2180	2687	RandomNode random = new RandomNode();
2181	2688	group(random);
2182	2689	if (random.size() > 0)
2183		- random.name = random.get(0).name + "Rnd";
	2690	+ random.name = random.get(0).name + "Switch";
2184	2691	} else
2185		- if (event.getSource() == physicsItem)
	2692	+ if (source == physicsItem)
2186	2693	{
2187	2694	group(new PhysicsNode());
2188	2695	} else
2189		- if (event.getSource() == frameselectorItem)
	2696	+ if (source == frameselectorItem)
2190	2697	{
2191	2698	for (int i=0; i<group.selection.size(); i++)
2192	2699	{
..	..	@@ -2198,7 +2705,7 @@
2198	2705	ResetModel();
2199	2706	refreshContents();
2200	2707	} else
2201		- if (event.getSource() == switchGeoItem)
	2708	+ if (source == switchGeoItem)
2202	2709	{
2203	2710	for (int i=0; i<group.selection.size(); i++)
2204	2711	{
..	..	@@ -2210,7 +2717,7 @@
2210	2717	ResetModel();
2211	2718	refreshContents();
2212	2719	} else
2213		- if (event.getSource() == switchTransfoItem)
	2720	+ if (source == switchTransfoItem)
2214	2721	{
2215	2722	for (int i=0; i<group.selection.size(); i++)
2216	2723	{
..	..	@@ -2222,7 +2729,7 @@
2222	2729	ResetModel();
2223	2730	refreshContents();
2224	2731	} else
2225		- if (event.getSource() == morphItem)
	2732	+ if (source == morphItem)
2226	2733	{
2227	2734	for (int i=0; i<group.selection.size(); i++)
2228	2735	{
..	..	@@ -2234,7 +2741,7 @@
2234	2741	ResetModel();
2235	2742	refreshContents();
2236	2743	} else
2237		- if (event.getSource() == scriptNodeItem)
	2744	+ if (source == scriptNodeItem)
2238	2745	{
2239	2746	boolean atleastone = false;
2240	2747
..	..	@@ -2273,195 +2780,252 @@
2273	2780	}
2274	2781	}
2275	2782	} else
2276		- if (event.getSource() == linkerItem)
	2783	+ if (source == linkerItem)
2277	2784	{
2278	2785	group(new cLinker());
2279	2786	} else
2280		- if (event.getSource() == textureItem)
	2787	+ if (source == textureItem \|\| source == textureButton)
2281	2788	{
2282	2789	group(new TextureNode());
2283	2790	} else
2284		- if (event.getSource() == shadowXItem)
	2791	+ if (source == billboardItem)
	2792	+ {
	2793	+ group(new BillboardNode());
	2794	+ } else
	2795	+ if (source == shadowXItem)
2285	2796	{
2286	2797	CastShadow(0);
2287	2798	} else
2288		- if (event.getSource() == shadowYItem)
	2799	+ if (source == shadowYItem)
2289	2800	{
2290	2801	CastShadow(1);
2291	2802	} else
2292		- if (event.getSource() == shadowZItem)
	2803	+ if (source == shadowZItem)
2293	2804	{
2294	2805	CastShadow(2);
2295	2806	} else
2296		- if (event.getSource() == ungroupItem)
	2807	+ if (source == ungroupItem \|\| source == ungroupButton)
2297	2808	{
2298		- ungroup();
	2809	+ boolean hasRoot = false;
	2810	+
	2811	+ for (int i=0; i<group.selection.size(); i++)
	2812	+ {
	2813	+ if (group.selection.get(i) == group)
	2814	+ {
	2815	+ hasRoot = true;
	2816	+ break;
	2817	+ }
	2818	+ }
	2819	+
	2820	+ if (!hasRoot)
	2821	+ {
	2822	+ for (int i=0; i<group.selection.size(); i++)
	2823	+ {
	2824	+ Ungroup(group.selection.get(i));
	2825	+ }
	2826	+
	2827	+ ClearSelection(false);
	2828	+
	2829	+ refreshContents();
	2830	+ }
2299	2831	} else
2300		- if (event.getSource() == genUVItem)
	2832	+ if (source == genUVItem)
2301	2833	{
2302	2834	GenUV();
2303	2835	} else
2304		- if (event.getSource() == genNormalsCADItem)
	2836	+ if (source == genNormalsCADItem)
2305	2837	{
2306	2838	GenNormals(true);
2307	2839	} else
2308		- if (event.getSource() == genNormalsORGANItem)
	2840	+ if (source == genNormalsMESHItem)
	2841	+ {
	2842	+ GenNormalsMESH();
	2843	+ } else
	2844	+ if (source == genNormalsORGANItem)
2309	2845	{
2310	2846	GenNormals(false);
2311	2847	} else
2312		- if (event.getSource() == stripifyItem)
	2848	+ if (source == genNormalsMINEItem)
	2849	+ {
	2850	+ GenNormalsMINE();
	2851	+ } else
	2852	+ if (source == stripifyItem)
2313	2853	{
2314	2854	Stripify();
2315	2855	} else
2316		- if (event.getSource() == unstripifyItem)
	2856	+ if (source == unstripifyItem)
2317	2857	{
2318	2858	Unstripify();
2319	2859	} else
2320		- if (event.getSource() == trimItem)
	2860	+ if (source == trimItem)
2321	2861	{
2322	2862	Trim();
2323	2863	} else
2324		- if (event.getSource() == untrimItem)
	2864	+ if (source == untrimItem)
2325	2865	{
2326	2866	Untrim();
2327	2867	} else
2328		- if (event.getSource() == clearColorsItem)
	2868	+ if (source == clearColorsItem)
2329	2869	{
2330	2870	ClearColors();
2331	2871	} else
2332		- if (event.getSource() == clearMaterialsItem)
	2872	+ if (source == clearMaterialsItem)
2333	2873	{
2334	2874	ClearMaterials();
2335	2875	} else
2336		- if (event.getSource() == liveleavesItem)
	2876	+ if (source == liveleavesItem)
2337	2877	{
2338	2878	LiveLeaves(true);
2339	2879	} else
2340		- if (event.getSource() == unliveleavesItem)
	2880	+ if (source == unliveleavesItem)
2341	2881	{
2342	2882	LiveLeaves(false);
2343	2883	} else
2344		- if (event.getSource() == supportleavesItem)
	2884	+ if (source == supportleavesItem)
2345	2885	{
2346	2886	SupportLeaves(true);
2347	2887	} else
2348		- if (event.getSource() == unsupportleavesItem)
	2888	+ if (source == unsupportleavesItem)
2349	2889	{
2350	2890	SupportLeaves(false);
2351	2891	} else
2352		- if (event.getSource() == hideleavesItem)
	2892	+ if (source == hideleavesItem)
2353	2893	{
2354	2894	HideLeaves(true);
2355	2895	} else
2356		- if (event.getSource() == showleavesItem)
	2896	+ if (source == showleavesItem)
2357	2897	{
2358	2898	HideLeaves(false);
2359	2899	} else
2360		- if (event.getSource() == markleavesItem)
	2900	+ if (source == markleavesItem)
2361	2901	{
2362	2902	MarkLeaves(true);
2363	2903	} else
2364		- if (event.getSource() == unmarkleavesItem)
	2904	+ if (source == unmarkleavesItem)
2365	2905	{
2366	2906	MarkLeaves(false);
2367	2907	} else
2368		- if (event.getSource() == flipVItem)
	2908	+ if (source == rewindleavesItem)
	2909	+ {
	2910	+ RewindLeaves(true);
	2911	+ } else
	2912	+ if (source == unrewindleavesItem)
	2913	+ {
	2914	+ RewindLeaves(false);
	2915	+ } else
	2916	+ if (source == randomleavesItem)
	2917	+ {
	2918	+ RandomLeaves(true);
	2919	+ } else
	2920	+ if (source == unrandomleavesItem)
	2921	+ {
	2922	+ RandomLeaves(false);
	2923	+ } else
	2924	+ if (source == flipVItem)
2369	2925	{
2370	2926	FlipV(true);
2371	2927	} else
2372		- if (event.getSource() == unflipVItem)
	2928	+ if (source == unflipVItem)
2373	2929	{
2374	2930	FlipV(false);
2375	2931	} else
2376		- if (event.getSource() == lowTexturesItem)
	2932	+ if (source == lowTexturesItem)
2377	2933	{
2378	2934	SetTexRes(0);
2379	2935	} else
2380		- if (event.getSource() == normalTexturesItem)
	2936	+ if (source == normalTexturesItem)
2381	2937	{
2382	2938	SetTexRes(1);
2383	2939	} else
2384		- if (event.getSource() == highTexturesItem)
	2940	+ if (source == highTexturesItem)
2385	2941	{
2386	2942	SetTexRes(2);
2387	2943	} else
2388		- if (event.getSource() == veryhighTexturesItem)
	2944	+ if (source == veryhighTexturesItem)
2389	2945	{
2390	2946	SetTexRes(3);
2391	2947	} else
2392		- if (event.getSource() == maxTexturesItem)
	2948	+ if (source == maxTexturesItem)
2393	2949	{
2394	2950	SetTexRes(4);
2395	2951	} else
2396		- if (event.getSource() == panoTexturesItem)
	2952	+ if (source == panoTexturesItem)
2397	2953	{
2398	2954	SetTexRes(5);
2399	2955	} else
2400		- if (event.getSource() == reverseNormalsItem)
	2956	+ if (source == reverseNormalsItem)
2401	2957	{
2402	2958	ReverseNormals();
2403	2959	} else
2404		- if (event.getSource() == parseverticesItem)
	2960	+ if (source == parseverticesItem)
2405	2961	{
2406	2962	ParseVertices();
2407	2963	} else
2408		- if (event.getSource() == textureFieldItem)
	2964	+ if (source == textureFieldItem)
2409	2965	{
2410	2966	TextureVertices();
2411	2967	} else
2412		- if (event.getSource() == alignItem)
	2968	+ if (source == alignItem)
2413	2969	{
2414	2970	Align();
2415	2971	} else
2416		- if (event.getSource() == mirrorItem)
	2972	+ if (source == mirrorItem)
2417	2973	{
2418	2974	MirrorPoses();
2419	2975	} else
2420		- if (event.getSource() == reduceMorphItem)
	2976	+ if (source == reduceMorphItem)
2421	2977	{
2422	2978	MeshReduction(false);
2423	2979	} else
2424		- if (event.getSource() == reduce34MorphItem)
	2980	+ if (source == reduce34MorphItem)
2425	2981	{
2426	2982	MeshReduction(true);
2427	2983	} else
2428		- if (event.getSource() == reverseTrianglesItem)
	2984	+ if (source == reverseTrianglesItem)
2429	2985	{
2430	2986	ReverseTriangles();
2431	2987	} else
2432		- if (event.getSource() == reduceMeshItem)
	2988	+ if (source == reduceMeshItem)
2433	2989	{
2434	2990	ReduceMesh(false);
2435	2991	} else
2436		- if (event.getSource() == reduce34MeshItem)
	2992	+ if (source == reduce34MeshItem)
2437	2993	{
2438	2994	ReduceMesh(true);
2439	2995	} else
2440		- if (event.getSource() == increaseMeshItem)
	2996	+ if (source == increaseMeshItem)
2441	2997	{
2442	2998	IncreaseMesh();
2443	2999	} else
2444		- if (event.getSource() == clipMeshItem)
	3000	+ if (source == clipMeshItem)
2445	3001	{
2446	3002	ClipMesh();
2447	3003	} else
2448		- if (event.getSource() == smoothMeshItem)
	3004	+ if (source == smoothMeshItem)
2449	3005	{
2450	3006	SmoothMesh();
2451	3007	} else
2452		- if (event.getSource() == transformgeometryItem)
	3008	+ if (source == transformGeometryItem)
2453	3009	{
2454	3010	TransformGeometry();
2455	3011	} else
2456		- if (event.getSource() == resetTransformItem)
	3012	+ if (source == transformChildrenItem)
	3013	+ {
	3014	+ TransformChildren();
	3015	+ } else
	3016	+ if (source == resetTransformItem)
2457	3017	{
2458	3018	ResetTransform();
2459	3019	} else
2460		- if (event.getSource() == resetCentroidItem)
	3020	+ if (source == resetCentroidItem)
2461	3021	{
2462		- ResetCentroid();
	3022	+ ResetCentroid(true);
2463	3023	} else
2464		- if (event.getSource() == resetParentItem)
	3024	+ if (source == resetCentroidXZItem)
	3025	+ {
	3026	+ ResetCentroid(false);
	3027	+ } else
	3028	+ if (source == resetParentItem)
2465	3029	{
2466	3030	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2467	3031	{
..	..	@@ -2471,7 +3035,7 @@
2471	3035
2472	3036	refreshContents();
2473	3037	} else
2474		- if (event.getSource() == repairParentItem)
	3038	+ if (source == repairParentItem)
2475	3039	{
2476	3040	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2477	3041	{
..	..	@@ -2485,7 +3049,21 @@
2485	3049
2486	3050	refreshContents();
2487	3051	} else
2488		- if (event.getSource() == sortbysizeItem)
	3052	+ if (source == repairShadowItem)
	3053	+ {
	3054	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3055	+ {
	3056	+ Object3D obj = (Object3D)e.nextElement();
	3057	+ obj.RepairShadow();
	3058	+// for (int i=0; i<obj.size(); i++)
	3059	+// {
	3060	+// obj.get(i).parent = obj;
	3061	+// }
	3062	+ }
	3063	+
	3064	+ refreshContents();
	3065	+ } else
	3066	+ if (source == sortbysizeItem)
2489	3067	{
2490	3068	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2491	3069	{
..	..	@@ -2497,7 +3075,7 @@
2497	3075	ResetModel();
2498	3076	refreshContents();
2499	3077	} else
2500		- if (event.getSource() == sortbynameItem)
	3078	+ if (source == sortbynameItem)
2501	3079	{
2502	3080	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2503	3081	{
..	..	@@ -2509,7 +3087,7 @@
2509	3087	ResetModel();
2510	3088	refreshContents();
2511	3089	} else
2512		- if (event.getSource() == attachPigmentItem)
	3090	+ if (source == attachPigmentItem)
2513	3091	{
2514	3092	String texture = GetFile("Attach pigment");
2515	3093	Object3D obj;
..	..	@@ -2521,7 +3099,7 @@
2521	3099
2522	3100	refreshContents();
2523	3101	} else
2524		- if (event.getSource() == detachPigmentItem)
	3102	+ if (source == detachPigmentItem)
2525	3103	{
2526	3104	Object3D obj;
2527	3105	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2532,7 +3110,7 @@
2532	3110
2533	3111	refreshContents();
2534	3112	} else
2535		- if (event.getSource() == attachBumpItem)
	3113	+ if (source == attachBumpItem)
2536	3114	{
2537	3115	String texture = GetFile("Attach bump");
2538	3116	Object3D obj;
..	..	@@ -2544,7 +3122,7 @@
2544	3122
2545	3123	refreshContents();
2546	3124	} else
2547		- if (event.getSource() == detachBumpItem)
	3125	+ if (source == detachBumpItem)
2548	3126	{
2549	3127	Object3D obj;
2550	3128	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2555,7 +3133,7 @@
2555	3133
2556	3134	refreshContents();
2557	3135	} else
2558		- if (event.getSource() == pigmentBumpItem)
	3136	+ if (source == pigmentBumpItem)
2559	3137	{
2560	3138	Object3D obj;
2561	3139	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2566,158 +3144,237 @@
2566	3144
2567	3145	refreshContents();
2568	3146	} else
2569		- if (event.getSource() == flashSelectionButton)
	3147	+ if (source == flashSelectionButton)
2570	3148	{
2571	3149	CameraPane.flash = true;
2572	3150	refreshContents();
2573	3151	} else
2574		- if (event.getSource() == oneButton)
	3152	+ if (source == oneButton)
2575	3153	{
2576	3154	} else
2577		- if (event.getSource() == twoButton)
	3155	+ if (source == twoButton)
2578	3156	{
2579	3157	radio.layout = twoButton;
	3158	+
	3159	+ if (CameraPane.FULLSCREEN)
	3160	+ fullscreenLayout = radio.layout;
	3161	+
2580	3162	// bug
2581	3163	//gridPanel.setDividerLocation(1.0);
2582	3164	//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();
	3165	+// bigThree.remove(scenePanel);
	3166	+// bigThree.remove(centralPanel);
	3167	+// bigThree.remove(XYZPanel);
	3168	+// aWindowConstraints.gridx = 0;
	3169	+// aWindowConstraints.gridy = 0;
	3170	+// aWindowConstraints.gridwidth = 1;
	3171	+// // aConstraints.gridheight = 3;
	3172	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3173	+// aWindowConstraints.weightx = 0;
	3174	+// aWindowConstraints.weighty = 1;
	3175	+// //bigThree.add(jtp, aWindowConstraints);
	3176	+// aWindowConstraints.weightx = 1;
	3177	+// aWindowConstraints.gridwidth = 3;
	3178	+// // aConstraints.gridheight = 3;
	3179	+// aWindowConstraints.gridx = 1;
	3180	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3181	+// bigThree.add(centralPanel, aWindowConstraints);
	3182	+// aWindowConstraints.weightx = 0;
	3183	+// aWindowConstraints.gridx = 4;
	3184	+// aWindowConstraints.gridwidth = 1;
	3185	+// // aConstraints.gridheight = 3;
	3186	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3187	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3188	+// scenePanel.setVisible(false);
	3189	+// centralPanel.setVisible(true);
	3190	+// XYZPanel.setVisible(false);
	3191	+ bigThree.ClearUI();
	3192	+ bigThree.add(centralPanel);
	3193	+ bigThree.FlushUI();
	3194	+
	3195	+ cameraView.requestFocusInWindow();
	3196	+
	3197	+// refreshContents(true);
	3198	+//
	3199	+// try
	3200	+// {
	3201	+// java.awt.Robot bot = new java.awt.Robot();
	3202	+// int mask = InputEvent.BUTTON1_MASK;
	3203	+// bot.mouseMove(100, 100);
	3204	+// bot.mousePress(mask);
	3205	+// bot.mouseRelease(mask);
	3206	+// }
	3207	+// catch (Exception e)
	3208	+// {
	3209	+//
	3210	+// }
	3211	+
2607	3212	} else
2608		- if (event.getSource() == threeButton)
	3213	+ if (source == threeButton)
2609	3214	{
2610	3215	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();
	3216	+
	3217	+ if (CameraPane.FULLSCREEN)
	3218	+ fullscreenLayout = radio.layout;
	3219	+
	3220	+// bigThree.remove(scenePanel);
	3221	+// bigThree.remove(centralPanel);
	3222	+// bigThree.remove(XYZPanel);
	3223	+// aWindowConstraints.gridx = 0;
	3224	+// aWindowConstraints.gridy = 0;
	3225	+// aWindowConstraints.gridwidth = 1;
	3226	+// // aConstraints.gridheight = 3;
	3227	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3228	+// aWindowConstraints.weightx = 0;
	3229	+// aWindowConstraints.weighty = 1;
	3230	+// //bigThree.add(jtp, aWindowConstraints);
	3231	+// aWindowConstraints.weightx = 1;
	3232	+// aWindowConstraints.gridwidth = 3;
	3233	+// // aConstraints.gridheight = 3;
	3234	+// aWindowConstraints.gridx = 1;
	3235	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3236	+// bigThree.add(centralPanel, aWindowConstraints);
	3237	+// aWindowConstraints.weightx = 0;
	3238	+// aWindowConstraints.gridx = 4;
	3239	+// aWindowConstraints.gridwidth = 1;
	3240	+// // aConstraints.gridheight = 3;
	3241	+// aConstraints.fill = GridBagConstraints.VERTICAL;
	3242	+// bigThree.add(XYZPanel, aWindowConstraints);
	3243	+// bigThree.validate();
	3244	+// scenePanel.setVisible(false);
	3245	+// centralPanel.setVisible(true);
	3246	+// XYZPanel.setVisible(true);
	3247	+ bigThree.ClearUI();
	3248	+ bigThree.add(centralPanel);
	3249	+ bigThree.add(XYZPanel);
	3250	+ bigThree.FlushUI();
	3251	+
	3252	+ cameraView.requestFocusInWindow();
2635	3253	} else
2636		- if (event.getSource() == fourButton)
	3254	+ if (source == fourButton)
2637	3255	{
2638	3256	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();
	3257	+
	3258	+ if (CameraPane.FULLSCREEN)
	3259	+ fullscreenLayout = radio.layout;
	3260	+
	3261	+// bigThree.remove(scenePanel);
	3262	+// bigThree.remove(centralPanel);
	3263	+// bigThree.remove(XYZPanel);
	3264	+// aWindowConstraints.gridx = 0;
	3265	+// aWindowConstraints.gridy = 0;
	3266	+// aWindowConstraints.gridwidth = 1;
	3267	+// // aWindowConstraints.gridheight = 3;
	3268	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3269	+// aWindowConstraints.weightx = 1;
	3270	+// aWindowConstraints.weighty = 1;
	3271	+// bigThree.add(scenePanel, aWindowConstraints);
	3272	+// aWindowConstraints.weightx = 1;
	3273	+// aWindowConstraints.gridwidth = 3;
	3274	+// // aConstraints.gridheight = 3;
	3275	+// aWindowConstraints.gridx = 1;
	3276	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3277	+// //bigThree.add(cameraPanel, aWindowConstraints);
	3278	+// aWindowConstraints.weightx = 0;
	3279	+// aWindowConstraints.gridx = 4;
	3280	+// aWindowConstraints.gridwidth = 1;
	3281	+// // aWindowConstraints.gridheight = 3;
	3282	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3283	+// //bigThree.add(XYZPanel, aWindowConstraints);
	3284	+// bigThree.validate();
	3285	+// scenePanel.setVisible(true);
	3286	+// centralPanel.setVisible(false);
	3287	+// XYZPanel.setVisible(false);
	3288	+ bigThree.ClearUI();
	3289	+ bigThree.add(scenePanel);
	3290	+ bigThree.FlushUI();
	3291	+
	3292	+ cameraView.requestFocusInWindow();
2663	3293	} else
2664		- if (event.getSource() == sixButton)
	3294	+ if (source == sixButton)
2665	3295	{
2666	3296	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();
	3297	+
	3298	+ if (CameraPane.FULLSCREEN)
	3299	+ fullscreenLayout = radio.layout;
	3300	+
	3301	+// bigThree.remove(scenePanel);
	3302	+// bigThree.remove(centralPanel);
	3303	+// bigThree.remove(XYZPanel);
	3304	+// aWindowConstraints.gridx = 0;
	3305	+// aWindowConstraints.gridy = 0;
	3306	+// aWindowConstraints.gridwidth = 1;
	3307	+// // aConstraints.gridheight = 3;
	3308	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3309	+// aWindowConstraints.weightx = 0;
	3310	+// aWindowConstraints.weighty = 1;
	3311	+// bigThree.add(scenePanel, aWindowConstraints);
	3312	+// aWindowConstraints.weightx = 1;
	3313	+// aWindowConstraints.gridwidth = 3;
	3314	+// // aWindowConstraints.gridheight = 3;
	3315	+// aWindowConstraints.gridx = 1;
	3316	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3317	+// bigThree.add(centralPanel, aWindowConstraints);
	3318	+// aWindowConstraints.weightx = 0;
	3319	+// aWindowConstraints.gridx = 4;
	3320	+// aWindowConstraints.gridwidth = 1;
	3321	+// // aWindowConstraints.gridheight = 3;
	3322	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3323	+// //bigThree.add(XYZPanel, aConstraints);
	3324	+// bigThree.validate();
	3325	+// scenePanel.setVisible(true);
	3326	+// centralPanel.setVisible(true);
	3327	+// XYZPanel.setVisible(false);
	3328	+ bigThree.ClearUI();
	3329	+ bigThree.add(scenePanel);
	3330	+ bigThree.add(centralPanel);
	3331	+ bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2691	3334	} else
2692		- if (event.getSource() == sevenButton)
	3335	+ if (source == sevenButton)
2693	3336	{
2694	3337	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();
	3338	+
	3339	+ if (CameraPane.FULLSCREEN)
	3340	+ fullscreenLayout = radio.layout;
	3341	+
	3342	+// bigThree.remove(scenePanel);
	3343	+// bigThree.remove(centralPanel);
	3344	+// bigThree.remove(XYZPanel);
	3345	+// aWindowConstraints.gridx = 0;
	3346	+// aWindowConstraints.gridy = 0;
	3347	+// aWindowConstraints.gridwidth = 1;
	3348	+// // aWindowConstraints.gridheight = 3;
	3349	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3350	+// aWindowConstraints.weightx = 0;
	3351	+// aWindowConstraints.weighty = 1;
	3352	+// bigThree.add(scenePanel, aWindowConstraints);
	3353	+// aWindowConstraints.weightx = 1;
	3354	+// aWindowConstraints.gridwidth = 3;
	3355	+// // aWindowConstraints.gridheight = 3;
	3356	+// aWindowConstraints.gridx = 1;
	3357	+// aWindowConstraints.fill = GridBagConstraints.BOTH;
	3358	+// bigThree.add(centralPanel, aWindowConstraints);
	3359	+// aWindowConstraints.weightx = 0;
	3360	+// aWindowConstraints.gridx = 4;
	3361	+// aWindowConstraints.gridwidth = 1;
	3362	+// // aConstraints.gridheight = 3;
	3363	+// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
	3364	+// bigThree.add(XYZPanel, aWindowConstraints);
	3365	+// bigThree.validate();
	3366	+// scenePanel.setVisible(true);
	3367	+// centralPanel.setVisible(true);
	3368	+// XYZPanel.setVisible(true);
	3369	+ bigThree.ClearUI();
	3370	+ bigThree.add(scenePanel);
	3371	+ bigThree.add(centralPanel);
	3372	+ bigThree.add(XYZPanel);
	3373	+ bigThree.FlushUI();
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2719	3376	} else
2720		- if (event.getSource() == rootButton)
	3377	+ if (source == rootButton)
2721	3378	{
2722	3379	Object3D obj;
2723	3380	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -2727,66 +3384,84 @@
2727	3384	EditObject(obj);
2728	3385	}
2729	3386
	3387	+ cameraView.requestFocusInWindow();
2730	3388	refreshContents(true);
2731	3389	} else
2732		- if (event.getSource() == closeButton)
	3390	+ if (source == closeButton)
2733	3391	{
2734	3392	//System.out.println("CLOSE: " + buttonGroup.getSelection());
2735	3393	cRadio ab;
2736	3394	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2737	3395	{
2738	3396	ab = (cRadio)e.nextElement();
2739		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3397	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2740	3398	{
	3399	+ // Patch to avoid bug with transparency.
	3400	+ if (!ab.hadMaterial)
	3401	+ {
	3402	+ ab.object.material = null;
	3403	+ }
	3404	+
2741	3405	buttonGroup.remove(ab);
2742	3406	radioPanel.remove(ab);
2743	3407
2744		- ab.GetObject().editWindow = null;
	3408	+ //ab.GetObject().editWindow = null;
	3409	+ ab.GetObject().manipWindow = null;
2745	3410	// ab.GetObject().objectUI = null; // ?????????
2746	3411
2747	3412	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2748	3413	break;
2749	3414	}
2750	3415	}
	3416	+
	3417	+ cameraView.requestFocusInWindow();
2751	3418	refreshContents(true);
2752	3419	} else
2753		- if (event.getSource() == editItem \|\| event.getSource() == editButton)
	3420	+ if (source == editItem \|\| source == editButton)
2754	3421	{
	3422	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3423	+ {
	3424	+ Object3D child = (Object3D)e.nextElement();
	3425	+ child.pinned = true;
	3426	+ }
	3427	+
2755	3428	EditSelection(false);
2756	3429	} else
2757		- if (event.getSource() == uneditButton)
	3430	+ if (source == uneditButton)
2758	3431	{
2759	3432	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
2760	3433	{
2761	3434	Object3D child = (Object3D)e.nextElement();
2762	3435	if(child.editWindow != null)
2763	3436	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3437	+ child.pinned = false;
2764	3438	child.CloseUI();
2765	3439	listUI.remove(child);
2766	3440
2767		- child.editWindow = null; // ???????????
	3441	+ //child.editWindow = null; // ???????????
2768	3442	}
2769		- objEditor.ctrlPanel.revalidate();
	3443	+ objEditor.ctrlPanel.FlushUI();
2770	3444	//objEditor.jTree.clearSelection();
2771	3445	//objEditor.ResetSliders();
2772	3446	refreshContents(true);
2773	3447	} else
2774		- if (event.getSource() == clearPanelButton)
	3448	+ if (source == clearPanelButton)
2775	3449	{
2776	3450	assert(copy == group);
2777	3451	//copy.ClearUI();
2778	3452	for (Object3D obj : listUI)
2779	3453	{
	3454	+ obj.pinned = false;
2780	3455	obj.CloseUI();
2781	3456	}
2782	3457	listUI.clear();
2783	3458	refreshContents(true);
2784	3459	} else
2785		- if (event.getSource() == allParamsButton)
	3460	+ if (source == allParamsButton)
2786	3461	{
2787	3462	assert(copy == group);
2788	3463
2789		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3464	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2790	3465
2791	3466	for (Object3D obj : listUI)
2792	3467	{
..	..	@@ -2803,19 +3478,19 @@
2803	3478
2804	3479	refreshContents(true);
2805	3480	} else
2806		- if (event.getSource() == unselectButton)
	3481	+ if (source == unselectButton)
2807	3482	{
2808	3483	objEditor.jTree.clearSelection();
2809		- // ?? oct 2012 GraphreeD.clipboard.clear();
	3484	+ // ?? oct 2012 GrafreeD.clipboard.clear();
2810	3485	objEditor.ResetSliders();
2811	3486	refreshContents(true);
2812	3487	} else
2813		- if(event.getSource() instanceof cRadio)
	3488	+ if(source instanceof cRadio)
2814	3489	{
2815	3490	group.parent = keepparent;
2816	3491	group.attributes = 0;
2817	3492	//group.editWindow = null;
2818		- /cRadio/ radio = (cRadio)event.getSource();
	3493	+ /cRadio/ radio = (cRadio)source;
2819	3494	Object3D obj = radio.GetObject();
2820	3495	System.out.println("Edit " + obj);
2821	3496	if (true) // obj instanceof Composite) // obj.parent == null) // obj instanceof Composite)
..	..	@@ -2835,7 +3510,10 @@
2835	3510	}
2836	3511
2837	3512	copy = group;
2838		- //CameraPane.theRenderer.object = group;
	3513	+
	3514	+ SetUndoStates();
	3515	+
	3516	+ //Globals.theRenderer.object = group;
2839	3517	if(!useclient)
2840	3518	{
2841	3519	cameraView.renderCamera = radio.camera;
..	..	@@ -2844,25 +3522,50 @@
2844	3522	cameraView.cameras[cameraView.cameracount] = radio.camera;
2845	3523	cameraView.targetLookAt.set(radio.camera.lookAt);
2846	3524	cameraView.object = group;
2847		- cameraView.lighttouched = true;
	3525	+ //cameraView.lighttouched = true;
	3526	+ Globals.lighttouched = true;
2848	3527	topView.object = group;
2849	3528	frontView.object = group;
2850	3529	sideView.object = group;
2851	3530	}
2852		- group.editWindow = this;
	3531	+
	3532	+// fix "+" issue
	3533	+ //group.editWindow = this;
	3534	+ group.manipWindow = this;
	3535	+
2853	3536	/*
2854	3537	currentLayout = radio.layout;
2855	3538	if (currentLayout == null)
2856	3539	currentLayout = sevenButton;
2857	3540	*/
2858	3541	radio.layout.doClick();
	3542	+
	3543	+ ClearUnpinned();
	3544	+ SetPinStates(group.selection.size() > 0);
	3545	+ if (group.selection.size() == 1)
	3546	+ EditSelection(false);
2859	3547	keepparent = group.parent;
2860	3548	// PARENT = NULL or not???
2861	3549	//group.parent = null; // ROOT
2862	3550	//group.attributes = -1;
2863	3551	ResetModel();
	3552	+
	3553	+ cameraView.requestFocusInWindow();
2864	3554	refreshContents(true);
2865		- }
	3555	+ } else if (event.getSource() == editCameraItem)
	3556	+ {
	3557	+ cameraView.ProtectCamera();
	3558	+ cameraView.repaint();
	3559	+ return;
	3560	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3561	+ {
	3562	+ cameraView.RevertCamera();
	3563	+ cameraView.repaint();
	3564	+ return;
	3565	+ // } else if (event.getSource() == textureButton)
	3566	+ // {
	3567	+ // return; // true;
	3568	+ }
2866	3569	else
2867	3570	{
2868	3571	//return super.action(event, arg);
..	..	@@ -2871,7 +3574,6 @@
2871	3574	}
2872	3575
2873	3576	boolean useclient = false;
2874		- cRadio radio;
2875	3577
2876	3578	void ToggleRoot()
2877	3579	{
..	..	@@ -2880,7 +3582,7 @@
2880	3582	if (useclient)
2881	3583	{
2882	3584	cameraView.object = client;
2883		- cameraView.lighttouched = true;
	3585	+ Globals.lighttouched = true;
2884	3586	//topView.object = client;
2885	3587	//frontView.object = client;
2886	3588	//sideView.object = client;
..	..	@@ -2888,7 +3590,7 @@
2888	3590	else
2889	3591	{
2890	3592	cameraView.object = group;
2891		- cameraView.lighttouched = true;
	3593	+ Globals.lighttouched = true;
2892	3594	//topView.object = group;
2893	3595	//frontView.object = group;
2894	3596	//sideView.object = group;
..	..	@@ -2923,6 +3625,28 @@
2923	3625	refreshContents();
2924	3626	}
2925	3627
	3628	+ void TransformChildren()
	3629	+ {
	3630	+ Object3D obj;
	3631	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3632	+ {
	3633	+ obj = (Object3D)e.nextElement();
	3634	+ obj.KeepTextureMatrices();
	3635	+ obj.TransformChildren();
	3636	+ obj.RestoreTextureMatrices();
	3637	+
	3638	+// if (obj.parent == null)
	3639	+// {
	3640	+// System.out.println("NULL PARENT!");
	3641	+// new Exception().printStackTrace();
	3642	+// }
	3643	+// else
	3644	+// TouchTransform(obj);
	3645	+// //obj.parent.Touch();
	3646	+ }
	3647	+
	3648	+ refreshContents();
	3649	+ }
2926	3650
2927	3651	void ResetTransform()
2928	3652	{
..	..	@@ -3035,7 +3759,7 @@
3035	3759	refreshContents();
3036	3760	}
3037	3761
3038		- void ResetCentroid()
	3762	+ void ResetCentroid(boolean full)
3039	3763	{
3040	3764	Object3D obj;
3041	3765	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3050,12 +3774,16 @@
3050	3774	LA.matIdentity(Object3D.mat);
3051	3775	obj.getBounds(minima, maxima, false);
3052	3776	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3053		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3777	+ if (full)
	3778	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3054	3779	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3055	3780	obj.TransformMesh(Object3D.mat);
	3781	+
3056	3782	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3057		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3783	+ if (full)
	3784	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3058	3785	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3786	+
3059	3787	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3060	3788	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3061	3789	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3084,7 +3812,8 @@
3084	3812
3085	3813	int size = obj.MemorySize();
3086	3814
3087		- System.err.println((size/1024) + " KB is the size of " + obj);
	3815	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3816	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3088	3817	}
3089	3818	}
3090	3819	catch (Exception e)
..	..	@@ -3121,9 +3850,9 @@
3121	3850	obj = (Object3D)e.nextElement();
3122	3851
3123	3852	System.out.println("Object is: " + obj);
3124		- GraphreeD.AnalyzeObject(obj);
	3853	+ Grafreed.AnalyzeObject(obj);
3125	3854	System.out.println("Boundary rep: " + obj.bRep);
3126		- GraphreeD.AnalyzeObject(obj.bRep);
	3855	+ Grafreed.AnalyzeObject(obj.bRep);
3127	3856
3128	3857	// System.err.println((size/1024) + " KB is the size of " + obj);
3129	3858	}
..	..	@@ -3165,6 +3894,20 @@
3165	3894	void GenNormals(boolean crease)
3166	3895	{
3167	3896	group.GenNormalsS(crease);
	3897	+
	3898	+ refreshContents();
	3899	+ }
	3900	+
	3901	+ void GenNormalsMESH()
	3902	+ {
	3903	+ group.GenNormalsMeshS();
	3904	+
	3905	+ refreshContents();
	3906	+ }
	3907	+
	3908	+ void GenNormalsMINE()
	3909	+ {
	3910	+ group.selection.GenNormalsMINE();
3168	3911
3169	3912	refreshContents();
3170	3913	}
..	..	@@ -3250,7 +3993,7 @@
3250	3993	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3251	3994	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3252	3995	//
3253		-// g.add(GraphreeD.clipboard);
	3996	+// g.add(GrafreeD.clipboard);
3254	3997	//
3255	3998	// buffer.add(g);
3256	3999	// }
..	..	@@ -3269,8 +4012,8 @@
3269	4012	// nodes = new Object3D();
3270	4013	// vertices = new Vector<Vertex>();
3271	4014	//
3272		-// boolean epsequal = GraphreeD.epsequal;
3273		-// GraphreeD.epsequal = true;
	4015	+// boolean epsequal = GrafreeD.epsequal;
	4016	+// GrafreeD.epsequal = true;
3274	4017	//
3275	4018	// for (int i=0; i<group.selection.size(); i++)
3276	4019	// {
..	..	@@ -3311,7 +4054,7 @@
3311	4054	// LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3312	4055	// LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3313	4056	//
3314		-// g.add(GraphreeD.clipboard);
	4057	+// g.add(GrafreeD.clipboard);
3315	4058	//
3316	4059	// buffer.add(g);
3317	4060	// }
..	..	@@ -3319,7 +4062,7 @@
3319	4062	// makeSomething(buffer, i==group.selection.size()-1);
3320	4063	// }
3321	4064	//
3322		-// GraphreeD.epsequal = epsequal;
	4065	+// GrafreeD.epsequal = epsequal;
3323	4066	//
3324	4067	// //buffer = null;
3325	4068	// temprep = null;
..	..	@@ -3330,8 +4073,8 @@
3330	4073
3331	4074	void ParseVertices()
3332	4075	{
3333		- boolean epsequal = GraphreeD.epsequal;
3334		- GraphreeD.epsequal = true;
	4076	+ boolean epsequal = Grafreed.epsequal;
	4077	+ Grafreed.epsequal = true;
3335	4078
3336	4079	for (int i=0; i<group.selection.size(); i++)
3337	4080	{
..	..	@@ -3356,7 +4099,7 @@
3356	4099	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3357	4100	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3358	4101
3359		- g.add(GraphreeD.clipboard);
	4102	+ g.add(Grafreed.clipboard);
3360	4103
3361	4104	buffer.add(g);
3362	4105	}
..	..	@@ -3371,7 +4114,7 @@
3371	4114	makeSomething(buffer, i==group.selection.size()-1);
3372	4115	}
3373	4116
3374		- GraphreeD.epsequal = epsequal;
	4117	+ Grafreed.epsequal = epsequal;
3375	4118
3376	4119	refreshContents();
3377	4120	}
..	..	@@ -3389,7 +4132,16 @@
3389	4132	String pigment = Object3D.GetPigment(tex);
3390	4133	//String bump = Object3D.GetBump(tex);
3391	4134
3392		- com.sun.opengl.util.texture.TextureData texturedata = CameraPane.theRenderer.GetTextureData(pigment, false, node.texres);
	4135	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4136	+
	4137	+ try
	4138	+ {
	4139	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4140	+ }
	4141	+ catch (Exception e)
	4142	+ {
	4143	+ System.err.println("FAIL: " + node);
	4144	+ }
3393	4145
3394	4146	double s = v.s;
3395	4147
..	..	@@ -3416,7 +4168,7 @@
3416	4168	scale /= 3;
3417	4169
3418	4170	scale /= 0xFF;
3419		- scale /= 4;
	4171	+ // c'est quoi ca? scale /= 4;
3420	4172
3421	4173	//v.AO = scale;
3422	4174
..	..	@@ -3437,12 +4189,26 @@
3437	4189
3438	4190	void Align()
3439	4191	{
	4192	+ if (group.selection.size() == 0)
	4193	+ return;
	4194	+
	4195	+ cVector bbmin = new cVector();
	4196	+ cVector bbmax = new cVector();
	4197	+
	4198	+ group.selection.get(0).getBounds(bbmin, bbmax, true);
	4199	+
	4200	+ double dx = bbmax.x - bbmin.x;
	4201	+ double dy = bbmax.y - bbmin.y;
	4202	+ double dz = bbmax.z - bbmin.z;
	4203	+
	4204	+ double scale = Math.sqrt(dxdx + dydy + dz*dz);
	4205	+
3440	4206	for (int i=0; i<group.selection.size(); i++)
3441	4207	{
3442	4208	Object3D obj = group.selection.get(i);
3443	4209
3444		- LA.matTranslate(obj.toParent, i/2f, 0, 0);
3445		- LA.matTranslateInv(obj.fromParent, -i/2f, 0, 0);
	4210	+ LA.matTranslate(obj.toParent, i * scale, 0, 0);
	4211	+ LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
3446	4212	}
3447	4213
3448	4214	refreshContents();
..	..	@@ -3455,7 +4221,7 @@
3455	4221	// ref.SaveSupports();
3456	4222	// Object3D par = ref.parent;
3457	4223	// ref.parent = null;
3458		-// Object3D lowres = (Object3D) GraphreeD.clone(ref);
	4224	+// Object3D lowres = (Object3D) GrafreeD.clone(ref);
3459	4225	// ref.parent = par;
3460	4226	// ref.RestoreSupports();
3461	4227
..	..	@@ -3463,11 +4229,11 @@
3463	4229
3464	4230	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3465	4231
3466		- boolean random = CameraPane.RANDOM;
3467		- CameraPane.RANDOM = false; // parse all random nodes
	4232	+ boolean random = CameraPane.SWITCH;
	4233	+ CameraPane.SWITCH = false; // parse all random nodes
3468	4234	lowres.linkVerticesThis(null);
3469	4235	lowres.linkVerticesThis(sn);
3470		- CameraPane.RANDOM = random;
	4236	+ CameraPane.SWITCH = random;
3471	4237
3472	4238	System.err.flush();
3473	4239
..	..	@@ -3485,7 +4251,7 @@
3485	4251	// lowres.SaveSupports();
3486	4252	// par = lowres.parent;
3487	4253	// lowres.parent = null;
3488		-// Object3D newlow = (Object3D) GraphreeD.clone(lowres);
	4254	+// Object3D newlow = (Object3D) GrafreeD.clone(lowres);
3489	4255	Object3D newlow = CloneObject(lowres, false);
3490	4256	newlow.name = sn.switchobject.get(i).name;
3491	4257	System.out.println(" pose#" + i + " = " + newlow);
..	..	@@ -3507,7 +4273,7 @@
3507	4273	return;
3508	4274
3509	4275	Object3D poses = group.selection.get(0);
3510		- Object3D ref = GraphreeD.clipboard.get(0);
	4276	+ Object3D ref = Grafreed.clipboard.get(0);
3511	4277
3512	4278	Object3D newgroup = new Object3D("Po:" + poses.name);
3513	4279
..	..	@@ -3676,7 +4442,7 @@
3676	4442	group.selection.RelinkToSupport(); // july 2014
3677	4443	System.out.println("DONE.");
3678	4444	refreshContents();
3679		- CameraPane.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
	4445	+ Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
3680	4446	}
3681	4447
3682	4448	void ReduceMesh(boolean reduction34)
..	..	@@ -3701,20 +4467,20 @@
3701	4467
3702	4468	void ClipMesh()
3703	4469	{
3704		- if (/group.selection.size() == 1 &&/ GraphreeD.clipboard.size() == 1)
	4470	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3705	4471	{
3706		- Object3D content = GraphreeD.clipboard.get(0);
	4472	+ Object3D content = Grafreed.clipboard.get(0);
3707	4473
3708	4474	if (content instanceof cGroup && ((cGroup)content).transientlink )
3709	4475	content = ((cGroup)content).get(0);
3710	4476
3711	4477	// for (int i=0; i<group.selection.size(); i++)
3712	4478	// {
3713		-// group.selection.get(i).ClipMesh(GraphreeD.clipboard);
	4479	+// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3714	4480	// }
3715		- group.selection.ClipMesh(GraphreeD.clipboard);
	4481	+ group.selection.ClipMesh(Grafreed.clipboard);
3716	4482	}
3717		-// group.selection.ClipMesh(GraphreeD.clipboard);
	4483	+// group.selection.ClipMesh(GrafreeD.clipboard);
3718	4484	System.out.println("DONE.");
3719	4485	refreshContents();
3720	4486	}
..	..	@@ -3759,6 +4525,18 @@
3759	4525	void MarkLeaves(boolean hide)
3760	4526	{
3761	4527	group.selection.MarkLeaves(hide);
	4528	+ refreshContents();
	4529	+ }
	4530	+
	4531	+ void RewindLeaves(boolean hide)
	4532	+ {
	4533	+ group.selection.RewindLeaves(hide);
	4534	+ refreshContents();
	4535	+ }
	4536	+
	4537	+ void RandomLeaves(boolean hide)
	4538	+ {
	4539	+ group.selection.RandomLeaves(hide);
3762	4540	refreshContents();
3763	4541	}
3764	4542
..	..	@@ -3833,10 +4611,6 @@
3833	4611	// }
3834	4612	// }
3835	4613
3836		- static boolean allparams = true;
3837		-
3838		- static Vector<Object3D> listUI = new Vector<Object3D>();
3839		-
3840	4614	void EditSelection(boolean newWindow)
3841	4615	{
3842	4616	// aConstraints.gridy = 0;
..	..	@@ -3844,10 +4618,10 @@
3844	4618	{
3845	4619	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3846	4620	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3847		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4621	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3848	4622
3849	4623	Object3D elem = (Object3D)group.selection.elementAt(i);
3850		- if(elem != group)
	4624	+ if(elem != group \|\| !newWindow)
3851	4625	{
3852	4626	// if (!(elem instanceof Composite))
3853	4627	// newWindow = false;
..	..	@@ -3929,7 +4703,8 @@
3929	4703	//new Exception().printStackTrace();
3930	4704
3931	4705	freezemodel = true;
3932		-
	4706	+ ClearUnpinned();
	4707	+
3933	4708	/**/
3934	4709	//switch (event.id)
3935	4710	{
..	..	@@ -3937,7 +4712,6 @@
3937	4712	//case 702: // Event.LIST_DESELECT
3938	4713	group.deselectAll();
3939	4714	TreePath tps[] = objEditor.jTree.getSelectionPaths();
3940		- objEditor.ClearInfo(); // .GetMaterial());
3941	4715	if (tps != null)
3942	4716	{
3943	4717	for (int i=0; i < tps.length; i++)
..	..	@@ -3946,33 +4720,39 @@
3946	4720
3947	4721	//if (child.parent != null)
3948	4722	//child.parent.addSelectee(child);
	4723	+ objEditor.SetMaterial(child);
3949	4724	group.addSelectee(child);
3950		- objEditor.SetMaterial(child); // .GetMaterial());
3951		- objEditor.AddInfo(child, this, true); // .GetMaterial());
3952		- System.err.println("info : " + child.GetPath());
3953	4725	}
3954	4726	}
3955		- else
3956		- {
3957		- objEditor.SetMaterial(group); // .GetMaterial());
3958		- objEditor.AddInfo(group, this, true); // .GetMaterial());
3959		- System.err.println("info : " + group.GetPath());
3960		- }
	4727	+// else
	4728	+// {
	4729	+// objEditor.SetMaterial(group); // .GetMaterial());
	4730	+// objEditor.AddInfo(group, this, true); // .GetMaterial());
	4731	+// System.err.println("info : " + group.GetPath());
	4732	+// }
3961	4733
3962		- objEditor.SetText(); // jan 2014
3963		-
3964		- if (flashIt && !CameraPane.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4734	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
3965	4735	CameraPane.flash = true;
3966	4736
3967		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4737	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
3968	4738	// a camera
3969	4739	{
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;
	4740	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4741	+ {
	4742	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4743	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4744	+ }
	4745	+ // Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
	4746	+ // Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
3974	4747	}
3975	4748
	4749	+ if (tps != null && tps.length == 1)
	4750	+ {
	4751	+ EditSelection(false);
	4752	+ }
	4753	+
	4754	+ SetPinStates(tps != null && tps.length > 0);
	4755	+
3976	4756	refreshContents();
3977	4757	//return true;
3978	4758	}
..	..	@@ -3981,6 +4761,35 @@
3981	4761
3982	4762	freezemodel = false;
3983	4763	}
	4764	+
	4765	+ void SetPinStates(boolean enabled)
	4766	+ {
	4767	+ editButton.setEnabled(enabled);
	4768	+ uneditButton.setEnabled(enabled);
	4769	+ unselectButton.setEnabled(enabled);
	4770	+ flashSelectionButton.setEnabled(enabled);
	4771	+ }
	4772	+
	4773	+ void refreshContents(boolean cp)
	4774	+ {
	4775	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4776	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4777	+ {
	4778	+ objEditor.ClearInfo(); // .GetMaterial());
	4779	+
	4780	+ for (int i=0; i < group.selection.Size(); i++)
	4781	+ {
	4782	+ Object3D child = (Object3D) group.selection.get(i);
	4783	+
	4784	+ objEditor.AddInfo(child, this, true);
	4785	+ System.err.println("info : " + child.GetPath());
	4786	+ }
	4787	+
	4788	+ objEditor.SetText(); // jan 2014
	4789	+ }
	4790	+
	4791	+ super.refreshContents(cp);
	4792	+ }
3984	4793
3985	4794	void linkSomething(Object3D thing)
3986	4795	{
..	..	@@ -4052,16 +4861,19 @@
4052	4861	{
4053	4862	if (group.selection.isEmpty())
4054	4863	return;
4055		- GraphreeD.clipboardIsTempGroup = false;
	4864	+
	4865	+ Grafreed.clipboardIsTempGroup = false;
4056	4866	Composite tGroup = null;
4057	4867	if (group.selection.size() > 0) // 1)
4058	4868	{
4059	4869	tGroup = new cGroup();
4060		- GraphreeD.clipboardIsTempGroup = true;
	4870	+ Grafreed.clipboardIsTempGroup = true;
4061	4871	}
4062	4872
4063	4873	if (cut)
4064	4874	{
	4875	+// if (Globals.SAVEONMAKE) // Moved to the clipboard, no need to save.
	4876	+// Save();
4065	4877	//int indices[] = jList.getSelectedIndices();
4066	4878	//for (int i = indices.length - 1; i >= 0; i--)
4067	4879	//jList.remove(indices[i]);
..	..	@@ -4097,16 +4909,16 @@
4097	4909	//System.out.println("cut " + child);
4098	4910	//System.out.println("parent = " + child.parent);
4099	4911	// tmp.addChild(child);
4100		- if (GraphreeD.clipboardIsTempGroup)
	4912	+ if (Grafreed.clipboardIsTempGroup)
4101	4913	tGroup.add/Child/(tmp);
4102	4914	else
4103		- GraphreeD.clipboard = tmp;
	4915	+ Grafreed.clipboard = tmp;
4104	4916	}
4105	4917	else
4106		- if (GraphreeD.clipboardIsTempGroup)
	4918	+ if (Grafreed.clipboardIsTempGroup)
4107	4919	tGroup.add/Child/(child);
4108	4920	else
4109		- GraphreeD.clipboard = child;
	4921	+ Grafreed.clipboard = child;
4110	4922	}
4111	4923
4112	4924	//ResetModel();
..	..	@@ -4138,21 +4950,23 @@
4138	4950	//System.out.println("cut " + elem);
4139	4951	//System.out.println("parent = " + elem.parent);
4140	4952	// tmp.addChild(elem);
4141		- if (GraphreeD.clipboardIsTempGroup)
	4953	+ if (Grafreed.clipboardIsTempGroup)
4142	4954	tGroup.add/Child/(tmp);
4143	4955	else
4144		- GraphreeD.clipboard = tmp;
	4956	+ Grafreed.clipboard = tmp;
4145	4957	}
4146	4958	else
4147		- if (GraphreeD.clipboardIsTempGroup)
	4959	+ if (Grafreed.clipboardIsTempGroup)
4148	4960	tGroup.add/Child/(child);
4149	4961	else
4150		- GraphreeD.clipboard = child;
	4962	+ Grafreed.clipboard = child;
4151	4963	}
4152	4964
4153	4965	}
4154		- if (GraphreeD.clipboardIsTempGroup)
4155		- GraphreeD.clipboard = tGroup;
	4966	+
	4967	+ if (Grafreed.clipboardIsTempGroup)
	4968	+ Grafreed.clipboard = tGroup;
	4969	+
4156	4970	if (cut)
4157	4971	{
4158	4972	ResetModel();
..	..	@@ -4162,11 +4976,15 @@
4162	4976
4163	4977	void paste(boolean expand)
4164	4978	{
4165		- // if (GraphreeD.clipboard == null)
	4979	+ if (Globals.REPLACEONMAKE)
	4980	+ Save();
	4981	+ boolean keep = Globals.REPLACEONMAKE;
	4982	+ Globals.REPLACEONMAKE = false;
	4983	+ // if (GrafreeD.clipboard == null)
4166	4984	// return;
4167	4985	boolean first = true;
4168	4986
4169		- if (GraphreeD.clipboardIsTempGroup)
	4987	+ if (Grafreed.clipboardIsTempGroup)
4170	4988	{
4171	4989	Composite temp;
4172	4990
..	..	@@ -4177,7 +4995,7 @@
4177	4995	temp = (Composite)Applet3D.clipboard.deepCopy();
4178	4996	*/
4179	4997	Object3D elem;
4180		- for (Enumeration e = /temp.children/GraphreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4998	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4181	4999	{
4182	5000	Object3D child = (Object3D)e.nextElement();
4183	5001
..	..	@@ -4191,7 +5009,7 @@
4191	5009	else
4192	5010	elem = child.deepCopy(); // ?
4193	5011	child.parent = keepparent;
4194		- //if (GraphreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
	5012	+ //if (GrafreeD.clipboardIsTempGroup && LA.isIdentity(elem.fromParent))
4195	5013	// elem = elem.get(0);
4196	5014	makeSomething(elem, true); // ?? first);
4197	5015	//group.addChild(elem);
..	..	@@ -4211,23 +5029,24 @@
4211	5029	//Object3D cb = Applet3D.clipboard;
4212	5030	//temp.addChild(cb);
4213	5031	//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());
	5032	+ assert(Grafreed.clipboard.parent == null);
	5033	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	5034	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	5035	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	5036	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4219	5037	else
4220		- makeSomething(expand?GraphreeD.clipboard.copyExpand():GraphreeD.clipboard.deepCopy());
4221		- GraphreeD.clipboard.get(0).parent = keepparent;
	5038	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	5039	+ Grafreed.clipboard.get(0).parent = keepparent;
4222	5040	}
4223	5041
	5042	+ Globals.REPLACEONMAKE = keep;
4224	5043	ResetModel();
4225	5044	refreshContents();
4226	5045	}
4227	5046
4228		- void pasteInto(boolean copyit)
	5047	+ void pasteInto(boolean copyit, boolean clone)
4229	5048	{
4230		-// if (GraphreeD.clipboard == null)
	5049	+// if (GrafreeD.clipboard == null)
4231	5050	// return;
4232	5051
4233	5052	if (group.selection.size() != 1)
..	..	@@ -4254,15 +5073,22 @@
4254	5073	if (copyit)
4255	5074	{
4256	5075	// paste(false);
4257		- CloneClipboard(false); // sept 2014
	5076	+ if (clone)
	5077	+ {
	5078	+ CloneClipboard(false); // sept 2014
	5079	+ }
	5080	+ else
	5081	+ {
	5082	+ paste(false);
	5083	+ }
4258	5084	}
4259	5085	else
4260	5086	{
4261	5087	boolean first = true;
4262	5088
4263		- if (GraphreeD.clipboardIsTempGroup)
	5089	+ if (Grafreed.clipboardIsTempGroup)
4264	5090	{
4265		- Composite temp = (Composite)GraphreeD.clipboard;
	5091	+ Composite temp = (Composite)Grafreed.clipboard;
4266	5092	Object3D copy;
4267	5093	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4268	5094	{
..	..	@@ -4272,7 +5098,7 @@
4272	5098	}
4273	5099	} else
4274	5100	{
4275		- linkSomething(GraphreeD.clipboard); //.get(0));
	5101	+ linkSomething(Grafreed.clipboard); //.get(0));
4276	5102	}
4277	5103	}
4278	5104	}
..	..	@@ -4349,6 +5175,10 @@
4349	5175
4350	5176	void group(Object3D csg, boolean grab)
4351	5177	{
	5178	+ if (Globals.REPLACEONMAKE)
	5179	+ Save();
	5180	+ boolean keep = Globals.REPLACEONMAKE;
	5181	+ Globals.REPLACEONMAKE = false;
4352	5182	if (//false) // why??
4353	5183	!group.selection.isEmpty())
4354	5184	{
..	..	@@ -4462,8 +5292,34 @@
4462	5292	//node.add(csg);
4463	5293	//makeSomething(node);
4464	5294	makeSomething(csg);
	5295	+ Globals.REPLACEONMAKE = keep;
4465	5296	}
4466	5297
	5298	+ void Ungroup(Object3D g)
	5299	+ {
	5300	+ if (Globals.REPLACEONMAKE)
	5301	+ Save();
	5302	+ boolean keep = Globals.REPLACEONMAKE;
	5303	+ Globals.REPLACEONMAKE = false;
	5304	+ if (g instanceof HiddenObject)
	5305	+ {
	5306	+ HiddenObject h = (HiddenObject) g;
	5307	+
	5308	+ for (int i=0; i<h.ActualSize(); i++)
	5309	+ {
	5310	+ objEditor.makeSomething(h.get(i), false);
	5311	+ }
	5312	+ }
	5313	+ else
	5314	+ {
	5315	+ for (int i=0; i<g.Size(); i++)
	5316	+ {
	5317	+ objEditor.makeSomething(g.get(i), false);
	5318	+ }
	5319	+ }
	5320	+ Globals.REPLACEONMAKE = keep;
	5321	+ }
	5322	+
4467	5323	void ungroup()
4468	5324	{
4469	5325	/*
..	..	@@ -4657,21 +5513,6 @@
4657	5513	}
4658	5514	*/
4659	5515
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	5516	/*
4676	5517	public void Callback(Object obj)
4677	5518	{
..	..	@@ -4695,26 +5536,9 @@
4695	5536	}
4696	5537	*/
4697	5538
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	5539	String GetFile(String dialogName)
4716	5540	{
4717		- if (GraphreeD.standAlone)
	5541	+ if (Grafreed.standAlone)
4718	5542	{
4719	5543	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4720	5544	browser.show();
..	..	@@ -4778,10 +5602,33 @@
4778	5602	cButton flashSelectionButton;
4779	5603	cButton editButton;
4780	5604	cButton uneditButton;
	5605	+ JCheckBox allParamsButton;
4781	5606	cButton clearpanelButton;
4782		- cButton allParamsButton;
4783	5607	cButton unselectButton;
4784	5608
	5609	+ cButton restoreCameraButton;
	5610	+
	5611	+ cButton saveButton;
	5612	+ cButton oneStepButton;
	5613	+
	5614	+ cButton groupButton;
	5615	+ cButton ungroupButton;
	5616	+ cButton compositeButton;
	5617	+ cButton switchButton;
	5618	+ cButton loopButton;
	5619	+ cButton textureButton;
	5620	+
	5621	+ cButton gridButton;
	5622	+ cButton boxButton;
	5623	+ cButton sphereButton;
	5624	+ cButton coneButton;
	5625	+ cButton torusButton;
	5626	+ cButton superButton;
	5627	+ cButton kleinButton;
	5628	+ cButton particlesButton;
	5629	+ cButton overlayButton;
	5630	+ cButton lightButton;
	5631	+
4785	5632	cButton screenfitButton;
4786	5633	cButton screenfitpointButton;
4787	5634	cButton snapobjectButton;
..	..	@@ -4793,14 +5640,6 @@
4793	5640
4794	5641	cButton setsupportButton;
4795	5642
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	5643	//
4805	5644	//Composite
4806	5645	Object3D // to do !!
..	..	@@ -4810,9 +5649,11 @@
4810	5649	//JTree jTree;
4811	5650	private MenuItem lookAtItem;
4812	5651	private MenuItem lookFromItem;
4813		- private MenuItem switchItem;
	5652	+ private MenuItem switchViewItem;
4814	5653	private MenuItem cutItem;
4815		- private MenuItem duplicateItem;
	5654	+ private MenuItem undoItem;
	5655	+ private MenuItem redoItem;
	5656	+ private JMenuItem duplicateItem;
4816	5657	private MenuItem cloneItem;
4817	5658	private MenuItem cloneSupportItem;
4818	5659	private MenuItem overwriteGeoItem;
..	..	@@ -4823,8 +5664,9 @@
4823	5664	private MenuItem resetsupportItem;
4824	5665	private MenuItem resetreferencesItem;
4825	5666	private MenuItem linkverticesItem;
	5667	+ private MenuItem relinkverticesItem;
4826	5668	private MenuItem setMasterItem;
4827		- private MenuItem resetMeshItem;
	5669	+ private MenuItem resetAllItem;
4828	5670	private MenuItem stepAllItem;
4829	5671	private MenuItem revertMeshItem;
4830	5672	private MenuItem poseMeshItem;
..	..	@@ -4835,14 +5677,17 @@
4835	5677	private MenuItem mergeGeometriesItem;
4836	5678	private MenuItem copyItem;
4837	5679	private MenuItem pasteItem;
	5680	+ private MenuItem pasteIntoItem;
4838	5681	private MenuItem pasteLinkItem;
4839	5682	private MenuItem pasteCloneItem;
4840	5683	private MenuItem pasteExpandItem;
4841	5684	private MenuItem clearItem;
4842	5685	private MenuItem clearAllItem;
4843	5686	private MenuItem genUVItem;
	5687	+ private MenuItem genNormalsMESHItem;
4844	5688	private MenuItem genNormalsCADItem;
4845	5689	private MenuItem genNormalsORGANItem;
	5690	+ private MenuItem genNormalsMINEItem;
4846	5691	private MenuItem stripifyItem;
4847	5692	private MenuItem unstripifyItem;
4848	5693	private MenuItem trimItem;
..	..	@@ -4871,6 +5716,10 @@
4871	5716	private MenuItem showleavesItem;
4872	5717	private MenuItem markleavesItem;
4873	5718	private MenuItem unmarkleavesItem;
	5719	+ private MenuItem rewindleavesItem;
	5720	+ private MenuItem unrewindleavesItem;
	5721	+ private MenuItem randomleavesItem;
	5722	+ private MenuItem unrandomleavesItem;
4874	5723
4875	5724	private MenuItem flipVItem;
4876	5725	private MenuItem unflipVItem;
..	..	@@ -4882,14 +5731,17 @@
4882	5731	private MenuItem panoTexturesItem;
4883	5732
4884	5733	private MenuItem resetCentroidItem;
4885		- private MenuItem transformgeometryItem;
	5734	+ private MenuItem resetCentroidXZItem;
4886	5735	private MenuItem resetTransformItem;
	5736	+ private MenuItem transformGeometryItem;
	5737	+ private MenuItem transformChildrenItem;
	5738	+ private MenuItem hideItem;
4887	5739	private MenuItem grabItem;
4888	5740	private MenuItem backItem;
4889	5741	private MenuItem frontItem;
4890	5742	private MenuItem cameraItem;
4891	5743	private MenuItem compositeItem;
4892		- private MenuItem randomItem;
	5744	+ private MenuItem switchItem;
4893	5745	private MenuItem physicsItem;
4894	5746	private MenuItem frameselectorItem;
4895	5747	private MenuItem scriptNodeItem;
..	..	@@ -4904,6 +5756,7 @@
4904	5756
4905	5757	private MenuItem resetParentItem;
4906	5758	private MenuItem repairParentItem;
	5759	+ private MenuItem repairShadowItem;
4907	5760	private MenuItem sortbysizeItem;
4908	5761	private MenuItem sortbynameItem;
4909	5762
..	..	@@ -4924,10 +5777,11 @@
4924	5777	private MenuItem coneItem;
4925	5778	private MenuItem torusItem;
4926	5779	private MenuItem superItem;
	5780	+ private MenuItem kleinItem;
4927	5781	private MenuItem blobItem;
4928	5782	private MenuItem latheItem;
4929	5783	private MenuItem bezierItem;
4930		- private MenuItem checkerItem;
	5784	+ private MenuItem overlayItem;
4931	5785	private MenuItem meshItem;
4932	5786	// private MenuItem meshGroupItem;
4933	5787	private MenuItem springItem;
..	..	@@ -4936,6 +5790,7 @@
4936	5790	private MenuItem csgItem;
4937	5791	private MenuItem templateItem;
4938	5792	private MenuItem textureItem;
	5793	+ private MenuItem billboardItem;
4939	5794	private MenuItem shadowXItem;
4940	5795	private MenuItem shadowYItem;
4941	5796	private MenuItem shadowZItem;
..	..	@@ -4948,11 +5803,6 @@
4948	5803	private MenuItem doubleItem;
4949	5804	private MenuItem tripleItem;
4950	5805
4951		- private MenuItem importGFDItem;
4952		- private MenuItem importVRMLX3DItem;
4953		- private MenuItem import3DSItem;
4954		- private MenuItem importOBJItem;
4955		-
4956	5806	private MenuItem computeAOItem;
4957	5807	private MenuItem recompileItem;
4958	5808	private MenuItem editScriptItem;
..	..	@@ -4962,4 +5812,8 @@
4962	5812	private MenuItem analyzeItem;
4963	5813	private MenuItem dumpItem;
4964	5814	//boolean freezemodel = false;
	5815	+
	5816	+ Menu cameraMenu;
	5817	+ MenuItem editCameraItem;
	5818	+ MenuItem restoreCameraItem;
4965	5819	}