~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("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());
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	{
..	..	@@ -372,6 +451,10 @@
372	451	oe.menuBar.add(menu = new Menu("Attributes"));
373	452	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	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);
375	458	menu.add("-");
376	459	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	460	liveleavesItem.addActionListener(this);
..	..	@@ -392,6 +475,14 @@
392	475	markleavesItem.addActionListener(this);
393	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	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);
395	486	menu.add("-");
396	487	flipVItem = menu.add(new MenuItem("Flip V"));
397	488	flipVItem.addActionListener(this);
..	..	@@ -443,25 +534,24 @@
443	534	oe.menuBar.add(menu = new Menu("Insert"));
444	535	buildCreateMenu(menu);
445	536
446		- oe.menuBar.add(menu = new Menu("Include"));
447		- importOBJItem = menu.add(new MenuItem("OBJ file..."));
448		- importOBJItem.addActionListener(this);
449		- menu.add("-");
450		- import3DSItem = menu.add(new MenuItem("3DS file..."));
451		- import3DSItem.addActionListener(this);
452		- menu.add("-");
453		- importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
454		- importVRMLX3DItem.addActionListener(this);
455		- menu.add("-");
456		- importGFDItem = menu.add(new MenuItem("GrafreeD file..."));
457		- importGFDItem.addActionListener(this);
458		-
459	537	oe.menuBar.add(menu = new Menu("Tools"));
460	538	buildToolsMenu(menu);
461	539	}
462	540
463	541	void SetupUI2(ObjEditor oe)
464	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	+
465	555	//new Exception().printStackTrace();
466	556
467	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +580,63 @@
490	580	oe.radioPanel.add(dummyButton);
491	581	oe.buttonGroup.add(dummyButton);
492	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
493	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	588
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- 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");
497	621	liveCB.addItemListener(this);
498	622
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	624	oneStepButton.setToolTipText("Animate one step forward");
501	625	oneStepButton.addActionListener(this);
502	626
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	628	fastCB.setToolTipText("Fast mode");
505	629	fastCB.addItemListener(this);
506	630
507		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
508		- trackCB.setToolTipText("Enable tracking");
509		- trackCB.addItemListener(this);
510		-
511		- 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);
512	634	screenfitButton.setToolTipText("Screen fit");
513	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);
514	640
515	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -522,65 +648,145 @@
522	648	snapobjectButton.setToolTipText("Snap Object");
523	649	}
524	650
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	652
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532	654	twoButton.setToolTipText("Show center view only");
533	655	twoButton.addActionListener(this);
534		- 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);
535	659	fourButton.addActionListener(this);
536	660	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	662	sixButton.setToolTipText("2-column layout left");
539	663	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	665	threeButton.setToolTipText("2-column layout right");
542	666	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	668	sevenButton.setToolTipText("3-column layout");
545	669	sevenButton.addActionListener(this);
546	670	//
547	671
548		- 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);
549	673	rootButton.setToolTipText("Edit selection in new tab");
550	674	rootButton.addActionListener(this);
551	675
552		- 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);
553	677	closeButton.setToolTipText("Close tab");
554	678	closeButton.addActionListener(this);
555	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	680	//clearButton.addActionListener(this);
557		-
558		- 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	+ }
559	713
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- 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");
562	763	editButton.addActionListener(this);
563	764
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
566	767	uneditButton.addActionListener(this);
567	768
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
570	771	allParamsButton.addActionListener(this);
571	772
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	774	clearPanelButton.setToolTipText("Clear edit panel");
574	775	clearPanelButton.addActionListener(this);
575	776
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	778	unselectButton.setToolTipText("Unselect");
578	779	unselectButton.addActionListener(this);
579	780
580		- 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);
581	784
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
584	790
585	791	// oe.aConstraints.gridx += 1;
586	792	// oe.aConstraints.weighty = 0;
..	..	@@ -597,27 +803,12 @@
597	803
598	804	JScrollPane jSP;
599	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	807	ResetModel();
602	808
603	809	oe.treePanel.add(jSPPanel);
604	810	oe.treePanel.Return();
605	811
606		- cGridBag copyOptionsPanel = new cGridBag();
607		-
608		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
609		- colorCB.setToolTipText("Copy color when dropped");
610		- colorCB.addItemListener(this);
611		-
612		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
613		- materialCB.setToolTipText("Copy material when dropped");
614		- materialCB.addItemListener(this);
615		-
616		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
617		- textureCB.setToolTipText("Copy texture when dropped");
618		- textureCB.addItemListener(this);
619		-
620		- copyOptionsPanel.preferredHeight = 1;
621	812	oe.treePanel.add(copyOptionsPanel);
622	813	oe.treePanel.Return();
623	814
..	..	@@ -648,23 +839,43 @@
648	839
649	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	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	+
651	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	857	boxCB.setToolTipText("Display bounding boxes");
653	858	boxCB.addItemListener(this);
654	859
655	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	862	zoomBoxCB.addItemListener(this);
658	863
659	864	if (true) // Globals.ADVANCED)
660	865	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	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);
664	873
665	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	875	// localCB.addItemListener(this);
667	876
	877	+ panel.Return();
	878	+
