~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -74,7 +74,7 @@
74	74	this.copy = this.group = copy;
75	75	//selectees = this.group.selectees;
76	76
77		- SetupMenu2(objEditor);
	77	+ SetupMenu2(this); //objEditor);
78	78	SetupUI2(objEditor);
79	79	objEditor.SetupUI(true);
80	80	SetupViews(objEditor);
..	..	@@ -98,14 +98,14 @@
98	98
99	99	void CloneClipboard(boolean supports)
100	100	{
101		- assert(GrafreeD.clipboard.parent == null);
102		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
103		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
104		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
105		- makeSomething(CloneObject(GrafreeD.clipboard.get(0), false));
	101	+ assert(Grafreed.clipboard.parent == null);
	102	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	103	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	104	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	105	+ makeSomething(CloneObject(Grafreed.clipboard.get(0), false));
106	106	else
107		- makeSomething(CloneObject(GrafreeD.clipboard, false));
108		- GrafreeD.clipboard.get(0).parent = keepparent;
	107	+ makeSomething(CloneObject(Grafreed.clipboard, false));
	108	+ Grafreed.clipboard.get(0).parent = keepparent;
109	109	}
110	110
111	111	static Object3D CloneObject(Object3D obj, boolean supports)
..	..	@@ -119,7 +119,7 @@
119	119	// obj.support = null;
120	120	if (!supports)
121	121	obj.SaveSupports();
122		- Object3D clone = (Object3D)GrafreeD.clone(obj);
	122	+ Object3D clone = (Object3D)Grafreed.clone(obj);
123	123	obj.parent = parent;
124	124	// obj.support = support;
125	125	// clone.support = support; // aout 2013
..	..	@@ -148,30 +148,29 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
154		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
155		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
156		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
157		- oe.cameraMenu.add("-");
158		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
159		- openWindowItem.addActionListener(this);
160		- editLeafItem.addActionListener(this);
161		- lookAtItem.addActionListener(this);
162		- //lookFromItem.addActinoListener(this);
163		- //switchItem.addActionListener(this);
	153	+ oe.jTree = new cTree();
	154	+
164	155	Menu menu;
165	156	oe.menuBar.add(menu = new Menu("Edit"));
166	157	//editItem = menu.add(new MenuItem("Edit"));
167	158	//editItem.addActionListener(this);
168		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
169	166	duplicateItem.addActionListener(this);
170		- menu.add("-");
171	167	cloneItem = menu.add(new MenuItem("Clone"));
172	168	cloneItem.addActionListener(this);
	169	+ if (Globals.ADVANCED)
	170	+ {
173	171	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
174	172	cloneSupportItem.addActionListener(this);
	173	+ }
175	174	menu.add("-");
176	175	cutItem = menu.add(new MenuItem("Cut"));
177	176	cutItem.addActionListener(this);
..	..	@@ -179,27 +178,123 @@
179	178	copyItem.addActionListener(this);
180	179	pasteItem = menu.add(new MenuItem("Paste"));
181	180	pasteItem.addActionListener(this);
	181	+
	182	+ menu.add("-");
	183	+ pasteIntoItem = menu.add(new MenuItem("Paste into"));
	184	+ pasteIntoItem.addActionListener(this);
182	185	pasteLinkItem = menu.add(new MenuItem("Paste link"));
183	186	pasteLinkItem.addActionListener(this);
184	187	pasteCloneItem = menu.add(new MenuItem("Paste clone"));
185	188	pasteCloneItem.addActionListener(this);
186	189	// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
187	190	// pasteExpandItem.addActionListener(this);
	191	+ menu.add("-");
188	192	clearItem = menu.add(new MenuItem("Clear"));
189	193	clearItem.addActionListener(this);
	194	+
	195	+ if (Globals.ADVANCED)
	196	+ {
	197	+ // Deletes the cameras...
190	198	clearAllItem = menu.add(new MenuItem("Clear All"));
191	199	clearAllItem.addActionListener(this);
	200	+ }
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
192	237
	238	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	239	+ stepItem.addActionListener(this);
	240	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	241	+ // toggleDLItem.addItemListener(this);
	242	+ // toggleDLItem.setState(false);
	243	+
	244	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	245	+ toggleRenderItem.addItemListener(this);
	246	+ toggleRenderItem.setState(!CameraPane.frozen);
	247	+
	248	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	249	+ toggleDebugItem.addItemListener(this);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
	251	+
	252	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	253	+ toggleFrustumItem.addItemListener(this);
	254	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	255	+
	256	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	257	+ toggleFootContactItem.addItemListener(this);
	258	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	259	+
	260	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	261	+ toggleTimelineItem.addItemListener(this);
	262	+ }
	263	+
	264	+// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
	265	+// toggleRootItem.addItemListener(this);
	266	+// toggleRootItem.setState(false);
	267	+// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
	268	+// animationItem.addItemListener(this);
	269	+// animationItem.setState(CameraPane.ANIMATION);
	270	+ cameraMenu.add("-");
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
	272	+ editCameraItem.addActionListener(this);
	273	+
	274	+ if (Globals.ADVANCED)
	275	+ {
	276	+ oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
	277	+ //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
	279	+ editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
	280	+ oe.cameraMenu.add("-");
	281	+ openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
	282	+ openWindowItem.addActionListener(this);
	283	+ editLeafItem.addActionListener(this);
	284	+ lookAtItem.addActionListener(this);
	285	+ //lookFromItem.addActinoListener(this);
	286	+ //switchViewItem.addActionListener(this);
	287	+ }
	288	+
193	289	oe.menuBar.add(menu = new Menu("Setting"));
194		- resetMeshItem = menu.add(new MenuItem("Reset All"));
195		- resetMeshItem.addActionListener(this);
196		- stepAllItem = menu.add(new MenuItem("Step All"));
197		- stepAllItem.addActionListener(this);
	290	+ if (Globals.ADVANCED)
	291	+ {
198	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
199	293	revertMeshItem.addActionListener(this);
200	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
201	295	resetreferencesItem.addActionListener(this);
202	296	menu.add("-");
	297	+ }
203	298	overwriteGeoItem = menu.add(new MenuItem("Overwrite Geometry"));
204	299	overwriteGeoItem.addActionListener(this);
205	300	overwriteMatItem = menu.add(new MenuItem("Overwrite Material"));
..	..	@@ -211,79 +306,103 @@
211	306	overwriteUVItem = menu.add(new MenuItem("Overwrite UV"));
212	307	overwriteUVItem.addActionListener(this);
213	308	menu.add("-");
	309	+ if (Globals.ADVANCED)
	310	+ {
214	311	generateMeshItem = menu.add(new MenuItem("Generate Meshes"));
215	312	generateMeshItem.addActionListener(this);
216	313	poseMeshItem = menu.add(new MenuItem("Set Pose Meshes"));
217	314	poseMeshItem.addActionListener(this);
218	315	menu.add("-");
	316	+ }
219	317	resetsupportItem = menu.add(new MenuItem("Reset support"));
220	318	resetsupportItem.addActionListener(this);
221	319	linkverticesItem = menu.add(new MenuItem("Link to Support"));
222	320	linkverticesItem.addActionListener(this);
223	321	relinkverticesItem = menu.add(new MenuItem("Re-link to Support"));
224	322	relinkverticesItem.addActionListener(this);
	323	+
	324	+ if (Globals.ADVANCED)
	325	+ {
225	326	setMasterItem = menu.add(new MenuItem("Set Master Mesh"));
226	327	setMasterItem.addActionListener(this);
	328	+ }
227	329
228	330	oe.menuBar.add(menu = new Menu("Group"));
229		- grabItem = menu.add(new MenuItem("Grab"));
230		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
231	333	backItem = menu.add(new MenuItem("Back"));
232	334	backItem.addActionListener(this);
233	335	frontItem = menu.add(new MenuItem("Front"));
234	336	frontItem.addActionListener(this);
235		- compositeItem = menu.add(new MenuItem("Composite"));
236		- compositeItem.addActionListener(this);
237		- hideItem = menu.add(new MenuItem("Hide"));
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
	342	+ hideItem = menu.add(new MenuItem("Hidden Group"));
238	343	hideItem.addActionListener(this);
	344	+ }
239	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
240	346	ungroupItem.addActionListener(this);
241		- menu.add("-");
242		- randomItem = menu.add(new MenuItem("Random"));
243		- randomItem.addActionListener(this);
244		- physicsItem = menu.add(new MenuItem("Physics"));
245		- physicsItem.addActionListener(this);
246		- frameselectorItem = menu.add(new MenuItem("Frame Selector"));
247		- frameselectorItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
248	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
249	355	switchGeoItem.addActionListener(this);
250	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
251	357	switchTransfoItem.addActionListener(this);
252		- morphItem = menu.add(new MenuItem("Morph"));
	358	+ morphItem = menu.add(new MenuItem("Morph Group"));
253	359	morphItem.addActionListener(this);
	360	+
	361	+ menu.add("-");
	362	+ physicsItem = menu.add(new MenuItem("Physics"));
	363	+ physicsItem.addActionListener(this);
	364	+ frameselectorItem = menu.add(new MenuItem("Frame Selector"));
	365	+ frameselectorItem.addActionListener(this);
254	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
255	367	scriptNodeItem.addActionListener(this);
256		- cameraItem = menu.add(new MenuItem("Camera"));
257		- cameraItem.addActionListener(this);
	368	+ }
258	369
259	370	oe.menuBar.add(menu = new Menu("Object"));
260		- textureItem = menu.add(new MenuItem("Texture"));
261		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
262	373	billboardItem = menu.add(new MenuItem("Billboard"));
263	374	billboardItem.addActionListener(this);
264	375	csgItem = menu.add(new MenuItem("CSG"));
265	376	csgItem.addActionListener(this);
266		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
267	378	shadowXItem.addActionListener(this);
268		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
269	380	shadowYItem.addActionListener(this);
270		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
271	382	shadowZItem.addActionListener(this);
	383	+ if (Globals.ADVANCED)
	384	+ {
	385	+ menu.add("-");
272	386	linkerItem = menu.add(new MenuItem("Linker"));
273	387	linkerItem.addActionListener(this);
274		- templateItem = menu.add(new MenuItem("Template"));
275		- templateItem.addActionListener(this);
276	388	attributeItem = menu.add(new MenuItem("Attribute"));
277	389	attributeItem.addActionListener(this);
	390	+ templateItem = menu.add(new MenuItem("Template"));
	391	+ templateItem.addActionListener(this);
278	392	pointflowItem = menu.add(new MenuItem("Point Flow"));
279	393	pointflowItem.addActionListener(this);
	394	+ }
