~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);
..	..	@@ -148,28 +148,21 @@
148	148
149	149	//JTextField nameField;
150	150
151		- void SetupMenu2(ObjEditor oe)
	151	+ void SetupMenu2(GroupEditor oe)
152	152	{
153		- if (Globals.ADVANCED)
154		- {
155		- oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
156		- //cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
157		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
158		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
159		- oe.cameraMenu.add("-");
160		- openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
161		- openWindowItem.addActionListener(this);
162		- editLeafItem.addActionListener(this);
163		- lookAtItem.addActionListener(this);
164		- //lookFromItem.addActinoListener(this);
165		- //switchItem.addActionListener(this);
166		- }
167		-
	153	+ oe.jTree = new cTree();
	154	+
168	155	Menu menu;
169	156	oe.menuBar.add(menu = new Menu("Edit"));
170	157	//editItem = menu.add(new MenuItem("Edit"));
171	158	//editItem.addActionListener(this);
172		- 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"));
173	166	duplicateItem.addActionListener(this);
174	167	cloneItem = menu.add(new MenuItem("Clone"));
175	168	cloneItem.addActionListener(this);
..	..	@@ -185,7 +178,6 @@
185	178	copyItem.addActionListener(this);
186	179	pasteItem = menu.add(new MenuItem("Paste"));
187	180	pasteItem.addActionListener(this);
188		- menu.add("-");
189	181
190	182	menu.add("-");
191	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -206,14 +198,97 @@
206	198	clearAllItem = menu.add(new MenuItem("Clear All"));
207	199	clearAllItem.addActionListener(this);
208	200	}
	201	+
	202	+ menuBar.add(cameraMenu = new Menu("View"));
	203	+ //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
	204	+ //zBufferItem.addActionListener(this);
	205	+ //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
	206	+ //normalLensItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
	209	+
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
	222	+
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	224	+ toggleHandleItem.addItemListener(this);
	225	+ toggleHandleItem.setState(CameraPane.HANDLES);
	226	+
	227	+ cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
	228	+ togglePaintItem.addItemListener(this);
	229	+ togglePaintItem.setState(CameraPane.PAINTMODE);
	230	+
	231	+ if (Globals.ADVANCED)
	232	+ {
	233	+ cameraMenu.add("-");
	234	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	235	+ toggleLiveItem.addItemListener(this);
	236	+ toggleLiveItem.setState(Globals.isLIVE());
209	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	+
210	289	oe.menuBar.add(menu = new Menu("Setting"));
211	290	if (Globals.ADVANCED)
212	291	{
213		- resetMeshItem = menu.add(new MenuItem("Reset All"));
214		- resetMeshItem.addActionListener(this);
215		- stepAllItem = menu.add(new MenuItem("Step All"));
216		- stepAllItem.addActionListener(this);
217	292	revertMeshItem = menu.add(new MenuItem("Revert Meshes"));
218	293	revertMeshItem.addActionListener(this);
219	294	resetreferencesItem = menu.add(new MenuItem("Reset Mesh References"));
..	..	@@ -253,21 +328,29 @@
253	328	}
254	329
255	330	oe.menuBar.add(menu = new Menu("Group"));
256		- grabItem = menu.add(new MenuItem("Grab"));
257		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
258	333	backItem = menu.add(new MenuItem("Back"));
259	334	backItem.addActionListener(this);
260	335	frontItem = menu.add(new MenuItem("Front"));
261	336	frontItem.addActionListener(this);
262		- compositeItem = menu.add(new MenuItem("Composite"));
263		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
264	342	hideItem = menu.add(new MenuItem("Hidden Group"));
265	343	hideItem.addActionListener(this);
	344	+ }
266	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
267	346	ungroupItem.addActionListener(this);
268		- menu.add("-");
269		- randomItem = menu.add(new MenuItem("Switch node"));
270		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
271	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
272	355	switchGeoItem.addActionListener(this);
273	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -275,8 +358,6 @@
275	358	morphItem = menu.add(new MenuItem("Morph Group"));
276	359	morphItem.addActionListener(this);
277	360
278		- if (Globals.ADVANCED)
279		- {
280	361	menu.add("-");
281	362	physicsItem = menu.add(new MenuItem("Physics"));
282	363	physicsItem.addActionListener(this);
..	..	@@ -284,22 +365,20 @@
284	365	frameselectorItem.addActionListener(this);
285	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
286	367	scriptNodeItem.addActionListener(this);
287		- cameraItem = menu.add(new MenuItem("Camera"));
288		- cameraItem.addActionListener(this);
289	368	}
290	369
291	370	oe.menuBar.add(menu = new Menu("Object"));
292		- textureItem = menu.add(new MenuItem("Texture"));
293		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
294	373	billboardItem = menu.add(new MenuItem("Billboard"));
295	374	billboardItem.addActionListener(this);
296	375	csgItem = menu.add(new MenuItem("CSG"));
297	376	csgItem.addActionListener(this);
298		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
299	378	shadowXItem.addActionListener(this);
300		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
301	380	shadowYItem.addActionListener(this);
302		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
303	382	shadowZItem.addActionListener(this);
304	383	if (Globals.ADVANCED)
305	384	{
..	..	@@ -318,8 +397,12 @@
318	397	resetTransformItem.addActionListener(this);
319	398	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
320	399	resetCentroidItem.addActionListener(this);
321		- transformgeometryItem = menu.add(new MenuItem("Transform Geometry"));
322		- 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);
323	406
324	407	oe.menuBar.add(menu = new Menu("Geometry"));
325	408	genUVItem = menu.add(new MenuItem("Generate UV"));
..	..	@@ -368,6 +451,10 @@
368	451	oe.menuBar.add(menu = new Menu("Attributes"));
369	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
370	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);
371	458	menu.add("-");
372	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
373	460	liveleavesItem.addActionListener(this);
..	..	@@ -388,6 +475,14 @@
388	475	markleavesItem.addActionListener(this);
389	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
390	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);
391	486	menu.add("-");
392	487	flipVItem = menu.add(new MenuItem("Flip V"));
393	488	flipVItem.addActionListener(this);
..	..	@@ -422,41 +517,41 @@
422	517	sortbysizeItem.addActionListener(this);
423	518	sortbynameItem = menu.add(new MenuItem("Sort by name"));
424	519	sortbynameItem.addActionListener(this);
	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);
