~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,21 +204,21 @@
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("-");
213		-
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);
	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);
221	222
222	223	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223	224	toggleHandleItem.addItemListener(this);
..	..	@@ -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,63 @@
555	580	oe.radioPanel.add(dummyButton);
556	581	oe.buttonGroup.add(dummyButton);
557	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	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	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561	606	undoButton.setToolTipText("Undo changes");
562	607	undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
563	609
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	611	redoButton.setToolTipText("Redo changes");
566	612	redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
567	614
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	616	saveButton.setToolTipText("Save changes");
570	617	saveButton.addActionListener(this);
571	618
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	620	liveCB.setToolTipText("Enable animation");
574	621	liveCB.addItemListener(this);
575	622
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	624	oneStepButton.setToolTipText("Animate one step forward");
578	625	oneStepButton.addActionListener(this);
579	626
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	628	fastCB.setToolTipText("Fast mode");
582	629	fastCB.addItemListener(this);
583	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	634	screenfitButton.setToolTipText("Screen fit");
590	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
591	640
592	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -599,65 +648,145 @@
599	648	snapobjectButton.setToolTipText("Snap Object");
600	649	}
601	650
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	652
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	654	twoButton.setToolTipText("Show center view only");
610	655	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	659	fourButton.addActionListener(this);
613	660	fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615	662	sixButton.setToolTipText("2-column layout left");
616	663	sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618	665	threeButton.setToolTipText("2-column layout right");
619	666	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621	668	sevenButton.setToolTipText("3-column layout");
622	669	sevenButton.addActionListener(this);
623	670	//
624	671
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	673	rootButton.setToolTipText("Edit selection in new tab");
627	674	rootButton.addActionListener(this);
628	675
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	677	closeButton.setToolTipText("Close tab");
631	678	closeButton.addActionListener(this);
632	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	680	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
636	713
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
639	763	editButton.addActionListener(this);
640	764
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
643	767	uneditButton.addActionListener(this);
644	768
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
647	771	allParamsButton.addActionListener(this);
648	772
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	774	clearPanelButton.setToolTipText("Clear edit panel");
651	775	clearPanelButton.addActionListener(this);
652	776
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	778	unselectButton.setToolTipText("Unselect");
655	779	unselectButton.addActionListener(this);
656	780
657		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
658	784
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
661	790
662	791	// oe.aConstraints.gridx += 1;
663	792	// oe.aConstraints.weighty = 0;
..	..	@@ -674,27 +803,12 @@
674	803
675	804	JScrollPane jSP;
676	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	807	ResetModel();
679	808
680	809	oe.treePanel.add(jSPPanel);
681	810	oe.treePanel.Return();
682	811
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	812	oe.treePanel.add(copyOptionsPanel);
699	813	oe.treePanel.Return();
700	814
..	..	@@ -725,12 +839,26 @@
725	839
726	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
728	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	857	boxCB.setToolTipText("Display bounding boxes");
730	858	boxCB.addItemListener(this);
731	859
732	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	862	zoomBoxCB.addItemListener(this);
735	863
736	864	if (true) // Globals.ADVANCED)
..	..	@@ -742,6 +870,8 @@
742	870	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	871	// localCB.addItemListener(this);
744	872
	873	+ panel.Return();
	874	+
745	875	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	876	crowdCB.setToolTipText("Used for crowds");
747	877	crowdCB.addItemListener(this);
..	..	@@ -758,6 +888,8 @@
758	888	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	889	// speakerMocapCB.addItemListener(this);
760	890
	891	+ panel.Return();
	892	+
761	893	if (false)
762	894	{
763	895	// handled in scripts
..	..	@@ -772,32 +904,72 @@
772	904	//constraints.gridy += 1;
773	905	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	906	smoothfocusCB.addItemListener(this);
	907	+ panel.Return();
775	908	}
776	909
777	910	//constraints.gridx += 1;
778	911	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	912	// debugCB.addItemListener(this);
780	913
	914	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	915	+ trackCB.setToolTipText("Enable tracking target");
	916	+ trackCB.addItemListener(this);
	917	+