280	395	menu.add("-");
281	396	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
282	397	resetTransformItem.addActionListener(this);
283	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
284	399	resetCentroidItem.addActionListener(this);
285		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
286		- transformgeometryItem.addActionListener(this);
	400	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	401	+ resetCentroidXZItem.addActionListener(this);
	402	+ transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
	403	+ transformGeometryItem.addActionListener(this);
	404	+ transformChildrenItem = menu.add(new MenuItem("Transform Children"));
	405	+ transformChildrenItem.addActionListener(this);
287	406
288	407	oe.menuBar.add(menu = new Menu("Geometry"));
289	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -294,8 +413,11 @@
294	413	genNormalsCADItem.addActionListener(this);
295	414	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
296	415	genNormalsMESHItem.addActionListener(this);
	416	+ if (Globals.ADVANCED)
	417	+ {
297	418	genNormalsMINEItem = menu.add(new MenuItem("My Normals"));
298	419	genNormalsMINEItem.addActionListener(this);
	420	+ }
299	421	stripifyItem = menu.add(new MenuItem("Stripify"));
300	422	stripifyItem.addActionListener(this);
301	423	unstripifyItem = menu.add(new MenuItem("Unstripify"));
..	..	@@ -317,23 +439,34 @@
317	439	reduce34MeshItem.addActionListener(this);
318	440	increaseMeshItem = menu.add(new MenuItem("Increase mesh"));
319	441	increaseMeshItem.addActionListener(this);
320		- smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
321		- smoothMeshItem.addActionListener(this);
322	442	clipMeshItem = menu.add(new MenuItem("Clip mesh"));
323	443	clipMeshItem.addActionListener(this);
	444	+
	445	+ if (Globals.ADVANCED)
	446	+ {
	447	+ smoothMeshItem = menu.add(new MenuItem("Smooth mesh"));
	448	+ smoothMeshItem.addActionListener(this);
	449	+ }
324	450
325	451	oe.menuBar.add(menu = new Menu("Attributes"));
326	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
327	453	clearMaterialsItem.addActionListener(this);
	454	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	455	+ resetAllItem.addActionListener(this);
	456	+ stepAllItem = menu.add(new MenuItem("Step All"));
	457	+ stepAllItem.addActionListener(this);
328	458	menu.add("-");
329	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
330	460	liveleavesItem.addActionListener(this);
331	461	unliveleavesItem = menu.add(new MenuItem("Unlive Leaves"));
332	462	unliveleavesItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
333	465	supportleavesItem = menu.add(new MenuItem("Support Leaves"));
334	466	supportleavesItem.addActionListener(this);
335	467	unsupportleavesItem = menu.add(new MenuItem("Unsupport Leaves"));
336	468	unsupportleavesItem.addActionListener(this);
	469	+ }
337	470	hideleavesItem = menu.add(new MenuItem("Hide Leaves"));
338	471	hideleavesItem.addActionListener(this);
339	472	showleavesItem = menu.add(new MenuItem("Show Leaves"));
..	..	@@ -342,6 +475,14 @@
342	475	markleavesItem.addActionListener(this);
343	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
344	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
345	486	menu.add("-");
346	487	flipVItem = menu.add(new MenuItem("Flip V"));
347	488	flipVItem.addActionListener(this);
..	..	@@ -377,35 +518,40 @@
377	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
378	519	sortbynameItem.addActionListener(this);
379	520	menu.add("-");
	521	+ shareGeometriesItem = menu.add(new MenuItem("Share Geometries"));
	522	+ shareGeometriesItem.addActionListener(this);
	523	+ mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
	524	+ mergeGeometriesItem.addActionListener(this);
	525	+ if (Globals.ADVANCED)
	526	+ {
	527	+ // Pretty much the same as duplicate and clone.
380	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
381	529	extractGeometriesItem.addActionListener(this);
382	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
383	531	cloneGeometriesItem.addActionListener(this);
384		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
385		- shareGeometriesItem.addActionListener(this);
386		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
387		- mergeGeometriesItem.addActionListener(this);
	532	+ }
388	533
389	534	oe.menuBar.add(menu = new Menu("Insert"));
390	535	buildCreateMenu(menu);
391	536
392		-
393		- oe.menuBar.add(menu = new Menu("Include"));
394		- importGFDItem = menu.add(new MenuItem("GrafreeD Object..."));
395		- importGFDItem.addActionListener(this);
396		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D Object..."));
397		- importVRMLX3DItem.addActionListener(this);
398		- importOBJItem = menu.add(new MenuItem("OBJ Object..."));
399		- importOBJItem.addActionListener(this);
400		- import3DSItem = menu.add(new MenuItem("3DS Object..."));
401		- import3DSItem.addActionListener(this);
402		-
403	537	oe.menuBar.add(menu = new Menu("Tools"));
404	538	buildToolsMenu(menu);
405	539	}
406	540
407	541	void SetupUI2(ObjEditor oe)
408	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
409	555	//new Exception().printStackTrace();
410	556
411	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -434,96 +580,213 @@
434	580	oe.radioPanel.add(dummyButton);
435	581	oe.buttonGroup.add(dummyButton);
436	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
437	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
438	588
439		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
440		- liveCB.setToolTipText("Enabled animation");
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	620	+ liveCB.setToolTipText("Enable animation");
441	621	liveCB.addItemListener(this);
442	622
443		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ oneStepButton.setToolTipText("Animate one step forward");
	625	+ oneStepButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
444	628	fastCB.setToolTipText("Fast mode");
445	629	fastCB.addItemListener(this);
446	630
447		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
448		- trackCB.setToolTipText("Enable tracking");
449		- trackCB.addItemListener(this);
450		-
451		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
452	634	screenfitButton.setToolTipText("Screen fit");
453	635	screenfitButton.addActionListener(this);
454	636
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
	640	+
