~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,23 +365,22 @@
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);
	383	+
304	384	if (Globals.ADVANCED)
305	385	{
306	386	menu.add("-");
..	..	@@ -372,6 +452,10 @@
372	452	oe.menuBar.add(menu = new Menu("Attributes"));
373	453	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
374	454	clearMaterialsItem.addActionListener(this);
	455	+ resetAllItem = menu.add(new MenuItem("Reset All"));
	456	+ resetAllItem.addActionListener(this);
	457	+ stepAllItem = menu.add(new MenuItem("Step All"));
	458	+ stepAllItem.addActionListener(this);
375	459	menu.add("-");
376	460	liveleavesItem = menu.add(new MenuItem("Live Leaves"));
377	461	liveleavesItem.addActionListener(this);
..	..	@@ -392,6 +476,14 @@
392	476	markleavesItem.addActionListener(this);
393	477	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
394	478	unmarkleavesItem.addActionListener(this);
	479	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	480	+ rewindleavesItem.addActionListener(this);
	481	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	482	+ unrewindleavesItem.addActionListener(this);
	483	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	484	+ randomleavesItem.addActionListener(this);
	485	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	486	+ unrandomleavesItem.addActionListener(this);
395	487	menu.add("-");
396	488	flipVItem = menu.add(new MenuItem("Flip V"));
397	489	flipVItem.addActionListener(this);
..	..	@@ -443,25 +535,24 @@
443	535	oe.menuBar.add(menu = new Menu("Insert"));
444	536	buildCreateMenu(menu);
445	537
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	538	oe.menuBar.add(menu = new Menu("Tools"));
460	539	buildToolsMenu(menu);
461	540	}
462	541
463	542	void SetupUI2(ObjEditor oe)
464	543	{
	544	+ // June 2019
	545	+ if (oe == null)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ //return;
	549	+ }
	550	+
	551	+ if (copy != group)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ }
	555	+
465	556	//new Exception().printStackTrace();
466	557
467	558	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -490,27 +581,66 @@
490	581	oe.radioPanel.add(dummyButton);
491	582	oe.buttonGroup.add(dummyButton);
492	583	*/
	584	+ cGridBag copyOptionsPanel = new cGridBag();
	585	+
	586	+ copyOptionsPanel.preferredHeight = 1;
	587	+
493	588	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
494	589
495		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
496		- liveCB.setToolTipText("Enabled animation");
	590	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	591	+ //minButton.setToolTipText("Minimize window");
	592	+ //minButton.addActionListener(this);
	593	+
	594	+ if (Globals.ADVANCED)
	595	+ {
	596	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ maxButton.setToolTipText("Maximize window");
	598	+ maxButton.addActionListener(this);
	599	+ }
	600	+
	601	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ fullButton.setToolTipText("Full-screen window");
	603	+ fullButton.addActionListener(this);
	604	+
	605	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ screenfitButton.setToolTipText("Screen fit");
	607	+ screenfitButton.addActionListener(this);
	608	+
	609	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	611	+ restoreCameraButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ undoButton.setToolTipText("Undo changes");
	615	+ undoButton.addActionListener(this);
	616	+ undoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ redoButton.setToolTipText("Redo changes");
	620	+ redoButton.addActionListener(this);
	621	+ redoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ saveButton.setToolTipText("Save changes");
	625	+ saveButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	628	+ liveCB.setToolTipText("Enable animation");
497	629	liveCB.addItemListener(this);
498	630
499		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
500	632	oneStepButton.setToolTipText("Animate one step forward");
501	633	oneStepButton.addActionListener(this);
502	634
503		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	635	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
504	636	fastCB.setToolTipText("Fast mode");
505	637	fastCB.addItemListener(this);
506	638
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);
512		- screenfitButton.setToolTipText("Screen fit");
513		- screenfitButton.addActionListener(this);
	639	+ //oe.toolboxPanel.Return();
	640	+
	641	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	642	+// trackCB.setToolTipText("Enable tracking");
	643	+// trackCB.addItemListener(this);
514	644
515	645	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
516	646	// screenfitpointButton.addActionListener(this);
..	..	@@ -522,65 +652,145 @@
522	652	snapobjectButton.setToolTipText("Snap Object");
523	653	}
524	654
525		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
526		- flashSelectionButton.setToolTipText("Show selection");
527		- flashSelectionButton.addActionListener(this);
	655	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
528	656
529		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
530		-
531		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
532	658	twoButton.setToolTipText("Show center view only");
533	659	twoButton.addActionListener(this);
534		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ this.fullscreenLayout = twoButton;
	661	+
	662	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
535	663	fourButton.addActionListener(this);
536	664	fourButton.setToolTipText("Show left panel only");
537		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
538	666	sixButton.setToolTipText("2-column layout left");
539	667	sixButton.addActionListener(this);
540		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
541	669	threeButton.setToolTipText("2-column layout right");
542	670	threeButton.addActionListener(this);
543		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
544	672	sevenButton.setToolTipText("3-column layout");
545	673	sevenButton.addActionListener(this);
546	674	//
547	675
548		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
549	677	rootButton.setToolTipText("Edit selection in new tab");
550	678	rootButton.addActionListener(this);
551	679
552		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
553	681	closeButton.setToolTipText("Close tab");
554	682	closeButton.addActionListener(this);
555	683	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
556	684	//clearButton.addActionListener(this);
557		-
558		- cGridBag commandsPanel = new cGridBag();
	685	+
	686	+ // INSERT
	687	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ gridButton.setToolTipText("Create grid");
	689	+ gridButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ boxButton.setToolTipText("Create box");
	693	+ boxButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ sphereButton.setToolTipText("Create sphere");
	697	+ sphereButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ coneButton.setToolTipText("Create cone");
	701	+ coneButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ torusButton.setToolTipText("Create torus");
	705	+ torusButton.addActionListener(this);
	706	+
	707	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ superButton.setToolTipText("Create superellipsoid");
	709	+ superButton.addActionListener(this);
	710	+
	711	+ if (Globals.ADVANCED)
	712	+ {
	713	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	714	+ kleinButton.setToolTipText("Create Klein bottle");
	715	+ kleinButton.addActionListener(this);
	716	+ }