781	918	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	919	+ oeilCB.setToolTipText("Move camera when tracking");
782	920	oeilCB.addItemListener(this);
783	921
	922	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	923	+ shadowCB.setToolTipText("When live compute shadows");
	924	+ shadowCB.addItemListener(this);
	925	+
	926	+ panel.Return();
	927	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	928	+ toggleTextureCB.setToolTipText("Load textures");
	929	+ toggleTextureCB.addItemListener(this);
	930	+
	931	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	932	+ toggleSwitchCB.setToolTipText("Use switch");
	933	+ toggleSwitchCB.addItemListener(this);
	934	+
	935	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	936	+ autosaveCB.setToolTipText("On structure change");
	937	+ autosaveCB.addItemListener(this);
	938	+
	939	+ panel.Return();
	940	+ if (Globals.ADVANCED)
	941	+ {
784	942	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	943	lookAtCB.setToolTipText("Look-at target");
786	944	lookAtCB.addItemListener(this);
	945	+ }
787	946
788	947	}
789	948
790	949	cGridBag fill = new cGridBag();
791		-
792	950	fill.preferredHeight = 200;
	951	+ cGridBag fill2 = new cGridBag();
	952	+ fill2.preferredHeight = 200;
	953	+ cGridBag fill3 = new cGridBag();
	954	+ fill3.preferredHeight = 200;
793	955
794	956	panel.add(fill);
	957	+ panel.add(fill2);
	958	+ panel.add(fill3);