425	525	if (Globals.ADVANCED)
426	526	{
427		- menu.add("-");
	527	+ // Pretty much the same as duplicate and clone.
428	528	extractGeometriesItem = menu.add(new MenuItem("Link Geometry"));
429	529	extractGeometriesItem.addActionListener(this);
430	530	cloneGeometriesItem = menu.add(new MenuItem("Clone Geometry"));
431	531	cloneGeometriesItem.addActionListener(this);
432		- shareGeometriesItem = menu.add(new MenuItem("Share Geometry"));
433		- shareGeometriesItem.addActionListener(this);
434		- mergeGeometriesItem = menu.add(new MenuItem("Merge Geometry"));
435		- mergeGeometriesItem.addActionListener(this);
436	532	}
437	533
438	534	oe.menuBar.add(menu = new Menu("Insert"));
439	535	buildCreateMenu(menu);
440	536
441		- oe.menuBar.add(menu = new Menu("Include"));
442		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
443		- importOBJItem.addActionListener(this);
444		- menu.add("-");
445		- import3DSItem = menu.add(new MenuItem("3DS file..."));
446		- import3DSItem.addActionListener(this);
447		- menu.add("-");
448		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
449		- importVRMLX3DItem.addActionListener(this);
450		- menu.add("-");
451		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
452		- importGFDItem.addActionListener(this);
453		-
454	537	oe.menuBar.add(menu = new Menu("Tools"));
455	538	buildToolsMenu(menu);
456	539	}
457	540
458	541	void SetupUI2(ObjEditor oe)
459	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	+
460	555	//new Exception().printStackTrace();
461	556
462	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -485,27 +580,63 @@
485	580	oe.radioPanel.add(dummyButton);
486	581	oe.buttonGroup.add(dummyButton);
487	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
488	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
489	588
490		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
491		- 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");
492	621	liveCB.addItemListener(this);
493	622
494		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
495	624	oneStepButton.setToolTipText("Animate one step forward");
496	625	oneStepButton.addActionListener(this);
497	626
498		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
499	628	fastCB.setToolTipText("Fast mode");
500	629	fastCB.addItemListener(this);
501	630
502		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
503		- trackCB.setToolTipText("Enable tracking");
504		- trackCB.addItemListener(this);
505		-
506		- 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);
507	634	screenfitButton.setToolTipText("Screen fit");
508	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
509	640
510	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
511	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -517,65 +648,145 @@
517	648	snapobjectButton.setToolTipText("Snap Object");
518	649	}
519	650
520		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
521		- flashSelectionButton.setToolTipText("Show selection");
522		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
523	652
524		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
525		-
526		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
527	654	twoButton.setToolTipText("Show center view only");
528	655	twoButton.addActionListener(this);
529		- 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);
530	659	fourButton.addActionListener(this);
531	660	fourButton.setToolTipText("Show left panel only");
532		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
533	662	sixButton.setToolTipText("2-column layout left");
534	663	sixButton.addActionListener(this);
535		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
536	665	threeButton.setToolTipText("2-column layout right");
537	666	threeButton.addActionListener(this);
538		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
539	668	sevenButton.setToolTipText("3-column layout");
540	669	sevenButton.addActionListener(this);
541	670	//
542	671
543		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	673	rootButton.setToolTipText("Edit selection in new tab");
545	674	rootButton.addActionListener(this);
546	675
547		- 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);
548	677	closeButton.setToolTipText("Close tab");
549	678	closeButton.addActionListener(this);
550	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
551	680	//clearButton.addActionListener(this);
552		-
553		- 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	+ }
554	713
555		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
556		- 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 switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
557	763	editButton.addActionListener(this);
558	764
559		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
560		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
561	767	uneditButton.addActionListener(this);
562	768
563		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
564		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
565	771	allParamsButton.addActionListener(this);
566	772
567		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
568	774	clearPanelButton.setToolTipText("Clear edit panel");
569	775	clearPanelButton.addActionListener(this);
570	776
571		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
572	778	unselectButton.setToolTipText("Unselect");
573	779	unselectButton.addActionListener(this);
574	780
575		- 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);
576	784
577		- oe.treePanel.add(commandsPanel);
578		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
579	790
580	791	// oe.aConstraints.gridx += 1;
581	792	// oe.aConstraints.weighty = 0;
..	..	@@ -592,27 +803,12 @@
592	803
593	804	JScrollPane jSP;
594	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
595		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
596	807	ResetModel();
597	808
598	809	oe.treePanel.add(jSPPanel);
599	810	oe.treePanel.Return();
600	811
601		- cGridBag copyOptionsPanel = new cGridBag();
602		-
603		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
604		- colorCB.setToolTipText("Copy color when dropped");
605		- colorCB.addItemListener(this);
606		-
607		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
608		- materialCB.setToolTipText("Copy material when dropped");
609		- materialCB.addItemListener(this);
610		-
611		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
612		- textureCB.setToolTipText("Copy texture when dropped");
613		- textureCB.addItemListener(this);
614		-
615		- copyOptionsPanel.preferredHeight = 1;
616	812	oe.treePanel.add(copyOptionsPanel);
617	813	oe.treePanel.Return();
618	814
..	..	@@ -643,15 +839,29 @@
643	839
644	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
645	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
646	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
647	857	boxCB.setToolTipText("Display bounding boxes");
648	858	boxCB.addItemListener(this);
649	859
650	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
651		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
652	862	zoomBoxCB.addItemListener(this);
653	863
654		- if (Globals.ADVANCED)
	864	+ if (true) // Globals.ADVANCED)
