~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,23 +365,22 @@
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);
	383	+
378	384	if (Globals.ADVANCED)
379	385	{
380	386	menu.add("-");
..	..	@@ -535,6 +541,18 @@
535	541
536	542	void SetupUI2(ObjEditor oe)
537	543	{
	544	+ // June 2019
	545	+ if (oe == null)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ //return;
	549	+ }
	550	+
	551	+ if (copy != group)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ }
	555	+
538	556	//new Exception().printStackTrace();
539	557
540	558	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -563,39 +581,66 @@
563	581	oe.radioPanel.add(dummyButton);
564	582	oe.buttonGroup.add(dummyButton);
565	583	*/
	584	+ cGridBag copyOptionsPanel = new cGridBag();
	585	+
	586	+ copyOptionsPanel.preferredHeight = 1;
	587	+
566	588	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
567	589
568		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	591	+ //minButton.setToolTipText("Minimize window");
	592	+ //minButton.addActionListener(this);
	593	+
	594	+ if (Globals.ADVANCED)
	595	+ {
	596	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ maxButton.setToolTipText("Maximize window");
	598	+ maxButton.addActionListener(this);
	599	+ }
	600	+
	601	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ fullButton.setToolTipText("Full-screen window");
	603	+ fullButton.addActionListener(this);
	604	+
	605	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ screenfitButton.setToolTipText("Screen fit");
	607	+ screenfitButton.addActionListener(this);
	608	+
	609	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	611	+ restoreCameraButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	614	undoButton.setToolTipText("Undo changes");
570	615	undoButton.addActionListener(this);
	616	+ undoButton.setEnabled(false);
571	617
572		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
573	619	redoButton.setToolTipText("Redo changes");
574	620	redoButton.addActionListener(this);
	621	+ redoButton.setEnabled(false);
575	622
576		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	624	saveButton.setToolTipText("Save changes");
578	625	saveButton.addActionListener(this);
579	626
580		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	627	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
581	628	liveCB.setToolTipText("Enable animation");
582	629	liveCB.addItemListener(this);
583	630
584		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585	632	oneStepButton.setToolTipText("Animate one step forward");
586	633	oneStepButton.addActionListener(this);
587	634
588		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	635	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
589	636	fastCB.setToolTipText("Fast mode");
590	637	fastCB.addItemListener(this);
591	638
592		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
593		- trackCB.setToolTipText("Enable tracking");
594		- trackCB.addItemListener(this);
595		-
596		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597		- screenfitButton.setToolTipText("Screen fit");
598		- screenfitButton.addActionListener(this);
	639	+ //oe.toolboxPanel.Return();
	640	+
	641	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	642	+// trackCB.setToolTipText("Enable tracking");
	643	+// trackCB.addItemListener(this);
599	644
600	645	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
601	646	// screenfitpointButton.addActionListener(this);
..	..	@@ -607,65 +652,145 @@
607	652	snapobjectButton.setToolTipText("Snap Object");
608	653	}
609	654
610		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
611		- flashSelectionButton.setToolTipText("Show selection");
612		- flashSelectionButton.addActionListener(this);
	655	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
613	656
614		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
615		-
616		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	658	twoButton.setToolTipText("Show center view only");
618	659	twoButton.addActionListener(this);
619		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ this.fullscreenLayout = twoButton;
	661	+
	662	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	663	fourButton.addActionListener(this);
621	664	fourButton.setToolTipText("Show left panel only");
622		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
623	666	sixButton.setToolTipText("2-column layout left");
624	667	sixButton.addActionListener(this);
625		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	669	threeButton.setToolTipText("2-column layout right");
627	670	threeButton.addActionListener(this);
628		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	672	sevenButton.setToolTipText("3-column layout");
630	673	sevenButton.addActionListener(this);
631	674	//
632	675
633		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
634	677	rootButton.setToolTipText("Edit selection in new tab");
635	678	rootButton.addActionListener(this);
636	679
637		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	681	closeButton.setToolTipText("Close tab");
639	682	closeButton.addActionListener(this);
640	683	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
641	684	//clearButton.addActionListener(this);
642		-
643		- cGridBag commandsPanel = new cGridBag();
	685	+
	686	+ // INSERT
	687	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ gridButton.setToolTipText("Create grid");
	689	+ gridButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ boxButton.setToolTipText("Create box");
	693	+ boxButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ sphereButton.setToolTipText("Create sphere");
	697	+ sphereButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ coneButton.setToolTipText("Create cone");
	701	+ coneButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ torusButton.setToolTipText("Create torus");
	705	+ torusButton.addActionListener(this);
	706	+
	707	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ superButton.setToolTipText("Create superellipsoid");
	709	+ superButton.addActionListener(this);
	710	+
	711	+ if (Globals.ADVANCED)
	712	+ {
	713	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	714	+ kleinButton.setToolTipText("Create Klein bottle");
	715	+ kleinButton.addActionListener(this);
	716	+ }