795	959
796	960	}
797	961
798	962	void EditObject(Object3D obj)
799	963	{
800	964	cRadio radioButton = new cRadio(obj.name);
	965	+
	966	+ // Patch to avoid bug with transparency.
	967	+ radioButton.hadMaterial = obj.material != null;
	968	+ if (!radioButton.hadMaterial)
	969	+ {
	970	+ obj.material = new cMaterial();
	971	+ }
	972	+
801	973	radioButton.SetObject(obj);
802	974	radioButton.layout = sevenButton;
803	975	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -809,6 +981,8 @@
809	981
810	982	void SetupViews(ObjEditor oe)
811	983	{
	984	+ theFrame = this;
	985	+
812	986	oe.SetupViews();
813	987
814	988	System.out.println("SetupViews");
..	..	@@ -817,23 +991,27 @@
817	991	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	992	}
819	993
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;
	994	+ cToggleButton liveCB;
	995	+ cCheckBox supportCB;
	996	+ cCheckBox localCB;
	997	+ cCheckBox crowdCB;
	998	+ cCheckBox smoothCB;
	999	+ cToggleButton fastCB;
	1000	+ cCheckBox slowCB;
	1001	+ cCheckBox boxCB;
	1002	+ cCheckBox zoomBoxCB;
	1003	+ //cToggleButton trackCB;
	1004	+ cCheckBox trackCB;
	1005	+ cCheckBox smoothfocusCB;
831	1006	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1007	+ cCheckBox speakerCameraCB;
	1008	+ cCheckBox speakerFocusCB;
	1009	+ cCheckBox debugCB;
	1010	+
	1011	+ cCheckBox oeilCB;
	1012	+ cCheckBox shadowCB;
	1013	+ cCheckBox autosaveCB;
	1014	+ cCheckBox lookAtCB;
837	1015
838	1016	// static int COLOR = 1;
839	1017	// static int MATERIAL = 2;
..	..	@@ -841,9 +1019,9 @@
841	1019
842	1020	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1021
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1022	+ cCheckBox colorCB;
	1023	+ cCheckBox materialCB;
	1024	+ cCheckBox textureCB;
847	1025
848	1026	public void itemStateChanged(ItemEvent e)
849	1027	{
..	..	@@ -871,6 +1049,7 @@
871	1049	} else if(e.getSource() == liveCB)
872	1050	{
873	1051	cameraView.ToggleLive();
	1052	+ refreshContents(false);
874	1053	}
875	1054	else if(e.getSource() == supportCB)
876	1055	{
..	..	@@ -935,6 +1114,14 @@
935	1114	{
936	1115	cameraView.ToggleOeil();
937	1116	}
	1117	+ else if(e.getSource() == shadowCB)
	1118	+ {
	1119	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1120	+ }
	1121	+ else if(e.getSource() == autosaveCB)
	1122	+ {
	1123	+ Globals.SAVEONMAKE ^= true;
	1124	+ }
938	1125	else if(e.getSource() == lookAtCB)
939	1126	{
940	1127	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1138,8 @@
951	1138
952	1139	/**/
953	1140	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1142	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1143	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1144	// We can't move the root node or an empty selection
957	1145	return;
..	..	@@ -1068,23 +1256,33 @@
1068	1256
1069	1257	assert target == objEditor.jTree;
1070	1258	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1259	+ Object3D destinationLeaf;
1071	1260	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1261	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1262	} catch (Exception e) {
1074	1263	System.out.println("destinationPath : " + destinationPath);
1075	1264	return;
1076	1265	}
1077	1266
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1267	+ for (int i=group.selection.size(); --i>=0;)
1079	1268	{
	1269	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1270	+
	1271	+ // Cannot move into itself
	1272	+ if (child == destinationLeaf)
	1273	+ return;
	1274	+ }
	1275	+
	1276	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1277	+// {
1080	1278	loadClipboard(true);
1081	1279	objEditor.jTree.setSelectionPath(destinationPath);
1082	1280	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1281	+// } else {
	1282	+// loadClipboard(false);
	1283	+// objEditor.jTree.setSelectionPath(destinationPath);
	1284	+// pasteInto(false, false); // true); // ???
	1285	+// }
1088	1286	}
1089	1287	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1288	// Called if the user has modified the current drop gesture
..	..	@@ -1189,22 +1387,30 @@
1189	1387	{
1190	1388	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1389	//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);
	1390	+// gridItem = menu.add(new MenuItem("Grid"));
	1391	+// gridItem.addActionListener(this);
	1392	+// rectoidItem = menu.add(new MenuItem("Box"));
	1393	+// rectoidItem.addActionListener(this);
	1394	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1395	+// ellipsoidItem.addActionListener(this);
	1396	+// coneItem = menu.add(new MenuItem("Cone"));
	1397	+// coneItem.addActionListener(this);
	1398	+// torusItem = menu.add(new MenuItem("Torus"));
	1399	+// torusItem.addActionListener(this);
	1400	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1401	+// superItem.addActionListener(this);
	1402	+
	1403	+ cameraItem = menu.add(new MenuItem("Camera"));
	1404	+ cameraItem.addActionListener(this);
	1405	+
	1406	+ if (!Globals.ADVANCED)
	1407	+ {
1204	1408	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1409	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1410	+ }
	1411	+
	1412	+// particleItem = menu.add(new MenuItem("Particle system"));
	1413	+// particleItem.addActionListener(this);
1208	1414	if (Globals.ADVANCED)
1209	1415	{
1210	1416	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1436,15 @@
1230	1436	}
1231	1437	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1438	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);
	1439	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1440	+// overlayItem.addActionListener(this);
	1441	+// lightItem = menu.add(new MenuItem("Light"));
	1442	+// lightItem.addActionListener(this);
1237	1443	menu.add("-");
1238	1444	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	1445	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	1446	+// loopItem = menu.add(new MenuItem("Loop"));
	1447	+// loopItem.addActionListener(this);
1242	1448	doubleItem = menu.add(new MenuItem("Fork"));
1243	1449	doubleItem.addActionListener(this);
1244	1450	if (Globals.ADVANCED)
..	..	@@ -1278,7 +1484,7 @@
1278	1484	memoryItem.addActionListener(this);
1279	1485	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	1486	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	1487	+ menu.add(dumpItem = new MenuItem("Print"));
1282	1488	dumpItem.addActionListener(this);
1283	1489	// menu.add(pathItem = new MenuItem("From-to path"));
1284	1490	// pathItem.addActionListener(this);
..	..	@@ -1419,9 +1625,24 @@
1419	1625	shadow.material = new cMaterial(obj.material);
1420	1626	shadow.material.diffuse = 0.0001f;
1421	1627	shadow.material.specular = 0.0001f;
	1628	+ //shadow.projectedVertices[1].x = 300;
1422	1629
1423	1630	makeSomething(shadow);
1424	1631	}
	1632	+
	1633	+ private void ClearUnpinned()
	1634	+ {
	1635	+ //for (Object3D obj : listUI)
	1636	+ for (int i=listUI.size(); --i>=0;)
	1637	+ {
	1638	+ Object3D obj = listUI.elementAt(i);
	1639	+ if (!obj.pinned)
	1640	+ {
	1641	+ obj.CloseUI();
	1642	+ listUI.remove(i);
	1643	+ }
	1644	+ }
	1645	+ }