559	717
560		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561		- editButton.setToolTipText("Edit selection");
	718	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ particlesButton.setToolTipText("Create particle system");
	720	+ particlesButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.Return();
	723	+
	724	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ groupButton.setToolTipText("Create group");
	726	+ groupButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ compositeButton.setToolTipText("Create composite");
	730	+ compositeButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ switchButton.setToolTipText("Create item switcher");
	734	+ switchButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ loopButton.setToolTipText("Create loop");
	738	+ loopButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ textureButton.setToolTipText("Create texture");
	742	+ textureButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ overlayButton.setToolTipText("Create overlay");
	746	+ overlayButton.addActionListener(this);
	747	+
	748	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	749	+ lightButton.setToolTipText("Create light");
	750	+ lightButton.addActionListener(this);
	751	+
	752	+ for (int i=6; --i>=0;)
	753	+ {
	754	+ oe.toolboxPanel.Return();
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ }
	763	+
	764	+ // EDIT panel
	765	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ editButton.setToolTipText("Pin selection controls");
562	767	editButton.addActionListener(this);
563	768
564		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565		- uneditButton.setToolTipText("Unedit selection");
	769	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ uneditButton.setToolTipText("Remove selection controls");
566	771	uneditButton.addActionListener(this);
567	772
568		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
569		- allParamsButton.setToolTipText("Edit all params");
	773	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	774	+ allParamsButton.setToolTipText("Show all controle");
570	775	allParamsButton.addActionListener(this);
571	776
572		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	778	clearPanelButton.setToolTipText("Clear edit panel");
574	779	clearPanelButton.addActionListener(this);
575	780
576		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	782	unselectButton.setToolTipText("Unselect");
578	783	unselectButton.addActionListener(this);
579	784
580		- commandsPanel.preferredHeight = 1;
	785	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ flashSelectionButton.setToolTipText("Highlight selection");
	787	+ flashSelectionButton.addActionListener(this);
581	788
582		- oe.treePanel.add(commandsPanel);
583		- oe.treePanel.Return();
	789	+ editCommandsPanel.preferredHeight = 1;
	790	+
	791	+ SetPinStates(false);
	792	+// oe.treePanel.add(commandsPanel);
	793	+// oe.treePanel.Return();
584	794
585	795	// oe.aConstraints.gridx += 1;
586	796	// oe.aConstraints.weighty = 0;
..	..	@@ -597,27 +807,12 @@
597	807
598	808	JScrollPane jSP;
599	809	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
600		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	810	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
601	811	ResetModel();
602	812
603	813	oe.treePanel.add(jSPPanel);
604	814	oe.treePanel.Return();
605	815
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	816	oe.treePanel.add(copyOptionsPanel);
622	817	oe.treePanel.Return();
623	818
..	..	@@ -648,23 +843,43 @@
648	843
649	844	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
650	845	{
	846	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	847	+ colorCB.setToolTipText("Copy color when dropped");
	848	+ colorCB.addItemListener(this);
	849	+
	850	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	851	+ materialCB.setToolTipText("Copy material when dropped");
	852	+ materialCB.addItemListener(this);
	853	+
	854	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	855	+ textureCB.setToolTipText("Copy texture when dropped");
	856	+ textureCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
651	860	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
652	861	boxCB.setToolTipText("Display bounding boxes");
653	862	boxCB.addItemListener(this);
654	863
655	864	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
656		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	865	+ zoomBoxCB.setToolTipText("Display only for wheel");
657	866	zoomBoxCB.addItemListener(this);
658	867
659	868	if (true) // Globals.ADVANCED)
660	869	{
661		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
662		- supportCB.setToolTipText("Enable rigging");
663		- supportCB.addItemListener(this);
	870	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	871	+// supportCB.setToolTipText("Enable rigging");
	872	+// supportCB.addItemListener(this);
	873	+
	874	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	875	+ freezeCB.setToolTipText("Fast moving camera");
	876	+ freezeCB.addItemListener(this);
664	877
665	878	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
666	879	// localCB.addItemListener(this);
667	880
	881	+ panel.Return();
	882	+
668	883	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
669	884	crowdCB.setToolTipText("Used for crowds");
670	885	crowdCB.addItemListener(this);
..	..	@@ -681,6 +896,8 @@
681	896	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
682	897	// speakerMocapCB.addItemListener(this);
683	898
	899	+ panel.Return();
	900	+
684	901	if (false)
685	902	{
686	903	// handled in scripts
..	..	@@ -695,32 +912,72 @@
695	912	//constraints.gridy += 1;
696	913	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
697	914	smoothfocusCB.addItemListener(this);
	915	+ panel.Return();
698	916	}
699	917
700	918	//constraints.gridx += 1;
701	919	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
702	920	// debugCB.addItemListener(this);
703	921
	922	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	923	+ trackCB.setToolTipText("Enable tracking target");
	924	+ trackCB.addItemListener(this);
	925	+
704	926	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	927	+ oeilCB.setToolTipText("Move camera when tracking");
705	928	oeilCB.addItemListener(this);
706	929
	930	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	931	+ shadowCB.setToolTipText("When live compute shadows");
	932	+ shadowCB.addItemListener(this);
	933	+
	934	+ panel.Return();
	935	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	936	+ toggleTextureCB.setToolTipText("Load textures");
	937	+ toggleTextureCB.addItemListener(this);
	938	+
	939	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	940	+ toggleSwitchCB.setToolTipText("Choose a single item");
	941	+ toggleSwitchCB.addItemListener(this);
	942	+
	943	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	944	+ autosaveCB.setToolTipText("On structure change");
	945	+ autosaveCB.addItemListener(this);
	946	+
	947	+ panel.Return();
	948	+ if (Globals.ADVANCED)
	949	+ {
707	950	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
708	951	lookAtCB.setToolTipText("Look-at target");
709	952	lookAtCB.addItemListener(this);
	953	+ }
710	954
711	955	}
712	956
713	957	cGridBag fill = new cGridBag();
714		-
715	958	fill.preferredHeight = 200;
	959	+ cGridBag fill2 = new cGridBag();
	960	+ fill2.preferredHeight = 200;
	961	+ cGridBag fill3 = new cGridBag();
	962	+ fill3.preferredHeight = 200;
716	963
717	964	panel.add(fill);
	965	+ panel.add(fill2);
	966	+ panel.add(fill3);
718	967
719	968	}
720	969
721	970	void EditObject(Object3D obj)
722	971	{
723	972	cRadio radioButton = new cRadio(obj.name);
	973	+
	974	+ // Patch to avoid bug with transparency.
	975	+ radioButton.hadMaterial = obj.material != null;
	976	+ if (!radioButton.hadMaterial)
	977	+ {
	978	+ obj.material = new cMaterial();
	979	+ }
	980	+
724	981	radioButton.SetObject(obj);
725	982	radioButton.layout = sevenButton;
726	983	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -729,8 +986,11 @@
729	986	buttonGroup.add(radioButton);
730	987	radioButton.doClick();
731	988	}
	989	+
