~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,6 +150,8 @@
150	150
151	151	void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
153	155	Menu menu;
154	156	oe.menuBar.add(menu = new Menu("Edit"));
155	157	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +162,7 @@
160	162	// redoItem = menu.add(new MenuItem("Redo"));
161	163	// redoItem.addActionListener(this);
162	164	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	166	duplicateItem.addActionListener(this);
165	167	cloneItem = menu.add(new MenuItem("Clone"));
166	168	cloneItem.addActionListener(this);
..	..	@@ -176,7 +178,6 @@
176	178	copyItem.addActionListener(this);
177	179	pasteItem = menu.add(new MenuItem("Paste"));
178	180	pasteItem.addActionListener(this);
179		- menu.add("-");
180	181
181	182	menu.add("-");
182	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -203,23 +204,23 @@
203	204	//zBufferItem.addActionListener(this);
204	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	206	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
208	209
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
213	222
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
221		-
222		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
223	224	toggleHandleItem.addItemListener(this);
224	225	toggleHandleItem.setState(CameraPane.HANDLES);
225	226
..	..	@@ -246,7 +247,7 @@
246	247
247	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	249	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
250	251
251	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +275,7 @@
274	275	{
275	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	280	oe.cameraMenu.add("-");
280	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +283,7 @@
282	283	editLeafItem.addActionListener(this);
283	284	lookAtItem.addActionListener(this);
284	285	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
286	287	}
287	288
288	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +328,29 @@
327	328	}
328	329
329	330	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
332	333	backItem = menu.add(new MenuItem("Back"));
333	334	backItem.addActionListener(this);
334	335	frontItem = menu.add(new MenuItem("Front"));
335	336	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
338	342	hideItem = menu.add(new MenuItem("Hidden Group"));
339	343	hideItem.addActionListener(this);
	344	+ }