644	717
645		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
646		- editButton.setToolTipText("Edit selection");
	718	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ particlesButton.setToolTipText("Create particle system");
	720	+ particlesButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.Return();
	723	+
	724	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ groupButton.setToolTipText("Create group");
	726	+ groupButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ compositeButton.setToolTipText("Create composite");
	730	+ compositeButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ switchButton.setToolTipText("Create item switcher");
	734	+ switchButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ loopButton.setToolTipText("Create loop");
	738	+ loopButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ textureButton.setToolTipText("Create texture");
	742	+ textureButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ overlayButton.setToolTipText("Create overlay");
	746	+ overlayButton.addActionListener(this);
	747	+
	748	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	749	+ lightButton.setToolTipText("Create light");
	750	+ lightButton.addActionListener(this);
	751	+
	752	+ for (int i=6; --i>=0;)
	753	+ {
	754	+ oe.toolboxPanel.Return();
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ }
	763	+
	764	+ // EDIT panel
	765	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ editButton.setToolTipText("Pin selection controls");
647	767	editButton.addActionListener(this);
648	768
649		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650		- uneditButton.setToolTipText("Unedit selection");
	769	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ uneditButton.setToolTipText("Remove selection controls");
651	771	uneditButton.addActionListener(this);
652	772
653		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
654		- allParamsButton.setToolTipText("Edit all params");
	773	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	774	+ allParamsButton.setToolTipText("Show all controle");
655	775	allParamsButton.addActionListener(this);
656	776
657		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
658	778	clearPanelButton.setToolTipText("Clear edit panel");
659	779	clearPanelButton.addActionListener(this);
660	780
661		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
662	782	unselectButton.setToolTipText("Unselect");
663	783	unselectButton.addActionListener(this);
664	784
665		- commandsPanel.preferredHeight = 1;
	785	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ flashSelectionButton.setToolTipText("Highlight selection");
	787	+ flashSelectionButton.addActionListener(this);
666	788
667		- oe.treePanel.add(commandsPanel);
668		- oe.treePanel.Return();
	789	+ editCommandsPanel.preferredHeight = 1;
	790	+
	791	+ SetPinStates(false);
	792	+// oe.treePanel.add(commandsPanel);
	793	+// oe.treePanel.Return();