732	990	void SetupViews(ObjEditor oe)
733	991	{
	992	+ theFrame = this;
	993	+
734	994	oe.SetupViews();
735	995
736	996	System.out.println("SetupViews");
..	..	@@ -739,23 +999,28 @@
739	999	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
740	1000	}
741	1001
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;
	1002	+ cToggleButton liveCB;
	1003	+ cCheckBox supportCB;
	1004	+ cCheckBox localCB;
	1005	+ cCheckBox crowdCB;
	1006	+ cCheckBox smoothCB;
	1007	+ cToggleButton fastCB;
	1008	+ cCheckBox slowCB;
	1009	+ cCheckBox boxCB;
	1010	+ cCheckBox zoomBoxCB;
	1011	+ cCheckBox freezeCB;
	1012	+ //cToggleButton trackCB;
	1013	+ cCheckBox trackCB;
	1014	+ cCheckBox smoothfocusCB;
753	1015	// JCheckBox speakerMocapCB;
754		- JCheckBox speakerCameraCB;
755		- JCheckBox speakerFocusCB;
756		- JCheckBox debugCB;
757		- JCheckBox oeilCB;
758		- JCheckBox lookAtCB;
	1016	+ cCheckBox speakerCameraCB;
	1017	+ cCheckBox speakerFocusCB;
	1018	+ cCheckBox debugCB;
	1019	+
	1020	+ cCheckBox oeilCB;
	1021	+ cCheckBox shadowCB;
	1022	+ cCheckBox autosaveCB;
	1023	+ cCheckBox lookAtCB;
759	1024
760	1025	// static int COLOR = 1;
761	1026	// static int MATERIAL = 2;
..	..	@@ -763,9 +1028,9 @@
763	1028
764	1029	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
765	1030
766		- JCheckBox colorCB;
767		- JCheckBox materialCB;
768		- JCheckBox textureCB;
	1031	+ cCheckBox colorCB;
	1032	+ cCheckBox materialCB;
	1033	+ cCheckBox textureCB;
769	1034
770	1035	public void itemStateChanged(ItemEvent e)
771	1036	{
..	..	@@ -793,6 +1058,7 @@
793	1058	} else if(e.getSource() == liveCB)
794	1059	{
795	1060	cameraView.ToggleLive();
	1061	+ refreshContents(false);
796	1062	}
797	1063	else if(e.getSource() == supportCB)
798	1064	{
..	..	@@ -857,6 +1123,18 @@
857	1123	{
858	1124	cameraView.ToggleOeil();
859	1125	}
	1126	+ else if(e.getSource() == shadowCB)
	1127	+ {
	1128	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == freezeCB)
	1131	+ {
	1132	+ Globals.FREEZEONMOVE ^= true;
	1133	+ }
	1134	+ else if(e.getSource() == autosaveCB)
	1135	+ {
	1136	+ Globals.SAVEONMAKE ^= true;
	1137	+ }
860	1138	else if(e.getSource() == lookAtCB)
861	1139	{
862	1140	cameraView.ToggleLookAt();
..	..	@@ -873,7 +1151,8 @@
873	1151
874	1152	/**/
875	1153	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
876		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1155	+ TreePath path = objEditor.jTree.getSelectionPath();
877	1156	if ((path == null) \|\| (path.getPathCount() <= 1)) {
878	1157	// We can't move the root node or an empty selection
879	1158	return;
..	..	@@ -936,8 +1215,6 @@
936	1215	}
937	1216	}
938	1217
939		- String string = (String) object;
940		-
941	1218	System.out.println("Transfer = " + object + "; drop : " + target);
942	1219	// if( object instanceof java.io.File[])
943	1220	// {
..	..	@@ -945,6 +1222,8 @@
945	1222	// objEditor.DropFile((java.io.File[]) object, true);
946	1223	// return;
947	1224	// }
	1225	+
	1226	+ String string = (String) object;
948	1227
949	1228	// File path for Mac and Windows
950	1229	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -990,23 +1269,33 @@
990	1269
991	1270	assert target == objEditor.jTree;
992	1271	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1272	+ Object3D destinationLeaf;
993	1273	try {
994		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1274	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
995	1275	} catch (Exception e) {
996	1276	System.out.println("destinationPath : " + destinationPath);
997	1277	return;
998	1278	}
999	1279
1000		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1280	+ for (int i=group.selection.size(); --i>=0;)
1001	1281	{
	1282	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1283	+
	1284	+ // Cannot move into itself
	1285	+ if (child == destinationLeaf)
	1286	+ return;
	1287	+ }
	1288	+
	1289	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1290	+// {
1002	1291	loadClipboard(true);
1003	1292	objEditor.jTree.setSelectionPath(destinationPath);
1004	1293	pasteInto(false, false);
1005		- } else {
1006		- loadClipboard(false);
1007		- objEditor.jTree.setSelectionPath(destinationPath);
1008		- pasteInto(false, false); // true); // ???
1009		- }
	1294	+// } else {
	1295	+// loadClipboard(false);
	1296	+// objEditor.jTree.setSelectionPath(destinationPath);
	1297	+// pasteInto(false, false); // true); // ???
	1298	+// }
