~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,6 +150,8 @@
150	150
151	151	void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
153	155	Menu menu;
154	156	oe.menuBar.add(menu = new Menu("Edit"));
155	157	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +162,7 @@
160	162	// redoItem = menu.add(new MenuItem("Redo"));
161	163	// redoItem.addActionListener(this);
162	164	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	166	duplicateItem.addActionListener(this);
165	167	cloneItem = menu.add(new MenuItem("Clone"));
166	168	cloneItem.addActionListener(this);
..	..	@@ -176,7 +178,6 @@
176	178	copyItem.addActionListener(this);
177	179	pasteItem = menu.add(new MenuItem("Paste"));
178	180	pasteItem.addActionListener(this);
179		- menu.add("-");
180	181
181	182	menu.add("-");
182	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -203,23 +204,23 @@
203	204	//zBufferItem.addActionListener(this);
204	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	206	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
208	209
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	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);
213	222
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	224	toggleHandleItem.addItemListener(this);
224	225	toggleHandleItem.setState(CameraPane.HANDLES);
225	226
..	..	@@ -246,7 +247,7 @@
246	247
247	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	249	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
250	251
251	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +275,7 @@
274	275	{
275	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	280	oe.cameraMenu.add("-");
280	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +283,7 @@
282	283	editLeafItem.addActionListener(this);
283	284	lookAtItem.addActionListener(this);
284	285	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
286	287	}
287	288
288	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +328,29 @@
327	328	}
328	329
329	330	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
332	333	backItem = menu.add(new MenuItem("Back"));
333	334	backItem.addActionListener(this);
334	335	frontItem = menu.add(new MenuItem("Front"));
335	336	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
338	342	hideItem = menu.add(new MenuItem("Hidden Group"));
339	343	hideItem.addActionListener(this);
	344	+ }