1425	1646
1426	1647	/**
1427	1648	* applyExample
..	..	@@ -1666,7 +1887,7 @@
1666	1887	{
1667	1888	ScreenFit();
1668	1889	} else
1669		- if (source == switchItem)
	1890	+ if (source == switchViewItem)
1670	1891	{
1671	1892	cVector v1 = new cVector();
1672	1893	cVector v2 = new cVector();
..	..	@@ -1675,11 +1896,11 @@
1675	1896	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	1897	objEditor.cameraView.repaint();
1677	1898	} else
1678		- if (source == rectoidItem)
	1899	+ if (source == rectoidItem \|\| source == boxButton)
1679	1900	{
1680	1901	makeSomething(new Box());
1681	1902	} else
1682		- if (source == particleItem)
	1903	+ if (source == particleItem \|\| source == particlesButton)
1683	1904	{
1684	1905	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	1906	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +1979,27 @@
1758	1979
1759	1980	makeSomething(obj);
1760	1981	} else
1761		- if (source == gridItem)
	1982	+ if (source == gridItem \|\| source == gridButton)
1762	1983	{
1763	1984	makeSomething(new Grid());
1764	1985	} else
1765		- if (source == ellipsoidItem)
	1986	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	1987	{
1767	1988	makeSomething(new Sphere());
1768	1989	} else
1769		- if (source == coneItem)
	1990	+ if (source == coneItem \|\| source == coneButton)
1770	1991	{
1771	1992	makeSomething(new Cone());
1772	1993	} else
1773		- if (source == torusItem)
	1994	+ if (source == torusItem \|\| source == torusButton)
1774	1995	{
1775	1996	makeSomething(new Torus());
1776	1997	} else
1777		- if (source == superItem)
	1998	+ if (source == superItem \|\| source == superButton)
1778	1999	{
1779	2000	makeSomething(new Superellipsoid());
1780	2001	} else
1781		- if (source == kleinItem)
	2002	+ if (source == kleinItem \|\| source == kleinButton)
1782	2003	{
1783	2004	makeSomething(new Klein());
1784	2005	} else
..	..	@@ -1798,7 +2019,7 @@
1798	2019	{
1799	2020	makeSomething(new BezierSurface());
1800	2021	} else
1801		- if (source == overlayItem)
	2022	+ if (source == overlayItem \|\| source == overlayButton)
1802	2023	{
1803	2024	/*
1804	2025	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,7 +2067,7 @@
1846	2067	s.setup();
1847	2068	makeSomething(s);
1848	2069	} else
1849		- if (source == lightItem)
	2070	+ if (source == lightItem \|\| source == lightButton)
1850	2071	{
1851	2072	makeSomething(new Light());
1852	2073	} else
..	..	@@ -1896,7 +2117,7 @@
1896	2117
1897	2118	group(g);
1898	2119	} else
1899		- if (source == loopItem)
	2120	+ if (source == loopItem \|\| source == loopButton)
1900	2121	{
1901	2122	Composite csg = new GroupLeaf();
1902	2123	csg.count = 5;
..	..	@@ -1968,6 +2189,18 @@
1968	2189	if (source == dumpItem)
1969	2190	{
1970	2191	DumpObject();
	2192	+ } else
	2193	+ if (source == minButton)
	2194	+ {
	2195	+ Minimize();
	2196	+ } else
	2197	+ if (source == maxButton)
	2198	+ {
	2199	+ Maximize();
	2200	+ } else
	2201	+ if (source == fullButton)
	2202	+ {
	2203	+ ToggleFullScreen();
1971	2204	} else
1972	2205	if (source == undoButton)
1973	2206	{
..	..	@@ -2374,9 +2607,9 @@
2374	2607	{
2375	2608	ClearSelection(true);
2376	2609	} else
2377		- if (source == grabItem)
	2610	+ if (source == grabItem \|\| source == groupButton)
2378	2611	{
2379		- group(new cGroup(), true);
	2612	+ group(new cGroup(), false); // true);
2380	2613	} else
2381	2614	if (source == hideItem)
2382	2615	{
..	..	@@ -2394,11 +2627,11 @@
2394	2627	{
2395	2628	makeSomething(new Camera());
2396	2629	} else
2397		- if (source == compositeItem)
	2630	+ if (source == compositeItem \|\| source == compositeButton)
2398	2631	{
2399	2632	group(new Composite());
2400	2633	} else
2401		- if (source == randomItem)
	2634	+ if (source == switchItem \|\| source == switchButton)
2402	2635	{
2403	2636	RandomNode random = new RandomNode();
2404	2637	group(random);
..	..	@@ -2500,7 +2733,7 @@
2500	2733	{
2501	2734	group(new cLinker());
2502	2735	} else
2503		- if (source == textureItem)
	2736	+ if (source == textureItem \|\| source == textureButton)
2504	2737	{
2505	2738	group(new TextureNode());
2506	2739	} else
..	..	@@ -2520,7 +2753,7 @@
2520	2753	{
2521	2754	CastShadow(2);
2522	2755	} else
2523		- if (source == ungroupItem)
	2756	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	2757	{
2525	2758	//ungroup();
2526	2759	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2542,7 +2775,7 @@
2542	2775	} else
2543	2776	if (source == genNormalsMESHItem)
2544	2777	{
2545		- GenNormals(true); // TODO
	2778	+ GenNormalsMESH();
2546	2779	} else
2547	2780	if (source == genNormalsORGANItem)
2548	2781	{
..	..	@@ -2607,6 +2840,22 @@
2607	2840	if (source == unmarkleavesItem)
2608	2841	{
2609	2842	MarkLeaves(false);
	2843	+ } else
	2844	+ if (source == rewindleavesItem)
	2845	+ {
	2846	+ RewindLeaves(true);
	2847	+ } else
	2848	+ if (source == unrewindleavesItem)
	2849	+ {
	2850	+ RewindLeaves(false);
	2851	+ } else
	2852	+ if (source == randomleavesItem)
	2853	+ {
	2854	+ RandomLeaves(true);
	2855	+ } else
	2856	+ if (source == unrandomleavesItem)
	2857	+ {
	2858	+ RandomLeaves(false);
2610	2859	} else
2611	2860	if (source == flipVItem)
2612	2861	{
..	..	@@ -2842,6 +3091,10 @@
2842	3091	if (source == twoButton)
2843	3092	{
2844	3093	radio.layout = twoButton;
	3094	+
	3095	+ if (CameraPane.FULLSCREEN)
	3096	+ fullscreenLayout = radio.layout;
	3097	+
2845	3098	// bug
2846	3099	//gridPanel.setDividerLocation(1.0);
2847	3100	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2874,10 +3127,31 @@
2874	3127	bigThree.ClearUI();
2875	3128	bigThree.add(centralPanel);
2876	3129	bigThree.FlushUI();
	3130	+
	3131	+ cameraView.requestFocusInWindow();
	3132	+
	3133	+// refreshContents(true);
	3134	+//
	3135	+// try
	3136	+// {
	3137	+// java.awt.Robot bot = new java.awt.Robot();
	3138	+// int mask = InputEvent.BUTTON1_MASK;
	3139	+// bot.mouseMove(100, 100);
	3140	+// bot.mousePress(mask);
	3141	+// bot.mouseRelease(mask);
	3142	+// }
	3143	+// catch (Exception e)
	3144	+// {
	3145	+//
	3146	+// }
	3147	+
2877	3148	} else
2878	3149	if (source == threeButton)
2879	3150	{
2880	3151	radio.layout = threeButton;
	3152	+
	3153	+ if (CameraPane.FULLSCREEN)
	3154	+ fullscreenLayout = radio.layout;
2881	3155
2882	3156	// bigThree.remove(scenePanel);
2883	3157	// bigThree.remove(centralPanel);
..	..	@@ -2910,10 +3184,15 @@
2910	3184	bigThree.add(centralPanel);
2911	3185	bigThree.add(XYZPanel);
2912	3186	bigThree.FlushUI();
	3187	+
	3188	+ cameraView.requestFocusInWindow();
2913	3189	} else
2914	3190	if (source == fourButton)
2915	3191	{
2916	3192	radio.layout = fourButton;
	3193	+
	3194	+ if (CameraPane.FULLSCREEN)
	3195	+ fullscreenLayout = radio.layout;
2917	3196
2918	3197	// bigThree.remove(scenePanel);
2919	3198	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3224,15 @@
2945	3224	bigThree.ClearUI();
2946	3225	bigThree.add(scenePanel);
2947	3226	bigThree.FlushUI();
	3227	+
	3228	+ cameraView.requestFocusInWindow();
2948	3229	} else
2949	3230	if (source == sixButton)
2950	3231	{
2951	3232	radio.layout = sixButton;
	3233	+
	3234	+ if (CameraPane.FULLSCREEN)
	3235	+ fullscreenLayout = radio.layout;
2952	3236
2953	3237	// bigThree.remove(scenePanel);
2954	3238	// bigThree.remove(centralPanel);
..	..	@@ -2981,10 +3265,15 @@
2981	3265	bigThree.add(scenePanel);
2982	3266	bigThree.add(centralPanel);
2983	3267	bigThree.FlushUI();
	3268	+
	3269	+ cameraView.requestFocusInWindow();
2984	3270	} else
2985	3271	if (source == sevenButton)
2986	3272	{
2987	3273	radio.layout = sevenButton;
	3274	+
	3275	+ if (CameraPane.FULLSCREEN)
	3276	+ fullscreenLayout = radio.layout;
2988	3277
2989	3278	// bigThree.remove(scenePanel);
2990	3279	// bigThree.remove(centralPanel);
..	..	@@ -3018,6 +3307,8 @@
3018	3307	bigThree.add(centralPanel);
3019	3308	bigThree.add(XYZPanel);
3020	3309	bigThree.FlushUI();
	3310	+
	3311	+ cameraView.requestFocusInWindow();
3021	3312	} else
3022	3313	if (source == rootButton)
3023	3314	{
..	..	@@ -3029,6 +3320,7 @@
3029	3320	EditObject(obj);
3030	3321	}
3031	3322
	3323	+ cameraView.requestFocusInWindow();
3032	3324	refreshContents(true);
3033	3325	} else
3034	3326	if (source == closeButton)
..	..	@@ -3038,22 +3330,37 @@
3038	3330	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	3331	{
3040	3332	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3333	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	3334	{
	3335	+ // Patch to avoid bug with transparency.
	3336	+ if (!ab.hadMaterial)
	3337	+ {
	3338	+ ab.object.material = null;
	3339	+ }
	3340	+
3043	3341	buttonGroup.remove(ab);
3044	3342	radioPanel.remove(ab);
3045	3343
3046		- ab.GetObject().editWindow = null;
	3344	+ //ab.GetObject().editWindow = null;
	3345	+ ab.GetObject().manipWindow = null;
3047	3346	// ab.GetObject().objectUI = null; // ?????????
3048	3347
3049	3348	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	3349	break;
3051	3350	}
3052	3351	}
	3352	+
	3353	+ cameraView.requestFocusInWindow();
3053	3354	refreshContents(true);
3054	3355	} else
3055	3356	if (source == editItem \|\| source == editButton)
3056	3357	{
	3358	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3359	+ {
	3360	+ Object3D child = (Object3D)e.nextElement();
	3361	+ child.pinned = true;
	3362	+ }
	3363	+
3057	3364	EditSelection(false);
3058	3365	} else
3059	3366	if (source == uneditButton)
..	..	@@ -3063,6 +3370,7 @@
3063	3370	Object3D child = (Object3D)e.nextElement();
3064	3371	if(child.editWindow != null)
3065	3372	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3373	+ child.pinned = false;
3066	3374	child.CloseUI();
3067	3375	listUI.remove(child);
3068	3376
..	..	@@ -3079,6 +3387,7 @@
3079	3387	//copy.ClearUI();
3080	3388	for (Object3D obj : listUI)
3081	3389	{
	3390	+ obj.pinned = false;
3082	3391	obj.CloseUI();
3083	3392	}
3084	3393	listUI.clear();
..	..	@@ -3088,7 +3397,7 @@
3088	3397	{
3089	3398	assert(copy == group);
3090	3399
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3400	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	3401
3093	3402	for (Object3D obj : listUI)
3094	3403	{
..	..	@@ -3154,7 +3463,8 @@
3154	3463	}
3155	3464
3156	3465	// fix "+" issue
3157		- group.editWindow = this;
	3466	+ //group.editWindow = this;
	3467	+ group.manipWindow = this;
3158	3468
3159	3469	/*
3160	3470	currentLayout = radio.layout;
..	..	@@ -3162,18 +3472,25 @@
3162	3472	currentLayout = sevenButton;
3163	3473	*/
3164	3474	radio.layout.doClick();
	3475	+
	3476	+ ClearUnpinned();
	3477	+ SetPinStates(group.selection.size() > 0);
	3478	+ if (group.selection.size() == 1)
	3479	+ EditSelection(false);