1010	1299	}
1011	1300	public void dropActionChanged(DropTargetDragEvent dtde)
1012	1301	// Called if the user has modified the current drop gesture
..	..	@@ -1111,22 +1400,30 @@
1111	1400	{
1112	1401	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1113	1402	//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);
	1403	+// gridItem = menu.add(new MenuItem("Grid"));
	1404	+// gridItem.addActionListener(this);
	1405	+// rectoidItem = menu.add(new MenuItem("Box"));
	1406	+// rectoidItem.addActionListener(this);
	1407	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1408	+// ellipsoidItem.addActionListener(this);
	1409	+// coneItem = menu.add(new MenuItem("Cone"));
	1410	+// coneItem.addActionListener(this);
	1411	+// torusItem = menu.add(new MenuItem("Torus"));
	1412	+// torusItem.addActionListener(this);
	1413	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1414	+// superItem.addActionListener(this);
	1415	+
	1416	+ cameraItem = menu.add(new MenuItem("Camera"));
	1417	+ cameraItem.addActionListener(this);
	1418	+
	1419	+ if (!Globals.ADVANCED)
	1420	+ {
1126	1421	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1127	1422	kleinItem.addActionListener(this);
1128		- particleItem = menu.add(new MenuItem("Particle system"));
1129		- particleItem.addActionListener(this);
	1423	+ }
	1424	+
	1425	+// particleItem = menu.add(new MenuItem("Particle system"));
	1426	+// particleItem.addActionListener(this);
1130	1427	if (Globals.ADVANCED)
1131	1428	{
1132	1429	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1152,15 +1449,15 @@
1152	1449	}
1153	1450	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1154	1451	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);
	1452	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1453	+// overlayItem.addActionListener(this);
	1454	+// lightItem = menu.add(new MenuItem("Light"));
	1455	+// lightItem.addActionListener(this);
1159	1456	menu.add("-");
1160	1457	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1161	1458	//superLoopItem.addActionListener(this);
1162		- loopItem = menu.add(new MenuItem("Loop"));
1163		- loopItem.addActionListener(this);
	1459	+// loopItem = menu.add(new MenuItem("Loop"));
	1460	+// loopItem.addActionListener(this);
1164	1461	doubleItem = menu.add(new MenuItem("Fork"));
1165	1462	doubleItem.addActionListener(this);
1166	1463	if (Globals.ADVANCED)
..	..	@@ -1175,6 +1472,9 @@
1175	1472	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1176	1473	animationItem.addItemListener(this);
1177	1474	animationItem.setState(Globals.ANIMATION);
	1475	+
	1476	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1477	+ archiveItem.addActionListener(this);
1178	1478
1179	1479	menu.add("-");
1180	1480	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1200,7 +1500,7 @@
1200	1500	memoryItem.addActionListener(this);
1201	1501	menu.add(analyzeItem = new MenuItem("Analyze"));
1202	1502	analyzeItem.addActionListener(this);
1203		- menu.add(dumpItem = new MenuItem("Dump"));
	1503	+ menu.add(dumpItem = new MenuItem("Print"));
1204	1504	dumpItem.addActionListener(this);
1205	1505	// menu.add(pathItem = new MenuItem("From-to path"));
1206	1506	// pathItem.addActionListener(this);
..	..	@@ -1341,9 +1641,24 @@
1341	1641	shadow.material = new cMaterial(obj.material);
1342	1642	shadow.material.diffuse = 0.0001f;
1343	1643	shadow.material.specular = 0.0001f;
	1644	+ //shadow.projectedVertices[1].x = 300;
1344	1645
1345	1646	makeSomething(shadow);
1346	1647	}
	1648	+
	1649	+ private void ClearUnpinned()
	1650	+ {
	1651	+ //for (Object3D obj : listUI)
	1652	+ for (int i=listUI.size(); --i>=0;)
	1653	+ {
	1654	+ Object3D obj = listUI.elementAt(i);
	1655	+ if (!obj.pinned)
	1656	+ {
	1657	+ obj.CloseUI();
	1658	+ listUI.remove(i);
	1659	+ }
	1660	+ }
	1661	+ }