668	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	880	crowdCB.setToolTipText("Used for crowds");
670	881	crowdCB.addItemListener(this);
..	..	@@ -681,6 +892,8 @@
681	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	893	// speakerMocapCB.addItemListener(this);
683	894
	895	+ panel.Return();
	896	+
684	897	if (false)
685	898	{
686	899	// handled in scripts
..	..	@@ -695,32 +908,72 @@
695	908	//constraints.gridy += 1;
696	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
698	912	}
699	913
700	914	//constraints.gridx += 1;
701	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	916	// debugCB.addItemListener(this);
703	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
704	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
705	924	oeilCB.addItemListener(this);
706	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	+ {
707	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	947	lookAtCB.setToolTipText("Look-at target");
709	948	lookAtCB.addItemListener(this);
	949	+ }
710	950
711	951	}
712	952
713	953	cGridBag fill = new cGridBag();
714		-
715	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
716	959
717	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
718	963
719	964	}
720	965
721	966	void EditObject(Object3D obj)
722	967	{
723	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	+
724	977	radioButton.SetObject(obj);
725	978	radioButton.layout = sevenButton;
726	979	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -729,8 +982,11 @@
729	982	buttonGroup.add(radioButton);
730	983	radioButton.doClick();
731	984	}
	985	+
732	986	void SetupViews(ObjEditor oe)
733	987	{
	988	+ theFrame = this;
	989	+
734	990	oe.SetupViews();
735	991
736	992	System.out.println("SetupViews");
..	..	@@ -739,23 +995,28 @@
739	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	996	}
741	997
742		- JCheckBox liveCB;
743		- JCheckBox supportCB;
744		- JCheckBox localCB;
745		- JCheckBox crowdCB;
746		- JCheckBox smoothCB;
747		- JCheckBox fastCB;
748		- JCheckBox slowCB;
749		- JCheckBox boxCB;
750		- JCheckBox zoomBoxCB;
751		- JCheckBox trackCB;
752		- 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;
753	1011	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
759	1020
760	1021	// static int COLOR = 1;
761	1022	// static int MATERIAL = 2;
..	..	@@ -763,9 +1024,9 @@
763	1024
764	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	1026
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
769	1030
770	1031	public void itemStateChanged(ItemEvent e)
771	1032	{
..	..	@@ -793,6 +1054,7 @@
793	1054	} else if(e.getSource() == liveCB)
794	1055	{
795	1056	cameraView.ToggleLive();
	1057	+ refreshContents(false);
796	1058	}
797	1059	else if(e.getSource() == supportCB)
798	1060	{
..	..	@@ -857,6 +1119,18 @@
857	1119	{
858	1120	cameraView.ToggleOeil();
859	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	+ }
860	1134	else if(e.getSource() == lookAtCB)
861	1135	{
862	1136	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1147,8 @@
873	1147
874	1148	/**/
875	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1153	// We can't move the root node or an empty selection
879	1154	return;
..	..	@@ -990,23 +1265,33 @@
990	1265
991	1266	assert target == objEditor.jTree;
992	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
993	1269	try {
994		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
995	1271	} catch (Exception e) {
996	1272	System.out.println("destinationPath : " + destinationPath);
997	1273	return;
998	1274	}
999	1275
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
1001	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	+// {
1002	1287	loadClipboard(true);
1003	1288	objEditor.jTree.setSelectionPath(destinationPath);
1004	1289	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
1010	1295	}
1011	1296	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1111,22 +1396,30 @@
1111	1396	{
1112	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1113	1398	//heightFieldItem.addActionListener(this);
1114		- gridItem = menu.add(new MenuItem("Grid"));
1115		- gridItem.addActionListener(this);
1116		- rectoidItem = menu.add(new MenuItem("Box"));
1117		- rectoidItem.addActionListener(this);
1118		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1119		- ellipsoidItem.addActionListener(this);
1120		- coneItem = menu.add(new MenuItem("Cone"));
1121		- coneItem.addActionListener(this);
1122		- torusItem = menu.add(new MenuItem("Torus"));
1123		- torusItem.addActionListener(this);
1124		- superItem = menu.add(new MenuItem("Superellipsoid"));
1125		- 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	+ {
1126	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1127	1418	kleinItem.addActionListener(this);
1128		- particleItem = menu.add(new MenuItem("Particle system"));
1129		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
1130	1423	if (Globals.ADVANCED)
1131	1424	{
1132	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1152,15 +1445,15 @@
1152	1445	}
1153	1446	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154	1447	bezierItem.addActionListener(this);
1155		- overlayItem = menu.add(new MenuItem("Overlay"));
1156		- overlayItem.addActionListener(this);
1157		- lightItem = menu.add(new MenuItem("Light"));
1158		- lightItem.addActionListener(this);
	1448	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1449	+// overlayItem.addActionListener(this);
	1450	+// lightItem = menu.add(new MenuItem("Light"));
	1451	+// lightItem.addActionListener(this);
1159	1452	menu.add("-");
1160	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1161	1454	//superLoopItem.addActionListener(this);
1162		- loopItem = menu.add(new MenuItem("Loop"));
1163		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1164	1457	doubleItem = menu.add(new MenuItem("Fork"));
1165	1458	doubleItem.addActionListener(this);
1166	1459	if (Globals.ADVANCED)
..	..	@@ -1200,7 +1493,7 @@
1200	1493	memoryItem.addActionListener(this);
1201	1494	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1495	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1496	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1497	dumpItem.addActionListener(this);
1205	1498	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1499	// pathItem.addActionListener(this);
..	..	@@ -1341,9 +1634,24 @@
1341	1634	shadow.material = new cMaterial(obj.material);
1342	1635	shadow.material.diffuse = 0.0001f;
1343	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1344	1638
1345	1639	makeSomething(shadow);
1346	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	+ }
1347	1655
1348	1656	/**
1349	1657	* applyExample
..	..	@@ -1588,7 +1896,7 @@
1588	1896	{
1589	1897	ScreenFit();
1590	1898	} else
1591		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1592	1900	{
1593	1901	cVector v1 = new cVector();
1594	1902	cVector v2 = new cVector();
..	..	@@ -1597,11 +1905,11 @@
1597	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	1906	objEditor.cameraView.repaint();
1599	1907	} else
1600		- if (source == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1601	1909	{
1602	1910	makeSomething(new Box());
1603	1911	} else
1604		- if (source == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1605	1913	{
1606	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +1988,27 @@
1680	1988
1681	1989	makeSomething(obj);
1682	1990	} else
1683		- if (source == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1684	1992	{
1685	1993	makeSomething(new Grid());
1686	1994	} else
1687		- if (source == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	1996	{
1689	1997	makeSomething(new Sphere());
1690	1998	} else
1691		- if (source == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1692	2000	{
1693	2001	makeSomething(new Cone());
1694	2002	} else
1695		- if (source == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1696	2004	{
1697	2005	makeSomething(new Torus());
1698	2006	} else
1699		- if (source == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1700	2008	{
1701	2009	makeSomething(new Superellipsoid());
1702	2010	} else
1703		- if (source == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1704	2012	{
1705	2013	makeSomething(new Klein());
1706	2014	} else
..	..	@@ -1720,7 +2028,7 @@
1720	2028	{
1721	2029	makeSomething(new BezierSurface());
1722	2030	} else
1723		- if (source == overlayItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1724	2032	{
1725	2033	/*
1726	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,7 +2076,7 @@
1768	2076	s.setup();
1769	2077	makeSomething(s);
1770	2078	} else
1771		- if (source == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1772	2080	{
1773	2081	makeSomething(new Light());
1774	2082	} else
..	..	@@ -1818,30 +2126,30 @@
1818	2126
1819	2127	group(g);
1820	2128	} else
1821		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1822	2130	{
1823	2131	Composite csg = new GroupLeaf();
1824	2132	csg.count = 5;
1825	2133	group(csg);
1826		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1827	2135	csg.addChild(child);
1828	2136	child.addChild(csg);
1829	2137	} else
1830	2138	if (source == doubleItem)
1831	2139	{
1832		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1833	2141	csg.count = 5;
1834	2142	group(csg);
1835		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1836	2144	csg.addChild(child);
1837	2145	child.addChild(csg);
1838		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1839	2147	csg.addChild(child);
1840	2148	child.addChild(csg);
1841	2149	} else
1842	2150	if (source == tripleItem)
1843	2151	{
1844		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1845	2153	csg.count = 4;
1846	2154	group(csg);
1847	2155	Composite child = new cGroup();
..	..	@@ -1853,31 +2161,6 @@
1853	2161	child = new cGroup();
1854	2162	csg.addChild(child);
1855	2163	child.addChild(csg);
1856		- } else
1857		-
1858		- if (source == importGFDItem)
1859		- {
1860		- ImportGFD();
1861		- } else
1862		- if (source == importVRMLX3DItem)
1863		- {
1864		- ImportVRMLX3D();
1865		- } else
1866		- if (source == import3DSItem)
1867		- {
1868		- objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
1869		- } else
1870		- if (source == importOBJItem)
1871		- {
1872		- //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
1873		- FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
1874		- browser.setVisible(true);
1875		- String filename = browser.getFile();
1876		- if (filename != null && filename.length() > 0)
1877		- {
1878		- String fullname = browser.getDirectory() + filename;
1879		- makeSomething(ReadOBJ(fullname), true);
1880		- }
1881	2164	} else
1882	2165	if (source == computeAOItem)
1883	2166	{
..	..	@@ -1915,6 +2198,30 @@
1915	2198	if (source == dumpItem)
1916	2199	{
1917	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();
1918	2225	} else
1919	2226	if (source == oneStepButton)
1920	2227	{
..	..	@@ -1969,6 +2276,14 @@
1969	2276	if (source == cutItem \|\| source == clearButton)
1970	2277	{
1971	2278	loadClipboard(true);
	2279	+ } else
	2280	+ if (source == undoItem)
	2281	+ {
	2282	+ Undo();
	2283	+ } else
	2284	+ if (source == redoItem)
	2285	+ {
	2286	+ Redo();
1972	2287	} else
1973	2288	if (source == duplicateItem)
1974	2289	{
..	..	@@ -2281,7 +2596,7 @@
2281	2596	{
2282	2597	RevertMeshes();
2283	2598	} else
2284		- if (source == resetMeshItem)
	2599	+ if (source == resetAllItem)
2285	2600	{
2286	2601	ResetAll();
2287	2602	} else
..	..	@@ -2301,9 +2616,9 @@
2301	2616	{
2302	2617	ClearSelection(true);
2303	2618	} else
2304		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2305	2620	{
2306		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2307	2622	} else
2308	2623	if (source == hideItem)
2309	2624	{
..	..	@@ -2321,11 +2636,11 @@
2321	2636	{
2322	2637	makeSomething(new Camera());
2323	2638	} else
2324		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2325	2640	{
2326	2641	group(new Composite());
2327	2642	} else
2328		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2329	2644	{
2330	2645	RandomNode random = new RandomNode();
2331	2646	group(random);
..	..	@@ -2427,7 +2742,7 @@
2427	2742	{
2428	2743	group(new cLinker());
2429	2744	} else
2430		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2431	2746	{
2432	2747	group(new TextureNode());
2433	2748	} else
..	..	@@ -2447,17 +2762,30 @@
2447	2762	{
2448	2763	CastShadow(2);
2449	2764	} else
2450		- if (source == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2766	{
2452		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2453	2769	for (int i=0; i<group.selection.size(); i++)
2454	2770	{
2455		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2456	2776	}
2457	2777
2458		- ClearSelection(false);
2459		-
2460		- 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	+ }
2461	2789	} else
2462	2790	if (source == genUVItem)
2463	2791	{
..	..	@@ -2469,7 +2797,7 @@
2469	2797	} else
2470	2798	if (source == genNormalsMESHItem)
2471	2799	{
2472		- GenNormals(true); // TODO
	2800	+ GenNormalsMESH();
2473	2801	} else
2474	2802	if (source == genNormalsORGANItem)
2475	2803	{
..	..	@@ -2534,6 +2862,22 @@
2534	2862	if (source == unmarkleavesItem)
2535	2863	{
2536	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);
2537	2881	} else
2538	2882	if (source == flipVItem)
2539	2883	{
..	..	@@ -2769,6 +3113,10 @@
2769	3113	if (source == twoButton)
2770	3114	{
2771	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2772	3120	// bug
2773	3121	//gridPanel.setDividerLocation(1.0);
2774	3122	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3149,31 @@
2801	3149	bigThree.ClearUI();
2802	3150	bigThree.add(centralPanel);
2803	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	+
2804	3170	} else
2805	3171	if (source == threeButton)
2806	3172	{
2807	3173	radio.layout = threeButton;
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
2808	3177
2809	3178	// bigThree.remove(scenePanel);
2810	3179	// bigThree.remove(centralPanel);
..	..	@@ -2837,10 +3206,15 @@
2837	3206	bigThree.add(centralPanel);
2838	3207	bigThree.add(XYZPanel);
2839	3208	bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2840	3211	} else
2841	3212	if (source == fourButton)
2842	3213	{
2843	3214	radio.layout = fourButton;
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
2844	3218
2845	3219	// bigThree.remove(scenePanel);
2846	3220	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3246,15 @@
2872	3246	bigThree.ClearUI();
2873	3247	bigThree.add(scenePanel);
2874	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2875	3251	} else
2876	3252	if (source == sixButton)
2877	3253	{
2878	3254	radio.layout = sixButton;
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
2879	3258
2880	3259	// bigThree.remove(scenePanel);
2881	3260	// bigThree.remove(centralPanel);
..	..	@@ -2908,10 +3287,15 @@
2908	3287	bigThree.add(scenePanel);
2909	3288	bigThree.add(centralPanel);
2910	3289	bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
2911	3292	} else
2912	3293	if (source == sevenButton)
2913	3294	{
2914	3295	radio.layout = sevenButton;
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
2915	3299
2916	3300	// bigThree.remove(scenePanel);
2917	3301	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3329,8 @@
2945	3329	bigThree.add(centralPanel);
2946	3330	bigThree.add(XYZPanel);
2947	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2948	3334	} else
2949	3335	if (source == rootButton)
2950	3336	{
..	..	@@ -2956,6 +3342,7 @@
2956	3342	EditObject(obj);
2957	3343	}
2958	3344
	3345	+ cameraView.requestFocusInWindow();
2959	3346	refreshContents(true);
2960	3347	} else
2961	3348	if (source == closeButton)
..	..	@@ -2965,22 +3352,37 @@
2965	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3353	{
2967	3354	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
2970	3363	buttonGroup.remove(ab);
2971	3364	radioPanel.remove(ab);
2972	3365
2973		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
2974	3368	// ab.GetObject().objectUI = null; // ?????????
2975	3369
2976	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3371	break;
2978	3372	}
2979	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
2980	3376	refreshContents(true);
2981	3377	} else
2982	3378	if (source == editItem \|\| source == editButton)
2983	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
2984	3386	EditSelection(false);
2985	3387	} else
2986	3388	if (source == uneditButton)
..	..	@@ -2990,10 +3392,11 @@
2990	3392	Object3D child = (Object3D)e.nextElement();
2991	3393	if(child.editWindow != null)
2992	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
2993	3396	child.CloseUI();
2994	3397	listUI.remove(child);
2995	3398
2996		- child.editWindow = null; // ???????????
	3399	+ //child.editWindow = null; // ???????????
2997	3400	}
2998	3401	objEditor.ctrlPanel.FlushUI();
2999	3402	//objEditor.jTree.clearSelection();
..	..	@@ -3006,6 +3409,7 @@
3006	3409	//copy.ClearUI();
3007	3410	for (Object3D obj : listUI)
3008	3411	{
	3412	+ obj.pinned = false;
3009	3413	obj.CloseUI();
3010	3414	}
3011	3415	listUI.clear();
..	..	@@ -3015,7 +3419,7 @@
3015	3419	{
3016	3420	assert(copy == group);
3017	3421
3018		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3019	3423
3020	3424	for (Object3D obj : listUI)
3021	3425	{
..	..	@@ -3079,20 +3483,44 @@
3079	3483	frontView.object = group;
3080	3484	sideView.object = group;
3081	3485	}
3082		- group.editWindow = this;
	3486	+
	3487	+// fix "+" issue
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
	3490	+
3083	3491	/*
3084	3492	currentLayout = radio.layout;
3085	3493	if (currentLayout == null)
3086	3494	currentLayout = sevenButton;
3087	3495	*/
3088	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
3089	3502	keepparent = group.parent;
3090	3503	// PARENT = NULL or not???
3091	3504	//group.parent = null; // ROOT
3092	3505	//group.attributes = -1;
3093	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
3094	3509	refreshContents(true);
3095		- }
	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	+ }