655	865	{
656	866	panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
657	867	supportCB.setToolTipText("Enable rigging");
..	..	@@ -660,6 +870,8 @@
660	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
661	871	// localCB.addItemListener(this);
662	872
	873	+ panel.Return();
	874	+
663	875	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
664	876	crowdCB.setToolTipText("Used for crowds");
665	877	crowdCB.addItemListener(this);
..	..	@@ -676,6 +888,8 @@
676	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
677	889	// speakerMocapCB.addItemListener(this);
678	890
	891	+ panel.Return();
	892	+
679	893	if (false)
680	894	{
681	895	// handled in scripts
..	..	@@ -690,32 +904,72 @@
690	904	//constraints.gridy += 1;
691	905	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
692	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
693	908	}
694	909
695	910	//constraints.gridx += 1;
696	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
697	912	// debugCB.addItemListener(this);
698	913
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
699	918	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
700	920	oeilCB.addItemListener(this);
701	921
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
702	942	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
703	943	lookAtCB.setToolTipText("Look-at target");
704	944	lookAtCB.addItemListener(this);
	945	+ }
705	946
706	947	}
707	948
708	949	cGridBag fill = new cGridBag();
709		-
710	950	fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
711	955
712	956	panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
713	959
714	960	}
715	961
716	962	void EditObject(Object3D obj)
717	963	{
718	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
719	973	radioButton.SetObject(obj);
720	974	radioButton.layout = sevenButton;
721	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -724,8 +978,11 @@
724	978	buttonGroup.add(radioButton);
725	979	radioButton.doClick();
726	980	}
	981	+