340	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	346	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- 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	+ {
345	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	355	switchGeoItem.addActionListener(this);
347	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +358,6 @@
349	358	morphItem = menu.add(new MenuItem("Morph Group"));
350	359	morphItem.addActionListener(this);
351	360
352		- if (Globals.ADVANCED)
353		- {
354	361	menu.add("-");
355	362	physicsItem = menu.add(new MenuItem("Physics"));
356	363	physicsItem.addActionListener(this);
..	..	@@ -358,22 +365,20 @@
358	365	frameselectorItem.addActionListener(this);
359	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	367	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	368	}
364	369
365	370	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
368	373	billboardItem = menu.add(new MenuItem("Billboard"));
369	374	billboardItem.addActionListener(this);
370	375	csgItem = menu.add(new MenuItem("CSG"));
371	376	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	378	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	380	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	382	shadowZItem.addActionListener(this);
378	383	if (Globals.ADVANCED)
379	384	{
..	..	@@ -470,6 +475,14 @@
470	475	markleavesItem.addActionListener(this);
471	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	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);
473	486	menu.add("-");
474	487	flipVItem = menu.add(new MenuItem("Flip V"));
475	488	flipVItem.addActionListener(this);
..	..	@@ -527,6 +540,18 @@
527	540
528	541	void SetupUI2(ObjEditor oe)
529	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	+
530	555	//new Exception().printStackTrace();
531	556
532	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -555,39 +580,66 @@
555	580	oe.radioPanel.add(dummyButton);
556	581	oe.buttonGroup.add(dummyButton);
557	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
558	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	588
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561	609	undoButton.setToolTipText("Undo changes");
562	610	undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
563	612
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	614	redoButton.setToolTipText("Redo changes");
566	615	redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
567	617
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	619	saveButton.setToolTipText("Save changes");
570	620	saveButton.addActionListener(this);
571	621
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	623	liveCB.setToolTipText("Enable animation");
574	624	liveCB.addItemListener(this);
575	625
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	627	oneStepButton.setToolTipText("Animate one step forward");
578	628	oneStepButton.addActionListener(this);
579	629
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	631	fastCB.setToolTipText("Fast mode");
582	632	fastCB.addItemListener(this);
583	633
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	637	screenfitButton.setToolTipText("Screen fit");
590	638	screenfitButton.addActionListener(this);
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
591	643
592	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	645	// screenfitpointButton.addActionListener(this);
..	..	@@ -599,65 +651,145 @@
599	651	snapobjectButton.setToolTipText("Snap Object");
600	652	}
601	653
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	655
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	657	twoButton.setToolTipText("Show center view only");
610	658	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	662	fourButton.addActionListener(this);
613	663	fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615	665	sixButton.setToolTipText("2-column layout left");
616	666	sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618	668	threeButton.setToolTipText("2-column layout right");
619	669	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621	671	sevenButton.setToolTipText("3-column layout");
622	672	sevenButton.addActionListener(this);
623	673	//
624	674
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	676	rootButton.setToolTipText("Edit selection in new tab");
627	677	rootButton.addActionListener(this);
628	678
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	680	closeButton.setToolTipText("Close tab");
631	681	closeButton.addActionListener(this);
632	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	683	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	684	+
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
636	716
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	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	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
639	766	editButton.addActionListener(this);
640	767
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
643	770	uneditButton.addActionListener(this);
644	771
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
647	774	allParamsButton.addActionListener(this);
648	775
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	777	clearPanelButton.setToolTipText("Clear edit panel");
651	778	clearPanelButton.addActionListener(this);
652	779
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	781	unselectButton.setToolTipText("Unselect");
655	782	unselectButton.addActionListener(this);
656	783
657		- commandsPanel.preferredHeight = 1;
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
658	787
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
661	793
662	794	// oe.aConstraints.gridx += 1;
663	795	// oe.aConstraints.weighty = 0;
..	..	@@ -674,27 +806,12 @@
674	806
675	807	JScrollPane jSP;
676	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	810	ResetModel();
679	811
680	812	oe.treePanel.add(jSPPanel);
681	813	oe.treePanel.Return();
682	814
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	815	oe.treePanel.add(copyOptionsPanel);
699	816	oe.treePanel.Return();
700	817
..	..	@@ -725,23 +842,43 @@
725	842
726	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	844	{
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
728	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	860	boxCB.setToolTipText("Display bounding boxes");
730	861	boxCB.addItemListener(this);
731	862
732	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	865	zoomBoxCB.addItemListener(this);
735	866
736	867	if (true) // Globals.ADVANCED)
737	868	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
741	876
742	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	878	// localCB.addItemListener(this);
744	879
	880	+ panel.Return();
	881	+
745	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	883	crowdCB.setToolTipText("Used for crowds");
747	884	crowdCB.addItemListener(this);
..	..	@@ -758,6 +895,8 @@
758	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	896	// speakerMocapCB.addItemListener(this);
760	897
	898	+ panel.Return();
	899	+
761	900	if (false)
762	901	{
763	902	// handled in scripts
..	..	@@ -772,32 +911,72 @@
772	911	//constraints.gridy += 1;
773	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
775	915	}
776	916
777	917	//constraints.gridx += 1;
778	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	919	// debugCB.addItemListener(this);
780	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
781	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
782	927	oeilCB.addItemListener(this);
783	928
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
784	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	950	lookAtCB.setToolTipText("Look-at target");
786	951	lookAtCB.addItemListener(this);
	952	+ }