3096	3524	else
3097	3525	{
3098	3526	//return super.action(event, arg);
..	..	@@ -3101,7 +3529,6 @@
3101	3529	}
3102	3530
3103	3531	boolean useclient = false;
3104		- cRadio radio;
3105	3532
3106	3533	void ToggleRoot()
3107	3534	{
..	..	@@ -3340,7 +3767,8 @@
3340	3767
3341	3768	int size = obj.MemorySize();
3342	3769
3343		- 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)");
3344	3772	}
3345	3773	}
3346	3774	catch (Exception e)
..	..	@@ -3421,6 +3849,13 @@
3421	3849	void GenNormals(boolean crease)
3422	3850	{
3423	3851	group.GenNormalsS(crease);
	3852	+
	3853	+ refreshContents();
	3854	+ }
	3855	+
	3856	+ void GenNormalsMESH()
	3857	+ {
	3858	+ group.GenNormalsMeshS();
3424	3859
3425	3860	refreshContents();
3426	3861	}
..	..	@@ -3652,7 +4087,16 @@
3652	4087	String pigment = Object3D.GetPigment(tex);
3653	4088	//String bump = Object3D.GetBump(tex);
3654	4089
3655		- 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	+ }
3656	4100
3657	4101	double s = v.s;
3658	4102
..	..	@@ -4039,6 +4483,18 @@
4039	4483	refreshContents();
4040	4484	}
4041	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);
	4495	+ refreshContents();
	4496	+ }
	4497	+