340	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	346	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
345	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	355	switchGeoItem.addActionListener(this);
347	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +358,6 @@
349	358	morphItem = menu.add(new MenuItem("Morph Group"));
350	359	morphItem.addActionListener(this);
351	360
352		- if (Globals.ADVANCED)
353		- {
354	361	menu.add("-");
355	362	physicsItem = menu.add(new MenuItem("Physics"));
356	363	physicsItem.addActionListener(this);
..	..	@@ -358,22 +365,20 @@
358	365	frameselectorItem.addActionListener(this);
359	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	367	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	368	}
364	369
365	370	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
368	373	billboardItem = menu.add(new MenuItem("Billboard"));
369	374	billboardItem.addActionListener(this);
370	375	csgItem = menu.add(new MenuItem("CSG"));
371	376	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	378	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	380	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	382	shadowZItem.addActionListener(this);
378	383	if (Globals.ADVANCED)
379	384	{
..	..	@@ -470,6 +475,14 @@
470	475	markleavesItem.addActionListener(this);
471	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
473	486	menu.add("-");
474	487	flipVItem = menu.add(new MenuItem("Flip V"));
475	488	flipVItem.addActionListener(this);
..	..	@@ -527,6 +540,18 @@
527	540
528	541	void SetupUI2(ObjEditor oe)
529	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
530	555	//new Exception().printStackTrace();
531	556
532	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -555,39 +580,66 @@
555	580	oe.radioPanel.add(dummyButton);
556	581	oe.buttonGroup.add(dummyButton);
557	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
558	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	588
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561	609	undoButton.setToolTipText("Undo changes");
562	610	undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
563	612
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	614	redoButton.setToolTipText("Redo changes");
566	615	redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
567	617
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	619	saveButton.setToolTipText("Save changes");
570	620	saveButton.addActionListener(this);
571	621
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	623	liveCB.setToolTipText("Enable animation");
574	624	liveCB.addItemListener(this);
575	625
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	627	oneStepButton.setToolTipText("Animate one step forward");
578	628	oneStepButton.addActionListener(this);
579	629
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	631	fastCB.setToolTipText("Fast mode");
582	632	fastCB.addItemListener(this);
583	633
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	637	screenfitButton.setToolTipText("Screen fit");
590	638	screenfitButton.addActionListener(this);
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
591	643
592	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	645	// screenfitpointButton.addActionListener(this);
..	..	@@ -599,65 +651,145 @@
599	651	snapobjectButton.setToolTipText("Snap Object");
600	652	}
601	653
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	655
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	657	twoButton.setToolTipText("Show center view only");
610	658	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	662	fourButton.addActionListener(this);
613	663	fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615	665	sixButton.setToolTipText("2-column layout left");
616	666	sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618	668	threeButton.setToolTipText("2-column layout right");
619	669	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621	671	sevenButton.setToolTipText("3-column layout");
622	672	sevenButton.addActionListener(this);
623	673	//
624	674
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	676	rootButton.setToolTipText("Edit selection in new tab");
627	677	rootButton.addActionListener(this);
628	678
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	680	closeButton.setToolTipText("Close tab");
631	681	closeButton.addActionListener(this);
632	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	683	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	684	+
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
636	716
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638		- editButton.setToolTipText("Edit selection");
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
639	766	editButton.addActionListener(this);
640	767
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
643	770	uneditButton.addActionListener(this);
644	771
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646		- allParamsButton.setToolTipText("Edit all params");
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
647	774	allParamsButton.addActionListener(this);
648	775
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	777	clearPanelButton.setToolTipText("Clear edit panel");
651	778	clearPanelButton.addActionListener(this);
652	779
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	781	unselectButton.setToolTipText("Unselect");
655	782	unselectButton.addActionListener(this);
656	783
657		- commandsPanel.preferredHeight = 1;
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
658	787
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
661	793
662	794	// oe.aConstraints.gridx += 1;
663	795	// oe.aConstraints.weighty = 0;
..	..	@@ -674,27 +806,12 @@
674	806
675	807	JScrollPane jSP;
676	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	810	ResetModel();
679	811
680	812	oe.treePanel.add(jSPPanel);
681	813	oe.treePanel.Return();
682	814
683		- cGridBag copyOptionsPanel = new cGridBag();
684		-
685		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
686		- colorCB.setToolTipText("Copy color when dropped");
687		- colorCB.addItemListener(this);
688		-
689		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
690		- materialCB.setToolTipText("Copy material when dropped");
691		- materialCB.addItemListener(this);
692		-
693		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
694		- textureCB.setToolTipText("Copy texture when dropped");
695		- textureCB.addItemListener(this);
696		-
697		- copyOptionsPanel.preferredHeight = 1;
698	815	oe.treePanel.add(copyOptionsPanel);
699	816	oe.treePanel.Return();
700	817
..	..	@@ -725,23 +842,43 @@
725	842
726	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	844	{
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
728	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	860	boxCB.setToolTipText("Display bounding boxes");
730	861	boxCB.addItemListener(this);
731	862
732	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
733		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
734	865	zoomBoxCB.addItemListener(this);
735	866
736	867	if (true) // Globals.ADVANCED)
737	868	{
738		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
739		- supportCB.setToolTipText("Enable rigging");
740		- supportCB.addItemListener(this);
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
741	876
742	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	878	// localCB.addItemListener(this);
744	879
	880	+ panel.Return();
	881	+
745	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	883	crowdCB.setToolTipText("Used for crowds");
747	884	crowdCB.addItemListener(this);
..	..	@@ -758,6 +895,8 @@
758	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	896	// speakerMocapCB.addItemListener(this);
760	897
	898	+ panel.Return();
	899	+
761	900	if (false)
762	901	{
763	902	// handled in scripts
..	..	@@ -772,32 +911,72 @@
772	911	//constraints.gridy += 1;
773	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
775	915	}
776	916
777	917	//constraints.gridx += 1;
778	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	919	// debugCB.addItemListener(this);
780	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
781	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
782	927	oeilCB.addItemListener(this);
783	928
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
784	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	950	lookAtCB.setToolTipText("Look-at target");
786	951	lookAtCB.addItemListener(this);
	952	+ }
787	953
788	954	}
789	955
790	956	cGridBag fill = new cGridBag();
791		-
792	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
793	962
794	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
795	966
796	967	}
797	968
798	969	void EditObject(Object3D obj)
799	970	{
800	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
801	980	radioButton.SetObject(obj);
802	981	radioButton.layout = sevenButton;
803	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -809,6 +988,8 @@
809	988
810	989	void SetupViews(ObjEditor oe)
811	990	{
	991	+ theFrame = this;
	992	+
812	993	oe.SetupViews();
813	994
814	995	System.out.println("SetupViews");
..	..	@@ -817,23 +998,28 @@
817	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	999	}
819	1000
820		- JCheckBox liveCB;
821		- JCheckBox supportCB;
822		- JCheckBox localCB;
823		- JCheckBox crowdCB;
824		- JCheckBox smoothCB;
825		- JCheckBox fastCB;
826		- JCheckBox slowCB;
827		- JCheckBox boxCB;
828		- JCheckBox zoomBoxCB;
829		- JCheckBox trackCB;
830		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
831	1014	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
837	1023
838	1024	// static int COLOR = 1;
839	1025	// static int MATERIAL = 2;
..	..	@@ -841,9 +1027,9 @@
841	1027
842	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1029
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
847	1033
848	1034	public void itemStateChanged(ItemEvent e)
849	1035	{
..	..	@@ -936,6 +1122,18 @@
936	1122	{
937	1123	cameraView.ToggleOeil();
938	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
939	1137	else if(e.getSource() == lookAtCB)
940	1138	{
941	1139	cameraView.ToggleLookAt();
..	..	@@ -952,7 +1150,8 @@
952	1150
953	1151	/**/
954	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
955		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
956	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
957	1156	// We can't move the root node or an empty selection
958	1157	return;
..	..	@@ -1069,23 +1268,33 @@
1069	1268
1070	1269	assert target == objEditor.jTree;
1071	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
1072	1272	try {
1073		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1074	1274	} catch (Exception e) {
1075	1275	System.out.println("destinationPath : " + destinationPath);
1076	1276	return;
1077	1277	}
1078	1278
1079		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
1080	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
1081	1290	loadClipboard(true);
1082	1291	objEditor.jTree.setSelectionPath(destinationPath);
1083	1292	pasteInto(false, false);
1084		- } else {
1085		- loadClipboard(false);
1086		- objEditor.jTree.setSelectionPath(destinationPath);
1087		- pasteInto(false, false); // true); // ???
1088		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1089	1298	}
1090	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1091	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1190,22 +1399,30 @@
1190	1399	{
1191	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1192	1401	//heightFieldItem.addActionListener(this);
1193		- gridItem = menu.add(new MenuItem("Grid"));
1194		- gridItem.addActionListener(this);
1195		- rectoidItem = menu.add(new MenuItem("Box"));
1196		- rectoidItem.addActionListener(this);
1197		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1198		- ellipsoidItem.addActionListener(this);
1199		- coneItem = menu.add(new MenuItem("Cone"));
1200		- coneItem.addActionListener(this);
1201		- torusItem = menu.add(new MenuItem("Torus"));
1202		- torusItem.addActionListener(this);
1203		- superItem = menu.add(new MenuItem("Superellipsoid"));
1204		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1205	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1206	1421	kleinItem.addActionListener(this);
1207		- particleItem = menu.add(new MenuItem("Particle system"));
1208		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1209	1426	if (Globals.ADVANCED)
1210	1427	{
1211	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1231,15 +1448,15 @@
1231	1448	}
1232	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1233	1450	bezierItem.addActionListener(this);
1234		- overlayItem = menu.add(new MenuItem("Overlay"));
1235		- overlayItem.addActionListener(this);
1236		- lightItem = menu.add(new MenuItem("Light"));
1237		- lightItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1238	1455	menu.add("-");
1239	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1240	1457	//superLoopItem.addActionListener(this);
1241		- loopItem = menu.add(new MenuItem("Loop"));
1242		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1243	1460	doubleItem = menu.add(new MenuItem("Fork"));
1244	1461	doubleItem.addActionListener(this);
1245	1462	if (Globals.ADVANCED)
..	..	@@ -1254,6 +1471,9 @@
1254	1471	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1255	1472	animationItem.addItemListener(this);
1256	1473	animationItem.setState(Globals.ANIMATION);
	1474	+
	1475	+ menu.add(archiveItem = new CheckboxMenuItem("Archive3D..."));
	1476	+ archiveItem.addItemListener(this);
1257	1477
1258	1478	menu.add("-");
1259	1479	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1420,9 +1640,24 @@
1420	1640	shadow.material = new cMaterial(obj.material);
1421	1641	shadow.material.diffuse = 0.0001f;
1422	1642	shadow.material.specular = 0.0001f;
	1643	+ //shadow.projectedVertices[1].x = 300;
1423	1644
1424	1645	makeSomething(shadow);
1425	1646	}
	1647	+
	1648	+ private void ClearUnpinned()
	1649	+ {
	1650	+ //for (Object3D obj : listUI)
	1651	+ for (int i=listUI.size(); --i>=0;)
	1652	+ {
	1653	+ Object3D obj = listUI.elementAt(i);
	1654	+ if (!obj.pinned)
	1655	+ {
	1656	+ obj.CloseUI();
	1657	+ listUI.remove(i);
	1658	+ }
	1659	+ }
	1660	+ }
1426	1661
1427	1662	/**
1428	1663	* applyExample
..	..	@@ -1667,7 +1902,7 @@
1667	1902	{
1668	1903	ScreenFit();
1669	1904	} else
1670		- if (source == switchItem)
	1905	+ if (source == switchViewItem)
1671	1906	{
1672	1907	cVector v1 = new cVector();
1673	1908	cVector v2 = new cVector();
..	..	@@ -1676,11 +1911,11 @@
1676	1911	objEditor.cameraView.renderCamera.setAim(v2, v1);
1677	1912	objEditor.cameraView.repaint();
1678	1913	} else
1679		- if (source == rectoidItem)
	1914	+ if (source == rectoidItem \|\| source == boxButton)
1680	1915	{
1681	1916	makeSomething(new Box());
1682	1917	} else
1683		- if (source == particleItem)
	1918	+ if (source == particleItem \|\| source == particlesButton)
1684	1919	{
1685	1920	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1686	1921	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1759,27 +1994,27 @@
1759	1994
1760	1995	makeSomething(obj);
1761	1996	} else
1762		- if (source == gridItem)
	1997	+ if (source == gridItem \|\| source == gridButton)
1763	1998	{
1764	1999	makeSomething(new Grid());
1765	2000	} else
1766		- if (source == ellipsoidItem)
	2001	+ if (source == ellipsoidItem \|\| source == sphereButton)
1767	2002	{
1768	2003	makeSomething(new Sphere());
1769	2004	} else
1770		- if (source == coneItem)
	2005	+ if (source == coneItem \|\| source == coneButton)
1771	2006	{
1772	2007	makeSomething(new Cone());
1773	2008	} else
1774		- if (source == torusItem)
	2009	+ if (source == torusItem \|\| source == torusButton)
1775	2010	{
1776	2011	makeSomething(new Torus());
1777	2012	} else
1778		- if (source == superItem)
	2013	+ if (source == superItem \|\| source == superButton)
1779	2014	{
1780	2015	makeSomething(new Superellipsoid());
1781	2016	} else
1782		- if (source == kleinItem)
	2017	+ if (source == kleinItem \|\| source == kleinButton)
1783	2018	{
1784	2019	makeSomething(new Klein());
1785	2020	} else
..	..	@@ -1799,7 +2034,7 @@
1799	2034	{
1800	2035	makeSomething(new BezierSurface());
1801	2036	} else
1802		- if (source == overlayItem)
	2037	+ if (source == overlayItem \|\| source == overlayButton)
1803	2038	{
1804	2039	/*
1805	2040	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1847,7 +2082,7 @@
1847	2082	s.setup();
1848	2083	makeSomething(s);
1849	2084	} else
1850		- if (source == lightItem)
	2085	+ if (source == lightItem \|\| source == lightButton)
1851	2086	{
1852	2087	makeSomething(new Light());
1853	2088	} else
..	..	@@ -1897,30 +2132,30 @@
1897	2132
1898	2133	group(g);
1899	2134	} else
1900		- if (source == loopItem)
	2135	+ if (source == loopItem \|\| source == loopButton)
1901	2136	{
1902	2137	Composite csg = new GroupLeaf();
1903	2138	csg.count = 5;
1904	2139	group(csg);
1905		- Composite child = new cGroup();
	2140	+ Composite child = new cGroup("Branch");
1906	2141	csg.addChild(child);
1907	2142	child.addChild(csg);
1908	2143	} else
1909	2144	if (source == doubleItem)
1910	2145	{
1911		- Composite csg = new GroupLeaf();
	2146	+ Composite csg = new GroupLeaf("Fork");
1912	2147	csg.count = 5;
1913	2148	group(csg);
1914		- Composite child = new cGroup();
	2149	+ Composite child = new cGroup("Branch A");
1915	2150	csg.addChild(child);
1916	2151	child.addChild(csg);
1917		- child = new cGroup();
	2152	+ child = new cGroup("Branch B");
1918	2153	csg.addChild(child);
1919	2154	child.addChild(csg);
1920	2155	} else
1921	2156	if (source == tripleItem)
1922	2157	{
1923		- Composite csg = new GroupLeaf();
	2158	+ Composite csg = new GroupLeaf("Trident");
1924	2159	csg.count = 4;
1925	2160	group(csg);
1926	2161	Composite child = new cGroup();
..	..	@@ -1969,6 +2204,18 @@
1969	2204	if (source == dumpItem)
1970	2205	{
1971	2206	DumpObject();
	2207	+ } else
	2208	+ if (source == minButton)
	2209	+ {
	2210	+ Minimize();
	2211	+ } else
	2212	+ if (source == maxButton)
	2213	+ {
	2214	+ Maximize();
	2215	+ } else
	2216	+ if (source == fullButton)
	2217	+ {
	2218	+ ToggleFullScreen();
1972	2219	} else
1973	2220	if (source == undoButton)
1974	2221	{
..	..	@@ -2375,9 +2622,9 @@
2375	2622	{
2376	2623	ClearSelection(true);
2377	2624	} else
2378		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2379	2626	{
2380		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2381	2628	} else
2382	2629	if (source == hideItem)
2383	2630	{
..	..	@@ -2395,11 +2642,11 @@
2395	2642	{
2396	2643	makeSomething(new Camera());
2397	2644	} else
2398		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2399	2646	{
2400	2647	group(new Composite());
2401	2648	} else
2402		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2403	2650	{
2404	2651	RandomNode random = new RandomNode();
2405	2652	group(random);
..	..	@@ -2501,7 +2748,7 @@
2501	2748	{
2502	2749	group(new cLinker());
2503	2750	} else
2504		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2505	2752	{
2506	2753	group(new TextureNode());
2507	2754	} else
..	..	@@ -2521,17 +2768,30 @@
2521	2768	{
2522	2769	CastShadow(2);
2523	2770	} else
2524		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2525	2772	{
2526		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2527	2775	for (int i=0; i<group.selection.size(); i++)
2528	2776	{
2529		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2530	2782	}
2531	2783
2532		- ClearSelection(false);
2533		-
2534		- 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	+ }
2535	2795	} else
2536	2796	if (source == genUVItem)
2537	2797	{
..	..	@@ -2608,6 +2868,22 @@
2608	2868	if (source == unmarkleavesItem)
2609	2869	{
2610	2870	MarkLeaves(false);
	2871	+ } else
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
2611	2887	} else
2612	2888	if (source == flipVItem)
2613	2889	{
..	..	@@ -2843,6 +3119,10 @@
2843	3119	if (source == twoButton)
2844	3120	{
2845	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2846	3126	// bug
2847	3127	//gridPanel.setDividerLocation(1.0);
2848	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2875,10 +3155,31 @@
2875	3155	bigThree.ClearUI();
2876	3156	bigThree.add(centralPanel);
2877	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	+
2878	3176	} else
2879	3177	if (source == threeButton)
2880	3178	{
2881	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2882	3183
2883	3184	// bigThree.remove(scenePanel);
2884	3185	// bigThree.remove(centralPanel);
..	..	@@ -2911,10 +3212,15 @@
2911	3212	bigThree.add(centralPanel);
2912	3213	bigThree.add(XYZPanel);
2913	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2914	3217	} else
2915	3218	if (source == fourButton)
2916	3219	{
2917	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2918	3224
2919	3225	// bigThree.remove(scenePanel);
2920	3226	// bigThree.remove(centralPanel);
..	..	@@ -2946,10 +3252,15 @@
2946	3252	bigThree.ClearUI();
2947	3253	bigThree.add(scenePanel);
2948	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2949	3257	} else
2950	3258	if (source == sixButton)
2951	3259	{
2952	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2953	3264
2954	3265	// bigThree.remove(scenePanel);
2955	3266	// bigThree.remove(centralPanel);
..	..	@@ -2982,10 +3293,15 @@
2982	3293	bigThree.add(scenePanel);
2983	3294	bigThree.add(centralPanel);
2984	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2985	3298	} else
2986	3299	if (source == sevenButton)
2987	3300	{
2988	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
2989	3305
2990	3306	// bigThree.remove(scenePanel);
2991	3307	// bigThree.remove(centralPanel);
..	..	@@ -3019,6 +3335,8 @@
3019	3335	bigThree.add(centralPanel);
3020	3336	bigThree.add(XYZPanel);
3021	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
3022	3340	} else
3023	3341	if (source == rootButton)
3024	3342	{
..	..	@@ -3030,6 +3348,7 @@
3030	3348	EditObject(obj);
3031	3349	}
3032	3350
	3351	+ cameraView.requestFocusInWindow();
3033	3352	refreshContents(true);
3034	3353	} else
3035	3354	if (source == closeButton)
..	..	@@ -3039,22 +3358,37 @@
3039	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3040	3359	{
3041	3360	ab = (cRadio)e.nextElement();
3042		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3043	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
3044	3369	buttonGroup.remove(ab);
3045	3370	radioPanel.remove(ab);
3046	3371
3047		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
3048	3374	// ab.GetObject().objectUI = null; // ?????????
3049	3375
3050	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3051	3377	break;
3052	3378	}
3053	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
3054	3382	refreshContents(true);
3055	3383	} else
3056	3384	if (source == editItem \|\| source == editButton)
3057	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
3058	3392	EditSelection(false);
3059	3393	} else
3060	3394	if (source == uneditButton)
..	..	@@ -3064,6 +3398,7 @@
3064	3398	Object3D child = (Object3D)e.nextElement();
3065	3399	if(child.editWindow != null)
3066	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
3067	3402	child.CloseUI();
3068	3403	listUI.remove(child);
3069	3404
..	..	@@ -3080,6 +3415,7 @@
3080	3415	//copy.ClearUI();
3081	3416	for (Object3D obj : listUI)
3082	3417	{
	3418	+ obj.pinned = false;
3083	3419	obj.CloseUI();
3084	3420	}
3085	3421	listUI.clear();
..	..	@@ -3089,7 +3425,7 @@
3089	3425	{
3090	3426	assert(copy == group);
3091	3427
3092		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3093	3429
3094	3430	for (Object3D obj : listUI)
3095	3431	{
..	..	@@ -3155,7 +3491,8 @@
3155	3491	}
3156	3492
3157	3493	// fix "+" issue
3158		- group.editWindow = this;
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
3159	3496
3160	3497	/*
3161	3498	currentLayout = radio.layout;
..	..	@@ -3163,18 +3500,25 @@
3163	3500	currentLayout = sevenButton;
3164	3501	*/
3165	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3166	3508	keepparent = group.parent;
3167	3509	// PARENT = NULL or not???
3168	3510	//group.parent = null; // ROOT
3169	3511	//group.attributes = -1;
3170	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
3171	3515	refreshContents(true);
3172	3516	} else if (event.getSource() == editCameraItem)
3173	3517	{
3174	3518	cameraView.ProtectCamera();
3175	3519	cameraView.repaint();
3176	3520	return;
3177		- } else if (event.getSource() == revertCameraItem)
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3178	3522	{
3179	3523	cameraView.RevertCamera();
3180	3524	cameraView.repaint();
..	..	@@ -3191,7 +3535,6 @@
3191	3535	}
3192	3536
3193	3537	boolean useclient = false;
3194		- cRadio radio;
3195	3538
3196	3539	void ToggleRoot()
3197	3540	{
..	..	@@ -4146,6 +4489,18 @@
4146	4489	refreshContents();
4147	4490	}
4148	4491
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
	4501	+ refreshContents();
	4502	+ }
	4503	+
4149	4504	void SetTexRes(int tr)
4150	4505	{
4151	4506	group.selection.SetTexRes(tr);
..	..	@@ -4217,10 +4572,6 @@
4217	4572	// }
4218	4573	// }
4219	4574
4220		- static boolean allparams = true;
4221		-
4222		- static Vector<Object3D> listUI = new Vector<Object3D>();
4223		-
4224	4575	void EditSelection(boolean newWindow)
4225	4576	{
4226	4577	// aConstraints.gridy = 0;
..	..	@@ -4228,7 +4579,7 @@
4228	4579	{
4229	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4230	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4231		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4232	4583
4233	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4234	4585	if(elem != group \|\| !newWindow)
..	..	@@ -4313,7 +4664,8 @@
4313	4664	//new Exception().printStackTrace();
4314	4665
4315	4666	freezemodel = true;
4316		-
	4667	+ ClearUnpinned();
	4668	+
4317	4669	/**/
4318	4670	//switch (event.id)
4319	4671	{
..	..	@@ -4329,6 +4681,7 @@
4329	4681
4330	4682	//if (child.parent != null)
4331	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4332	4685	group.addSelectee(child);
4333	4686	}
4334	4687	}
..	..	@@ -4345,7 +4698,7 @@
4345	4698	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4346	4699	// a camera
4347	4700	{
4348		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4349	4702	{
4350	4703	CameraPane.camerachangeframe = 0; // don't refuse it
4351	4704	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4354,6 +4707,13 @@
4354	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4355	4708	}
4356	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4357	4717	refreshContents();
4358	4718	//return true;
4359	4719	}
..	..	@@ -4363,21 +4723,27 @@
4363	4723	freezemodel = false;
4364	4724	}
4365	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	+
4366	4734	void refreshContents(boolean cp)
4367	4735	{
4368		- if (!Globals.MOUSEDRAGGED)
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4369	4738	{
4370	4739	objEditor.ClearInfo(); // .GetMaterial());
4371	4740
4372		- for (int i=0; i < group.selection.size(); i++)
	4741	+ for (int i=0; i < group.selection.Size(); i++)
4373	4742	{
4374		- Object3D child = (Object3D) group.selection.reserve(i);
	4743	+ Object3D child = (Object3D) group.selection.get(i);
4375	4744
4376		- objEditor.SetMaterial(child);
4377	4745	objEditor.AddInfo(child, this, true);
4378	4746	System.err.println("info : " + child.GetPath());
4379		-
4380		- group.selection.release(i);
4381	4747	}
4382	4748
4383	4749	objEditor.SetText(); // jan 2014
..	..	@@ -4467,6 +4833,7 @@
4467	4833
4468	4834	if (cut)
4469	4835	{
	4836	+ if (Globals.SAVEONMAKE)
4470	4837	Save();
4471	4838	//int indices[] = jList.getSelectedIndices();
4472	4839	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5185,10 +5552,28 @@
5185	5552	cButton clearpanelButton;
5186	5553	cButton unselectButton;
5187	5554
	5555	+ cButton restoreCameraButton;
	5556	+
5188	5557	cButton saveButton;
5189		- cButton undoButton;
5190		- cButton redoButton;
5191	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;
5192	5577
5193	5578	cButton screenfitButton;
5194	5579	cButton screenfitpointButton;
..	..	@@ -5201,14 +5586,6 @@
5201	5586
5202	5587	cButton setsupportButton;
5203	5588
5204		- cButton twoButton;
5205		- cButton sixButton;
5206		- cButton threeButton;
5207		- cButton sevenButton;
5208		- cButton fourButton; // full panel
5209		- cButton oneButton; // full XYZ
5210		- //cButton currentLayout;
5211		-
5212	5589	//
5213	5590	//Composite
5214	5591	Object3D // to do !!
..	..	@@ -5218,11 +5595,11 @@
5218	5595	//JTree jTree;
5219	5596	private MenuItem lookAtItem;
5220	5597	private MenuItem lookFromItem;
5221		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5222	5599	private MenuItem cutItem;
5223	5600	private MenuItem undoItem;
5224	5601	private MenuItem redoItem;
5225		- private MenuItem duplicateItem;
	5602	+ private JMenuItem duplicateItem;
5226	5603	private MenuItem cloneItem;
5227	5604	private MenuItem cloneSupportItem;
5228	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5285,6 +5662,10 @@
5285	5662	private MenuItem showleavesItem;
5286	5663	private MenuItem markleavesItem;
5287	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
5288	5669
5289	5670	private MenuItem flipVItem;
5290	5671	private MenuItem unflipVItem;
..	..	@@ -5306,7 +5687,7 @@
5306	5687	private MenuItem frontItem;
5307	5688	private MenuItem cameraItem;
5308	5689	private MenuItem compositeItem;
5309		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5310	5691	private MenuItem physicsItem;
5311	5692	private MenuItem frameselectorItem;
5312	5693	private MenuItem scriptNodeItem;
..	..	@@ -5380,5 +5761,5 @@
5380	5761
5381	5762	Menu cameraMenu;
5382	5763	MenuItem editCameraItem;
5383		- MenuItem revertCameraItem;
	5764	+ MenuItem restoreCameraItem;
5384	5765	}