1347	1662
1348	1663	/**
1349	1664	* applyExample
..	..	@@ -1588,7 +1903,7 @@
1588	1903	{
1589	1904	ScreenFit();
1590	1905	} else
1591		- if (source == switchItem)
	1906	+ if (source == switchViewItem)
1592	1907	{
1593	1908	cVector v1 = new cVector();
1594	1909	cVector v2 = new cVector();
..	..	@@ -1597,11 +1912,11 @@
1597	1912	objEditor.cameraView.renderCamera.setAim(v2, v1);
1598	1913	objEditor.cameraView.repaint();
1599	1914	} else
1600		- if (source == rectoidItem)
	1915	+ if (source == rectoidItem \|\| source == boxButton)
1601	1916	{
1602	1917	makeSomething(new Box());
1603	1918	} else
1604		- if (source == particleItem)
	1919	+ if (source == particleItem \|\| source == particlesButton)
1605	1920	{
1606	1921	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1607	1922	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1680,27 +1995,27 @@
1680	1995
1681	1996	makeSomething(obj);
1682	1997	} else
1683		- if (source == gridItem)
	1998	+ if (source == gridItem \|\| source == gridButton)
1684	1999	{
1685	2000	makeSomething(new Grid());
1686	2001	} else
1687		- if (source == ellipsoidItem)
	2002	+ if (source == ellipsoidItem \|\| source == sphereButton)
1688	2003	{
1689	2004	makeSomething(new Sphere());
1690	2005	} else
1691		- if (source == coneItem)
	2006	+ if (source == coneItem \|\| source == coneButton)
1692	2007	{
1693	2008	makeSomething(new Cone());
1694	2009	} else
1695		- if (source == torusItem)
	2010	+ if (source == torusItem \|\| source == torusButton)
1696	2011	{
1697	2012	makeSomething(new Torus());
1698	2013	} else
1699		- if (source == superItem)
	2014	+ if (source == superItem \|\| source == superButton)
1700	2015	{
1701	2016	makeSomething(new Superellipsoid());
1702	2017	} else
1703		- if (source == kleinItem)
	2018	+ if (source == kleinItem \|\| source == kleinButton)
1704	2019	{
1705	2020	makeSomething(new Klein());
1706	2021	} else
..	..	@@ -1720,7 +2035,7 @@
1720	2035	{
1721	2036	makeSomething(new BezierSurface());
1722	2037	} else
1723		- if (source == overlayItem)
	2038	+ if (source == overlayItem \|\| source == overlayButton)
1724	2039	{
1725	2040	/*
1726	2041	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1768,7 +2083,7 @@
1768	2083	s.setup();
1769	2084	makeSomething(s);
1770	2085	} else
1771		- if (source == lightItem)
	2086	+ if (source == lightItem \|\| source == lightButton)
1772	2087	{
1773	2088	makeSomething(new Light());
1774	2089	} else
..	..	@@ -1818,30 +2133,30 @@
1818	2133
1819	2134	group(g);
1820	2135	} else
1821		- if (source == loopItem)
	2136	+ if (source == loopItem \|\| source == loopButton)
1822	2137	{
1823	2138	Composite csg = new GroupLeaf();
1824	2139	csg.count = 5;
1825	2140	group(csg);
1826		- Composite child = new cGroup();
	2141	+ Composite child = new cGroup("Branch");
1827	2142	csg.addChild(child);
1828	2143	child.addChild(csg);
1829	2144	} else
1830	2145	if (source == doubleItem)
1831	2146	{
1832		- Composite csg = new GroupLeaf();
	2147	+ Composite csg = new GroupLeaf("Fork");
1833	2148	csg.count = 5;
1834	2149	group(csg);
1835		- Composite child = new cGroup();
	2150	+ Composite child = new cGroup("Branch A");
1836	2151	csg.addChild(child);
1837	2152	child.addChild(csg);
1838		- child = new cGroup();
	2153	+ child = new cGroup("Branch B");
1839	2154	csg.addChild(child);
1840	2155	child.addChild(csg);
1841	2156	} else
1842	2157	if (source == tripleItem)
1843	2158	{
1844		- Composite csg = new GroupLeaf();
	2159	+ Composite csg = new GroupLeaf("Trident");
1845	2160	csg.count = 4;
1846	2161	group(csg);
1847	2162	Composite child = new cGroup();
..	..	@@ -1853,31 +2168,6 @@
1853	2168	child = new cGroup();
1854	2169	csg.addChild(child);
1855	2170	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	2171	} else
1882	2172	if (source == computeAOItem)
1883	2173	{
..	..	@@ -1916,6 +2206,32 @@
1916	2206	{
1917	2207	DumpObject();
1918	2208	} else
	2209	+ if (source == minButton)
	2210	+ {
	2211	+ Minimize();
	2212	+ } else
	2213	+ if (source == maxButton)
	2214	+ {
	2215	+ Maximize();
	2216	+ } else
	2217	+ if (source == fullButton)
	2218	+ {
	2219	+ ToggleFullScreen();
	2220	+ } else
	2221	+ if (source == undoButton)
	2222	+ {
	2223	+ if (!Undo())
	2224	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2225	+ } else
	2226	+ if (source == redoButton)
	2227	+ {
	2228	+ Redo();
	2229	+ } else
	2230	+ if (source == saveButton)
	2231	+ {
	2232	+ if (!Save(true))
	2233	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2234	+ } else
1919	2235	if (source == oneStepButton)
1920	2236	{
1921	2237	Globals.ONESTEP = true;
..	..	@@ -1923,17 +2239,14 @@
1923	2239	} else
1924	2240	if (source == screenfitButton)
1925	2241	{
1926		- //Reload(lastConverter, lastFilename, true);
1927	2242	ScreenFit();
1928	2243	} else
1929	2244	if (source == screenfitpointButton)
1930	2245	{
1931		- //Reload(lastConverter, lastFilename, true);
1932	2246	ScreenFitPoint();
1933	2247	} else
1934	2248	if (source == snapobjectButton)
1935	2249	{
1936		- //Reload(lastConverter, lastFilename, true);
1937	2250	SnapObject();
1938	2251	} else
1939	2252	// if (event.getSource() == recompileButton)
..	..	@@ -1969,6 +2282,14 @@
1969	2282	if (source == cutItem \|\| source == clearButton)
1970	2283	{
1971	2284	loadClipboard(true);
	2285	+ } else
	2286	+ if (source == undoItem)
	2287	+ {
	2288	+ Undo();
	2289	+ } else
	2290	+ if (source == redoItem)
	2291	+ {
	2292	+ Redo();
1972	2293	} else
1973	2294	if (source == duplicateItem)
1974	2295	{
..	..	@@ -2281,7 +2602,7 @@
2281	2602	{
2282	2603	RevertMeshes();
2283	2604	} else
2284		- if (source == resetMeshItem)
	2605	+ if (source == resetAllItem)
2285	2606	{
2286	2607	ResetAll();
2287	2608	} else
..	..	@@ -2301,9 +2622,9 @@
2301	2622	{
2302	2623	ClearSelection(true);
2303	2624	} else
2304		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2305	2626	{
2306		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2307	2628	} else
2308	2629	if (source == hideItem)
2309	2630	{
..	..	@@ -2321,11 +2642,11 @@
2321	2642	{
2322	2643	makeSomething(new Camera());
2323	2644	} else
2324		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2325	2646	{
2326	2647	group(new Composite());
2327	2648	} else
2328		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2329	2650	{
2330	2651	RandomNode random = new RandomNode();
2331	2652	group(random);
..	..	@@ -2427,7 +2748,7 @@
2427	2748	{
2428	2749	group(new cLinker());
2429	2750	} else
2430		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2431	2752	{
2432	2753	group(new TextureNode());
2433	2754	} else
..	..	@@ -2447,17 +2768,30 @@
2447	2768	{
2448	2769	CastShadow(2);
2449	2770	} else
2450		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2451	2772	{
2452		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2453	2775	for (int i=0; i<group.selection.size(); i++)
2454	2776	{
2455		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2456	2782	}
2457	2783
2458		- ClearSelection(false);
2459		-
2460		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2461	2795	} else
2462	2796	if (source == genUVItem)
2463	2797	{
..	..	@@ -2469,7 +2803,7 @@
2469	2803	} else
2470	2804	if (source == genNormalsMESHItem)
2471	2805	{
2472		- GenNormals(true); // TODO
	2806	+ GenNormalsMESH();
2473	2807	} else
2474	2808	if (source == genNormalsORGANItem)
2475	2809	{
..	..	@@ -2534,6 +2868,22 @@
2534	2868	if (source == unmarkleavesItem)
2535	2869	{
2536	2870	MarkLeaves(false);
	2871	+ } else
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
2537	2887	} else
2538	2888	if (source == flipVItem)
2539	2889	{
..	..	@@ -2769,6 +3119,10 @@
2769	3119	if (source == twoButton)
2770	3120	{
2771	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2772	3126	// bug
2773	3127	//gridPanel.setDividerLocation(1.0);
2774	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2801,10 +3155,31 @@
2801	3155	bigThree.ClearUI();
2802	3156	bigThree.add(centralPanel);
2803	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2804	3176	} else
2805	3177	if (source == threeButton)
2806	3178	{
2807	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2808	3183
2809	3184	// bigThree.remove(scenePanel);
2810	3185	// bigThree.remove(centralPanel);
..	..	@@ -2837,10 +3212,15 @@
2837	3212	bigThree.add(centralPanel);
2838	3213	bigThree.add(XYZPanel);
2839	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2840	3217	} else
2841	3218	if (source == fourButton)
2842	3219	{
2843	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2844	3224
2845	3225	// bigThree.remove(scenePanel);
2846	3226	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3252,15 @@
2872	3252	bigThree.ClearUI();
2873	3253	bigThree.add(scenePanel);
2874	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2875	3257	} else
2876	3258	if (source == sixButton)
2877	3259	{
2878	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2879	3264
2880	3265	// bigThree.remove(scenePanel);
2881	3266	// bigThree.remove(centralPanel);
..	..	@@ -2908,10 +3293,15 @@
2908	3293	bigThree.add(scenePanel);
2909	3294	bigThree.add(centralPanel);
2910	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2911	3298	} else
2912	3299	if (source == sevenButton)
2913	3300	{
2914	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
2915	3305
2916	3306	// bigThree.remove(scenePanel);
2917	3307	// bigThree.remove(centralPanel);
..	..	@@ -2945,6 +3335,8 @@
2945	3335	bigThree.add(centralPanel);
2946	3336	bigThree.add(XYZPanel);
2947	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
2948	3340	} else
2949	3341	if (source == rootButton)
2950	3342	{
..	..	@@ -2956,6 +3348,7 @@
2956	3348	EditObject(obj);
2957	3349	}
2958	3350
	3351	+ cameraView.requestFocusInWindow();
2959	3352	refreshContents(true);
2960	3353	} else
2961	3354	if (source == closeButton)
..	..	@@ -2965,22 +3358,37 @@
2965	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
2966	3359	{
2967	3360	ab = (cRadio)e.nextElement();
2968		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
2969	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
2970	3369	buttonGroup.remove(ab);
2971	3370	radioPanel.remove(ab);
2972	3371
2973		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
2974	3374	// ab.GetObject().objectUI = null; // ?????????
2975	3375
2976	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
2977	3377	break;
2978	3378	}
2979	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
2980	3382	refreshContents(true);
2981	3383	} else
2982	3384	if (source == editItem \|\| source == editButton)
2983	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
2984	3392	EditSelection(false);
2985	3393	} else
2986	3394	if (source == uneditButton)
..	..	@@ -2990,10 +3398,11 @@
2990	3398	Object3D child = (Object3D)e.nextElement();
2991	3399	if(child.editWindow != null)
2992	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
2993	3402	child.CloseUI();
2994	3403	listUI.remove(child);
2995	3404
2996		- child.editWindow = null; // ???????????
	3405	+ //child.editWindow = null; // ???????????
2997	3406	}
2998	3407	objEditor.ctrlPanel.FlushUI();
2999	3408	//objEditor.jTree.clearSelection();
..	..	@@ -3006,6 +3415,7 @@
3006	3415	//copy.ClearUI();
3007	3416	for (Object3D obj : listUI)
3008	3417	{
	3418	+ obj.pinned = false;
3009	3419	obj.CloseUI();
3010	3420	}
3011	3421	listUI.clear();
..	..	@@ -3015,7 +3425,7 @@
3015	3425	{
3016	3426	assert(copy == group);
3017	3427
3018		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3019	3429
3020	3430	for (Object3D obj : listUI)
3021	3431	{
..	..	@@ -3079,20 +3489,44 @@
3079	3489	frontView.object = group;
3080	3490	sideView.object = group;
3081	3491	}
3082		- group.editWindow = this;
	3492	+
	3493	+// fix "+" issue
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
	3496	+
3083	3497	/*
3084	3498	currentLayout = radio.layout;
3085	3499	if (currentLayout == null)
3086	3500	currentLayout = sevenButton;
3087	3501	*/
3088	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3089	3508	keepparent = group.parent;
3090	3509	// PARENT = NULL or not???
3091	3510	//group.parent = null; // ROOT
3092	3511	//group.attributes = -1;
3093	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
3094	3515	refreshContents(true);
3095		- }
	3516	+ } else if (event.getSource() == editCameraItem)
	3517	+ {
	3518	+ cameraView.ProtectCamera();
	3519	+ cameraView.repaint();
	3520	+ return;
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
	3522	+ {
	3523	+ cameraView.RevertCamera();
	3524	+ cameraView.repaint();
	3525	+ return;
	3526	+ // } else if (event.getSource() == textureButton)
	3527	+ // {
	3528	+ // return; // true;
	3529	+ }
3096	3530	else
3097	3531	{
3098	3532	//return super.action(event, arg);
..	..	@@ -3101,7 +3535,6 @@
3101	3535	}
3102	3536
3103	3537	boolean useclient = false;
3104		- cRadio radio;
3105	3538
3106	3539	void ToggleRoot()
3107	3540	{
..	..	@@ -3340,7 +3773,8 @@
3340	3773
3341	3774	int size = obj.MemorySize();
3342	3775
3343		- System.err.println((size/1024) + " KB is the size of " + obj);
	3776	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3777	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3344	3778	}
3345	3779	}
3346	3780	catch (Exception e)
..	..	@@ -3421,6 +3855,13 @@
3421	3855	void GenNormals(boolean crease)
3422	3856	{
3423	3857	group.GenNormalsS(crease);
	3858	+
	3859	+ refreshContents();
	3860	+ }
	3861	+
	3862	+ void GenNormalsMESH()
	3863	+ {
	3864	+ group.GenNormalsMeshS();
3424	3865
3425	3866	refreshContents();
3426	3867	}
..	..	@@ -3652,7 +4093,16 @@
3652	4093	String pigment = Object3D.GetPigment(tex);
3653	4094	//String bump = Object3D.GetBump(tex);
3654	4095
3655		- com.sun.opengl.util.texture.TextureData texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4096	+ com.sun.opengl.util.texture.TextureData texturedata = null;
	4097	+
	4098	+ try
	4099	+ {
	4100	+ texturedata = Globals.theRenderer.GetTextureData(pigment, false, node.texres);
	4101	+ }
	4102	+ catch (Exception e)
	4103	+ {
	4104	+ System.err.println("FAIL: " + node);
	4105	+ }