727	982	void SetupViews(ObjEditor oe)
728	983	{
	984	+ theFrame = this;
	985	+
729	986	oe.SetupViews();
730	987
731	988	System.out.println("SetupViews");
..	..	@@ -734,23 +991,27 @@
734	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
735	992	}
736	993
737		- JCheckBox liveCB;
738		- JCheckBox supportCB;
739		- JCheckBox localCB;
740		- JCheckBox crowdCB;
741		- JCheckBox smoothCB;
742		- JCheckBox fastCB;
743		- JCheckBox slowCB;
744		- JCheckBox boxCB;
745		- JCheckBox zoomBoxCB;
746		- JCheckBox trackCB;
747		- JCheckBox smoothfocusCB;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
748	1006	// JCheckBox speakerMocapCB;
749		- JCheckBox speakerCameraCB;
750		- JCheckBox speakerFocusCB;
751		- JCheckBox debugCB;
752		- JCheckBox oeilCB;
753		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
754	1015
755	1016	// static int COLOR = 1;
756	1017	// static int MATERIAL = 2;
..	..	@@ -758,9 +1019,9 @@
758	1019
759	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
760	1021
761		- JCheckBox colorCB;
762		- JCheckBox materialCB;
763		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
764	1025
765	1026	public void itemStateChanged(ItemEvent e)
766	1027	{
..	..	@@ -788,6 +1049,7 @@
788	1049	} else if(e.getSource() == liveCB)
789	1050	{
790	1051	cameraView.ToggleLive();
	1052	+ refreshContents(false);
791	1053	}
792	1054	else if(e.getSource() == supportCB)
793	1055	{
..	..	@@ -852,6 +1114,14 @@
852	1114	{
853	1115	cameraView.ToggleOeil();
854	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
855	1125	else if(e.getSource() == lookAtCB)
856	1126	{
857	1127	cameraView.ToggleLookAt();
..	..	@@ -868,7 +1138,8 @@
868	1138
869	1139	/**/
870	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
871		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
872	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
873	1144	// We can't move the root node or an empty selection
874	1145	return;
..	..	@@ -985,23 +1256,33 @@
985	1256
986	1257	assert target == objEditor.jTree;
987	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
988	1260	try {
989		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
990	1262	} catch (Exception e) {
991	1263	System.out.println("destinationPath : " + destinationPath);
992	1264	return;
993	1265	}
994	1266
995		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
996	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
997	1278	loadClipboard(true);
998	1279	objEditor.jTree.setSelectionPath(destinationPath);
999	1280	pasteInto(false, false);
1000		- } else {
1001		- loadClipboard(false);
1002		- objEditor.jTree.setSelectionPath(destinationPath);
1003		- pasteInto(false, false); // true); // ???
1004		- }
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
1005	1286	}
1006	1287	public void dropActionChanged(DropTargetDragEvent dtde)
1007	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1106,22 +1387,30 @@
1106	1387	{
1107	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1108	1389	//heightFieldItem.addActionListener(this);
1109		- gridItem = menu.add(new MenuItem("Grid"));
1110		- gridItem.addActionListener(this);
1111		- rectoidItem = menu.add(new MenuItem("Box"));
1112		- rectoidItem.addActionListener(this);
1113		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1114		- ellipsoidItem.addActionListener(this);
1115		- coneItem = menu.add(new MenuItem("Cone"));
1116		- coneItem.addActionListener(this);
1117		- torusItem = menu.add(new MenuItem("Torus"));
1118		- torusItem.addActionListener(this);
1119		- superItem = menu.add(new MenuItem("Superellipsoid"));
1120		- superItem.addActionListener(this);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1121	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1122	1409	kleinItem.addActionListener(this);
1123		- particleItem = menu.add(new MenuItem("Particle system"));
1124		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
1125	1414	if (Globals.ADVANCED)
1126	1415	{
1127	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1147,15 +1436,15 @@
1147	1436	}
1148	1437	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1149	1438	bezierItem.addActionListener(this);
1150		- overlayItem = menu.add(new MenuItem("Overlay"));
1151		- overlayItem.addActionListener(this);
1152		- lightItem = menu.add(new MenuItem("Light"));
1153		- lightItem.addActionListener(this);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1154	1443	menu.add("-");
1155	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1156	1445	//superLoopItem.addActionListener(this);
1157		- loopItem = menu.add(new MenuItem("Loop"));
1158		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1159	1448	doubleItem = menu.add(new MenuItem("Fork"));
1160	1449	doubleItem.addActionListener(this);
1161	1450	if (Globals.ADVANCED)
..	..	@@ -1195,7 +1484,7 @@
1195	1484	memoryItem.addActionListener(this);
1196	1485	menu.add(analyzeItem = new MenuItem("Analyze"));
1197	1486	analyzeItem.addActionListener(this);
1198		- menu.add(dumpItem = new MenuItem("Dump"));
	1487	+ menu.add(dumpItem = new MenuItem("Print"));
1199	1488	dumpItem.addActionListener(this);
1200	1489	// menu.add(pathItem = new MenuItem("From-to path"));
1201	1490	// pathItem.addActionListener(this);
..	..	@@ -1336,9 +1625,24 @@
1336	1625	shadow.material = new cMaterial(obj.material);
1337	1626	shadow.material.diffuse = 0.0001f;
1338	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1339	1629
1340	1630	makeSomething(shadow);
1341	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1342	1646
1343	1647	/**
1344	1648	* applyExample
..	..	@@ -1583,7 +1887,7 @@
1583	1887	{
1584	1888	ScreenFit();
1585	1889	} else
1586		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1587	1891	{
1588	1892	cVector v1 = new cVector();
1589	1893	cVector v2 = new cVector();
..	..	@@ -1592,11 +1896,11 @@
1592	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1593	1897	objEditor.cameraView.repaint();
1594	1898	} else
1595		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1596	1900	{
1597	1901	makeSomething(new Box());
1598	1902	} else
1599		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1600	1904	{
1601	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1602	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1675,27 +1979,27 @@
1675	1979
1676	1980	makeSomething(obj);
1677	1981	} else
1678		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1679	1983	{
1680	1984	makeSomething(new Grid());
1681	1985	} else
1682		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1683	1987	{
1684	1988	makeSomething(new Sphere());
1685	1989	} else
1686		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1687	1991	{
1688	1992	makeSomething(new Cone());
1689	1993	} else
1690		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1691	1995	{
1692	1996	makeSomething(new Torus());
1693	1997	} else
1694		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1695	1999	{
1696	2000	makeSomething(new Superellipsoid());
1697	2001	} else
1698		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1699	2003	{
1700	2004	makeSomething(new Klein());
1701	2005	} else
..	..	@@ -1715,7 +2019,7 @@
1715	2019	{
1716	2020	makeSomething(new BezierSurface());
1717	2021	} else
1718		- if (source == overlayItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1719	2023	{
1720	2024	/*
1721	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1763,7 +2067,7 @@
1763	2067	s.setup();
1764	2068	makeSomething(s);
1765	2069	} else
1766		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1767	2071	{
1768	2072	makeSomething(new Light());
1769	2073	} else
..	..	@@ -1813,7 +2117,7 @@
1813	2117
1814	2118	group(g);
1815	2119	} else
1816		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1817	2121	{
1818	2122	Composite csg = new GroupLeaf();
1819	2123	csg.count = 5;
..	..	@@ -1848,31 +2152,6 @@
1848	2152	child = new cGroup();
1849	2153	csg.addChild(child);
1850	2154	child.addChild(csg);
1851		- } else
1852		-
1853		- if (source == importGFDItem)
1854		- {
1855		- ImportGFD();
1856		- } else
1857		- if (source == importVRMLX3DItem)
1858		- {
1859		- ImportVRMLX3D();
1860		- } else
1861		- if (source == import3DSItem)
1862		- {
1863		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1864		- } else
1865		- if (source == importOBJItem)
1866		- {
1867		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1868		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1869		- browser.setVisible(true);
1870		- String filename = browser.getFile();
1871		- if (filename != null && filename.length() > 0)
1872		- {
1873		- String fullname = browser.getDirectory() + filename;
1874		- makeSomething(ReadOBJ(fullname), true);
1875		- }
1876	2155	} else
1877	2156	if (source == computeAOItem)
1878	2157	{
..	..	@@ -1910,6 +2189,30 @@
1910	2189	if (source == dumpItem)
1911	2190	{
1912	2191	DumpObject();
	2192	+ } else
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
	2204	+ } else
	2205	+ if (source == undoButton)
	2206	+ {
	2207	+ Undo();
	2208	+ } else
	2209	+ if (source == redoButton)
	2210	+ {
	2211	+ Redo();
	2212	+ } else
	2213	+ if (source == saveButton)
	2214	+ {
	2215	+ Save();
1913	2216	} else
1914	2217	if (source == oneStepButton)
1915	2218	{
..	..	@@ -1964,6 +2267,14 @@
1964	2267	if (source == cutItem \|\| source == clearButton)
1965	2268	{
1966	2269	loadClipboard(true);
	2270	+ } else
	2271	+ if (source == undoItem)
	2272	+ {
	2273	+ Undo();
	2274	+ } else
	2275	+ if (source == redoItem)
	2276	+ {
	2277	+ Redo();
1967	2278	} else
1968	2279	if (source == duplicateItem)
1969	2280	{
..	..	@@ -2276,7 +2587,7 @@
2276	2587	{
2277	2588	RevertMeshes();
2278	2589	} else
2279		- if (source == resetMeshItem)
	2590	+ if (source == resetAllItem)
2280	2591	{
2281	2592	ResetAll();
2282	2593	} else
..	..	@@ -2296,9 +2607,9 @@
2296	2607	{
2297	2608	ClearSelection(true);
2298	2609	} else
2299		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2300	2611	{
2301		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2302	2613	} else
2303	2614	if (source == hideItem)
2304	2615	{
..	..	@@ -2316,11 +2627,11 @@
2316	2627	{
2317	2628	makeSomething(new Camera());
2318	2629	} else
2319		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2320	2631	{
2321	2632	group(new Composite());
2322	2633	} else
2323		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2324	2635	{
2325	2636	RandomNode random = new RandomNode();
2326	2637	group(random);
..	..	@@ -2422,7 +2733,7 @@
2422	2733	{
2423	2734	group(new cLinker());
2424	2735	} else
2425		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2426	2737	{
2427	2738	group(new TextureNode());
2428	2739	} else
..	..	@@ -2442,7 +2753,7 @@
2442	2753	{
2443	2754	CastShadow(2);
2444	2755	} else
2445		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2446	2757	{
2447	2758	//ungroup();
2448	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2464,7 +2775,7 @@
2464	2775	} else
2465	2776	if (source == genNormalsMESHItem)
2466	2777	{
2467		- GenNormals(true); // TODO
	2778	+ GenNormalsMESH();
2468	2779	} else
2469	2780	if (source == genNormalsORGANItem)
2470	2781	{
..	..	@@ -2529,6 +2840,22 @@
2529	2840	if (source == unmarkleavesItem)
2530	2841	{
2531	2842	MarkLeaves(false);
	2843	+ } else
	2844	+ if (source == rewindleavesItem)
	2845	+ {
	2846	+ RewindLeaves(true);
	2847	+ } else
	2848	+ if (source == unrewindleavesItem)
	2849	+ {
	2850	+ RewindLeaves(false);
	2851	+ } else
	2852	+ if (source == randomleavesItem)
	2853	+ {
	2854	+ RandomLeaves(true);
	2855	+ } else
	2856	+ if (source == unrandomleavesItem)
	2857	+ {
	2858	+ RandomLeaves(false);
2532	2859	} else
2533	2860	if (source == flipVItem)
2534	2861	{
..	..	@@ -2614,9 +2941,13 @@
2614	2941	{
2615	2942	SmoothMesh();
2616	2943	} else
2617		- if (source == transformgeometryItem)
	2944	+ if (source == transformGeometryItem)
2618	2945	{
2619	2946	TransformGeometry();
	2947	+ } else
	2948	+ if (source == transformChildrenItem)
	2949	+ {
	2950	+ TransformChildren();
2620	2951	} else
2621	2952	if (source == resetTransformItem)
2622	2953	{
..	..	@@ -2624,7 +2955,11 @@
2624	2955	} else
2625	2956	if (source == resetCentroidItem)
2626	2957	{
2627		- ResetCentroid();
	2958	+ ResetCentroid(true);
	2959	+ } else
	2960	+ if (source == resetCentroidXZItem)
	2961	+ {
	2962	+ ResetCentroid(false);
2628	2963	} else
2629	2964	if (source == resetParentItem)
2630	2965	{
..	..	@@ -2756,6 +3091,10 @@
2756	3091	if (source == twoButton)
2757	3092	{
2758	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2759	3098	// bug
2760	3099	//gridPanel.setDividerLocation(1.0);
2761	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2788,10 +3127,31 @@
2788	3127	bigThree.ClearUI();
2789	3128	bigThree.add(centralPanel);
2790	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2791	3148	} else
2792	3149	if (source == threeButton)
2793	3150	{
2794	3151	radio.layout = threeButton;
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
2795	3155
2796	3156	// bigThree.remove(scenePanel);
2797	3157	// bigThree.remove(centralPanel);
..	..	@@ -2824,10 +3184,15 @@
2824	3184	bigThree.add(centralPanel);
2825	3185	bigThree.add(XYZPanel);
2826	3186	bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2827	3189	} else
2828	3190	if (source == fourButton)
2829	3191	{
2830	3192	radio.layout = fourButton;
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
2831	3196
2832	3197	// bigThree.remove(scenePanel);
2833	3198	// bigThree.remove(centralPanel);
..	..	@@ -2859,10 +3224,15 @@
2859	3224	bigThree.ClearUI();
2860	3225	bigThree.add(scenePanel);
2861	3226	bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2862	3229	} else
2863	3230	if (source == sixButton)
2864	3231	{
2865	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
2866	3236
2867	3237	// bigThree.remove(scenePanel);
2868	3238	// bigThree.remove(centralPanel);
..	..	@@ -2895,10 +3265,15 @@
2895	3265	bigThree.add(scenePanel);
2896	3266	bigThree.add(centralPanel);
2897	3267	bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
2898	3270	} else
2899	3271	if (source == sevenButton)
2900	3272	{
2901	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
2902	3277
2903	3278	// bigThree.remove(scenePanel);
2904	3279	// bigThree.remove(centralPanel);
..	..	@@ -2932,6 +3307,8 @@
2932	3307	bigThree.add(centralPanel);
2933	3308	bigThree.add(XYZPanel);
2934	3309	bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
2935	3312	} else
2936	3313	if (source == rootButton)
2937	3314	{
..	..	@@ -2943,6 +3320,7 @@
2943	3320	EditObject(obj);
2944	3321	}
2945	3322
	3323	+ cameraView.requestFocusInWindow();
2946	3324	refreshContents(true);
2947	3325	} else
2948	3326	if (source == closeButton)
..	..	@@ -2952,22 +3330,37 @@
2952	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2953	3331	{
2954	3332	ab = (cRadio)e.nextElement();
2955		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2956	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
2957	3341	buttonGroup.remove(ab);
2958	3342	radioPanel.remove(ab);
2959	3343
2960		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
2961	3346	// ab.GetObject().objectUI = null; // ?????????
2962	3347
2963	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2964	3349	break;
2965	3350	}
2966	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
2967	3354	refreshContents(true);
2968	3355	} else
2969	3356	if (source == editItem \|\| source == editButton)
2970	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
2971	3364	EditSelection(false);
2972	3365	} else
2973	3366	if (source == uneditButton)
..	..	@@ -2977,10 +3370,11 @@
2977	3370	Object3D child = (Object3D)e.nextElement();
2978	3371	if(child.editWindow != null)
2979	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
2980	3374	child.CloseUI();
2981	3375	listUI.remove(child);
2982	3376
2983		- child.editWindow = null; // ???????????
	3377	+ //child.editWindow = null; // ???????????
2984	3378	}
2985	3379	objEditor.ctrlPanel.FlushUI();
2986	3380	//objEditor.jTree.clearSelection();
..	..	@@ -2993,6 +3387,7 @@
2993	3387	//copy.ClearUI();
2994	3388	for (Object3D obj : listUI)
2995	3389	{
	3390	+ obj.pinned = false;
2996	3391	obj.CloseUI();
2997	3392	}
2998	3393	listUI.clear();
..	..	@@ -3002,7 +3397,7 @@
3002	3397	{
3003	3398	assert(copy == group);
3004	3399
3005		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3006	3401
3007	3402	for (Object3D obj : listUI)
3008	3403	{
..	..	@@ -3066,20 +3461,44 @@
3066	3461	frontView.object = group;
3067	3462	sideView.object = group;
3068	3463	}
3069		- group.editWindow = this;
	3464	+
	3465	+// fix "+" issue
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
	3468	+
3070	3469	/*
3071	3470	currentLayout = radio.layout;
3072	3471	if (currentLayout == null)
3073	3472	currentLayout = sevenButton;
3074	3473	*/
3075	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
3076	3480	keepparent = group.parent;
3077	3481	// PARENT = NULL or not???
3078	3482	//group.parent = null; // ROOT
3079	3483	//group.attributes = -1;
3080	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
3081	3487	refreshContents(true);
3082		- }
	3488	+ } else if (event.getSource() == editCameraItem)
	3489	+ {
	3490	+ cameraView.ProtectCamera();
	3491	+ cameraView.repaint();
	3492	+ return;
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3494	+ {
	3495	+ cameraView.RevertCamera();
	3496	+ cameraView.repaint();
	3497	+ return;
	3498	+ // } else if (event.getSource() == textureButton)
	3499	+ // {
	3500	+ // return; // true;
	3501	+ }
3083	3502	else
3084	3503	{
3085	3504	//return super.action(event, arg);
..	..	@@ -3088,7 +3507,6 @@
3088	3507	}
3089	3508
3090	3509	boolean useclient = false;
3091		- cRadio radio;
3092	3510
3093	3511	void ToggleRoot()
3094	3512	{
..	..	@@ -3140,6 +3558,28 @@
3140	3558	refreshContents();
3141	3559	}
3142	3560
	3561	+ void TransformChildren()
	3562	+ {
	3563	+ Object3D obj;
	3564	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3565	+ {
	3566	+ obj = (Object3D)e.nextElement();
	3567	+ obj.KeepTextureMatrices();
	3568	+ obj.TransformChildren();
	3569	+ obj.RestoreTextureMatrices();
	3570	+
	3571	+// if (obj.parent == null)
	3572	+// {
	3573	+// System.out.println("NULL PARENT!");
	3574	+// new Exception().printStackTrace();
	3575	+// }
	3576	+// else
	3577	+// TouchTransform(obj);
	3578	+// //obj.parent.Touch();
	3579	+ }
	3580	+
	3581	+ refreshContents();
	3582	+ }
3143	3583
3144	3584	void ResetTransform()
3145	3585	{
..	..	@@ -3252,7 +3692,7 @@
3252	3692	refreshContents();
3253	3693	}
3254	3694
3255		- void ResetCentroid()
	3695	+ void ResetCentroid(boolean full)
3256	3696	{
3257	3697	Object3D obj;
3258	3698	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
..	..	@@ -3267,12 +3707,16 @@
3267	3707	LA.matIdentity(Object3D.mat);
3268	3708	obj.getBounds(minima, maxima, false);
3269	3709	Object3D.mat[3][0] = -(minima.x + maxima.x)/2;
3270		- Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
	3710	+ if (full)
	3711	+ Object3D.mat[3][1] = -(minima.y + maxima.y)/2;
3271	3712	Object3D.mat[3][2] = -(minima.z + maxima.z)/2;
3272	3713	obj.TransformMesh(Object3D.mat);
	3714	+
3273	3715	Object3D.mat[3][0] = (minima.x + maxima.x)/2;
3274		- Object3D.mat[3][1] = (minima.y + maxima.y)/2;
	3716	+ if (full)
	3717	+ Object3D.mat[3][1] = (minima.y + maxima.y)/2;
3275	3718	Object3D.mat[3][2] = (minima.z + maxima.z)/2;
	3719	+
3276	3720	LA.matConcat(Object3D.mat, obj.toParent, obj.toParent);
3277	3721	//Object3D.mat[3][0] = -Object3D.mat[3][0];
3278	3722	//Object3D.mat[3][1] = -Object3D.mat[3][1];
..	..	@@ -3301,7 +3745,8 @@
3301	3745
3302	3746	int size = obj.MemorySize();
3303	3747
3304		- System.err.println((size/1024) + " KB is the size of " + obj);
	3748	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3749	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3305	3750	}
3306	3751	}
3307	3752	catch (Exception e)
..	..	@@ -3382,6 +3827,13 @@
3382	3827	void GenNormals(boolean crease)
3383	3828	{
3384	3829	group.GenNormalsS(crease);
	3830	+
	3831	+ refreshContents();
	3832	+ }
	3833	+
	3834	+ void GenNormalsMESH()
	3835	+ {
	3836	+ group.GenNormalsMeshS();
3385	3837
3386	3838	refreshContents();
3387	3839	}
..	..	@@ -3613,7 +4065,16 @@
3613	4065	String pigment = Object3D.GetPigment(tex);
3614	4066	//String bump = Object3D.GetBump(tex);
3615	4067
3616		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4068	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4069	+
	4070	+ try
	4071	+ {
	4072	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4073	+ }
	4074	+ catch (Exception e)
	4075	+ {
	4076	+ System.err.println("FAIL: " + node);
	4077	+ }