3165	3480	keepparent = group.parent;
3166	3481	// PARENT = NULL or not???
3167	3482	//group.parent = null; // ROOT
3168	3483	//group.attributes = -1;
3169	3484	ResetModel();
	3485	+
	3486	+ cameraView.requestFocusInWindow();
3170	3487	refreshContents(true);
3171	3488	} else if (event.getSource() == editCameraItem)
3172	3489	{
3173	3490	cameraView.ProtectCamera();
3174	3491	cameraView.repaint();
3175	3492	return;
3176		- } else if (event.getSource() == revertCameraItem)
	3493	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	3494	{
3178	3495	cameraView.RevertCamera();
3179	3496	cameraView.repaint();
..	..	@@ -3190,7 +3507,6 @@
3190	3507	}
3191	3508
3192	3509	boolean useclient = false;
3193		- cRadio radio;
3194	3510
3195	3511	void ToggleRoot()
3196	3512	{
..	..	@@ -3511,6 +3827,13 @@
3511	3827	void GenNormals(boolean crease)
3512	3828	{
3513	3829	group.GenNormalsS(crease);
	3830	+
	3831	+ refreshContents();
	3832	+ }
	3833	+
	3834	+ void GenNormalsMESH()
	3835	+ {
	3836	+ group.GenNormalsMeshS();
3514	3837
3515	3838	refreshContents();
3516	3839	}
..	..	@@ -4138,6 +4461,18 @@
4138	4461	refreshContents();
4139	4462	}
4140	4463
	4464	+ void RewindLeaves(boolean hide)
	4465	+ {
	4466	+ group.selection.RewindLeaves(hide);
	4467	+ refreshContents();
	4468	+ }
	4469	+
	4470	+ void RandomLeaves(boolean hide)
	4471	+ {
	4472	+ group.selection.RandomLeaves(hide);
	4473	+ refreshContents();
	4474	+ }
	4475	+