4042	4498	void SetTexRes(int tr)
4043	4499	{
4044	4500	group.selection.SetTexRes(tr);
..	..	@@ -4110,10 +4566,6 @@
4110	4566	// }
4111	4567	// }
4112	4568
4113		- static boolean allparams = true;
4114		-
4115		- static Vector<Object3D> listUI = new Vector<Object3D>();
4116		-
4117	4569	void EditSelection(boolean newWindow)
4118	4570	{
4119	4571	// aConstraints.gridy = 0;
..	..	@@ -4121,10 +4573,10 @@
4121	4573	{
4122	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4123	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4124		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4577
4126	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4579	+ if(elem != group \|\| !newWindow)
4128	4580	{
4129	4581	// if (!(elem instanceof Composite))
4130	4582	// newWindow = false;
..	..	@@ -4206,7 +4658,8 @@
4206	4658	//new Exception().printStackTrace();
4207	4659
4208	4660	freezemodel = true;
4209		-
	4661	+ ClearUnpinned();
	4662	+
4210	4663	/**/
4211	4664	//switch (event.id)
4212	4665	{
..	..	@@ -4214,7 +4667,6 @@
4214	4667	//case 702: // Event.LIST_DESELECT
4215	4668	group.deselectAll();
4216	4669	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4217		- objEditor.ClearInfo(); // .GetMaterial());
4218	4670	if (tps != null)
4219	4671	{
4220	4672	for (int i=0; i < tps.length; i++)
..	..	@@ -4223,10 +4675,8 @@
4223	4675
4224	4676	//if (child.parent != null)
4225	4677	//child.parent.addSelectee(child);
	4678	+ objEditor.SetMaterial(child);
4226	4679	group.addSelectee(child);
4227		- objEditor.SetMaterial(child); // .GetMaterial());
4228		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4229		- System.err.println("info : " + child.GetPath());
4230	4680	}
4231	4681	}
4232	4682	// else
..	..	@@ -4236,20 +4686,28 @@
4236	4686	// System.err.println("info : " + group.GetPath());
4237	4687	// }
4238	4688
4239		- objEditor.SetText(); // jan 2014
4240		-
4241		- 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))
4242	4690	CameraPane.flash = true;
4243	4691
4244		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4692	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4245	4693	// a camera
4246	4694	{
4247		- CameraPane.camerachangeframe = 0; // don't refuse it
4248		- 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	+ }
4249	4700	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4250	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4251	4702	}
4252	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4253	4711	refreshContents();
4254	4712	//return true;
4255	4713	}
..	..	@@ -4258,6 +4716,35 @@
4258	4716
4259	4717	freezemodel = false;
4260	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	+ }
4261	4748
4262	4749	void linkSomething(Object3D thing)
4263	4750	{
..	..	@@ -4329,6 +4816,7 @@
4329	4816	{
4330	4817	if (group.selection.isEmpty())
4331	4818	return;
	4819	+
4332	4820	Grafreed.clipboardIsTempGroup = false;
4333	4821	Composite tGroup = null;
4334	4822	if (group.selection.size() > 0) // 1)
..	..	@@ -4339,6 +4827,8 @@
4339	4827
4340	4828	if (cut)
4341	4829	{
	4830	+ if (Globals.SAVEONMAKE)
	4831	+ Save();
4342	4832	//int indices[] = jList.getSelectedIndices();
4343	4833	//for (int i = indices.length - 1; i >= 0; i--)
4344	4834	//jList.remove(indices[i]);
..	..	@@ -4428,8 +4918,10 @@
4428	4918	}
4429	4919
4430	4920	}
	4921	+
4431	4922	if (Grafreed.clipboardIsTempGroup)
4432	4923	Grafreed.clipboard = tGroup;
	4924	+
4433	4925	if (cut)
4434	4926	{
4435	4927	ResetModel();
..	..	@@ -4961,21 +5453,6 @@
4961	5453	}
4962	5454	*/
4963	5455
4964		- void ImportGFD()
4965		- {
4966		- FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4967		- browser.show();
4968		- String filename = browser.getFile();
4969		- if (filename != null && filename.length() > 0)
4970		- {
4971		- String fullname = browser.getDirectory() + filename;
4972		-
4973		- //Object3D readobj =
4974		- objEditor.ReadGFD(fullname, objEditor);
4975		- //makeSomething(readobj);
4976		- }
4977		- }
4978		-
4979	5456	/*
4980	5457	public void Callback(Object obj)
4981	5458	{
..	..	@@ -4999,23 +5476,6 @@
4999	5476	}
5000	5477	*/
5001	5478
5002		- void ImportVRMLX3D()
5003		- {
5004		- if (Grafreed.standAlone)
5005		- {
5006		- /**/
5007		- FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
5008		- browser.show();
5009		- String filename = browser.getFile();
5010		- if (filename != null && filename.length() > 0)
5011		- {
5012		- String fullname = browser.getDirectory() + filename;
5013		- LoadVRMLX3D(fullname);
5014		- }
5015		- /**/
5016		- }
5017		- }
5018		-
5019	5479	String GetFile(String dialogName)
5020	5480	{
5021	5481	if (Grafreed.standAlone)
..	..	@@ -5086,7 +5546,28 @@
5086	5546	cButton clearpanelButton;
5087	5547	cButton unselectButton;
5088	5548
	5549	+ cButton restoreCameraButton;
	5550	+
	5551	+ cButton saveButton;
5089	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;
5090	5571
5091	5572	cButton screenfitButton;
5092	5573	cButton screenfitpointButton;
..	..	@@ -5099,14 +5580,6 @@
5099	5580
5100	5581	cButton setsupportButton;
5101	5582
5102		- cButton twoButton;
5103		- cButton sixButton;
5104		- cButton threeButton;
5105		- cButton sevenButton;
5106		- cButton fourButton; // full panel
5107		- cButton oneButton; // full XYZ
5108		- //cButton currentLayout;
5109		-
5110	5583	//
5111	5584	//Composite
5112	5585	Object3D // to do !!
..	..	@@ -5116,9 +5589,11 @@
5116	5589	//JTree jTree;
5117	5590	private MenuItem lookAtItem;
5118	5591	private MenuItem lookFromItem;
5119		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
5120	5593	private MenuItem cutItem;
5121		- private MenuItem duplicateItem;
	5594	+ private MenuItem undoItem;
	5595	+ private MenuItem redoItem;
	5596	+ private JMenuItem duplicateItem;
5122	5597	private MenuItem cloneItem;
5123	5598	private MenuItem cloneSupportItem;
5124	5599	private MenuItem overwriteGeoItem;
..	..	@@ -5131,7 +5606,7 @@
5131	5606	private MenuItem linkverticesItem;
5132	5607	private MenuItem relinkverticesItem;
5133	5608	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5609	+ private MenuItem resetAllItem;
5135	5610	private MenuItem stepAllItem;
5136	5611	private MenuItem revertMeshItem;
5137	5612	private MenuItem poseMeshItem;
..	..	@@ -5181,6 +5656,10 @@
5181	5656	private MenuItem showleavesItem;
5182	5657	private MenuItem markleavesItem;
5183	5658	private MenuItem unmarkleavesItem;
	5659	+ private MenuItem rewindleavesItem;
	5660	+ private MenuItem unrewindleavesItem;
	5661	+ private MenuItem randomleavesItem;
	5662	+ private MenuItem unrandomleavesItem;
5184	5663
5185	5664	private MenuItem flipVItem;
5186	5665	private MenuItem unflipVItem;
..	..	@@ -5202,7 +5681,7 @@
5202	5681	private MenuItem frontItem;
5203	5682	private MenuItem cameraItem;
5204	5683	private MenuItem compositeItem;
5205		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5206	5685	private MenuItem physicsItem;
5207	5686	private MenuItem frameselectorItem;
5208	5687	private MenuItem scriptNodeItem;
..	..	@@ -5264,11 +5743,6 @@
5264	5743	private MenuItem doubleItem;
5265	5744	private MenuItem tripleItem;
5266	5745
5267		- private MenuItem importGFDItem;
5268		- private MenuItem importVRMLX3DItem;
5269		- private MenuItem import3DSItem;
5270		- private MenuItem importOBJItem;
5271		-
5272	5746	private MenuItem computeAOItem;
5273	5747	private MenuItem recompileItem;
5274	5748	private MenuItem editScriptItem;
..	..	@@ -5278,4 +5752,8 @@
5278	5752	private MenuItem analyzeItem;
5279	5753	private MenuItem dumpItem;
5280	5754	//boolean freezemodel = false;
	5755	+
	5756	+ Menu cameraMenu;
	5757	+ MenuItem editCameraItem;
	5758	+ MenuItem restoreCameraItem;
5281	5759	}