669	794
670	795	// oe.aConstraints.gridx += 1;
671	796	// oe.aConstraints.weighty = 0;
..	..	@@ -682,27 +807,12 @@
682	807
683	808	JScrollPane jSP;
684	809	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
685		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	810	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
686	811	ResetModel();
687	812
688	813	oe.treePanel.add(jSPPanel);
689	814	oe.treePanel.Return();
690	815
691		- cGridBag copyOptionsPanel = new cGridBag();
692		-
693		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
694		- colorCB.setToolTipText("Copy color when dropped");
695		- colorCB.addItemListener(this);
696		-
697		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
698		- materialCB.setToolTipText("Copy material when dropped");
699		- materialCB.addItemListener(this);
700		-
701		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
702		- textureCB.setToolTipText("Copy texture when dropped");
703		- textureCB.addItemListener(this);
704		-
705		- copyOptionsPanel.preferredHeight = 1;
706	816	oe.treePanel.add(copyOptionsPanel);
707	817	oe.treePanel.Return();
708	818
..	..	@@ -733,23 +843,43 @@
733	843
734	844	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
735	845	{
	846	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	847	+ colorCB.setToolTipText("Copy color when dropped");
	848	+ colorCB.addItemListener(this);
	849	+
	850	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	851	+ materialCB.setToolTipText("Copy material when dropped");
	852	+ materialCB.addItemListener(this);
	853	+
	854	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	855	+ textureCB.setToolTipText("Copy texture when dropped");
	856	+ textureCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
736	860	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
737	861	boxCB.setToolTipText("Display bounding boxes");
738	862	boxCB.addItemListener(this);
739	863
740	864	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
741		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	865	+ zoomBoxCB.setToolTipText("Display only for wheel");
742	866	zoomBoxCB.addItemListener(this);
743	867
744	868	if (true) // Globals.ADVANCED)
745	869	{
746		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
747		- supportCB.setToolTipText("Enable rigging");
748		- supportCB.addItemListener(this);
	870	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	871	+// supportCB.setToolTipText("Enable rigging");
	872	+// supportCB.addItemListener(this);
	873	+
	874	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	875	+ freezeCB.setToolTipText("Fast moving camera");
	876	+ freezeCB.addItemListener(this);
749	877
750	878	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
751	879	// localCB.addItemListener(this);
752	880
	881	+ panel.Return();
	882	+
753	883	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
754	884	crowdCB.setToolTipText("Used for crowds");
755	885	crowdCB.addItemListener(this);
..	..	@@ -766,6 +896,8 @@
766	896	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
767	897	// speakerMocapCB.addItemListener(this);
768	898
	899	+ panel.Return();
	900	+
769	901	if (false)
770	902	{
771	903	// handled in scripts
..	..	@@ -780,32 +912,72 @@
780	912	//constraints.gridy += 1;
781	913	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
782	914	smoothfocusCB.addItemListener(this);
	915	+ panel.Return();
783	916	}
784	917
785	918	//constraints.gridx += 1;
786	919	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
787	920	// debugCB.addItemListener(this);
788	921
	922	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	923	+ trackCB.setToolTipText("Enable tracking target");
	924	+ trackCB.addItemListener(this);
	925	+
789	926	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	927	+ oeilCB.setToolTipText("Move camera when tracking");
790	928	oeilCB.addItemListener(this);
791	929
	930	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	931	+ shadowCB.setToolTipText("When live compute shadows");
	932	+ shadowCB.addItemListener(this);
	933	+
	934	+ panel.Return();
	935	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	936	+ toggleTextureCB.setToolTipText("Load textures");
	937	+ toggleTextureCB.addItemListener(this);
	938	+
	939	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	940	+ toggleSwitchCB.setToolTipText("Choose a single item");
	941	+ toggleSwitchCB.addItemListener(this);
	942	+
	943	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	944	+ autosaveCB.setToolTipText("On structure change");
	945	+ autosaveCB.addItemListener(this);
	946	+
	947	+ panel.Return();
	948	+ if (Globals.ADVANCED)
	949	+ {
792	950	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
793	951	lookAtCB.setToolTipText("Look-at target");
794	952	lookAtCB.addItemListener(this);
	953	+ }
795	954
796	955	}
797	956
798	957	cGridBag fill = new cGridBag();
799		-
800	958	fill.preferredHeight = 200;
	959	+ cGridBag fill2 = new cGridBag();
	960	+ fill2.preferredHeight = 200;
	961	+ cGridBag fill3 = new cGridBag();
	962	+ fill3.preferredHeight = 200;
801	963
802	964	panel.add(fill);
	965	+ panel.add(fill2);
	966	+ panel.add(fill3);
803	967
804	968	}
805	969
806	970	void EditObject(Object3D obj)
807	971	{
808	972	cRadio radioButton = new cRadio(obj.name);
	973	+
	974	+ // Patch to avoid bug with transparency.
	975	+ radioButton.hadMaterial = obj.material != null;
	976	+ if (!radioButton.hadMaterial)
	977	+ {
	978	+ obj.material = new cMaterial();
	979	+ }
	980	+
809	981	radioButton.SetObject(obj);
810	982	radioButton.layout = sevenButton;
811	983	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -817,6 +989,8 @@
817	989
818	990	void SetupViews(ObjEditor oe)
819	991	{
	992	+ theFrame = this;
	993	+
820	994	oe.SetupViews();
821	995
822	996	System.out.println("SetupViews");
..	..	@@ -825,23 +999,28 @@
825	999	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
826	1000	}
827	1001
828		- JCheckBox liveCB;
829		- JCheckBox supportCB;
830		- JCheckBox localCB;
831		- JCheckBox crowdCB;
832		- JCheckBox smoothCB;
833		- JCheckBox fastCB;
834		- JCheckBox slowCB;
835		- JCheckBox boxCB;
836		- JCheckBox zoomBoxCB;
837		- JCheckBox trackCB;
838		- JCheckBox smoothfocusCB;
	1002	+ cToggleButton liveCB;
	1003	+ cCheckBox supportCB;
	1004	+ cCheckBox localCB;
	1005	+ cCheckBox crowdCB;
	1006	+ cCheckBox smoothCB;
	1007	+ cToggleButton fastCB;
	1008	+ cCheckBox slowCB;
	1009	+ cCheckBox boxCB;
	1010	+ cCheckBox zoomBoxCB;
	1011	+ cCheckBox freezeCB;
	1012	+ //cToggleButton trackCB;
	1013	+ cCheckBox trackCB;
	1014	+ cCheckBox smoothfocusCB;
839	1015	// JCheckBox speakerMocapCB;
840		- JCheckBox speakerCameraCB;
841		- JCheckBox speakerFocusCB;
842		- JCheckBox debugCB;
843		- JCheckBox oeilCB;
844		- JCheckBox lookAtCB;
	1016	+ cCheckBox speakerCameraCB;
	1017	+ cCheckBox speakerFocusCB;
	1018	+ cCheckBox debugCB;
	1019	+
	1020	+ cCheckBox oeilCB;
	1021	+ cCheckBox shadowCB;
	1022	+ cCheckBox autosaveCB;
	1023	+ cCheckBox lookAtCB;
845	1024
846	1025	// static int COLOR = 1;
847	1026	// static int MATERIAL = 2;
..	..	@@ -849,9 +1028,9 @@
849	1028
850	1029	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
851	1030
852		- JCheckBox colorCB;
853		- JCheckBox materialCB;
854		- JCheckBox textureCB;
	1031	+ cCheckBox colorCB;
	1032	+ cCheckBox materialCB;
	1033	+ cCheckBox textureCB;
855	1034
856	1035	public void itemStateChanged(ItemEvent e)
857	1036	{
..	..	@@ -944,6 +1123,18 @@
944	1123	{
945	1124	cameraView.ToggleOeil();
946	1125	}
	1126	+ else if(e.getSource() == shadowCB)
	1127	+ {
	1128	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == freezeCB)
	1131	+ {
	1132	+ Globals.FREEZEONMOVE ^= true;
	1133	+ }
	1134	+ else if(e.getSource() == autosaveCB)
	1135	+ {
	1136	+ Globals.SAVEONMAKE ^= true;
	1137	+ }
947	1138	else if(e.getSource() == lookAtCB)
948	1139	{
949	1140	cameraView.ToggleLookAt();
..	..	@@ -960,7 +1151,8 @@
960	1151
961	1152	/**/
962	1153	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
963		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1155	+ TreePath path = objEditor.jTree.getSelectionPath();
964	1156	if ((path == null) \|\| (path.getPathCount() <= 1)) {
965	1157	// We can't move the root node or an empty selection
966	1158	return;
..	..	@@ -1023,8 +1215,6 @@
1023	1215	}
1024	1216	}
1025	1217
1026		- String string = (String) object;
1027		-
1028	1218	System.out.println("Transfer = " + object + "; drop : " + target);
1029	1219	// if( object instanceof java.io.File[])
1030	1220	// {
..	..	@@ -1032,6 +1222,8 @@
1032	1222	// objEditor.DropFile((java.io.File[]) object, true);
1033	1223	// return;
1034	1224	// }
	1225	+
	1226	+ String string = (String) object;
1035	1227
1036	1228	// File path for Mac and Windows
1037	1229	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1077,23 +1269,33 @@
1077	1269
1078	1270	assert target == objEditor.jTree;
1079	1271	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1272	+ Object3D destinationLeaf;
1080	1273	try {
1081		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1274	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1082	1275	} catch (Exception e) {
1083	1276	System.out.println("destinationPath : " + destinationPath);
1084	1277	return;
1085	1278	}
1086	1279
1087		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1280	+ for (int i=group.selection.size(); --i>=0;)
1088	1281	{
	1282	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1283	+
	1284	+ // Cannot move into itself
	1285	+ if (child == destinationLeaf)
	1286	+ return;
	1287	+ }
	1288	+
	1289	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1290	+// {
1089	1291	loadClipboard(true);
1090	1292	objEditor.jTree.setSelectionPath(destinationPath);
1091	1293	pasteInto(false, false);
1092		- } else {
1093		- loadClipboard(false);
1094		- objEditor.jTree.setSelectionPath(destinationPath);
1095		- pasteInto(false, false); // true); // ???
1096		- }
	1294	+// } else {
	1295	+// loadClipboard(false);
	1296	+// objEditor.jTree.setSelectionPath(destinationPath);
	1297	+// pasteInto(false, false); // true); // ???
	1298	+// }
1097	1299	}
1098	1300	public void dropActionChanged(DropTargetDragEvent dtde)
1099	1301	// Called if the user has modified the current drop gesture
..	..	@@ -1198,22 +1400,30 @@
1198	1400	{
1199	1401	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1200	1402	//heightFieldItem.addActionListener(this);
1201		- gridItem = menu.add(new MenuItem("Grid"));
1202		- gridItem.addActionListener(this);
1203		- rectoidItem = menu.add(new MenuItem("Box"));
1204		- rectoidItem.addActionListener(this);
1205		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1206		- ellipsoidItem.addActionListener(this);
1207		- coneItem = menu.add(new MenuItem("Cone"));
1208		- coneItem.addActionListener(this);
1209		- torusItem = menu.add(new MenuItem("Torus"));
1210		- torusItem.addActionListener(this);
1211		- superItem = menu.add(new MenuItem("Superellipsoid"));
1212		- superItem.addActionListener(this);
	1403	+// gridItem = menu.add(new MenuItem("Grid"));
	1404	+// gridItem.addActionListener(this);
	1405	+// rectoidItem = menu.add(new MenuItem("Box"));
	1406	+// rectoidItem.addActionListener(this);
	1407	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1408	+// ellipsoidItem.addActionListener(this);
	1409	+// coneItem = menu.add(new MenuItem("Cone"));
	1410	+// coneItem.addActionListener(this);
	1411	+// torusItem = menu.add(new MenuItem("Torus"));
	1412	+// torusItem.addActionListener(this);
	1413	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1414	+// superItem.addActionListener(this);
	1415	+
	1416	+ cameraItem = menu.add(new MenuItem("Camera"));
	1417	+ cameraItem.addActionListener(this);
	1418	+
	1419	+ if (!Globals.ADVANCED)
	1420	+ {
1213	1421	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1214	1422	kleinItem.addActionListener(this);
1215		- particleItem = menu.add(new MenuItem("Particle system"));
1216		- particleItem.addActionListener(this);
	1423	+ }
	1424	+
	1425	+// particleItem = menu.add(new MenuItem("Particle system"));
	1426	+// particleItem.addActionListener(this);
1217	1427	if (Globals.ADVANCED)
1218	1428	{
1219	1429	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1239,15 +1449,15 @@
1239	1449	}
1240	1450	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1241	1451	bezierItem.addActionListener(this);
1242		- overlayItem = menu.add(new MenuItem("Overlay"));
1243		- overlayItem.addActionListener(this);
1244		- lightItem = menu.add(new MenuItem("Light"));
1245		- lightItem.addActionListener(this);
	1452	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1453	+// overlayItem.addActionListener(this);
	1454	+// lightItem = menu.add(new MenuItem("Light"));
	1455	+// lightItem.addActionListener(this);
1246	1456	menu.add("-");
1247	1457	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1248	1458	//superLoopItem.addActionListener(this);
1249		- loopItem = menu.add(new MenuItem("Loop"));
1250		- loopItem.addActionListener(this);
	1459	+// loopItem = menu.add(new MenuItem("Loop"));
	1460	+// loopItem.addActionListener(this);
1251	1461	doubleItem = menu.add(new MenuItem("Fork"));
1252	1462	doubleItem.addActionListener(this);
1253	1463	if (Globals.ADVANCED)
..	..	@@ -1262,6 +1472,9 @@
1262	1472	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1263	1473	animationItem.addItemListener(this);
1264	1474	animationItem.setState(Globals.ANIMATION);
	1475	+
	1476	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1477	+ archiveItem.addActionListener(this);
1265	1478
1266	1479	menu.add("-");
1267	1480	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1428,9 +1641,24 @@
1428	1641	shadow.material = new cMaterial(obj.material);
1429	1642	shadow.material.diffuse = 0.0001f;
1430	1643	shadow.material.specular = 0.0001f;
	1644	+ //shadow.projectedVertices[1].x = 300;
1431	1645
1432	1646	makeSomething(shadow);
1433	1647	}
	1648	+
	1649	+ private void ClearUnpinned()
	1650	+ {
	1651	+ //for (Object3D obj : listUI)
	1652	+ for (int i=listUI.size(); --i>=0;)
	1653	+ {
	1654	+ Object3D obj = listUI.elementAt(i);
	1655	+ if (!obj.pinned)
	1656	+ {
	1657	+ obj.CloseUI();
	1658	+ listUI.remove(i);
	1659	+ }
	1660	+ }
	1661	+ }