4141	4476	void SetTexRes(int tr)
4142	4477	{
4143	4478	group.selection.SetTexRes(tr);
..	..	@@ -4209,10 +4544,6 @@
4209	4544	// }
4210	4545	// }
4211	4546
4212		- static boolean allparams = true;
4213		-
4214		- static Vector<Object3D> listUI = new Vector<Object3D>();
4215		-
4216	4547	void EditSelection(boolean newWindow)
4217	4548	{
4218	4549	// aConstraints.gridy = 0;
..	..	@@ -4220,7 +4551,7 @@
4220	4551	{
4221	4552	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4222	4553	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4223		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4554	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4224	4555
4225	4556	Object3D elem = (Object3D)group.selection.elementAt(i);
4226	4557	if(elem != group \|\| !newWindow)
..	..	@@ -4305,7 +4636,8 @@
4305	4636	//new Exception().printStackTrace();
4306	4637
4307	4638	freezemodel = true;
4308		-
	4639	+ ClearUnpinned();
	4640	+
4309	4641	/**/
4310	4642	//switch (event.id)
4311	4643	{
..	..	@@ -4313,7 +4645,6 @@
4313	4645	//case 702: // Event.LIST_DESELECT
4314	4646	group.deselectAll();
4315	4647	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4316		- objEditor.ClearInfo(); // .GetMaterial());
4317	4648	if (tps != null)
4318	4649	{
4319	4650	for (int i=0; i < tps.length; i++)
..	..	@@ -4322,10 +4653,8 @@
4322	4653
4323	4654	//if (child.parent != null)
4324	4655	//child.parent.addSelectee(child);
	4656	+ objEditor.SetMaterial(child);
4325	4657	group.addSelectee(child);
4326		- objEditor.SetMaterial(child); // .GetMaterial());
4327		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4328		- System.err.println("info : " + child.GetPath());
4329	4658	}
4330	4659	}
4331	4660	// else
..	..	@@ -4335,15 +4664,13 @@
4335	4664	// System.err.println("info : " + group.GetPath());
4336	4665	// }
4337	4666
4338		- objEditor.SetText(); // jan 2014
4339		-
4340	4667	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4341	4668	CameraPane.flash = true;
4342	4669
4343	4670	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4344	4671	// a camera
4345	4672	{
4346		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4673	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4347	4674	{
4348	4675	CameraPane.camerachangeframe = 0; // don't refuse it
4349	4676	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4352,6 +4679,13 @@
4352	4679	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4353	4680	}
4354	4681
	4682	+ if (tps != null && tps.length == 1)
	4683	+ {
	4684	+ EditSelection(false);
	4685	+ }
	4686	+
	4687	+ SetPinStates(tps != null && tps.length > 0);
	4688	+
4355	4689	refreshContents();
4356	4690	//return true;
4357	4691	}
..	..	@@ -4360,6 +4694,35 @@
4360	4694
4361	4695	freezemodel = false;
4362	4696	}
	4697	+
	4698	+ void SetPinStates(boolean enabled)
	4699	+ {
	4700	+ editButton.setEnabled(enabled);
	4701	+ uneditButton.setEnabled(enabled);
	4702	+ unselectButton.setEnabled(enabled);
	4703	+ flashSelectionButton.setEnabled(enabled);
	4704	+ }
	4705	+
	4706	+ void refreshContents(boolean cp)
	4707	+ {
	4708	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4709	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4710	+ {
	4711	+ objEditor.ClearInfo(); // .GetMaterial());
	4712	+
	4713	+ for (int i=0; i < group.selection.Size(); i++)
	4714	+ {
	4715	+ Object3D child = (Object3D) group.selection.get(i);
	4716	+
	4717	+ objEditor.AddInfo(child, this, true);
	4718	+ System.err.println("info : " + child.GetPath());
	4719	+ }
	4720	+
	4721	+ objEditor.SetText(); // jan 2014
	4722	+ }
	4723	+
	4724	+ super.refreshContents(cp);
	4725	+ }
4363	4726
4364	4727	void linkSomething(Object3D thing)
4365	4728	{
..	..	@@ -4442,6 +4805,7 @@
4442	4805
4443	4806	if (cut)
4444	4807	{
	4808	+ if (Globals.SAVEONMAKE)
4445	4809	Save();
4446	4810	//int indices[] = jList.getSelectedIndices();
4447	4811	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5160,10 +5524,31 @@
5160	5524	cButton clearpanelButton;
5161	5525	cButton unselectButton;
5162	5526
	5527	+ cButton restoreCameraButton;
	5528	+
	5529	+ cButton minButton;
	5530	+ cButton maxButton;
	5531	+ cButton fullButton;
5163	5532	cButton saveButton;
5164		- cButton undoButton;
5165		- cButton redoButton;
5166	5533	cButton oneStepButton;
	5534	+
	5535	+ cButton groupButton;
	5536	+ cButton ungroupButton;
	5537	+ cButton compositeButton;
	5538	+ cButton switchButton;
	5539	+ cButton loopButton;
	5540	+ cButton textureButton;
	5541	+
	5542	+ cButton gridButton;
	5543	+ cButton boxButton;
	5544	+ cButton sphereButton;
	5545	+ cButton coneButton;
	5546	+ cButton torusButton;
	5547	+ cButton superButton;
	5548	+ cButton kleinButton;
	5549	+ cButton particlesButton;
	5550	+ cButton overlayButton;
	5551	+ cButton lightButton;
5167	5552
5168	5553	cButton screenfitButton;
5169	5554	cButton screenfitpointButton;
..	..	@@ -5176,14 +5561,6 @@
5176	5561
5177	5562	cButton setsupportButton;
5178	5563
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	5564	//
5188	5565	//Composite
5189	5566	Object3D // to do !!
..	..	@@ -5193,11 +5570,11 @@
5193	5570	//JTree jTree;
5194	5571	private MenuItem lookAtItem;
5195	5572	private MenuItem lookFromItem;
5196		- private MenuItem switchItem;
	5573	+ private MenuItem switchViewItem;
5197	5574	private MenuItem cutItem;
5198	5575	private MenuItem undoItem;
5199	5576	private MenuItem redoItem;
5200		- private MenuItem duplicateItem;
	5577	+ private JMenuItem duplicateItem;
5201	5578	private MenuItem cloneItem;
5202	5579	private MenuItem cloneSupportItem;
5203	5580	private MenuItem overwriteGeoItem;
..	..	@@ -5260,6 +5637,10 @@
5260	5637	private MenuItem showleavesItem;
5261	5638	private MenuItem markleavesItem;
5262	5639	private MenuItem unmarkleavesItem;
	5640	+ private MenuItem rewindleavesItem;
	5641	+ private MenuItem unrewindleavesItem;
	5642	+ private MenuItem randomleavesItem;
	5643	+ private MenuItem unrandomleavesItem;
5263	5644
5264	5645	private MenuItem flipVItem;
5265	5646	private MenuItem unflipVItem;
..	..	@@ -5281,7 +5662,7 @@
5281	5662	private MenuItem frontItem;
5282	5663	private MenuItem cameraItem;
5283	5664	private MenuItem compositeItem;
5284		- private MenuItem randomItem;
	5665	+ private MenuItem switchItem;
5285	5666	private MenuItem physicsItem;
5286	5667	private MenuItem frameselectorItem;
5287	5668	private MenuItem scriptNodeItem;
..	..	@@ -5355,5 +5736,5 @@
5355	5736
5356	5737	Menu cameraMenu;
5357	5738	MenuItem editCameraItem;
5358		- MenuItem revertCameraItem;
	5739	+ MenuItem restoreCameraItem;
5359	5740	}