455	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
456	642	// screenfitpointButton.addActionListener(this);
457		-// oe.aConstraints.gridx += 1;
458		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
459		- snapobjectButton.addActionListener(this);
460		- snapobjectButton.setToolTipText("Snap Object");
461		- oe.aConstraints.gridx += 1;
462	643
463		- //aConstraints.gridx = 0;
464		- //aConstraints.gridy += 1;
465		- oe.aConstraints.weighty = 0;
466		- oe.aConstraints.gridwidth = 1;
467		-
468		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
469		- flashSelectionButton.setToolTipText("Show selection");
470		- flashSelectionButton.addActionListener(this);
	644	+ if (Globals.ADVANCED)
	645	+ {
	646	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	647	+ snapobjectButton.addActionListener(this);
	648	+ snapobjectButton.setToolTipText("Snap Object");
	649	+ }
	650	+
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
471	652
472		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
473		-
474		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
475	654	twoButton.setToolTipText("Show center view only");
476	655	twoButton.addActionListener(this);
477		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
478	659	fourButton.addActionListener(this);
479	660	fourButton.setToolTipText("Show left panel only");
480		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
481	662	sixButton.setToolTipText("2-column layout left");
482	663	sixButton.addActionListener(this);
483		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
484	665	threeButton.setToolTipText("2-column layout right");
485	666	threeButton.addActionListener(this);
486		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
487	668	sevenButton.setToolTipText("3-column layout");
488	669	sevenButton.addActionListener(this);
489	670	//
490	671
491		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
492	673	rootButton.setToolTipText("Edit selection in new tab");
493	674	rootButton.addActionListener(this);
494	675
495		- oe.toolbarPanel.add(closeButton = new cButton("X", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
496	677	closeButton.setToolTipText("Close tab");
497	678	closeButton.addActionListener(this);
498	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
499	680	//clearButton.addActionListener(this);
500		-
501		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
502	713
503		- commandsPanel.add(editButton = new cButton("+", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
504		- editButton.setToolTipText("Edit selection");
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create item switcher");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
505	763	editButton.addActionListener(this);
506	764
507		- commandsPanel.add(uneditButton = new cButton("-", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
508		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
509	767	uneditButton.addActionListener(this);
510	768
511		- commandsPanel.add(clearPanelButton = new cButton("C", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
	771	+ allParamsButton.addActionListener(this);
	772	+
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
512	774	clearPanelButton.setToolTipText("Clear edit panel");
513	775	clearPanelButton.addActionListener(this);
514	776
515		- commandsPanel.add(allParamsButton = new cButton("A", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
516		- allParamsButton.setToolTipText("All params??");
517		- allParamsButton.addActionListener(this);
518		-
519		- commandsPanel.add(unselectButton = new cButton("U", !GrafreeD.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
520	778	unselectButton.setToolTipText("Unselect");
521	779	unselectButton.addActionListener(this);
522	780
523		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
524	784
525		- oe.treePanel.add(commandsPanel);
526		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
527	790
528	791	// oe.aConstraints.gridx += 1;
529	792	// oe.aConstraints.weighty = 0;
..	..	@@ -540,27 +803,12 @@
540	803
541	804	JScrollPane jSP;
542	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
543		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
544	807	ResetModel();
545	808
546	809	oe.treePanel.add(jSPPanel);
547	810	oe.treePanel.Return();
548	811
549		- cGridBag copyOptionsPanel = new cGridBag();
550		-
551		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
552		- colorCB.setToolTipText("Copy color when dropped");
553		- colorCB.addItemListener(this);
554		-
555		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
556		- materialCB.setToolTipText("Copy material when dropped");
557		- materialCB.addItemListener(this);
558		-
559		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
560		- textureCB.setToolTipText("Copy texture when dropped");
561		- textureCB.addItemListener(this);
562		-
563		- copyOptionsPanel.preferredHeight = 1;
564	812	oe.treePanel.add(copyOptionsPanel);
565	813	oe.treePanel.Return();
566	814
..	..	@@ -591,13 +839,43 @@
591	839
592	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
593	841	{
594		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
595		- supportCB.setToolTipText("Enabled rigging");
596		- supportCB.addItemListener(this);
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
	856	+ panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
	857	+ boxCB.setToolTipText("Display bounding boxes");
	858	+ boxCB.addItemListener(this);
	859	+
	860	+ panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
	862	+ zoomBoxCB.addItemListener(this);
	863	+
	864	+ if (true) // Globals.ADVANCED)
	865	+ {
	866	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	867	+// supportCB.setToolTipText("Enable rigging");
	868	+// supportCB.addItemListener(this);
	869	+
	870	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	871	+ freezeCB.setToolTipText("Fast moving camera");
	872	+ freezeCB.addItemListener(this);
597	873
598	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
599	875	// localCB.addItemListener(this);
600	876
	877	+ panel.Return();
	878	+
601	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
602	880	crowdCB.setToolTipText("Used for crowds");
603	881	crowdCB.addItemListener(this);
..	..	@@ -610,18 +888,12 @@
610	888	slowCB.setToolTipText("Smooth interpolation");
611	889	slowCB.addItemListener(this);
612	890
613		- panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
614		- boxCB.setToolTipText("Display bounding boxes");
615		- boxCB.addItemListener(this);
616		-
617		- panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
618		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
619		- zoomBoxCB.addItemListener(this);
620		-
621	891	// constraints.gridy += 1;
622	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
623	893	// speakerMocapCB.addItemListener(this);
624	894
	895	+ panel.Return();
	896	+
625	897	if (false)
626	898	{
627	899	// handled in scripts
..	..	@@ -636,30 +908,72 @@
636	908	//constraints.gridy += 1;
637	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
638	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
639	912	}
640	913
641	914	//constraints.gridx += 1;
642	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
643	916	// debugCB.addItemListener(this);
644	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
645	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
646	924	oeilCB.addItemListener(this);
647	925
	926	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	927	+ shadowCB.setToolTipText("When live compute shadows");
	928	+ shadowCB.addItemListener(this);
	929	+
	930	+ panel.Return();
	931	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	932	+ toggleTextureCB.setToolTipText("Load textures");
	933	+ toggleTextureCB.addItemListener(this);
	934	+
	935	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	936	+ toggleSwitchCB.setToolTipText("Choose a single item");
	937	+ toggleSwitchCB.addItemListener(this);
	938	+
	939	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	940	+ autosaveCB.setToolTipText("On structure change");
	941	+ autosaveCB.addItemListener(this);
	942	+
	943	+ panel.Return();
	944	+ if (Globals.ADVANCED)
	945	+ {
648	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
649	947	lookAtCB.setToolTipText("Look-at target");
650	948	lookAtCB.addItemListener(this);
	949	+ }
	950	+
	951	+ }
651	952
652	953	cGridBag fill = new cGridBag();
653		-
654	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
655	959
656	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
657	963
658	964	}
659	965
660	966	void EditObject(Object3D obj)
661	967	{
662	968	cRadio radioButton = new cRadio(obj.name);
	969	+
	970	+ // Patch to avoid bug with transparency.
	971	+ radioButton.hadMaterial = obj.material != null;
	972	+ if (!radioButton.hadMaterial)
	973	+ {
	974	+ obj.material = new cMaterial();
	975	+ }
	976	+
663	977	radioButton.SetObject(obj);
664	978	radioButton.layout = sevenButton;
665	979	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -668,8 +982,11 @@
668	982	buttonGroup.add(radioButton);
669	983	radioButton.doClick();
670	984	}
	985	+
671	986	void SetupViews(ObjEditor oe)
672	987	{
	988	+ theFrame = this;
	989	+
673	990	oe.SetupViews();
674	991
675	992	System.out.println("SetupViews");
..	..	@@ -678,23 +995,28 @@
678	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
679	996	}
680	997
681		- JCheckBox liveCB;
682		- JCheckBox supportCB;
683		- JCheckBox localCB;
684		- JCheckBox crowdCB;
685		- JCheckBox smoothCB;
686		- JCheckBox fastCB;
687		- JCheckBox slowCB;
688		- JCheckBox boxCB;
689		- JCheckBox zoomBoxCB;
690		- JCheckBox trackCB;
691		- JCheckBox smoothfocusCB;
	998	+ cToggleButton liveCB;
	999	+ cCheckBox supportCB;
	1000	+ cCheckBox localCB;
	1001	+ cCheckBox crowdCB;
	1002	+ cCheckBox smoothCB;
	1003	+ cToggleButton fastCB;
	1004	+ cCheckBox slowCB;
	1005	+ cCheckBox boxCB;
	1006	+ cCheckBox zoomBoxCB;
	1007	+ cCheckBox freezeCB;
	1008	+ //cToggleButton trackCB;
	1009	+ cCheckBox trackCB;
	1010	+ cCheckBox smoothfocusCB;
692	1011	// JCheckBox speakerMocapCB;
693		- JCheckBox speakerCameraCB;
694		- JCheckBox speakerFocusCB;
695		- JCheckBox debugCB;
696		- JCheckBox oeilCB;
697		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
698	1020
699	1021	// static int COLOR = 1;
700	1022	// static int MATERIAL = 2;
..	..	@@ -702,9 +1024,9 @@
702	1024
703	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
704	1026
705		- JCheckBox colorCB;
706		- JCheckBox materialCB;
707		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
708	1030
709	1031	public void itemStateChanged(ItemEvent e)
710	1032	{
..	..	@@ -732,6 +1054,7 @@
732	1054	} else if(e.getSource() == liveCB)
733	1055	{
734	1056	cameraView.ToggleLive();
	1057	+ refreshContents(false);
735	1058	}
736	1059	else if(e.getSource() == supportCB)
737	1060	{
..	..	@@ -796,6 +1119,18 @@
796	1119	{
797	1120	cameraView.ToggleOeil();
798	1121	}
	1122	+ else if(e.getSource() == shadowCB)
	1123	+ {
	1124	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1125	+ }
	1126	+ else if(e.getSource() == freezeCB)
	1127	+ {
	1128	+ Globals.FREEZEONMOVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == autosaveCB)
	1131	+ {
	1132	+ Globals.SAVEONMAKE ^= true;
	1133	+ }
799	1134	else if(e.getSource() == lookAtCB)
800	1135	{
801	1136	cameraView.ToggleLookAt();
..	..	@@ -812,7 +1147,8 @@
812	1147
813	1148	/**/
814	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
815		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
816	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
817	1153	// We can't move the root node or an empty selection
818	1154	return;
..	..	@@ -884,7 +1220,9 @@
884	1220	// objEditor.DropFile((java.io.File[]) object, true);
885	1221	// return;
886	1222	// }
887		- if (string.charAt(0) == '/')
	1223	+
	1224	+ // File path for Mac and Windows
	1225	+ if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
888	1226	{
889	1227	// file(s)
890	1228	String[] names = string.split("\n");
..	..	@@ -911,7 +1249,7 @@
911	1249
912	1250	flashIt = false;
913	1251	CameraPane pane = (CameraPane) target;
914		- pane.clickStart(objEditor.location.x, objEditor.location.y, 0);
	1252	+ pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
915	1253	pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
916	1254
917	1255	if (group.selection.size() == 1)
..	..	@@ -927,23 +1265,33 @@
927	1265
928	1266	assert target == objEditor.jTree;
929	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
930	1269	try {
931		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
932	1271	} catch (Exception e) {
933	1272	System.out.println("destinationPath : " + destinationPath);
934	1273	return;
935	1274	}
936	1275
937		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
938	1277	{
	1278	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1279	+
	1280	+ // Cannot move into itself
	1281	+ if (child == destinationLeaf)
	1282	+ return;
	1283	+ }
	1284	+
	1285	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1286	+// {
939	1287	loadClipboard(true);
940	1288	objEditor.jTree.setSelectionPath(destinationPath);
941		- pasteInto(false);
942		- } else {
943		- loadClipboard(false);
944		- objEditor.jTree.setSelectionPath(destinationPath);
945		- pasteInto(false); // true); // ???
946		- }
	1289	+ pasteInto(false, false);
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
947	1295	}
948	1296	public void dropActionChanged(DropTargetDragEvent dtde)
949	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1048,54 +1396,71 @@
1048	1396	{
1049	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1050	1398	//heightFieldItem.addActionListener(this);
1051		- gridItem = menu.add(new MenuItem("Grid"));
1052		- gridItem.addActionListener(this);
1053		- rectoidItem = menu.add(new MenuItem("Box"));
1054		- rectoidItem.addActionListener(this);
1055		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1056		- ellipsoidItem.addActionListener(this);
1057		- coneItem = menu.add(new MenuItem("Cone"));
1058		- coneItem.addActionListener(this);
1059		- torusItem = menu.add(new MenuItem("Torus"));
1060		- torusItem.addActionListener(this);
1061		- superItem = menu.add(new MenuItem("Superellipsoid"));
1062		- superItem.addActionListener(this);
	1399	+// gridItem = menu.add(new MenuItem("Grid"));
	1400	+// gridItem.addActionListener(this);
	1401	+// rectoidItem = menu.add(new MenuItem("Box"));
	1402	+// rectoidItem.addActionListener(this);
	1403	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1404	+// ellipsoidItem.addActionListener(this);
	1405	+// coneItem = menu.add(new MenuItem("Cone"));
	1406	+// coneItem.addActionListener(this);
	1407	+// torusItem = menu.add(new MenuItem("Torus"));
	1408	+// torusItem.addActionListener(this);
	1409	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1410	+// superItem.addActionListener(this);
	1411	+
	1412	+ cameraItem = menu.add(new MenuItem("Camera"));
	1413	+ cameraItem.addActionListener(this);
	1414	+
	1415	+ if (!Globals.ADVANCED)
	1416	+ {
1063	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1064	1418	kleinItem.addActionListener(this);
1065		- particleItem = menu.add(new MenuItem("Particle system"));
1066		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
	1423	+ if (Globals.ADVANCED)
	1424	+ {
1067	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
1068	1426	ragdollItem.addActionListener(this);
1069	1427	ragdoll2Item = menu.add(new MenuItem("Rag Fall"));
1070	1428	ragdoll2Item.addActionListener(this);
	1429	+ }
1071	1430	menu.add("-");
1072		- meshItem = menu.add(new MenuItem("Mesh"));
	1431	+ meshItem = menu.add(new MenuItem("Dynamic Mesh"));
1073	1432	meshItem.addActionListener(this);
1074	1433	// meshGroupItem = menu.add(new MenuItem("Mesh Group"));
1075	1434	// meshGroupItem.addActionListener(this);
	1435	+ if (Globals.ADVANCED)
	1436	+ {
1076	1437	springItem = menu.add(new MenuItem("Spring"));
1077	1438	springItem.addActionListener(this);
1078	1439	flagItem = menu.add(new MenuItem("Flag"));
1079	1440	flagItem.addActionListener(this);
1080		- bezierItem = menu.add(new MenuItem("Patch"));
1081		- bezierItem.addActionListener(this);
1082		- checkerItem = menu.add(new MenuItem("Checker"));
1083		- checkerItem.addActionListener(this);
1084	1441	blobItem = menu.add(new MenuItem("Blob"));
1085	1442	blobItem.addActionListener(this);
1086	1443	latheItem = menu.add(new MenuItem("Lathe"));
1087	1444	latheItem.addActionListener(this);
1088		- lightItem = menu.add(new MenuItem("Light"));
1089		- lightItem.addActionListener(this);
	1445	+ }
	1446	+ bezierItem = menu.add(new MenuItem("Bezier Patch"));
	1447	+ bezierItem.addActionListener(this);
	1448	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1449	+// overlayItem.addActionListener(this);
	1450	+// lightItem = menu.add(new MenuItem("Light"));
	1451	+// lightItem.addActionListener(this);
1090	1452	menu.add("-");
1091	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1092	1454	//superLoopItem.addActionListener(this);
1093		- loopItem = menu.add(new MenuItem("Loop"));
1094		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1095	1457	doubleItem = menu.add(new MenuItem("Fork"));
1096	1458	doubleItem.addActionListener(this);
	1459	+ if (Globals.ADVANCED)
	1460	+ {
1097	1461	tripleItem = menu.add(new MenuItem("Trident"));
1098	1462	tripleItem.addActionListener(this);
	1463	+ }
1099	1464	}
1100	1465
1101	1466	void buildToolsMenu(Menu menu)
..	..	@@ -1109,24 +1474,26 @@
1109	1474	parseverticesItem.addActionListener(this);
1110	1475	textureFieldItem = menu.add(new MenuItem("Texture Field"));
1111	1476	textureFieldItem.addActionListener(this);
1112		- alignItem = menu.add(new MenuItem("Align"));
	1477	+ alignItem = menu.add(new MenuItem("Align Objects"));
1113	1478	alignItem.addActionListener(this);
1114		- mirrorItem = menu.add(new MenuItem("Mirror Poses"));
1115		- mirrorItem.addActionListener(this);
1116	1479	reduceMorphItem = menu.add(new MenuItem("Reduce Morphs"));
1117	1480	reduceMorphItem.addActionListener(this);
1118	1481	reduce34MorphItem = menu.add(new MenuItem("Reduce Morphs (34)"));
1119	1482	reduce34MorphItem.addActionListener(this);
1120		-
	1483	+ menu.add("-");
1121	1484	menu.add(computeAOItem = new MenuItem("Compute AO"));
1122	1485	computeAOItem.addActionListener(this);
1123		- menu.add("-");
1124	1486
	1487	+ if (Globals.ADVANCED)
	1488	+ {
	1489	+ mirrorItem = menu.add(new MenuItem("Mirror Poses"));
	1490	+ mirrorItem.addActionListener(this);
	1491	+ menu.add("-");
1125	1492	menu.add(memoryItem = new MenuItem("Memory Usage"));
1126	1493	memoryItem.addActionListener(this);
1127	1494	menu.add(analyzeItem = new MenuItem("Analyze"));
1128	1495	analyzeItem.addActionListener(this);
1129		- menu.add(dumpItem = new MenuItem("Dump"));
	1496	+ menu.add(dumpItem = new MenuItem("Print"));
1130	1497	dumpItem.addActionListener(this);
1131	1498	// menu.add(pathItem = new MenuItem("From-to path"));
1132	1499	// pathItem.addActionListener(this);
..	..	@@ -1144,6 +1511,7 @@
1144	1511	menu.add("-");
1145	1512	menu.add(editScriptItem = new MenuItem("Edit Script..."));
1146	1513	editScriptItem.addActionListener(this);
	1514	+ }
1147	1515	}
1148	1516
1149	1517	void ScreenFit()
..	..	@@ -1266,9 +1634,24 @@
1266	1634	shadow.material = new cMaterial(obj.material);
1267	1635	shadow.material.diffuse = 0.0001f;
1268	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1269	1638
1270	1639	makeSomething(shadow);
1271	1640	}
	1641	+
	1642	+ private void ClearUnpinned()
	1643	+ {
	1644	+ //for (Object3D obj : listUI)
	1645	+ for (int i=listUI.size(); --i>=0;)
	1646	+ {
	1647	+ Object3D obj = listUI.elementAt(i);
	1648	+ if (!obj.pinned)
	1649	+ {
	1650	+ obj.CloseUI();
	1651	+ listUI.remove(i);
	1652	+ }
	1653	+ }
	1654	+ }
1272	1655
1273	1656	/**
1274	1657	* applyExample
..	..	@@ -1472,9 +1855,9 @@
1472	1855
1473	1856	void Overwrite(int mask)
1474	1857	{
1475		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	1858	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
1476	1859	{
1477		- Object3D content = GrafreeD.clipboard.get(0);
	1860	+ Object3D content = Grafreed.clipboard.get(0);
1478	1861
1479	1862	if (content instanceof cGroup && ((cGroup)content).transientlink )
1480	1863	content = ((cGroup)content).get(0);
..	..	@@ -1513,7 +1896,7 @@
1513	1896	{
1514	1897	ScreenFit();
1515	1898	} else
1516		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1517	1900	{
1518	1901	cVector v1 = new cVector();
1519	1902	cVector v2 = new cVector();
..	..	@@ -1522,11 +1905,11 @@
1522	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1523	1906	objEditor.cameraView.repaint();
1524	1907	} else
1525		- if (source == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1526	1909	{
1527	1910	makeSomething(new Box());
1528	1911	} else
1529		- if (source == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1530	1913	{
1531	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1532	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1605,27 +1988,27 @@
1605	1988
1606	1989	makeSomething(obj);
1607	1990	} else
1608		- if (source == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1609	1992	{
1610	1993	makeSomething(new Grid());
1611	1994	} else
1612		- if (source == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1613	1996	{
1614	1997	makeSomething(new Sphere());
1615	1998	} else
1616		- if (source == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1617	2000	{
1618	2001	makeSomething(new Cone());
1619	2002	} else
1620		- if (source == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1621	2004	{
1622	2005	makeSomething(new Torus());
1623	2006	} else
1624		- if (source == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1625	2008	{
1626	2009	makeSomething(new Superellipsoid());
1627	2010	} else
1628		- if (source == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1629	2012	{
1630	2013	makeSomething(new Klein());
1631	2014	} else
..	..	@@ -1645,7 +2028,7 @@
1645	2028	{
1646	2029	makeSomething(new BezierSurface());
1647	2030	} else
1648		- if (source == checkerItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1649	2032	{
1650	2033	/*
1651	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1693,7 +2076,7 @@
1693	2076	s.setup();
1694	2077	makeSomething(s);
1695	2078	} else
1696		- if (source == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1697	2080	{
1698	2081	makeSomething(new Light());
1699	2082	} else
..	..	@@ -1743,30 +2126,30 @@
1743	2126
1744	2127	group(g);
1745	2128	} else
1746		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1747	2130	{
1748	2131	Composite csg = new GroupLeaf();
1749	2132	csg.count = 5;
1750	2133	group(csg);
1751		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1752	2135	csg.addChild(child);
1753	2136	child.addChild(csg);
1754	2137	} else
1755	2138	if (source == doubleItem)
1756	2139	{
1757		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1758	2141	csg.count = 5;
1759	2142	group(csg);
1760		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1761	2144	csg.addChild(child);
1762	2145	child.addChild(csg);
1763		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1764	2147	csg.addChild(child);
1765	2148	child.addChild(csg);
1766	2149	} else
1767	2150	if (source == tripleItem)
1768	2151	{
1769		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1770	2153	csg.count = 4;
1771	2154	group(csg);
1772	2155	Composite child = new cGroup();
..	..	@@ -1778,23 +2161,6 @@
1778	2161	child = new cGroup();
1779	2162	csg.addChild(child);
1780	2163	child.addChild(csg);
1781		- } else
1782		-
1783		- if (source == importGFDItem)
1784		- {
1785		- ImportGFD();
1786		- } else
1787		- if (source == importVRMLX3DItem)
1788		- {
1789		- ImportVRMLX3D();
1790		- } else
1791		- if (source == import3DSItem)
1792		- {
1793		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1794		- } else
1795		- if (source == importOBJItem)
1796		- {
1797		- objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1798	2164	} else
1799	2165	if (source == computeAOItem)
1800	2166	{
..	..	@@ -1814,7 +2180,7 @@
1814	2180	if (source == invariantsItem)
1815	2181	{
1816	2182	System.out.println("Invariants:");
1817		- GrafreeD.grafreeD.universe.invariants();
	2183	+ Grafreed.grafreeD.universe.invariants();
1818	2184	} else
1819	2185	if (source == memoryItem)
1820	2186	{
..	..	@@ -1832,6 +2198,35 @@
1832	2198	if (source == dumpItem)
1833	2199	{
1834	2200	DumpObject();
	2201	+ } else
	2202	+ if (source == minButton)
	2203	+ {
	2204	+ Minimize();
	2205	+ } else
	2206	+ if (source == maxButton)
	2207	+ {
	2208	+ Maximize();
	2209	+ } else
	2210	+ if (source == fullButton)
	2211	+ {
	2212	+ ToggleFullScreen();
	2213	+ } else
	2214	+ if (source == undoButton)
	2215	+ {
	2216	+ Undo();
	2217	+ } else
	2218	+ if (source == redoButton)
	2219	+ {
	2220	+ Redo();
	2221	+ } else
	2222	+ if (source == saveButton)
	2223	+ {
	2224	+ Save();
	2225	+ } else
	2226	+ if (source == oneStepButton)
	2227	+ {
	2228	+ Globals.ONESTEP = true;
	2229	+ cameraView.repaint();
1835	2230	} else
1836	2231	if (source == screenfitButton)
1837	2232	{
..	..	@@ -1882,12 +2277,20 @@
1882	2277	{
1883	2278	loadClipboard(true);
1884	2279	} else
	2280	+ if (source == undoItem)
	2281	+ {
	2282	+ Undo();
	2283	+ } else
	2284	+ if (source == redoItem)
	2285	+ {
	2286	+ Redo();
	2287	+ } else
1885	2288	if (source == duplicateItem)
1886	2289	{
1887		- Object3D keep = GrafreeD.clipboard;
	2290	+ Object3D keep = Grafreed.clipboard;
1888	2291	loadClipboard(false);
1889	2292	paste(false);
1890		- GrafreeD.clipboard = keep;
	2293	+ Grafreed.clipboard = keep;
1891	2294	} else
1892	2295	if (source == cloneItem)
1893	2296	{
..	..	@@ -1905,13 +2308,17 @@
1905	2308	{
1906	2309	paste(false);
1907	2310	} else
	2311	+ if (source == pasteIntoItem)
	2312	+ {
	2313	+ pasteInto(true, false);
	2314	+ } else
1908	2315	if (source == pasteLinkItem)
1909	2316	{
1910		- pasteInto(false);
	2317	+ pasteInto(false, false);
1911	2318	} else
1912	2319	if (source == pasteCloneItem)
1913	2320	{
1914		- pasteInto(true);
	2321	+ pasteInto(true, true);
1915	2322	} else
1916	2323	if (source == pasteExpandItem)
1917	2324	{
..	..	@@ -2103,9 +2510,9 @@
2103	2510	// group.selection.get(0).setMasterThis(content); // should be identity
2104	2511	// refreshContents();
2105	2512	// }
2106		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	2513	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
2107	2514	{
2108		- Object3D content = GrafreeD.clipboard.get(0);
	2515	+ Object3D content = Grafreed.clipboard.get(0);
2109	2516
2110	2517	if (content instanceof cGroup && ((cGroup)content).transientlink )
2111	2518	content = ((cGroup)content).get(0);
..	..	@@ -2113,11 +2520,11 @@
2113	2520	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.WAIT_CURSOR));
2114	2521	for (int i=0; i<group.selection.size(); i++)
2115	2522	{
2116		- boolean random = CameraPane.RANDOM;
2117		- CameraPane.RANDOM = false; // parse all random nodes
	2523	+ boolean random = CameraPane.SWITCH;
	2524	+ CameraPane.SWITCH = false; // parse all random nodes
2118	2525	group.selection.get(i).linkVerticesThis(content);
2119	2526	// group.selection.get(i).setMasterThis(content); // should be identity
2120		- CameraPane.RANDOM = random;
	2527	+ CameraPane.SWITCH = random;
2121	2528	}
2122	2529	Globals.theRenderer.setCursor(java.awt.Cursor.getPredefinedCursor(java.awt.Cursor.DEFAULT_CURSOR));
2123	2530	refreshContents();
..	..	@@ -2127,20 +2534,20 @@
2127	2534	{
2128	2535	for (int i=0; i<group.selection.size(); i++)
2129	2536	{
2130		- boolean random = CameraPane.RANDOM;
2131		- CameraPane.RANDOM = false; // parse all random nodes
	2537	+ boolean random = CameraPane.SWITCH;
	2538	+ CameraPane.SWITCH = false; // parse all random nodes
2132	2539	group.selection.get(i).linkVerticesThis(null);
2133		- CameraPane.RANDOM = random;
	2540	+ CameraPane.SWITCH = random;
2134	2541	}
2135	2542
2136	2543	refreshContents();
2137	2544	} else
2138	2545	if (source == relinkverticesItem)
2139	2546	{
2140		- boolean random = CameraPane.RANDOM;
2141		- CameraPane.RANDOM = false; // parse all random nodes
	2547	+ boolean random = CameraPane.SWITCH;
	2548	+ CameraPane.SWITCH = false; // parse all random nodes
2142	2549	group.selection.RelinkToSupport();
2143		- CameraPane.RANDOM = random;
	2550	+ CameraPane.SWITCH = random;
2144	2551
2145	2552	refreshContents();
2146	2553	} else
..	..	@@ -2155,9 +2562,9 @@
2155	2562	} else
2156	2563	if (source == setMasterItem)
2157	2564	{
2158		- if (group.selection.size() == 1 && GrafreeD.clipboard.size() == 1)
	2565	+ if (group.selection.size() == 1 && Grafreed.clipboard.size() == 1)
2159	2566	{
2160		- Object3D content = GrafreeD.clipboard.get(0);
	2567	+ Object3D content = Grafreed.clipboard.get(0);
2161	2568
2162	2569	if (content instanceof cGroup && ((cGroup)content).transientlink )
2163	2570	content = ((cGroup)content).get(0);
..	..	@@ -2170,9 +2577,9 @@
2170	2577	{
2171	2578	if (group.selection.size() == 1)
2172	2579	{
2173		- if (GrafreeD.clipboard.size() == 1)
	2580	+ if (Grafreed.clipboard.size() == 1)
2174	2581	{
2175		- Object3D content = GrafreeD.clipboard.get(0);
	2582	+ Object3D content = Grafreed.clipboard.get(0);
2176	2583
2177	2584	if (content instanceof cGroup && ((cGroup)content).transientlink )
2178	2585	content = ((cGroup)content).get(0);
..	..	@@ -2189,7 +2596,7 @@
2189	2596	{
2190	2597	RevertMeshes();
2191	2598	} else
2192		- if (source == resetMeshItem)
	2599	+ if (source == resetAllItem)
2193	2600	{
2194	2601	ResetAll();
2195	2602	} else
..	..	@@ -2209,9 +2616,9 @@
2209	2616	{
2210	2617	ClearSelection(true);
2211	2618	} else
2212		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2213	2620	{
2214		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2215	2622	} else
2216	2623	if (source == hideItem)
2217	2624	{
..	..	@@ -2229,16 +2636,16 @@
2229	2636	{
2230	2637	makeSomething(new Camera());
2231	2638	} else
2232		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2233	2640	{
2234	2641	group(new Composite());
2235	2642	} else
2236		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2237	2644	{
2238	2645	RandomNode random = new RandomNode();
2239	2646	group(random);
2240	2647	if (random.size() > 0)
2241		- random.name = random.get(0).name + "Rnd";
	2648	+ random.name = random.get(0).name + "Switch";
2242	2649	} else
2243	2650	if (source == physicsItem)
2244	2651	{
..	..	@@ -2335,7 +2742,7 @@
2335	2742	{
2336	2743	group(new cLinker());
2337	2744	} else
2338		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2339	2746	{
2340	2747	group(new TextureNode());
2341	2748	} else
..	..	@@ -2355,17 +2762,30 @@
2355	2762	{
2356	2763	CastShadow(2);
2357	2764	} else
2358		- if (source == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2359	2766	{
2360		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2361	2769	for (int i=0; i<group.selection.size(); i++)
2362	2770	{
2363		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2364	2776	}
2365	2777
2366		- ClearSelection(false);
2367		-
2368		- refreshContents();
	2778	+ if (!hasRoot)
	2779	+ {
	2780	+ for (int i=0; i<group.selection.size(); i++)
	2781	+ {
	2782	+ Ungroup(group.selection.get(i));
	2783	+ }
	2784	+
	2785	+ ClearSelection(false);
	2786	+
	2787	+ refreshContents();
	2788	+ }
2369	2789	} else
2370	2790	if (source == genUVItem)
2371	2791	{
..	..	@@ -2377,7 +2797,7 @@
2377	2797	} else
2378	2798	if (source == genNormalsMESHItem)
2379	2799	{
2380		- GenNormals(true); // TODO
	2800	+ GenNormalsMESH();
2381	2801	} else
2382	2802	if (source == genNormalsORGANItem)
2383	2803	{
..	..	@@ -2442,6 +2862,22 @@
2442	2862	if (source == unmarkleavesItem)
2443	2863	{
2444	2864	MarkLeaves(false);
	2865	+ } else
	2866	+ if (source == rewindleavesItem)
	2867	+ {
	2868	+ RewindLeaves(true);
	2869	+ } else
	2870	+ if (source == unrewindleavesItem)
	2871	+ {
	2872	+ RewindLeaves(false);
	2873	+ } else
	2874	+ if (source == randomleavesItem)
	2875	+ {
	2876	+ RandomLeaves(true);
	2877	+ } else
	2878	+ if (source == unrandomleavesItem)
	2879	+ {
	2880	+ RandomLeaves(false);
2445	2881	} else
2446	2882	if (source == flipVItem)
2447	2883	{
..	..	@@ -2527,9 +2963,13 @@
2527	2963	{
2528	2964	SmoothMesh();
2529	2965	} else
2530		- if (source == transformgeometryItem)
	2966	+ if (source == transformGeometryItem)
2531	2967	{
2532	2968	TransformGeometry();
	2969	+ } else
	2970	+ if (source == transformChildrenItem)
	2971	+ {
	2972	+ TransformChildren();
2533	2973	} else
2534	2974	if (source == resetTransformItem)
2535	2975	{
..	..	@@ -2537,7 +2977,11 @@
2537	2977	} else
2538	2978	if (source == resetCentroidItem)
2539	2979	{
2540		- ResetCentroid();
	2980	+ ResetCentroid(true);
	2981	+ } else
	2982	+ if (source == resetCentroidXZItem)
	2983	+ {
	2984	+ ResetCentroid(false);
2541	2985	} else
2542	2986	if (source == resetParentItem)
2543	2987	{
..	..	@@ -2669,6 +3113,10 @@
2669	3113	if (source == twoButton)
2670	3114	{
2671	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2672	3120	// bug
2673	3121	//gridPanel.setDividerLocation(1.0);
2674	3122	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2701,10 +3149,31 @@
2701	3149	bigThree.ClearUI();
2702	3150	bigThree.add(centralPanel);
2703	3151	bigThree.FlushUI();
	3152	+
	3153	+ cameraView.requestFocusInWindow();
	3154	+
	3155	+// refreshContents(true);
	3156	+//
	3157	+// try
	3158	+// {
	3159	+// java.awt.Robot bot = new java.awt.Robot();
	3160	+// int mask = InputEvent.BUTTON1_MASK;
	3161	+// bot.mouseMove(100, 100);
	3162	+// bot.mousePress(mask);
	3163	+// bot.mouseRelease(mask);
	3164	+// }
	3165	+// catch (Exception e)
	3166	+// {
	3167	+//
	3168	+// }
	3169	+
2704	3170	} else
2705	3171	if (source == threeButton)
2706	3172	{
2707	3173	radio.layout = threeButton;
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
2708	3177
2709	3178	// bigThree.remove(scenePanel);
2710	3179	// bigThree.remove(centralPanel);
..	..	@@ -2737,10 +3206,15 @@
2737	3206	bigThree.add(centralPanel);
2738	3207	bigThree.add(XYZPanel);
2739	3208	bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2740	3211	} else
2741	3212	if (source == fourButton)
2742	3213	{
2743	3214	radio.layout = fourButton;
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
2744	3218
2745	3219	// bigThree.remove(scenePanel);
2746	3220	// bigThree.remove(centralPanel);
..	..	@@ -2772,10 +3246,15 @@
2772	3246	bigThree.ClearUI();
2773	3247	bigThree.add(scenePanel);
2774	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2775	3251	} else
2776	3252	if (source == sixButton)
2777	3253	{
2778	3254	radio.layout = sixButton;
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
2779	3258
2780	3259	// bigThree.remove(scenePanel);
2781	3260	// bigThree.remove(centralPanel);
..	..	@@ -2808,10 +3287,15 @@
2808	3287	bigThree.add(scenePanel);
2809	3288	bigThree.add(centralPanel);
2810	3289	bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
2811	3292	} else
2812	3293	if (source == sevenButton)
2813	3294	{
2814	3295	radio.layout = sevenButton;
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
2815	3299
2816	3300	// bigThree.remove(scenePanel);
2817	3301	// bigThree.remove(centralPanel);
..	..	@@ -2845,6 +3329,8 @@
2845	3329	bigThree.add(centralPanel);
2846	3330	bigThree.add(XYZPanel);
2847	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2848	3334	} else
2849	3335	if (source == rootButton)
2850	3336	{
..	..	@@ -2856,6 +3342,7 @@
2856	3342	EditObject(obj);
2857	3343	}
2858	3344
	3345	+ cameraView.requestFocusInWindow();
2859	3346	refreshContents(true);
2860	3347	} else
2861	3348	if (source == closeButton)
..	..	@@ -2865,22 +3352,37 @@
2865	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2866	3353	{
2867	3354	ab = (cRadio)e.nextElement();
2868		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2869	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
2870	3363	buttonGroup.remove(ab);
2871	3364	radioPanel.remove(ab);
2872	3365
2873		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
2874	3368	// ab.GetObject().objectUI = null; // ?????????
2875	3369
2876	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2877	3371	break;
2878	3372	}
2879	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2880	3376	refreshContents(true);
2881	3377	} else
2882	3378	if (source == editItem \|\| source == editButton)
2883	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
2884	3386	EditSelection(false);
2885	3387	} else
2886	3388	if (source == uneditButton)
..	..	@@ -2890,12 +3392,13 @@
2890	3392	Object3D child = (Object3D)e.nextElement();
2891	3393	if(child.editWindow != null)
2892	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
2893	3396	child.CloseUI();
2894	3397	listUI.remove(child);
2895	3398
2896		- child.editWindow = null; // ???????????
	3399	+ //child.editWindow = null; // ???????????
2897	3400	}
2898		- objEditor.ctrlPanel.validate();
	3401	+ objEditor.ctrlPanel.FlushUI();
2899	3402	//objEditor.jTree.clearSelection();
2900	3403	//objEditor.ResetSliders();
2901	3404	refreshContents(true);
..	..	@@ -2906,6 +3409,7 @@
2906	3409	//copy.ClearUI();
2907	3410	for (Object3D obj : listUI)
2908	3411	{
	3412	+ obj.pinned = false;
2909	3413	obj.CloseUI();
2910	3414	}
2911	3415	listUI.clear();
..	..	@@ -2915,7 +3419,7 @@
2915	3419	{
2916	3420	assert(copy == group);
2917	3421
2918		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
2919	3423
2920	3424	for (Object3D obj : listUI)
2921	3425	{
..	..	@@ -2979,20 +3483,44 @@
2979	3483	frontView.object = group;
2980	3484	sideView.object = group;
2981	3485	}
2982		- group.editWindow = this;
	3486	+
	3487	+// fix "+" issue
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
	3490	+
2983	3491	/*
2984	3492	currentLayout = radio.layout;
2985	3493	if (currentLayout == null)
2986	3494	currentLayout = sevenButton;
2987	3495	*/
2988	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
2989	3502	keepparent = group.parent;
2990	3503	// PARENT = NULL or not???
2991	3504	//group.parent = null; // ROOT
2992	3505	//group.attributes = -1;
2993	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
2994	3509	refreshContents(true);
2995		- }
	3510	+ } else if (event.getSource() == editCameraItem)
	3511	+ {
	3512	+ cameraView.ProtectCamera();
	3513	+ cameraView.repaint();
	3514	+ return;
	3515	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3516	+ {
	3517	+ cameraView.RevertCamera();
	3518	+ cameraView.repaint();
	3519	+ return;
	3520	+ // } else if (event.getSource() == textureButton)
	3521	+ // {
	3522	+ // return; // true;
	3523	+ }
2996	3524	else
2997	3525	{
2998	3526	//return super.action(event, arg);
..	..	@@ -3001,7 +3529,6 @@
3001	3529	}
3002	3530
3003	3531	boolean useclient = false;
3004		- cRadio radio;
3005	3532
3006	3533	void ToggleRoot()
3007	3534	{
..	..	@@ -3053,6 +3580,28 @@
3053	3580	refreshContents();
3054	3581	}
3055	3582
	3583	+ void TransformChildren()
	3584	+ {
	3585	+ Object3D obj;
	3586	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3587	+ {
	3588	+ obj = (Object3D)e.nextElement();
	3589	+ obj.KeepTextureMatrices();
	3590	+ obj.TransformChildren();
	3591	+ obj.RestoreTextureMatrices();
	3592	+
	3593	+// if (obj.parent == null)
	3594	+// {
	3595	+// System.out.println("NULL PARENT!");
	3596	+// new Exception().printStackTrace();
	3597	+// }
	3598	+// else
	3599	+// TouchTransform(obj);
	3600	+// //obj.parent.Touch();
	3601	+ }
	3602	+
	3603	+ refreshContents();
	3604	+ }
3056	3605
3057	3606	void ResetTransform()
3058	3607	{
..	..	@@ -3165,7 +3714,7 @@
3165	3714	refreshContents();
3166	3715	}
3167	3716
3168		- void ResetCentroid()
	3717	+ void ResetCentroid(boolean full)
3169	3718	{
3170	3719	Object3D obj;
3171	3720	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3180,12 +3729,16 @@
3180	3729	LA.matIdentity(Object3D.mat);
3181	3730	obj.getBounds(minima, maxima, false);
3182	3731	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3183		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3732	+ if (full)
	3733	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3184	3734	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3185	3735	obj.TransformMesh(Object3D.mat);
	3736	+
3186	3737	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3187		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3738	+ if (full)
	3739	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3188	3740	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3741	+
3189	3742	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3190	3743	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3191	3744	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3214,7 +3767,8 @@
3214	3767
3215	3768	int size = obj.MemorySize();
3216	3769
3217		- System.err.println((size/1024) + " KB is the size of " + obj);
	3770	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3771	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3218	3772	}
3219	3773	}
3220	3774	catch (Exception e)
..	..	@@ -3251,9 +3805,9 @@
3251	3805	obj = (Object3D)e.nextElement();
3252	3806
3253	3807	System.out.println("Object is: " + obj);
3254		- GrafreeD.AnalyzeObject(obj);
	3808	+ Grafreed.AnalyzeObject(obj);
3255	3809	System.out.println("Boundary rep: " + obj.bRep);
3256		- GrafreeD.AnalyzeObject(obj.bRep);
	3810	+ Grafreed.AnalyzeObject(obj.bRep);
3257	3811
3258	3812	// System.err.println((size/1024) + " KB is the size of " + obj);
3259	3813	}
..	..	@@ -3295,6 +3849,13 @@
3295	3849	void GenNormals(boolean crease)
3296	3850	{
3297	3851	group.GenNormalsS(crease);
	3852	+
	3853	+ refreshContents();
	3854	+ }
	3855	+
	3856	+ void GenNormalsMESH()
	3857	+ {
	3858	+ group.GenNormalsMeshS();
3298	3859
3299	3860	refreshContents();
3300	3861	}
..	..	@@ -3467,8 +4028,8 @@
3467	4028
3468	4029	void ParseVertices()
3469	4030	{
3470		- boolean epsequal = GrafreeD.epsequal;
3471		- GrafreeD.epsequal = true;
	4031	+ boolean epsequal = Grafreed.epsequal;
	4032	+ Grafreed.epsequal = true;
3472	4033
3473	4034	for (int i=0; i<group.selection.size(); i++)
3474	4035	{
..	..	@@ -3493,7 +4054,7 @@
3493	4054	LA.matTranslate(g.toParent, temp.x, temp.y, temp.z);
3494	4055	LA.matTranslate(g.fromParent, -temp.x, -temp.y, -temp.z);
3495	4056
3496		- g.add(GrafreeD.clipboard);
	4057	+ g.add(Grafreed.clipboard);
3497	4058
3498	4059	buffer.add(g);
3499	4060	}
..	..	@@ -3508,7 +4069,7 @@
3508	4069	makeSomething(buffer, i==group.selection.size()-1);
3509	4070	}
3510	4071
3511		- GrafreeD.epsequal = epsequal;
	4072	+ Grafreed.epsequal = epsequal;
3512	4073
3513	4074	refreshContents();
3514	4075	}
..	..	@@ -3526,7 +4087,16 @@
3526	4087	String pigment = Object3D.GetPigment(tex);
3527	4088	//String bump = Object3D.GetBump(tex);
3528	4089
3529		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4090	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4091	+
	4092	+ try
	4093	+ {
	4094	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4095	+ }
	4096	+ catch (Exception e)
	4097	+ {
	4098	+ System.err.println("FAIL: " + node);
	4099	+ }
3530	4100
3531	4101	double s = v.s;
3532	4102
..	..	@@ -3614,11 +4184,11 @@
3614	4184
3615	4185	SwitchNode sn = new SwitchNode(poses, Object3D.GEOMETRY);
3616	4186
3617		- boolean random = CameraPane.RANDOM;
3618		- CameraPane.RANDOM = false; // parse all random nodes
	4187	+ boolean random = CameraPane.SWITCH;
	4188	+ CameraPane.SWITCH = false; // parse all random nodes
3619	4189	lowres.linkVerticesThis(null);
3620	4190	lowres.linkVerticesThis(sn);
3621		- CameraPane.RANDOM = random;
	4191	+ CameraPane.SWITCH = random;
3622	4192
3623	4193	System.err.flush();
3624	4194
..	..	@@ -3658,7 +4228,7 @@
3658	4228	return;
3659	4229
3660	4230	Object3D poses = group.selection.get(0);
3661		- Object3D ref = GrafreeD.clipboard.get(0);
	4231	+ Object3D ref = Grafreed.clipboard.get(0);
3662	4232
3663	4233	Object3D newgroup = new Object3D("Po:" + poses.name);
3664	4234
..	..	@@ -3852,9 +4422,9 @@
3852	4422
3853	4423	void ClipMesh()
3854	4424	{
3855		- if (/group.selection.size() == 1 &&/ GrafreeD.clipboard.size() == 1)
	4425	+ if (/group.selection.size() == 1 &&/ Grafreed.clipboard.size() == 1)
3856	4426	{
3857		- Object3D content = GrafreeD.clipboard.get(0);
	4427	+ Object3D content = Grafreed.clipboard.get(0);
3858	4428
3859	4429	if (content instanceof cGroup && ((cGroup)content).transientlink )
3860	4430	content = ((cGroup)content).get(0);
..	..	@@ -3863,7 +4433,7 @@
3863	4433	// {
3864	4434	// group.selection.get(i).ClipMesh(GrafreeD.clipboard);
3865	4435	// }
3866		- group.selection.ClipMesh(GrafreeD.clipboard);
	4436	+ group.selection.ClipMesh(Grafreed.clipboard);
3867	4437	}
3868	4438	// group.selection.ClipMesh(GrafreeD.clipboard);
3869	4439	System.out.println("DONE.");
..	..	@@ -3910,6 +4480,18 @@
3910	4480	void MarkLeaves(boolean hide)
3911	4481	{
3912	4482	group.selection.MarkLeaves(hide);
	4483	+ refreshContents();
	4484	+ }
	4485	+
	4486	+ void RewindLeaves(boolean hide)
	4487	+ {
	4488	+ group.selection.RewindLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RandomLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RandomLeaves(hide);
3913	4495	refreshContents();
3914	4496	}
3915	4497
..	..	@@ -3984,10 +4566,6 @@
3984	4566	// }
3985	4567	// }
3986	4568
3987		- static boolean allparams = true;
3988		-
3989		- static Vector<Object3D> listUI = new Vector<Object3D>();
3990		-
3991	4569	void EditSelection(boolean newWindow)
3992	4570	{
3993	4571	// aConstraints.gridy = 0;
..	..	@@ -3995,10 +4573,10 @@
3995	4573	{
3996	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
3997	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
3998		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3999	4577
4000	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
4001		- if(elem != group)
	4579	+ if(elem != group \|\| !newWindow)
4002	4580	{
4003	4581	// if (!(elem instanceof Composite))
4004	4582	// newWindow = false;
..	..	@@ -4080,7 +4658,8 @@
4080	4658	//new Exception().printStackTrace();
4081	4659
4082	4660	freezemodel = true;
4083		-
	4661	+ ClearUnpinned();
	4662	+
4084	4663	/**/
4085	4664	//switch (event.id)
4086	4665	{
..	..	@@ -4088,7 +4667,6 @@
4088	4667	//case 702: // Event.LIST_DESELECT
4089	4668	group.deselectAll();
4090	4669	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4091		- objEditor.ClearInfo(); // .GetMaterial());
4092	4670	if (tps != null)
4093	4671	{
4094	4672	for (int i=0; i < tps.length; i++)
..	..	@@ -4097,10 +4675,8 @@
4097	4675
4098	4676	//if (child.parent != null)
4099	4677	//child.parent.addSelectee(child);
	4678	+ objEditor.SetMaterial(child);
4100	4679	group.addSelectee(child);
4101		- objEditor.SetMaterial(child); // .GetMaterial());
4102		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4103		- System.err.println("info : " + child.GetPath());
4104	4680	}
4105	4681	}
4106	4682	// else
..	..	@@ -4110,20 +4686,28 @@
4110	4686	// System.err.println("info : " + group.GetPath());
4111	4687	// }
4112	4688
4113		- objEditor.SetText(); // jan 2014
4114		-
4115		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4689	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4116	4690	CameraPane.flash = true;
4117	4691
4118		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4692	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4119	4693	// a camera
4120	4694	{
4121		- CameraPane.camerachangeframe = 0; // don't refuse it
4122		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4695	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4696	+ {
	4697	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4698	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4699	+ }
4123	4700	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4124	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4125	4702	}
4126	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4127	4711	refreshContents();
4128	4712	//return true;
4129	4713	}
..	..	@@ -4132,6 +4716,35 @@
4132	4716
4133	4717	freezemodel = false;
4134	4718	}
	4719	+
	4720	+ void SetPinStates(boolean enabled)
	4721	+ {
	4722	+ editButton.setEnabled(enabled);
	4723	+ uneditButton.setEnabled(enabled);
	4724	+ unselectButton.setEnabled(enabled);
	4725	+ flashSelectionButton.setEnabled(enabled);
	4726	+ }
	4727	+
	4728	+ void refreshContents(boolean cp)
	4729	+ {
	4730	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4731	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4732	+ {
	4733	+ objEditor.ClearInfo(); // .GetMaterial());
	4734	+
	4735	+ for (int i=0; i < group.selection.Size(); i++)
	4736	+ {
	4737	+ Object3D child = (Object3D) group.selection.get(i);
	4738	+
	4739	+ objEditor.AddInfo(child, this, true);
	4740	+ System.err.println("info : " + child.GetPath());
	4741	+ }
	4742	+
	4743	+ objEditor.SetText(); // jan 2014
	4744	+ }
	4745	+
	4746	+ super.refreshContents(cp);
	4747	+ }
4135	4748
4136	4749	void linkSomething(Object3D thing)
4137	4750	{
..	..	@@ -4203,16 +4816,19 @@
4203	4816	{
4204	4817	if (group.selection.isEmpty())
4205	4818	return;
4206		- GrafreeD.clipboardIsTempGroup = false;
	4819	+
	4820	+ Grafreed.clipboardIsTempGroup = false;
4207	4821	Composite tGroup = null;
4208	4822	if (group.selection.size() > 0) // 1)
4209	4823	{
4210	4824	tGroup = new cGroup();
4211		- GrafreeD.clipboardIsTempGroup = true;
	4825	+ Grafreed.clipboardIsTempGroup = true;
4212	4826	}
4213	4827
4214	4828	if (cut)
4215	4829	{
	4830	+ if (Globals.SAVEONMAKE)
	4831	+ Save();
4216	4832	//int indices[] = jList.getSelectedIndices();
4217	4833	//for (int i = indices.length - 1; i >= 0; i--)
4218	4834	//jList.remove(indices[i]);
..	..	@@ -4248,16 +4864,16 @@
4248	4864	//System.out.println("cut " + child);
4249	4865	//System.out.println("parent = " + child.parent);
4250	4866	// tmp.addChild(child);
4251		- if (GrafreeD.clipboardIsTempGroup)
	4867	+ if (Grafreed.clipboardIsTempGroup)
4252	4868	tGroup.add/Child/(tmp);
4253	4869	else
4254		- GrafreeD.clipboard = tmp;
	4870	+ Grafreed.clipboard = tmp;
4255	4871	}
4256	4872	else
4257		- if (GrafreeD.clipboardIsTempGroup)
	4873	+ if (Grafreed.clipboardIsTempGroup)
4258	4874	tGroup.add/Child/(child);
4259	4875	else
4260		- GrafreeD.clipboard = child;
	4876	+ Grafreed.clipboard = child;
4261	4877	}
4262	4878
4263	4879	//ResetModel();
..	..	@@ -4289,21 +4905,23 @@
4289	4905	//System.out.println("cut " + elem);
4290	4906	//System.out.println("parent = " + elem.parent);
4291	4907	// tmp.addChild(elem);
4292		- if (GrafreeD.clipboardIsTempGroup)
	4908	+ if (Grafreed.clipboardIsTempGroup)
4293	4909	tGroup.add/Child/(tmp);
4294	4910	else
4295		- GrafreeD.clipboard = tmp;
	4911	+ Grafreed.clipboard = tmp;
4296	4912	}
4297	4913	else
4298		- if (GrafreeD.clipboardIsTempGroup)
	4914	+ if (Grafreed.clipboardIsTempGroup)
4299	4915	tGroup.add/Child/(child);
4300	4916	else
4301		- GrafreeD.clipboard = child;
	4917	+ Grafreed.clipboard = child;
4302	4918	}
4303	4919
4304	4920	}
4305		- if (GrafreeD.clipboardIsTempGroup)
4306		- GrafreeD.clipboard = tGroup;
	4921	+
	4922	+ if (Grafreed.clipboardIsTempGroup)
	4923	+ Grafreed.clipboard = tGroup;
	4924	+
4307	4925	if (cut)
4308	4926	{
4309	4927	ResetModel();
..	..	@@ -4317,7 +4935,7 @@
4317	4935	// return;
4318	4936	boolean first = true;
4319	4937
4320		- if (GrafreeD.clipboardIsTempGroup)
	4938	+ if (Grafreed.clipboardIsTempGroup)
4321	4939	{
4322	4940	Composite temp;
4323	4941
..	..	@@ -4328,7 +4946,7 @@
4328	4946	temp = (Composite)Applet3D.clipboard.deepCopy();
4329	4947	*/
4330	4948	Object3D elem;
4331		- for (Enumeration e = /temp.children/GrafreeD.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
	4949	+ for (Enumeration e = /temp.children/Grafreed.clipboard.elements(); e.hasMoreElements();) // objList.add(copy.name))
4332	4950	{
4333	4951	Object3D child = (Object3D)e.nextElement();
4334	4952
..	..	@@ -4362,21 +4980,21 @@
4362	4980	//Object3D cb = Applet3D.clipboard;
4363	4981	//temp.addChild(cb);
4364	4982	//makeSomething((expand?temp.copyExpand():temp.deepCopy()).get(0));
4365		- assert(GrafreeD.clipboard.parent == null);
4366		- Object3D /Composite/ keepparent = GrafreeD.clipboard.get(0).parent;
4367		- GrafreeD.clipboard.get(0).parent = null; // Avoid copy?
4368		- if (LA.isIdentity(GrafreeD.clipboard.toParent))
4369		- makeSomething(expand?GrafreeD.clipboard.get(0).copyExpand():GrafreeD.clipboard.get(0).deepCopy());
	4983	+ assert(Grafreed.clipboard.parent == null);
	4984	+ Object3D /Composite/ keepparent = Grafreed.clipboard.get(0).parent;
	4985	+ Grafreed.clipboard.get(0).parent = null; // Avoid copy?
	4986	+ if (LA.isIdentity(Grafreed.clipboard.toParent))
	4987	+ makeSomething(expand?Grafreed.clipboard.get(0).copyExpand():Grafreed.clipboard.get(0).deepCopy());
4370	4988	else
4371		- makeSomething(expand?GrafreeD.clipboard.copyExpand():GrafreeD.clipboard.deepCopy());
4372		- GrafreeD.clipboard.get(0).parent = keepparent;
	4989	+ makeSomething(expand?Grafreed.clipboard.copyExpand():Grafreed.clipboard.deepCopy());
	4990	+ Grafreed.clipboard.get(0).parent = keepparent;
4373	4991	}
4374	4992
4375	4993	ResetModel();
4376	4994	refreshContents();
4377	4995	}
4378	4996
4379		- void pasteInto(boolean copyit)
	4997	+ void pasteInto(boolean copyit, boolean clone)
4380	4998	{
4381	4999	// if (GrafreeD.clipboard == null)
4382	5000	// return;
..	..	@@ -4405,15 +5023,22 @@
4405	5023	if (copyit)
4406	5024	{
4407	5025	// paste(false);
4408		- CloneClipboard(false); // sept 2014
	5026	+ if (clone)
	5027	+ {
	5028	+ CloneClipboard(false); // sept 2014
	5029	+ }
	5030	+ else
	5031	+ {
	5032	+ paste(false);
	5033	+ }
4409	5034	}
4410	5035	else
4411	5036	{
4412	5037	boolean first = true;
4413	5038
4414		- if (GrafreeD.clipboardIsTempGroup)
	5039	+ if (Grafreed.clipboardIsTempGroup)
4415	5040	{
4416		- Composite temp = (Composite)GrafreeD.clipboard;
	5041	+ Composite temp = (Composite)Grafreed.clipboard;
4417	5042	Object3D copy;
4418	5043	for (Enumeration e = temp.children.elements(); e.hasMoreElements();)
4419	5044	{
..	..	@@ -4423,7 +5048,7 @@
4423	5048	}
4424	5049	} else
4425	5050	{
4426		- linkSomething(GrafreeD.clipboard); //.get(0));
	5051	+ linkSomething(Grafreed.clipboard); //.get(0));
4427	5052	}
4428	5053	}
4429	5054	}
..	..	@@ -4828,21 +5453,6 @@
4828	5453	}
4829	5454	*/
4830	5455
4831		- void ImportGFD()
4832		- {
4833		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4834		- browser.show();
4835		- String filename = browser.getFile();
4836		- if (filename != null && filename.length() > 0)
4837		- {
4838		- String fullname = browser.getDirectory() + filename;
4839		-
4840		- //Object3D readobj =
4841		- objEditor.ReadGFD(fullname, objEditor);
4842		- //makeSomething(readobj);
4843		- }
4844		- }
4845		-
4846	5456	/*
4847	5457	public void Callback(Object obj)
4848	5458	{
..	..	@@ -4866,26 +5476,9 @@
4866	5476	}
4867	5477	*/
4868	5478
4869		- void ImportVRMLX3D()
4870		- {
4871		- if (GrafreeD.standAlone)
4872		- {
4873		- /**/
4874		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4875		- browser.show();
4876		- String filename = browser.getFile();
4877		- if (filename != null && filename.length() > 0)
4878		- {
4879		- String fullname = browser.getDirectory() + filename;
4880		- LoadVRMLX3D(fullname);
4881		- }
4882		- /**/
4883		- }
4884		- }
4885		-
4886	5479	String GetFile(String dialogName)
4887	5480	{
4888		- if (GrafreeD.standAlone)
	5481	+ if (Grafreed.standAlone)
4889	5482	{
4890	5483	FileDialog browser = new FileDialog(objEditor.frame, dialogName, FileDialog.LOAD);
4891	5484	browser.show();
..	..	@@ -4949,10 +5542,33 @@
4949	5542	cButton flashSelectionButton;
4950	5543	cButton editButton;
4951	5544	cButton uneditButton;
	5545	+ JCheckBox allParamsButton;
4952	5546	cButton clearpanelButton;
4953		- cButton allParamsButton;
4954	5547	cButton unselectButton;
4955	5548
	5549	+ cButton restoreCameraButton;
	5550	+
	5551	+ cButton saveButton;
	5552	+ cButton oneStepButton;
	5553	+
	5554	+ cButton groupButton;
	5555	+ cButton ungroupButton;
	5556	+ cButton compositeButton;
	5557	+ cButton switchButton;
	5558	+ cButton loopButton;
	5559	+ cButton textureButton;
	5560	+
	5561	+ cButton gridButton;
	5562	+ cButton boxButton;
	5563	+ cButton sphereButton;
	5564	+ cButton coneButton;
	5565	+ cButton torusButton;
	5566	+ cButton superButton;
	5567	+ cButton kleinButton;
	5568	+ cButton particlesButton;
	5569	+ cButton overlayButton;
	5570	+ cButton lightButton;
	5571	+
4956	5572	cButton screenfitButton;
4957	5573	cButton screenfitpointButton;
4958	5574	cButton snapobjectButton;
..	..	@@ -4964,14 +5580,6 @@
4964	5580
4965	5581	cButton setsupportButton;
4966	5582
4967		- cButton twoButton;
4968		- cButton sixButton;
4969		- cButton threeButton;
4970		- cButton sevenButton;
4971		- cButton fourButton; // full panel
4972		- cButton oneButton; // full XYZ
4973		- //cButton currentLayout;
4974		-
4975	5583	//
4976	5584	//Composite
4977	5585	Object3D // to do !!
..	..	@@ -4981,9 +5589,11 @@
4981	5589	//JTree jTree;
4982	5590	private MenuItem lookAtItem;
4983	5591	private MenuItem lookFromItem;
4984		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
4985	5593	private MenuItem cutItem;
4986		- private MenuItem duplicateItem;
	5594	+ private MenuItem undoItem;
	5595	+ private MenuItem redoItem;
	5596	+ private JMenuItem duplicateItem;
4987	5597	private MenuItem cloneItem;
4988	5598	private MenuItem cloneSupportItem;
4989	5599	private MenuItem overwriteGeoItem;
..	..	@@ -4996,7 +5606,7 @@
4996	5606	private MenuItem linkverticesItem;
4997	5607	private MenuItem relinkverticesItem;
4998	5608	private MenuItem setMasterItem;
4999		- private MenuItem resetMeshItem;
	5609	+ private MenuItem resetAllItem;
5000	5610	private MenuItem stepAllItem;
5001	5611	private MenuItem revertMeshItem;
5002	5612	private MenuItem poseMeshItem;
..	..	@@ -5007,6 +5617,7 @@
5007	5617	private MenuItem mergeGeometriesItem;
5008	5618	private MenuItem copyItem;
5009	5619	private MenuItem pasteItem;
	5620	+ private MenuItem pasteIntoItem;
5010	5621	private MenuItem pasteLinkItem;
5011	5622	private MenuItem pasteCloneItem;
5012	5623	private MenuItem pasteExpandItem;
..	..	@@ -5045,6 +5656,10 @@
5045	5656	private MenuItem showleavesItem;
5046	5657	private MenuItem markleavesItem;
5047	5658	private MenuItem unmarkleavesItem;
	5659	+ private MenuItem rewindleavesItem;
	5660	+ private MenuItem unrewindleavesItem;
	5661	+ private MenuItem randomleavesItem;
	5662	+ private MenuItem unrandomleavesItem;
5048	5663
5049	5664	private MenuItem flipVItem;
5050	5665	private MenuItem unflipVItem;
..	..	@@ -5056,15 +5671,17 @@
5056	5671	private MenuItem panoTexturesItem;
5057	5672
5058	5673	private MenuItem resetCentroidItem;
5059		- private MenuItem transformgeometryItem;
	5674	+ private MenuItem resetCentroidXZItem;
5060	5675	private MenuItem resetTransformItem;
	5676	+ private MenuItem transformGeometryItem;
	5677	+ private MenuItem transformChildrenItem;
5061	5678	private MenuItem hideItem;
5062	5679	private MenuItem grabItem;
5063	5680	private MenuItem backItem;
5064	5681	private MenuItem frontItem;
5065	5682	private MenuItem cameraItem;
5066	5683	private MenuItem compositeItem;
5067		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5068	5685	private MenuItem physicsItem;
5069	5686	private MenuItem frameselectorItem;
5070	5687	private MenuItem scriptNodeItem;
..	..	@@ -5104,7 +5721,7 @@
5104	5721	private MenuItem blobItem;
5105	5722	private MenuItem latheItem;
5106	5723	private MenuItem bezierItem;
5107		- private MenuItem checkerItem;
	5724	+ private MenuItem overlayItem;
5108	5725	private MenuItem meshItem;
5109	5726	// private MenuItem meshGroupItem;
5110	5727	private MenuItem springItem;
..	..	@@ -5126,11 +5743,6 @@
5126	5743	private MenuItem doubleItem;
5127	5744	private MenuItem tripleItem;
5128	5745
5129		- private MenuItem importGFDItem;
5130		- private MenuItem importVRMLX3DItem;
5131		- private MenuItem import3DSItem;
5132		- private MenuItem importOBJItem;
5133		-
5134	5746	private MenuItem computeAOItem;
5135	5747	private MenuItem recompileItem;
5136	5748	private MenuItem editScriptItem;
..	..	@@ -5140,4 +5752,8 @@
5140	5752	private MenuItem analyzeItem;
5141	5753	private MenuItem dumpItem;
5142	5754	//boolean freezemodel = false;
	5755	+
	5756	+ Menu cameraMenu;
	5757	+ MenuItem editCameraItem;
	5758	+ MenuItem restoreCameraItem;
5143	5759	}