3617	4078
3618	4079	double s = v.s;
3619	4080
..	..	@@ -4000,6 +4461,18 @@
4000	4461	refreshContents();
4001	4462	}
4002	4463
	4464	+ void RewindLeaves(boolean hide)
	4465	+ {
	4466	+ group.selection.RewindLeaves(hide);
	4467	+ refreshContents();
	4468	+ }
	4469	+
	4470	+ void RandomLeaves(boolean hide)
	4471	+ {
	4472	+ group.selection.RandomLeaves(hide);
	4473	+ refreshContents();
	4474	+ }
	4475	+
4003	4476	void SetTexRes(int tr)
4004	4477	{
4005	4478	group.selection.SetTexRes(tr);
..	..	@@ -4071,10 +4544,6 @@
4071	4544	// }
4072	4545	// }
4073	4546
4074		- static boolean allparams = true;
4075		-
4076		- static Vector<Object3D> listUI = new Vector<Object3D>();
4077		-
4078	4547	void EditSelection(boolean newWindow)
4079	4548	{
4080	4549	// aConstraints.gridy = 0;
..	..	@@ -4082,10 +4551,10 @@
4082	4551	{
4083	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4084	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4085		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4086	4555
4087	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4088		- if(elem != group)
	4557	+ if(elem != group \|\| !newWindow)
4089	4558	{
4090	4559	// if (!(elem instanceof Composite))
4091	4560	// newWindow = false;
..	..	@@ -4167,7 +4636,8 @@
4167	4636	//new Exception().printStackTrace();
4168	4637
4169	4638	freezemodel = true;
4170		-
	4639	+ ClearUnpinned();
	4640	+
4171	4641	/**/
4172	4642	//switch (event.id)
4173	4643	{
..	..	@@ -4175,7 +4645,6 @@
4175	4645	//case 702: // Event.LIST_DESELECT
4176	4646	group.deselectAll();
4177	4647	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4178		- objEditor.ClearInfo(); // .GetMaterial());
4179	4648	if (tps != null)
4180	4649	{
4181	4650	for (int i=0; i < tps.length; i++)
..	..	@@ -4184,10 +4653,8 @@
4184	4653
4185	4654	//if (child.parent != null)
4186	4655	//child.parent.addSelectee(child);
	4656	+ objEditor.SetMaterial(child);
4187	4657	group.addSelectee(child);
4188		- objEditor.SetMaterial(child); // .GetMaterial());
4189		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4190		- System.err.println("info : " + child.GetPath());
4191	4658	}
4192	4659	}
4193	4660	// else
..	..	@@ -4197,20 +4664,28 @@
4197	4664	// System.err.println("info : " + group.GetPath());
4198	4665	// }
4199	4666
4200		- objEditor.SetText(); // jan 2014
4201		-
4202		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4667	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4203	4668	CameraPane.flash = true;
4204	4669
4205		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4670	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4206	4671	// a camera
4207	4672	{
4208		- CameraPane.camerachangeframe = 0; // don't refuse it
4209		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4674	+ {
	4675	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4676	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4677	+ }
4210	4678	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4211	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4212	4680	}
4213	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4214	4689	refreshContents();
4215	4690	//return true;
4216	4691	}
..	..	@@ -4219,6 +4694,35 @@
4219	4694
4220	4695	freezemodel = false;
4221	4696	}
	4697	+
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
	4706	+ void refreshContents(boolean cp)
	4707	+ {
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4710	+ {
	4711	+ objEditor.ClearInfo(); // .GetMaterial());
	4712	+
	4713	+ for (int i=0; i < group.selection.Size(); i++)
	4714	+ {
	4715	+ Object3D child = (Object3D) group.selection.get(i);
	4716	+
	4717	+ objEditor.AddInfo(child, this, true);
	4718	+ System.err.println("info : " + child.GetPath());
	4719	+ }
	4720	+
	4721	+ objEditor.SetText(); // jan 2014
	4722	+ }
	4723	+
	4724	+ super.refreshContents(cp);
	4725	+ }
4222	4726
4223	4727	void linkSomething(Object3D thing)
4224	4728	{
..	..	@@ -4290,6 +4794,7 @@
4290	4794	{
4291	4795	if (group.selection.isEmpty())
4292	4796	return;
	4797	+
4293	4798	Grafreed.clipboardIsTempGroup = false;
4294	4799	Composite tGroup = null;
4295	4800	if (group.selection.size() > 0) // 1)
..	..	@@ -4300,6 +4805,8 @@
4300	4805
4301	4806	if (cut)
4302	4807	{
	4808	+ if (Globals.SAVEONMAKE)
	4809	+ Save();
4303	4810	//int indices[] = jList.getSelectedIndices();
4304	4811	//for (int i = indices.length - 1; i >= 0; i--)
4305	4812	//jList.remove(indices[i]);
..	..	@@ -4389,8 +4896,10 @@
4389	4896	}
4390	4897
4391	4898	}
	4899	+
4392	4900	if (Grafreed.clipboardIsTempGroup)
4393	4901	Grafreed.clipboard = tGroup;
	4902	+
4394	4903	if (cut)
4395	4904	{
4396	4905	ResetModel();
..	..	@@ -4922,21 +5431,6 @@
4922	5431	}
4923	5432	*/
4924	5433
4925		- void ImportGFD()
4926		- {
4927		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4928		- browser.show();
4929		- String filename = browser.getFile();
4930		- if (filename != null && filename.length() > 0)
4931		- {
4932		- String fullname = browser.getDirectory() + filename;
4933		-
4934		- //Object3D readobj =
4935		- objEditor.ReadGFD(fullname, objEditor);
4936		- //makeSomething(readobj);
4937		- }
4938		- }
4939		-
4940	5434	/*
4941	5435	public void Callback(Object obj)
4942	5436	{
..	..	@@ -4960,23 +5454,6 @@
4960	5454	}
4961	5455	*/
4962	5456
4963		- void ImportVRMLX3D()
4964		- {
4965		- if (Grafreed.standAlone)
4966		- {
4967		- /**/
4968		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4969		- browser.show();
4970		- String filename = browser.getFile();
4971		- if (filename != null && filename.length() > 0)
4972		- {
4973		- String fullname = browser.getDirectory() + filename;
4974		- LoadVRMLX3D(fullname);
4975		- }
4976		- /**/
4977		- }
4978		- }
4979		-
4980	5457	String GetFile(String dialogName)
4981	5458	{
4982	5459	if (Grafreed.standAlone)
..	..	@@ -5047,7 +5524,31 @@
5047	5524	cButton clearpanelButton;
5048	5525	cButton unselectButton;
5049	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
	5532	+ cButton saveButton;
5050	5533	cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
5051	5552
5052	5553	cButton screenfitButton;
5053	5554	cButton screenfitpointButton;
..	..	@@ -5060,14 +5561,6 @@
5060	5561
5061	5562	cButton setsupportButton;
5062	5563
5063		- cButton twoButton;
5064		- cButton sixButton;
5065		- cButton threeButton;
5066		- cButton sevenButton;
5067		- cButton fourButton; // full panel
5068		- cButton oneButton; // full XYZ
5069		- //cButton currentLayout;
5070		-
5071	5564	//
5072	5565	//Composite
5073	5566	Object3D // to do !!
..	..	@@ -5077,9 +5570,11 @@
5077	5570	//JTree jTree;
5078	5571	private MenuItem lookAtItem;
5079	5572	private MenuItem lookFromItem;
5080		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
5081	5574	private MenuItem cutItem;
5082		- private MenuItem duplicateItem;
	5575	+ private MenuItem undoItem;
	5576	+ private MenuItem redoItem;
	5577	+ private JMenuItem duplicateItem;
5083	5578	private MenuItem cloneItem;
5084	5579	private MenuItem cloneSupportItem;
5085	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5092,7 +5587,7 @@
5092	5587	private MenuItem linkverticesItem;
5093	5588	private MenuItem relinkverticesItem;
5094	5589	private MenuItem setMasterItem;
5095		- private MenuItem resetMeshItem;
	5590	+ private MenuItem resetAllItem;
5096	5591	private MenuItem stepAllItem;
5097	5592	private MenuItem revertMeshItem;
5098	5593	private MenuItem poseMeshItem;
..	..	@@ -5142,6 +5637,10 @@
5142	5637	private MenuItem showleavesItem;
5143	5638	private MenuItem markleavesItem;
5144	5639	private MenuItem unmarkleavesItem;
	5640	+ private MenuItem rewindleavesItem;
	5641	+ private MenuItem unrewindleavesItem;
	5642	+ private MenuItem randomleavesItem;
	5643	+ private MenuItem unrandomleavesItem;
5145	5644
5146	5645	private MenuItem flipVItem;
5147	5646	private MenuItem unflipVItem;
..	..	@@ -5153,15 +5652,17 @@
5153	5652	private MenuItem panoTexturesItem;
5154	5653
5155	5654	private MenuItem resetCentroidItem;
5156		- private MenuItem transformgeometryItem;
	5655	+ private MenuItem resetCentroidXZItem;
5157	5656	private MenuItem resetTransformItem;
	5657	+ private MenuItem transformGeometryItem;
	5658	+ private MenuItem transformChildrenItem;
5158	5659	private MenuItem hideItem;
5159	5660	private MenuItem grabItem;
5160	5661	private MenuItem backItem;
5161	5662	private MenuItem frontItem;
5162	5663	private MenuItem cameraItem;
5163	5664	private MenuItem compositeItem;
5164		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5165	5666	private MenuItem physicsItem;
5166	5667	private MenuItem frameselectorItem;
5167	5668	private MenuItem scriptNodeItem;
..	..	@@ -5223,11 +5724,6 @@
5223	5724	private MenuItem doubleItem;
5224	5725	private MenuItem tripleItem;
5225	5726
5226		- private MenuItem importGFDItem;
5227		- private MenuItem importVRMLX3DItem;
5228		- private MenuItem import3DSItem;
5229		- private MenuItem importOBJItem;
5230		-
5231	5727	private MenuItem computeAOItem;
5232	5728	private MenuItem recompileItem;
5233	5729	private MenuItem editScriptItem;
..	..	@@ -5237,4 +5733,8 @@
5237	5733	private MenuItem analyzeItem;
5238	5734	private MenuItem dumpItem;
5239	5735	//boolean freezemodel = false;
	5736	+
	5737	+ Menu cameraMenu;
	5738	+ MenuItem editCameraItem;
	5739	+ MenuItem restoreCameraItem;
5240	5740	}