787	953
788	954	}
789	955
790	956	cGridBag fill = new cGridBag();
791		-
792	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
793	962
794	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
795	966
796	967	}
797	968
798	969	void EditObject(Object3D obj)
799	970	{
800	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
801	980	radioButton.SetObject(obj);
802	981	radioButton.layout = sevenButton;
803	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -809,6 +988,8 @@
809	988
810	989	void SetupViews(ObjEditor oe)
811	990	{
	991	+ theFrame = this;
	992	+
812	993	oe.SetupViews();
813	994
814	995	System.out.println("SetupViews");
..	..	@@ -817,23 +998,28 @@
817	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	999	}
819	1000
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
831	1014	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
837	1023
838	1024	// static int COLOR = 1;
839	1025	// static int MATERIAL = 2;
..	..	@@ -841,9 +1027,9 @@
841	1027
842	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1029
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
847	1033
848	1034	public void itemStateChanged(ItemEvent e)
849	1035	{
..	..	@@ -871,6 +1057,7 @@
871	1057	} else if(e.getSource() == liveCB)
872	1058	{
873	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
874	1061	}
875	1062	else if(e.getSource() == supportCB)
876	1063	{
..	..	@@ -935,6 +1122,18 @@
935	1122	{
936	1123	cameraView.ToggleOeil();
937	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
938	1137	else if(e.getSource() == lookAtCB)
939	1138	{
940	1139	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1150,8 @@
951	1150
952	1151	/**/
953	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1156	// We can't move the root node or an empty selection
957	1157	return;
..	..	@@ -1068,23 +1268,33 @@
1068	1268
1069	1269	assert target == objEditor.jTree;
1070	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
1071	1272	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1274	} catch (Exception e) {
1074	1275	System.out.println("destinationPath : " + destinationPath);
1075	1276	return;
1076	1277	}
1077	1278
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
1079	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
1080	1290	loadClipboard(true);
1081	1291	objEditor.jTree.setSelectionPath(destinationPath);
1082	1292	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1088	1298	}
1089	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1189,22 +1399,30 @@
1189	1399	{
1190	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1401	//heightFieldItem.addActionListener(this);
1192		- gridItem = menu.add(new MenuItem("Grid"));
1193		- gridItem.addActionListener(this);
1194		- rectoidItem = menu.add(new MenuItem("Box"));
1195		- rectoidItem.addActionListener(this);
1196		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197		- ellipsoidItem.addActionListener(this);
1198		- coneItem = menu.add(new MenuItem("Cone"));
1199		- coneItem.addActionListener(this);
1200		- torusItem = menu.add(new MenuItem("Torus"));
1201		- torusItem.addActionListener(this);
1202		- superItem = menu.add(new MenuItem("Superellipsoid"));
1203		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1204	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1421	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1208	1426	if (Globals.ADVANCED)
1209	1427	{
1210	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1448,15 @@
1230	1448	}
1231	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1450	bezierItem.addActionListener(this);
1233		- overlayItem = menu.add(new MenuItem("Overlay"));
1234		- overlayItem.addActionListener(this);
1235		- lightItem = menu.add(new MenuItem("Light"));
1236		- lightItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1237	1455	menu.add("-");
1238	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	1457	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1242	1460	doubleItem = menu.add(new MenuItem("Fork"));
1243	1461	doubleItem.addActionListener(this);
1244	1462	if (Globals.ADVANCED)
..	..	@@ -1278,7 +1496,7 @@
1278	1496	memoryItem.addActionListener(this);
1279	1497	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	1498	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	1499	+ menu.add(dumpItem = new MenuItem("Print"));
1282	1500	dumpItem.addActionListener(this);
1283	1501	// menu.add(pathItem = new MenuItem("From-to path"));
1284	1502	// pathItem.addActionListener(this);
..	..	@@ -1419,9 +1637,24 @@
1419	1637	shadow.material = new cMaterial(obj.material);
1420	1638	shadow.material.diffuse = 0.0001f;
1421	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1422	1641
1423	1642	makeSomething(shadow);
1424	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1425	1658
1426	1659	/**
1427	1660	* applyExample
..	..	@@ -1666,7 +1899,7 @@
1666	1899	{
1667	1900	ScreenFit();
1668	1901	} else
1669		- if (source == switchItem)
	1902	+ if (source == switchViewItem)
1670	1903	{
1671	1904	cVector v1 = new cVector();
1672	1905	cVector v2 = new cVector();
..	..	@@ -1675,11 +1908,11 @@
1675	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	1909	objEditor.cameraView.repaint();
1677	1910	} else
1678		- if (source == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1679	1912	{
1680	1913	makeSomething(new Box());
1681	1914	} else
1682		- if (source == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1683	1916	{
1684	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +1991,27 @@
1758	1991
1759	1992	makeSomething(obj);
1760	1993	} else
1761		- if (source == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1762	1995	{
1763	1996	makeSomething(new Grid());
1764	1997	} else
1765		- if (source == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	1999	{
1767	2000	makeSomething(new Sphere());
1768	2001	} else
1769		- if (source == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1770	2003	{
1771	2004	makeSomething(new Cone());
1772	2005	} else
1773		- if (source == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1774	2007	{
1775	2008	makeSomething(new Torus());
1776	2009	} else
1777		- if (source == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1778	2011	{
1779	2012	makeSomething(new Superellipsoid());
1780	2013	} else
1781		- if (source == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1782	2015	{
1783	2016	makeSomething(new Klein());
1784	2017	} else
..	..	@@ -1798,7 +2031,7 @@
1798	2031	{
1799	2032	makeSomething(new BezierSurface());
1800	2033	} else
1801		- if (source == overlayItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1802	2035	{
1803	2036	/*
1804	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,7 +2079,7 @@
1846	2079	s.setup();
1847	2080	makeSomething(s);
1848	2081	} else
1849		- if (source == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1850	2083	{
1851	2084	makeSomething(new Light());
1852	2085	} else
..	..	@@ -1896,30 +2129,30 @@
1896	2129
1897	2130	group(g);
1898	2131	} else
1899		- if (source == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1900	2133	{
1901	2134	Composite csg = new GroupLeaf();
1902	2135	csg.count = 5;
1903	2136	group(csg);
1904		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1905	2138	csg.addChild(child);
1906	2139	child.addChild(csg);
1907	2140	} else
1908	2141	if (source == doubleItem)
1909	2142	{
1910		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1911	2144	csg.count = 5;
1912	2145	group(csg);
1913		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1914	2147	csg.addChild(child);
1915	2148	child.addChild(csg);
1916		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1917	2150	csg.addChild(child);
1918	2151	child.addChild(csg);
1919	2152	} else
1920	2153	if (source == tripleItem)
1921	2154	{
1922		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1923	2156	csg.count = 4;
1924	2157	group(csg);
1925	2158	Composite child = new cGroup();
..	..	@@ -1968,6 +2201,18 @@
1968	2201	if (source == dumpItem)
1969	2202	{
1970	2203	DumpObject();
	2204	+ } else
	2205	+ if (source == minButton)
	2206	+ {
	2207	+ Minimize();
	2208	+ } else
	2209	+ if (source == maxButton)
	2210	+ {
	2211	+ Maximize();
	2212	+ } else
	2213	+ if (source == fullButton)
	2214	+ {
	2215	+ ToggleFullScreen();
1971	2216	} else
1972	2217	if (source == undoButton)
1973	2218	{
..	..	@@ -2374,9 +2619,9 @@
2374	2619	{
2375	2620	ClearSelection(true);
2376	2621	} else
2377		- if (source == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2378	2623	{
2379		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2380	2625	} else
2381	2626	if (source == hideItem)
2382	2627	{
..	..	@@ -2394,11 +2639,11 @@
2394	2639	{
2395	2640	makeSomething(new Camera());
2396	2641	} else
2397		- if (source == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2398	2643	{
2399	2644	group(new Composite());
2400	2645	} else
2401		- if (source == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2402	2647	{
2403	2648	RandomNode random = new RandomNode();
2404	2649	group(random);
..	..	@@ -2500,7 +2745,7 @@
2500	2745	{
2501	2746	group(new cLinker());
2502	2747	} else
2503		- if (source == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2504	2749	{
2505	2750	group(new TextureNode());
2506	2751	} else
..	..	@@ -2520,17 +2765,30 @@
2520	2765	{
2521	2766	CastShadow(2);
2522	2767	} else
2523		- if (source == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	2769	{
2525		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2526	2772	for (int i=0; i<group.selection.size(); i++)
2527	2773	{
2528		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2529	2779	}
2530	2780
2531		- ClearSelection(false);
2532		-
2533		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2534	2792	} else
2535	2793	if (source == genUVItem)
2536	2794	{
..	..	@@ -2542,7 +2800,7 @@
2542	2800	} else
2543	2801	if (source == genNormalsMESHItem)
2544	2802	{
2545		- GenNormals(true); // TODO
	2803	+ GenNormalsMESH();
2546	2804	} else
2547	2805	if (source == genNormalsORGANItem)
2548	2806	{
..	..	@@ -2607,6 +2865,22 @@
2607	2865	if (source == unmarkleavesItem)
2608	2866	{
2609	2867	MarkLeaves(false);
	2868	+ } else
	2869	+ if (source == rewindleavesItem)
	2870	+ {
	2871	+ RewindLeaves(true);
	2872	+ } else
	2873	+ if (source == unrewindleavesItem)
	2874	+ {
	2875	+ RewindLeaves(false);
	2876	+ } else
	2877	+ if (source == randomleavesItem)
	2878	+ {
	2879	+ RandomLeaves(true);
	2880	+ } else
	2881	+ if (source == unrandomleavesItem)
	2882	+ {
	2883	+ RandomLeaves(false);
2610	2884	} else
2611	2885	if (source == flipVItem)
2612	2886	{
..	..	@@ -2842,6 +3116,10 @@
2842	3116	if (source == twoButton)
2843	3117	{
2844	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2845	3123	// bug
2846	3124	//gridPanel.setDividerLocation(1.0);
2847	3125	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2874,10 +3152,31 @@
2874	3152	bigThree.ClearUI();
2875	3153	bigThree.add(centralPanel);
2876	3154	bigThree.FlushUI();
	3155	+
	3156	+ cameraView.requestFocusInWindow();
	3157	+
	3158	+// refreshContents(true);
	3159	+//
	3160	+// try
	3161	+// {
	3162	+// java.awt.Robot bot = new java.awt.Robot();
	3163	+// int mask = InputEvent.BUTTON1_MASK;
	3164	+// bot.mouseMove(100, 100);
	3165	+// bot.mousePress(mask);
	3166	+// bot.mouseRelease(mask);
	3167	+// }
	3168	+// catch (Exception e)
	3169	+// {
	3170	+//
	3171	+// }
	3172	+
2877	3173	} else
2878	3174	if (source == threeButton)
2879	3175	{
2880	3176	radio.layout = threeButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2881	3180
2882	3181	// bigThree.remove(scenePanel);
2883	3182	// bigThree.remove(centralPanel);
..	..	@@ -2910,10 +3209,15 @@
2910	3209	bigThree.add(centralPanel);
2911	3210	bigThree.add(XYZPanel);
2912	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2913	3214	} else
2914	3215	if (source == fourButton)
2915	3216	{
2916	3217	radio.layout = fourButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2917	3221
2918	3222	// bigThree.remove(scenePanel);
2919	3223	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3249,15 @@
2945	3249	bigThree.ClearUI();
2946	3250	bigThree.add(scenePanel);
2947	3251	bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2948	3254	} else
2949	3255	if (source == sixButton)
2950	3256	{
2951	3257	radio.layout = sixButton;
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
2952	3261
2953	3262	// bigThree.remove(scenePanel);
2954	3263	// bigThree.remove(centralPanel);
..	..	@@ -2981,10 +3290,15 @@
2981	3290	bigThree.add(scenePanel);
2982	3291	bigThree.add(centralPanel);
2983	3292	bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
2984	3295	} else
2985	3296	if (source == sevenButton)
2986	3297	{
2987	3298	radio.layout = sevenButton;
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
2988	3302
2989	3303	// bigThree.remove(scenePanel);
2990	3304	// bigThree.remove(centralPanel);
..	..	@@ -3018,6 +3332,8 @@
3018	3332	bigThree.add(centralPanel);
3019	3333	bigThree.add(XYZPanel);
3020	3334	bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
3021	3337	} else
3022	3338	if (source == rootButton)
3023	3339	{
..	..	@@ -3029,6 +3345,7 @@
3029	3345	EditObject(obj);
3030	3346	}
3031	3347
	3348	+ cameraView.requestFocusInWindow();
3032	3349	refreshContents(true);
3033	3350	} else
3034	3351	if (source == closeButton)
..	..	@@ -3038,22 +3355,37 @@
3038	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	3356	{
3040	3357	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
3043	3366	buttonGroup.remove(ab);
3044	3367	radioPanel.remove(ab);
3045	3368
3046		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
3047	3371	// ab.GetObject().objectUI = null; // ?????????
3048	3372
3049	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	3374	break;
3051	3375	}
3052	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
3053	3379	refreshContents(true);
3054	3380	} else
3055	3381	if (source == editItem \|\| source == editButton)
3056	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
3057	3389	EditSelection(false);
3058	3390	} else
3059	3391	if (source == uneditButton)
..	..	@@ -3063,6 +3395,7 @@
3063	3395	Object3D child = (Object3D)e.nextElement();
3064	3396	if(child.editWindow != null)
3065	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
3066	3399	child.CloseUI();
3067	3400	listUI.remove(child);
3068	3401
..	..	@@ -3079,6 +3412,7 @@
3079	3412	//copy.ClearUI();
3080	3413	for (Object3D obj : listUI)
3081	3414	{
	3415	+ obj.pinned = false;
3082	3416	obj.CloseUI();
3083	3417	}
3084	3418	listUI.clear();
..	..	@@ -3088,7 +3422,7 @@
3088	3422	{
3089	3423	assert(copy == group);
3090	3424
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	3426
3093	3427	for (Object3D obj : listUI)
3094	3428	{
..	..	@@ -3154,7 +3488,8 @@
3154	3488	}
3155	3489
3156	3490	// fix "+" issue
3157		- group.editWindow = this;
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
3158	3493
3159	3494	/*
3160	3495	currentLayout = radio.layout;
..	..	@@ -3162,18 +3497,25 @@
3162	3497	currentLayout = sevenButton;
3163	3498	*/
3164	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
3165	3505	keepparent = group.parent;
3166	3506	// PARENT = NULL or not???
3167	3507	//group.parent = null; // ROOT
3168	3508	//group.attributes = -1;
3169	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
3170	3512	refreshContents(true);
3171	3513	} else if (event.getSource() == editCameraItem)
3172	3514	{
3173	3515	cameraView.ProtectCamera();
3174	3516	cameraView.repaint();
3175	3517	return;
3176		- } else if (event.getSource() == revertCameraItem)
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	3519	{
3178	3520	cameraView.RevertCamera();
3179	3521	cameraView.repaint();
..	..	@@ -3190,7 +3532,6 @@
3190	3532	}
3191	3533
3192	3534	boolean useclient = false;
3193		- cRadio radio;
3194	3535
3195	3536	void ToggleRoot()
3196	3537	{
..	..	@@ -3511,6 +3852,13 @@
3511	3852	void GenNormals(boolean crease)
3512	3853	{
3513	3854	group.GenNormalsS(crease);
	3855	+
	3856	+ refreshContents();
	3857	+ }
	3858	+
	3859	+ void GenNormalsMESH()
	3860	+ {
	3861	+ group.GenNormalsMeshS();
3514	3862
3515	3863	refreshContents();
3516	3864	}
..	..	@@ -4138,6 +4486,18 @@
4138	4486	refreshContents();
4139	4487	}
4140	4488
	4489	+ void RewindLeaves(boolean hide)
	4490	+ {
	4491	+ group.selection.RewindLeaves(hide);
	4492	+ refreshContents();
	4493	+ }
	4494	+
	4495	+ void RandomLeaves(boolean hide)
	4496	+ {
	4497	+ group.selection.RandomLeaves(hide);
	4498	+ refreshContents();
	4499	+ }
	4500	+
4141	4501	void SetTexRes(int tr)
4142	4502	{
4143	4503	group.selection.SetTexRes(tr);
..	..	@@ -4209,10 +4569,6 @@
4209	4569	// }
4210	4570	// }
4211	4571
4212		- static boolean allparams = true;
4213		-
4214		- static Vector<Object3D> listUI = new Vector<Object3D>();
4215		-
4216	4572	void EditSelection(boolean newWindow)
4217	4573	{
4218	4574	// aConstraints.gridy = 0;
..	..	@@ -4220,7 +4576,7 @@
4220	4576	{
4221	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4222	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4223		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4224	4580
4225	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
4226	4582	if(elem != group \|\| !newWindow)
..	..	@@ -4305,7 +4661,8 @@
4305	4661	//new Exception().printStackTrace();
4306	4662
4307	4663	freezemodel = true;
4308		-
	4664	+ ClearUnpinned();
	4665	+
4309	4666	/**/
4310	4667	//switch (event.id)
4311	4668	{
..	..	@@ -4313,7 +4670,6 @@
4313	4670	//case 702: // Event.LIST_DESELECT
4314	4671	group.deselectAll();
4315	4672	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4316		- objEditor.ClearInfo(); // .GetMaterial());
4317	4673	if (tps != null)
4318	4674	{
4319	4675	for (int i=0; i < tps.length; i++)
..	..	@@ -4322,10 +4678,8 @@
4322	4678
4323	4679	//if (child.parent != null)
4324	4680	//child.parent.addSelectee(child);
	4681	+ objEditor.SetMaterial(child);
4325	4682	group.addSelectee(child);
4326		- objEditor.SetMaterial(child); // .GetMaterial());
4327		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4328		- System.err.println("info : " + child.GetPath());
4329	4683	}
4330	4684	}
4331	4685	// else
..	..	@@ -4335,15 +4689,13 @@
4335	4689	// System.err.println("info : " + group.GetPath());
4336	4690	// }
4337	4691
4338		- objEditor.SetText(); // jan 2014
4339		-
4340	4692	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4341	4693	CameraPane.flash = true;
4342	4694
4343	4695	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4344	4696	// a camera
4345	4697	{
4346		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4347	4699	{
4348	4700	CameraPane.camerachangeframe = 0; // don't refuse it
4349	4701	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4352,6 +4704,13 @@
4352	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4353	4705	}
4354	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4355	4714	refreshContents();
4356	4715	//return true;
4357	4716	}
..	..	@@ -4360,6 +4719,35 @@
4360	4719
4361	4720	freezemodel = false;
4362	4721	}
	4722	+
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
	4731	+ void refreshContents(boolean cp)
	4732	+ {
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4735	+ {
	4736	+ objEditor.ClearInfo(); // .GetMaterial());
	4737	+
	4738	+ for (int i=0; i < group.selection.Size(); i++)
	4739	+ {
	4740	+ Object3D child = (Object3D) group.selection.get(i);
	4741	+
	4742	+ objEditor.AddInfo(child, this, true);
	4743	+ System.err.println("info : " + child.GetPath());
	4744	+ }
	4745	+
	4746	+ objEditor.SetText(); // jan 2014
	4747	+ }
	4748	+
	4749	+ super.refreshContents(cp);
	4750	+ }
4363	4751
4364	4752	void linkSomething(Object3D thing)
4365	4753	{
..	..	@@ -4442,6 +4830,7 @@
4442	4830
4443	4831	if (cut)
4444	4832	{
	4833	+ if (Globals.SAVEONMAKE)
4445	4834	Save();
4446	4835	//int indices[] = jList.getSelectedIndices();
4447	4836	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5160,10 +5549,28 @@
5160	5549	cButton clearpanelButton;
5161	5550	cButton unselectButton;
5162	5551
	5552	+ cButton restoreCameraButton;
	5553	+
5163	5554	cButton saveButton;
5164		- cButton undoButton;
5165		- cButton redoButton;
5166	5555	cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
5167	5574
5168	5575	cButton screenfitButton;
5169	5576	cButton screenfitpointButton;
..	..	@@ -5176,14 +5583,6 @@
5176	5583
5177	5584	cButton setsupportButton;
5178	5585
5179		- cButton twoButton;
5180		- cButton sixButton;
5181		- cButton threeButton;
5182		- cButton sevenButton;
5183		- cButton fourButton; // full panel
5184		- cButton oneButton; // full XYZ
5185		- //cButton currentLayout;
5186		-
5187	5586	//
5188	5587	//Composite
5189	5588	Object3D // to do !!
..	..	@@ -5193,11 +5592,11 @@
5193	5592	//JTree jTree;
5194	5593	private MenuItem lookAtItem;
5195	5594	private MenuItem lookFromItem;
5196		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
5197	5596	private MenuItem cutItem;
5198	5597	private MenuItem undoItem;
5199	5598	private MenuItem redoItem;
5200		- private MenuItem duplicateItem;
	5599	+ private JMenuItem duplicateItem;
5201	5600	private MenuItem cloneItem;
5202	5601	private MenuItem cloneSupportItem;
5203	5602	private MenuItem overwriteGeoItem;
..	..	@@ -5260,6 +5659,10 @@
5260	5659	private MenuItem showleavesItem;
5261	5660	private MenuItem markleavesItem;
5262	5661	private MenuItem unmarkleavesItem;
	5662	+ private MenuItem rewindleavesItem;
	5663	+ private MenuItem unrewindleavesItem;
	5664	+ private MenuItem randomleavesItem;
	5665	+ private MenuItem unrandomleavesItem;
5263	5666
5264	5667	private MenuItem flipVItem;
5265	5668	private MenuItem unflipVItem;
..	..	@@ -5281,7 +5684,7 @@
5281	5684	private MenuItem frontItem;
5282	5685	private MenuItem cameraItem;
5283	5686	private MenuItem compositeItem;
5284		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5285	5688	private MenuItem physicsItem;
5286	5689	private MenuItem frameselectorItem;
5287	5690	private MenuItem scriptNodeItem;
..	..	@@ -5355,5 +5758,5 @@
5355	5758
5356	5759	Menu cameraMenu;
5357	5760	MenuItem editCameraItem;
5358		- MenuItem revertCameraItem;
	5761	+ MenuItem restoreCameraItem;
5359	5762	}