3656	4106
3657	4107	double s = v.s;
3658	4108
..	..	@@ -4039,6 +4489,18 @@
4039	4489	refreshContents();
4040	4490	}
4041	4491
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
	4501	+ refreshContents();
	4502	+ }
	4503	+
4042	4504	void SetTexRes(int tr)
4043	4505	{
4044	4506	group.selection.SetTexRes(tr);
..	..	@@ -4110,10 +4572,6 @@
4110	4572	// }
4111	4573	// }
4112	4574
4113		- static boolean allparams = true;
4114		-
4115		- static Vector<Object3D> listUI = new Vector<Object3D>();
4116		-
4117	4575	void EditSelection(boolean newWindow)
4118	4576	{
4119	4577	// aConstraints.gridy = 0;
..	..	@@ -4121,10 +4579,10 @@
4121	4579	{
4122	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4123	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4124		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4125	4583
4126	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4127		- if(elem != group)
	4585	+ if(elem != group \|\| !newWindow)
4128	4586	{
4129	4587	// if (!(elem instanceof Composite))
4130	4588	// newWindow = false;
..	..	@@ -4206,7 +4664,8 @@
4206	4664	//new Exception().printStackTrace();
4207	4665
4208	4666	freezemodel = true;
4209		-
	4667	+ ClearUnpinned();
	4668	+
4210	4669	/**/
4211	4670	//switch (event.id)
4212	4671	{
..	..	@@ -4214,7 +4673,6 @@
4214	4673	//case 702: // Event.LIST_DESELECT
4215	4674	group.deselectAll();
4216	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4217		- objEditor.ClearInfo(); // .GetMaterial());
4218	4676	if (tps != null)
4219	4677	{
4220	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -4223,10 +4681,8 @@
4223	4681
4224	4682	//if (child.parent != null)
4225	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4226	4685	group.addSelectee(child);
4227		- objEditor.SetMaterial(child); // .GetMaterial());
4228		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4229		- System.err.println("info : " + child.GetPath());
4230	4686	}
4231	4687	}
4232	4688	// else
..	..	@@ -4236,20 +4692,28 @@
4236	4692	// System.err.println("info : " + group.GetPath());
4237	4693	// }
4238	4694
4239		- objEditor.SetText(); // jan 2014
4240		-
4241		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4695	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4242	4696	CameraPane.flash = true;
4243	4697
4244		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4698	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4245	4699	// a camera
4246	4700	{
4247		- CameraPane.camerachangeframe = 0; // don't refuse it
4248		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4702	+ {
	4703	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4704	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4705	+ }
4249	4706	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4250	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4251	4708	}
4252	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4253	4717	refreshContents();
4254	4718	//return true;
4255	4719	}
..	..	@@ -4258,6 +4722,35 @@
4258	4722
4259	4723	freezemodel = false;
4260	4724	}
	4725	+
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
	4734	+ void refreshContents(boolean cp)
	4735	+ {
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4738	+ {
	4739	+ objEditor.ClearInfo(); // .GetMaterial());
	4740	+
	4741	+ for (int i=0; i < group.selection.Size(); i++)
	4742	+ {
	4743	+ Object3D child = (Object3D) group.selection.get(i);
	4744	+
	4745	+ objEditor.AddInfo(child, this, true);
	4746	+ System.err.println("info : " + child.GetPath());
	4747	+ }
	4748	+
	4749	+ objEditor.SetText(); // jan 2014
	4750	+ }
	4751	+
	4752	+ super.refreshContents(cp);
	4753	+ }
4261	4754
4262	4755	void linkSomething(Object3D thing)
4263	4756	{
..	..	@@ -4329,6 +4822,7 @@
4329	4822	{
4330	4823	if (group.selection.isEmpty())
4331	4824	return;
	4825	+
4332	4826	Grafreed.clipboardIsTempGroup = false;
4333	4827	Composite tGroup = null;
4334	4828	if (group.selection.size() > 0) // 1)
..	..	@@ -4339,6 +4833,8 @@
4339	4833
4340	4834	if (cut)
4341	4835	{
	4836	+ if (Globals.SAVEONMAKE)
	4837	+ Save();
4342	4838	//int indices[] = jList.getSelectedIndices();
4343	4839	//for (int i = indices.length - 1; i >= 0; i--)
4344	4840	//jList.remove(indices[i]);
..	..	@@ -4428,8 +4924,10 @@
4428	4924	}
4429	4925
4430	4926	}
	4927	+
4431	4928	if (Grafreed.clipboardIsTempGroup)
4432	4929	Grafreed.clipboard = tGroup;
	4930	+
4433	4931	if (cut)
4434	4932	{
4435	4933	ResetModel();
..	..	@@ -4961,21 +5459,6 @@
4961	5459	}
4962	5460	*/
4963	5461
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	5462	/*
4980	5463	public void Callback(Object obj)
4981	5464	{
..	..	@@ -4999,23 +5482,6 @@
4999	5482	}
5000	5483	*/
5001	5484
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	5485	String GetFile(String dialogName)
5020	5486	{
5021	5487	if (Grafreed.standAlone)
..	..	@@ -5086,7 +5552,28 @@
5086	5552	cButton clearpanelButton;
5087	5553	cButton unselectButton;
5088	5554
	5555	+ cButton restoreCameraButton;
	5556	+
	5557	+ cButton saveButton;
5089	5558	cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
5090	5577
5091	5578	cButton screenfitButton;
5092	5579	cButton screenfitpointButton;
..	..	@@ -5099,14 +5586,6 @@
5099	5586
5100	5587	cButton setsupportButton;
5101	5588
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	5589	//
5111	5590	//Composite
5112	5591	Object3D // to do !!
..	..	@@ -5116,9 +5595,11 @@
5116	5595	//JTree jTree;
5117	5596	private MenuItem lookAtItem;
5118	5597	private MenuItem lookFromItem;
5119		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5120	5599	private MenuItem cutItem;
5121		- private MenuItem duplicateItem;
	5600	+ private MenuItem undoItem;
	5601	+ private MenuItem redoItem;
	5602	+ private JMenuItem duplicateItem;
5122	5603	private MenuItem cloneItem;
5123	5604	private MenuItem cloneSupportItem;
5124	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5131,7 +5612,7 @@
5131	5612	private MenuItem linkverticesItem;
5132	5613	private MenuItem relinkverticesItem;
5133	5614	private MenuItem setMasterItem;
5134		- private MenuItem resetMeshItem;
	5615	+ private MenuItem resetAllItem;
5135	5616	private MenuItem stepAllItem;
5136	5617	private MenuItem revertMeshItem;
5137	5618	private MenuItem poseMeshItem;
..	..	@@ -5181,6 +5662,10 @@
5181	5662	private MenuItem showleavesItem;
5182	5663	private MenuItem markleavesItem;
5183	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
5184	5669
5185	5670	private MenuItem flipVItem;
5186	5671	private MenuItem unflipVItem;
..	..	@@ -5202,7 +5687,7 @@
5202	5687	private MenuItem frontItem;
5203	5688	private MenuItem cameraItem;
5204	5689	private MenuItem compositeItem;
5205		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5206	5691	private MenuItem physicsItem;
5207	5692	private MenuItem frameselectorItem;
5208	5693	private MenuItem scriptNodeItem;
..	..	@@ -5264,11 +5749,6 @@
5264	5749	private MenuItem doubleItem;
5265	5750	private MenuItem tripleItem;
5266	5751
5267		- private MenuItem importGFDItem;
5268		- private MenuItem importVRMLX3DItem;
5269		- private MenuItem import3DSItem;
5270		- private MenuItem importOBJItem;
5271		-
5272	5752	private MenuItem computeAOItem;
5273	5753	private MenuItem recompileItem;
5274	5754	private MenuItem editScriptItem;
..	..	@@ -5278,4 +5758,8 @@
5278	5758	private MenuItem analyzeItem;
5279	5759	private MenuItem dumpItem;
5280	5760	//boolean freezemodel = false;
	5761	+
	5762	+ Menu cameraMenu;
	5763	+ MenuItem editCameraItem;
	5764	+ MenuItem restoreCameraItem;
5281	5765	}