1434	1662
1435	1663	/**
1436	1664	* applyExample
..	..	@@ -1675,7 +1903,7 @@
1675	1903	{
1676	1904	ScreenFit();
1677	1905	} else
1678		- if (source == switchItem)
	1906	+ if (source == switchViewItem)
1679	1907	{
1680	1908	cVector v1 = new cVector();
1681	1909	cVector v2 = new cVector();
..	..	@@ -1684,11 +1912,11 @@
1684	1912	objEditor.cameraView.renderCamera.setAim(v2, v1);
1685	1913	objEditor.cameraView.repaint();
1686	1914	} else
1687		- if (source == rectoidItem)
	1915	+ if (source == rectoidItem \|\| source == boxButton)
1688	1916	{
1689	1917	makeSomething(new Box());
1690	1918	} else
1691		- if (source == particleItem)
	1919	+ if (source == particleItem \|\| source == particlesButton)
1692	1920	{
1693	1921	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1694	1922	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1767,27 +1995,27 @@
1767	1995
1768	1996	makeSomething(obj);
1769	1997	} else
1770		- if (source == gridItem)
	1998	+ if (source == gridItem \|\| source == gridButton)
1771	1999	{
1772	2000	makeSomething(new Grid());
1773	2001	} else
1774		- if (source == ellipsoidItem)
	2002	+ if (source == ellipsoidItem \|\| source == sphereButton)
1775	2003	{
1776	2004	makeSomething(new Sphere());
1777	2005	} else
1778		- if (source == coneItem)
	2006	+ if (source == coneItem \|\| source == coneButton)
1779	2007	{
1780	2008	makeSomething(new Cone());
1781	2009	} else
1782		- if (source == torusItem)
	2010	+ if (source == torusItem \|\| source == torusButton)
1783	2011	{
1784	2012	makeSomething(new Torus());
1785	2013	} else
1786		- if (source == superItem)
	2014	+ if (source == superItem \|\| source == superButton)
1787	2015	{
1788	2016	makeSomething(new Superellipsoid());
1789	2017	} else
1790		- if (source == kleinItem)
	2018	+ if (source == kleinItem \|\| source == kleinButton)
1791	2019	{
1792	2020	makeSomething(new Klein());
1793	2021	} else
..	..	@@ -1807,7 +2035,7 @@
1807	2035	{
1808	2036	makeSomething(new BezierSurface());
1809	2037	} else
1810		- if (source == overlayItem)
	2038	+ if (source == overlayItem \|\| source == overlayButton)
1811	2039	{
1812	2040	/*
1813	2041	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1855,7 +2083,7 @@
1855	2083	s.setup();
1856	2084	makeSomething(s);
1857	2085	} else
1858		- if (source == lightItem)
	2086	+ if (source == lightItem \|\| source == lightButton)
1859	2087	{
1860	2088	makeSomething(new Light());
1861	2089	} else
..	..	@@ -1905,30 +2133,30 @@
1905	2133
1906	2134	group(g);
1907	2135	} else
1908		- if (source == loopItem)
	2136	+ if (source == loopItem \|\| source == loopButton)
1909	2137	{
1910	2138	Composite csg = new GroupLeaf();
1911	2139	csg.count = 5;
1912	2140	group(csg);
1913		- Composite child = new cGroup();
	2141	+ Composite child = new cGroup("Branch");
1914	2142	csg.addChild(child);
1915	2143	child.addChild(csg);
1916	2144	} else
1917	2145	if (source == doubleItem)
1918	2146	{
1919		- Composite csg = new GroupLeaf();
	2147	+ Composite csg = new GroupLeaf("Fork");
1920	2148	csg.count = 5;
1921	2149	group(csg);
1922		- Composite child = new cGroup();
	2150	+ Composite child = new cGroup("Branch A");
1923	2151	csg.addChild(child);
1924	2152	child.addChild(csg);
1925		- child = new cGroup();
	2153	+ child = new cGroup("Branch B");
1926	2154	csg.addChild(child);
1927	2155	child.addChild(csg);
1928	2156	} else
1929	2157	if (source == tripleItem)
1930	2158	{
1931		- Composite csg = new GroupLeaf();
	2159	+ Composite csg = new GroupLeaf("Trident");
1932	2160	csg.count = 4;
1933	2161	group(csg);
1934	2162	Composite child = new cGroup();
..	..	@@ -1978,9 +2206,22 @@
1978	2206	{
1979	2207	DumpObject();
1980	2208	} else
	2209	+ if (source == minButton)
	2210	+ {
	2211	+ Minimize();
	2212	+ } else
	2213	+ if (source == maxButton)
	2214	+ {
	2215	+ Maximize();
	2216	+ } else
	2217	+ if (source == fullButton)
	2218	+ {
	2219	+ ToggleFullScreen();
	2220	+ } else
1981	2221	if (source == undoButton)
1982	2222	{
1983		- Undo();
	2223	+ if (!Undo())
	2224	+ java.awt.Toolkit.getDefaultToolkit().beep();
1984	2225	} else
1985	2226	if (source == redoButton)
1986	2227	{
..	..	@@ -1988,7 +2229,8 @@
1988	2229	} else
1989	2230	if (source == saveButton)
1990	2231	{
1991		- Save();
	2232	+ if (!Save(true))
	2233	+ java.awt.Toolkit.getDefaultToolkit().beep();
1992	2234	} else
1993	2235	if (source == oneStepButton)
1994	2236	{
..	..	@@ -1997,17 +2239,14 @@
1997	2239	} else
1998	2240	if (source == screenfitButton)
1999	2241	{
2000		- //Reload(lastConverter, lastFilename, true);
2001	2242	ScreenFit();
2002	2243	} else
2003	2244	if (source == screenfitpointButton)
2004	2245	{
2005		- //Reload(lastConverter, lastFilename, true);
2006	2246	ScreenFitPoint();
2007	2247	} else
2008	2248	if (source == snapobjectButton)
2009	2249	{
2010		- //Reload(lastConverter, lastFilename, true);
2011	2250	SnapObject();
2012	2251	} else
2013	2252	// if (event.getSource() == recompileButton)
..	..	@@ -2383,9 +2622,9 @@
2383	2622	{
2384	2623	ClearSelection(true);
2385	2624	} else
2386		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2387	2626	{
2388		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2389	2628	} else
2390	2629	if (source == hideItem)
2391	2630	{
..	..	@@ -2403,11 +2642,11 @@
2403	2642	{
2404	2643	makeSomething(new Camera());
2405	2644	} else
2406		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2407	2646	{
2408	2647	group(new Composite());
2409	2648	} else
2410		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2411	2650	{
2412	2651	RandomNode random = new RandomNode();
2413	2652	group(random);
..	..	@@ -2509,7 +2748,7 @@
2509	2748	{
2510	2749	group(new cLinker());
2511	2750	} else
2512		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2513	2752	{
2514	2753	group(new TextureNode());
2515	2754	} else
..	..	@@ -2529,17 +2768,30 @@
2529	2768	{
2530	2769	CastShadow(2);
2531	2770	} else
2532		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2533	2772	{
2534		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2535	2775	for (int i=0; i<group.selection.size(); i++)
2536	2776	{
2537		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2538	2782	}
2539	2783
2540		- ClearSelection(false);
2541		-
2542		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2543	2795	} else
2544	2796	if (source == genUVItem)
2545	2797	{
..	..	@@ -2867,6 +3119,10 @@
2867	3119	if (source == twoButton)
2868	3120	{
2869	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2870	3126	// bug
2871	3127	//gridPanel.setDividerLocation(1.0);
2872	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2899,10 +3155,31 @@
2899	3155	bigThree.ClearUI();
2900	3156	bigThree.add(centralPanel);
2901	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2902	3176	} else
2903	3177	if (source == threeButton)
2904	3178	{
2905	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2906	3183
2907	3184	// bigThree.remove(scenePanel);
2908	3185	// bigThree.remove(centralPanel);
..	..	@@ -2935,10 +3212,15 @@
2935	3212	bigThree.add(centralPanel);
2936	3213	bigThree.add(XYZPanel);
2937	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2938	3217	} else
2939	3218	if (source == fourButton)
2940	3219	{
2941	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2942	3224
2943	3225	// bigThree.remove(scenePanel);
2944	3226	// bigThree.remove(centralPanel);
..	..	@@ -2970,10 +3252,15 @@
2970	3252	bigThree.ClearUI();
2971	3253	bigThree.add(scenePanel);
2972	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2973	3257	} else
2974	3258	if (source == sixButton)
2975	3259	{
2976	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2977	3264
2978	3265	// bigThree.remove(scenePanel);
2979	3266	// bigThree.remove(centralPanel);
..	..	@@ -3006,10 +3293,15 @@
3006	3293	bigThree.add(scenePanel);
3007	3294	bigThree.add(centralPanel);
3008	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
3009	3298	} else
3010	3299	if (source == sevenButton)
3011	3300	{
3012	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
3013	3305
3014	3306	// bigThree.remove(scenePanel);
3015	3307	// bigThree.remove(centralPanel);
..	..	@@ -3043,6 +3335,8 @@
3043	3335	bigThree.add(centralPanel);
3044	3336	bigThree.add(XYZPanel);
3045	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
3046	3340	} else
3047	3341	if (source == rootButton)
3048	3342	{
..	..	@@ -3054,6 +3348,7 @@
3054	3348	EditObject(obj);
3055	3349	}
3056	3350
	3351	+ cameraView.requestFocusInWindow();
3057	3352	refreshContents(true);
3058	3353	} else
3059	3354	if (source == closeButton)
..	..	@@ -3063,22 +3358,37 @@
3063	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3064	3359	{
3065	3360	ab = (cRadio)e.nextElement();
3066		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3067	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
3068	3369	buttonGroup.remove(ab);
3069	3370	radioPanel.remove(ab);
3070	3371
3071		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
3072	3374	// ab.GetObject().objectUI = null; // ?????????
3073	3375
3074	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3075	3377	break;
3076	3378	}
3077	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
3078	3382	refreshContents(true);
3079	3383	} else
3080	3384	if (source == editItem \|\| source == editButton)
3081	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
3082	3392	EditSelection(false);
3083	3393	} else
3084	3394	if (source == uneditButton)
..	..	@@ -3088,6 +3398,7 @@
3088	3398	Object3D child = (Object3D)e.nextElement();
3089	3399	if(child.editWindow != null)
3090	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
3091	3402	child.CloseUI();
3092	3403	listUI.remove(child);
3093	3404
..	..	@@ -3104,6 +3415,7 @@
3104	3415	//copy.ClearUI();
3105	3416	for (Object3D obj : listUI)
3106	3417	{
	3418	+ obj.pinned = false;
3107	3419	obj.CloseUI();
3108	3420	}
3109	3421	listUI.clear();
..	..	@@ -3113,7 +3425,7 @@
3113	3425	{
3114	3426	assert(copy == group);
3115	3427
3116		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3117	3429
3118	3430	for (Object3D obj : listUI)
3119	3431	{
..	..	@@ -3179,7 +3491,8 @@
3179	3491	}
3180	3492
3181	3493	// fix "+" issue
3182		- group.editWindow = this;
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
3183	3496
3184	3497	/*
3185	3498	currentLayout = radio.layout;
..	..	@@ -3187,18 +3500,25 @@
3187	3500	currentLayout = sevenButton;
3188	3501	*/
3189	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3190	3508	keepparent = group.parent;
3191	3509	// PARENT = NULL or not???
3192	3510	//group.parent = null; // ROOT
3193	3511	//group.attributes = -1;
3194	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
3195	3515	refreshContents(true);
3196	3516	} else if (event.getSource() == editCameraItem)
3197	3517	{
3198	3518	cameraView.ProtectCamera();
3199	3519	cameraView.repaint();
3200	3520	return;
3201		- } else if (event.getSource() == revertCameraItem)
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3202	3522	{
3203	3523	cameraView.RevertCamera();
3204	3524	cameraView.repaint();
..	..	@@ -3215,7 +3535,6 @@
3215	3535	}
3216	3536
3217	3537	boolean useclient = false;
3218		- cRadio radio;
3219	3538
3220	3539	void ToggleRoot()
3221	3540	{
..	..	@@ -4253,10 +4572,6 @@
4253	4572	// }
4254	4573	// }
4255	4574
4256		- static boolean allparams = true;
4257		-
4258		- static Vector<Object3D> listUI = new Vector<Object3D>();
4259		-
4260	4575	void EditSelection(boolean newWindow)
4261	4576	{
4262	4577	// aConstraints.gridy = 0;
..	..	@@ -4264,7 +4579,7 @@
4264	4579	{
4265	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4266	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4267		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4268	4583
4269	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4270	4585	if(elem != group \|\| !newWindow)
..	..	@@ -4349,7 +4664,8 @@
4349	4664	//new Exception().printStackTrace();
4350	4665
4351	4666	freezemodel = true;
4352		-
	4667	+ ClearUnpinned();
	4668	+
4353	4669	/**/
4354	4670	//switch (event.id)
4355	4671	{
..	..	@@ -4382,7 +4698,7 @@
4382	4698	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4383	4699	// a camera
4384	4700	{
4385		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4386	4702	{
4387	4703	CameraPane.camerachangeframe = 0; // don't refuse it
4388	4704	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4391,6 +4707,13 @@
4391	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4392	4708	}
4393	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4394	4717	refreshContents();
4395	4718	//return true;
4396	4719	}
..	..	@@ -4400,9 +4723,18 @@
4400	4723	freezemodel = false;
4401	4724	}
4402	4725
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
4403	4734	void refreshContents(boolean cp)
4404	4735	{
4405		- if (!Globals.MOUSEDRAGGED)
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4406	4738	{
4407	4739	objEditor.ClearInfo(); // .GetMaterial());
4408	4740
..	..	@@ -4501,6 +4833,7 @@
4501	4833
4502	4834	if (cut)
4503	4835	{
	4836	+ if (Globals.SAVEONMAKE)
4504	4837	Save();
4505	4838	//int indices[] = jList.getSelectedIndices();
4506	4839	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5219,10 +5552,28 @@
5219	5552	cButton clearpanelButton;
5220	5553	cButton unselectButton;
5221	5554
	5555	+ cButton restoreCameraButton;
	5556	+
5222	5557	cButton saveButton;
5223		- cButton undoButton;
5224		- cButton redoButton;
5225	5558	cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
5226	5577
5227	5578	cButton screenfitButton;
5228	5579	cButton screenfitpointButton;
..	..	@@ -5235,14 +5586,6 @@
5235	5586
5236	5587	cButton setsupportButton;
5237	5588
5238		- cButton twoButton;
5239		- cButton sixButton;
5240		- cButton threeButton;
5241		- cButton sevenButton;
5242		- cButton fourButton; // full panel
5243		- cButton oneButton; // full XYZ
5244		- //cButton currentLayout;
5245		-
5246	5589	//
5247	5590	//Composite
5248	5591	Object3D // to do !!
..	..	@@ -5252,11 +5595,11 @@
5252	5595	//JTree jTree;
5253	5596	private MenuItem lookAtItem;
5254	5597	private MenuItem lookFromItem;
5255		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5256	5599	private MenuItem cutItem;
5257	5600	private MenuItem undoItem;
5258	5601	private MenuItem redoItem;
5259		- private MenuItem duplicateItem;
	5602	+ private JMenuItem duplicateItem;
5260	5603	private MenuItem cloneItem;
5261	5604	private MenuItem cloneSupportItem;
5262	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5344,7 +5687,7 @@
5344	5687	private MenuItem frontItem;
5345	5688	private MenuItem cameraItem;
5346	5689	private MenuItem compositeItem;
5347		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5348	5691	private MenuItem physicsItem;
5349	5692	private MenuItem frameselectorItem;
5350	5693	private MenuItem scriptNodeItem;
..	..	@@ -5418,5 +5761,5 @@
5418	5761
5419	5762	Menu cameraMenu;
5420	5763	MenuItem editCameraItem;
5421		- MenuItem revertCameraItem;
	5764	+ MenuItem restoreCameraItem;
5422	5765	}