~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,6 +150,8 @@
150	150
151	151	void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
153	155	Menu menu;
154	156	oe.menuBar.add(menu = new Menu("Edit"));
155	157	//editItem = menu.add(new MenuItem("Edit"));
..	..	@@ -160,7 +162,7 @@
160	162	// redoItem = menu.add(new MenuItem("Redo"));
161	163	// redoItem.addActionListener(this);
162	164	// menu.add("-");
163		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
164	166	duplicateItem.addActionListener(this);
165	167	cloneItem = menu.add(new MenuItem("Clone"));
166	168	cloneItem.addActionListener(this);
..	..	@@ -176,7 +178,6 @@
176	178	copyItem.addActionListener(this);
177	179	pasteItem = menu.add(new MenuItem("Paste"));
178	180	pasteItem.addActionListener(this);
179		- menu.add("-");
180	181
181	182	menu.add("-");
182	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -203,21 +204,21 @@
203	204	//zBufferItem.addActionListener(this);
204	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
205	206	//normalLensItem.addActionListener(this);
206		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Viewpoint"));
207		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
208	209
209		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
210		- toggleFullScreenItem.addItemListener(this);
211		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
212		- cameraMenu.add("-");
213		-
214		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
215		- toggleTextureItem.addItemListener(this);
216		- toggleTextureItem.setState(CameraPane.textureon);
217		-
218		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
219		- toggleSwitchItem.addItemListener(this);
220		- toggleSwitchItem.setState(CameraPane.SWITCH);
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
221	222
222	223	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
223	224	toggleHandleItem.addItemListener(this);
..	..	@@ -246,7 +247,7 @@
246	247
247	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
248	249	toggleDebugItem.addItemListener(this);
249		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
250	251
251	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
252	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -274,7 +275,7 @@
274	275	{
275	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
276	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
277		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
278	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
279	280	oe.cameraMenu.add("-");
280	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -282,7 +283,7 @@
282	283	editLeafItem.addActionListener(this);
283	284	lookAtItem.addActionListener(this);
284	285	//lookFromItem.addActinoListener(this);
285		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
286	287	}
287	288
288	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -327,21 +328,29 @@
327	328	}
328	329
329	330	oe.menuBar.add(menu = new Menu("Group"));
330		- grabItem = menu.add(new MenuItem("Grab"));
331		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
332	333	backItem = menu.add(new MenuItem("Back"));
333	334	backItem.addActionListener(this);
334	335	frontItem = menu.add(new MenuItem("Front"));
335	336	frontItem.addActionListener(this);
336		- compositeItem = menu.add(new MenuItem("Composite"));
337		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
338	342	hideItem = menu.add(new MenuItem("Hidden Group"));
339	343	hideItem.addActionListener(this);
	344	+ }
340	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
341	346	ungroupItem.addActionListener(this);
342		- menu.add("-");
343		- randomItem = menu.add(new MenuItem("Switch node"));
344		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
345	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
346	355	switchGeoItem.addActionListener(this);
347	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -349,8 +358,6 @@
349	358	morphItem = menu.add(new MenuItem("Morph Group"));
350	359	morphItem.addActionListener(this);
351	360
352		- if (Globals.ADVANCED)
353		- {
354	361	menu.add("-");
355	362	physicsItem = menu.add(new MenuItem("Physics"));
356	363	physicsItem.addActionListener(this);
..	..	@@ -358,22 +365,20 @@
358	365	frameselectorItem.addActionListener(this);
359	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
360	367	scriptNodeItem.addActionListener(this);
361		- cameraItem = menu.add(new MenuItem("Camera"));
362		- cameraItem.addActionListener(this);
363	368	}
364	369
365	370	oe.menuBar.add(menu = new Menu("Object"));
366		- textureItem = menu.add(new MenuItem("Texture"));
367		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
368	373	billboardItem = menu.add(new MenuItem("Billboard"));
369	374	billboardItem.addActionListener(this);
370	375	csgItem = menu.add(new MenuItem("CSG"));
371	376	csgItem.addActionListener(this);
372		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
373	378	shadowXItem.addActionListener(this);
374		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
375	380	shadowYItem.addActionListener(this);
376		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
377	382	shadowZItem.addActionListener(this);
378	383	if (Globals.ADVANCED)
379	384	{
..	..	@@ -470,6 +475,14 @@
470	475	markleavesItem.addActionListener(this);
471	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
472	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
473	486	menu.add("-");
474	487	flipVItem = menu.add(new MenuItem("Flip V"));
475	488	flipVItem.addActionListener(this);
..	..	@@ -527,6 +540,18 @@
527	540
528	541	void SetupUI2(ObjEditor oe)
529	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
530	555	//new Exception().printStackTrace();
531	556
532	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -555,39 +580,63 @@
555	580	oe.radioPanel.add(dummyButton);
556	581	oe.buttonGroup.add(dummyButton);
557	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
558	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
559	588
560		- oe.toolbarPanel.add(undoButton = new cButton("Undo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
561	606	undoButton.setToolTipText("Undo changes");
562	607	undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
563	609
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	611	redoButton.setToolTipText("Redo changes");
566	612	redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
567	614
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	616	saveButton.setToolTipText("Save changes");
570	617	saveButton.addActionListener(this);
571	618
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	620	liveCB.setToolTipText("Enable animation");
574	621	liveCB.addItemListener(this);
575	622
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	624	oneStepButton.setToolTipText("Animate one step forward");
578	625	oneStepButton.addActionListener(this);
579	626
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	628	fastCB.setToolTipText("Fast mode");
582	629	fastCB.addItemListener(this);
583	630
584		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
585		- trackCB.setToolTipText("Enable tracking");
586		- trackCB.addItemListener(this);
587		-
588		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	634	screenfitButton.setToolTipText("Screen fit");
590	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
591	640
592	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -599,65 +648,144 @@
599	648	snapobjectButton.setToolTipText("Snap Object");
600	649	}
601	650
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	652
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	654	twoButton.setToolTipText("Show center view only");
610	655	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	659	fourButton.addActionListener(this);
613	660	fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615	662	sixButton.setToolTipText("2-column layout left");
616	663	sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618	665	threeButton.setToolTipText("2-column layout right");
619	666	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621	668	sevenButton.setToolTipText("3-column layout");
622	669	sevenButton.addActionListener(this);
623	670	//
624	671
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	673	rootButton.setToolTipText("Edit selection in new tab");
627	674	rootButton.addActionListener(this);
628	675
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	677	closeButton.setToolTipText("Close tab");
631	678	closeButton.addActionListener(this);
632	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	680	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
636	713
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	762	editButton.setToolTipText("Edit selection");
639	763	editButton.addActionListener(this);
640	764
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642	766	uneditButton.setToolTipText("Unedit selection");
643	767	uneditButton.addActionListener(this);
644	768
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646	770	allParamsButton.setToolTipText("Edit all params");
647	771	allParamsButton.addActionListener(this);
648	772
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	774	clearPanelButton.setToolTipText("Clear edit panel");
651	775	clearPanelButton.addActionListener(this);
652	776
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	778	unselectButton.setToolTipText("Unselect");
655	779	unselectButton.addActionListener(this);
656	780
657		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
658	784
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
661	789
662	790	// oe.aConstraints.gridx += 1;
663	791	// oe.aConstraints.weighty = 0;
..	..	@@ -674,27 +802,12 @@
674	802
675	803	JScrollPane jSP;
676	804	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	806	ResetModel();
679	807
680	808	oe.treePanel.add(jSPPanel);
681	809	oe.treePanel.Return();
682	810
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	811	oe.treePanel.add(copyOptionsPanel);
699	812	oe.treePanel.Return();
700	813
..	..	@@ -725,6 +838,20 @@
725	838
726	839	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	840	{
	841	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	842	+ colorCB.setToolTipText("Copy color when dropped");
	843	+ colorCB.addItemListener(this);
	844	+
	845	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	846	+ materialCB.setToolTipText("Copy material when dropped");
	847	+ materialCB.addItemListener(this);
	848	+
	849	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	850	+ textureCB.setToolTipText("Copy texture when dropped");
	851	+ textureCB.addItemListener(this);
	852	+
	853	+ panel.Return();
	854	+
728	855	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	856	boxCB.setToolTipText("Display bounding boxes");
730	857	boxCB.addItemListener(this);
..	..	@@ -742,6 +869,8 @@
742	869	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	870	// localCB.addItemListener(this);
744	871
	872	+ panel.Return();
	873	+
745	874	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	875	crowdCB.setToolTipText("Used for crowds");
747	876	crowdCB.addItemListener(this);
..	..	@@ -758,6 +887,8 @@
758	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	888	// speakerMocapCB.addItemListener(this);
760	889
	890	+ panel.Return();
	891	+
761	892	if (false)
762	893	{
763	894	// handled in scripts
..	..	@@ -772,32 +903,72 @@
772	903	//constraints.gridy += 1;
773	904	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
775	907	}
776	908
777	909	//constraints.gridx += 1;
778	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	911	// debugCB.addItemListener(this);
780	912
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
781	917	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
782	919	oeilCB.addItemListener(this);
783	920
	921	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	922	+ shadowCB.setToolTipText("Compute shadows when live");
	923	+ shadowCB.addItemListener(this);
	924	+
	925	+ panel.Return();
	926	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	927	+ toggleTextureCB.setToolTipText("Load textures");
	928	+ toggleTextureCB.addItemListener(this);
	929	+
	930	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	931	+ toggleSwitchCB.setToolTipText("Use switch");
	932	+ toggleSwitchCB.addItemListener(this);
	933	+
	934	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	935	+ autosaveCB.setToolTipText("Auto-save on structure change");
	936	+ autosaveCB.addItemListener(this);
	937	+
	938	+ panel.Return();
	939	+ if (Globals.ADVANCED)
	940	+ {
784	941	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	942	lookAtCB.setToolTipText("Look-at target");
786	943	lookAtCB.addItemListener(this);
	944	+ }
787	945
788	946	}
789	947
790	948	cGridBag fill = new cGridBag();
791		-
792	949	fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
793	954
794	955	panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
795	958
796	959	}
797	960
798	961	void EditObject(Object3D obj)
799	962	{
800	963	cRadio radioButton = new cRadio(obj.name);
	964	+
	965	+ // Patch to avoid bug with transparency.
	966	+ radioButton.hadMaterial = obj.material != null;
	967	+ if (!radioButton.hadMaterial)
	968	+ {
	969	+ obj.material = new cMaterial();
	970	+ }
	971	+
801	972	radioButton.SetObject(obj);
802	973	radioButton.layout = sevenButton;
803	974	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -809,6 +980,8 @@
809	980
810	981	void SetupViews(ObjEditor oe)
811	982	{
	983	+ theFrame = this;
	984	+
812	985	oe.SetupViews();
813	986
814	987	System.out.println("SetupViews");
..	..	@@ -817,23 +990,27 @@
817	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	991	}
819	992
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;
	993	+ cToggleButton liveCB;
	994	+ cCheckBox supportCB;
	995	+ cCheckBox localCB;
	996	+ cCheckBox crowdCB;
	997	+ cCheckBox smoothCB;
	998	+ cToggleButton fastCB;
	999	+ cCheckBox slowCB;
	1000	+ cCheckBox boxCB;
	1001	+ cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
	1004	+ cCheckBox smoothfocusCB;
831	1005	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
837	1014
838	1015	// static int COLOR = 1;
839	1016	// static int MATERIAL = 2;
..	..	@@ -841,9 +1018,9 @@
841	1018
842	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1020
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
847	1024
848	1025	public void itemStateChanged(ItemEvent e)
849	1026	{
..	..	@@ -871,6 +1048,7 @@
871	1048	} else if(e.getSource() == liveCB)
872	1049	{
873	1050	cameraView.ToggleLive();
	1051	+ refreshContents(false);
874	1052	}
875	1053	else if(e.getSource() == supportCB)
876	1054	{
..	..	@@ -935,6 +1113,14 @@
935	1113	{
936	1114	cameraView.ToggleOeil();
937	1115	}
	1116	+ else if(e.getSource() == shadowCB)
	1117	+ {
	1118	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1119	+ }
	1120	+ else if(e.getSource() == autosaveCB)
	1121	+ {
	1122	+ Globals.SAVEONMAKE ^= true;
	1123	+ }
938	1124	else if(e.getSource() == lookAtCB)
939	1125	{
940	1126	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1137,8 @@
951	1137
952	1138	/**/
953	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1143	// We can't move the root node or an empty selection
957	1144	return;
..	..	@@ -1068,23 +1255,33 @@
1068	1255
1069	1256	assert target == objEditor.jTree;
1070	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
1071	1259	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1261	} catch (Exception e) {
1074	1262	System.out.println("destinationPath : " + destinationPath);
1075	1263	return;
1076	1264	}
1077	1265
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
1079	1267	{
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
	1275	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+// {
1080	1277	loadClipboard(true);
1081	1278	objEditor.jTree.setSelectionPath(destinationPath);
1082	1279	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
1088	1285	}
1089	1286	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1189,22 +1386,30 @@
1189	1386	{
1190	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1388	//heightFieldItem.addActionListener(this);
1192		- gridItem = menu.add(new MenuItem("Grid"));
1193		- gridItem.addActionListener(this);
1194		- rectoidItem = menu.add(new MenuItem("Box"));
1195		- rectoidItem.addActionListener(this);
1196		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1197		- ellipsoidItem.addActionListener(this);
1198		- coneItem = menu.add(new MenuItem("Cone"));
1199		- coneItem.addActionListener(this);
1200		- torusItem = menu.add(new MenuItem("Torus"));
1201		- torusItem.addActionListener(this);
1202		- superItem = menu.add(new MenuItem("Superellipsoid"));
1203		- superItem.addActionListener(this);
	1389	+// gridItem = menu.add(new MenuItem("Grid"));
	1390	+// gridItem.addActionListener(this);
	1391	+// rectoidItem = menu.add(new MenuItem("Box"));
	1392	+// rectoidItem.addActionListener(this);
	1393	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1394	+// ellipsoidItem.addActionListener(this);
	1395	+// coneItem = menu.add(new MenuItem("Cone"));
	1396	+// coneItem.addActionListener(this);
	1397	+// torusItem = menu.add(new MenuItem("Torus"));
	1398	+// torusItem.addActionListener(this);
	1399	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1400	+// superItem.addActionListener(this);
	1401	+
	1402	+ cameraItem = menu.add(new MenuItem("Camera"));
	1403	+ cameraItem.addActionListener(this);
	1404	+
	1405	+ if (!Globals.ADVANCED)
	1406	+ {
1204	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1408	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
1208	1413	if (Globals.ADVANCED)
1209	1414	{
1210	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1435,15 @@
1230	1435	}
1231	1436	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1437	bezierItem.addActionListener(this);
1233		- overlayItem = menu.add(new MenuItem("Overlay"));
1234		- overlayItem.addActionListener(this);
1235		- lightItem = menu.add(new MenuItem("Light"));
1236		- lightItem.addActionListener(this);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1237	1442	menu.add("-");
1238	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	1444	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1242	1447	doubleItem = menu.add(new MenuItem("Fork"));
1243	1448	doubleItem.addActionListener(this);
1244	1449	if (Globals.ADVANCED)
..	..	@@ -1278,7 +1483,7 @@
1278	1483	memoryItem.addActionListener(this);
1279	1484	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	1485	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	1486	+ menu.add(dumpItem = new MenuItem("Print"));
1282	1487	dumpItem.addActionListener(this);
1283	1488	// menu.add(pathItem = new MenuItem("From-to path"));
1284	1489	// pathItem.addActionListener(this);
..	..	@@ -1419,6 +1624,7 @@
1419	1624	shadow.material = new cMaterial(obj.material);
1420	1625	shadow.material.diffuse = 0.0001f;
1421	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1422	1628
1423	1629	makeSomething(shadow);
1424	1630	}
..	..	@@ -1666,7 +1872,7 @@
1666	1872	{
1667	1873	ScreenFit();
1668	1874	} else
1669		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1670	1876	{
1671	1877	cVector v1 = new cVector();
1672	1878	cVector v2 = new cVector();
..	..	@@ -1675,11 +1881,11 @@
1675	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	1882	objEditor.cameraView.repaint();
1677	1883	} else
1678		- if (source == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1679	1885	{
1680	1886	makeSomething(new Box());
1681	1887	} else
1682		- if (source == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1683	1889	{
1684	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +1964,27 @@
1758	1964
1759	1965	makeSomething(obj);
1760	1966	} else
1761		- if (source == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1762	1968	{
1763	1969	makeSomething(new Grid());
1764	1970	} else
1765		- if (source == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	1972	{
1767	1973	makeSomething(new Sphere());
1768	1974	} else
1769		- if (source == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1770	1976	{
1771	1977	makeSomething(new Cone());
1772	1978	} else
1773		- if (source == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1774	1980	{
1775	1981	makeSomething(new Torus());
1776	1982	} else
1777		- if (source == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1778	1984	{
1779	1985	makeSomething(new Superellipsoid());
1780	1986	} else
1781		- if (source == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1782	1988	{
1783	1989	makeSomething(new Klein());
1784	1990	} else
..	..	@@ -1798,7 +2004,7 @@
1798	2004	{
1799	2005	makeSomething(new BezierSurface());
1800	2006	} else
1801		- if (source == overlayItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1802	2008	{
1803	2009	/*
1804	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,7 +2052,7 @@
1846	2052	s.setup();
1847	2053	makeSomething(s);
1848	2054	} else
1849		- if (source == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1850	2056	{
1851	2057	makeSomething(new Light());
1852	2058	} else
..	..	@@ -1896,7 +2102,7 @@
1896	2102
1897	2103	group(g);
1898	2104	} else
1899		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1900	2106	{
1901	2107	Composite csg = new GroupLeaf();
1902	2108	csg.count = 5;
..	..	@@ -1968,6 +2174,18 @@
1968	2174	if (source == dumpItem)
1969	2175	{
1970	2176	DumpObject();
	2177	+ } else
	2178	+ if (source == minButton)
	2179	+ {
	2180	+ Minimize();
	2181	+ } else
	2182	+ if (source == maxButton)
	2183	+ {
	2184	+ Maximize();
	2185	+ } else
	2186	+ if (source == fullButton)
	2187	+ {
	2188	+ ToggleFullScreen();
1971	2189	} else
1972	2190	if (source == undoButton)
1973	2191	{
..	..	@@ -2374,9 +2592,9 @@
2374	2592	{
2375	2593	ClearSelection(true);
2376	2594	} else
2377		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2378	2596	{
2379		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2380	2598	} else
2381	2599	if (source == hideItem)
2382	2600	{
..	..	@@ -2394,11 +2612,11 @@
2394	2612	{
2395	2613	makeSomething(new Camera());
2396	2614	} else
2397		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2398	2616	{
2399	2617	group(new Composite());
2400	2618	} else
2401		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2402	2620	{
2403	2621	RandomNode random = new RandomNode();
2404	2622	group(random);
..	..	@@ -2500,7 +2718,7 @@
2500	2718	{
2501	2719	group(new cLinker());
2502	2720	} else
2503		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2504	2722	{
2505	2723	group(new TextureNode());
2506	2724	} else
..	..	@@ -2520,7 +2738,7 @@
2520	2738	{
2521	2739	CastShadow(2);
2522	2740	} else
2523		- if (source == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	2742	{
2525	2743	//ungroup();
2526	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2607,6 +2825,22 @@
2607	2825	if (source == unmarkleavesItem)
2608	2826	{
2609	2827	MarkLeaves(false);
	2828	+ } else
	2829	+ if (source == rewindleavesItem)
	2830	+ {
	2831	+ RewindLeaves(true);
	2832	+ } else
	2833	+ if (source == unrewindleavesItem)
	2834	+ {
	2835	+ RewindLeaves(false);
	2836	+ } else
	2837	+ if (source == randomleavesItem)
	2838	+ {
	2839	+ RandomLeaves(true);
	2840	+ } else
	2841	+ if (source == unrandomleavesItem)
	2842	+ {
	2843	+ RandomLeaves(false);
2610	2844	} else
2611	2845	if (source == flipVItem)
2612	2846	{
..	..	@@ -2842,6 +3076,10 @@
2842	3076	if (source == twoButton)
2843	3077	{
2844	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2845	3083	// bug
2846	3084	//gridPanel.setDividerLocation(1.0);
2847	3085	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2874,10 +3112,31 @@
2874	3112	bigThree.ClearUI();
2875	3113	bigThree.add(centralPanel);
2876	3114	bigThree.FlushUI();
	3115	+
	3116	+ cameraView.requestFocusInWindow();
	3117	+
	3118	+// refreshContents(true);
	3119	+//
	3120	+// try
	3121	+// {
	3122	+// java.awt.Robot bot = new java.awt.Robot();
	3123	+// int mask = InputEvent.BUTTON1_MASK;
	3124	+// bot.mouseMove(100, 100);
	3125	+// bot.mousePress(mask);
	3126	+// bot.mouseRelease(mask);
	3127	+// }
	3128	+// catch (Exception e)
	3129	+// {
	3130	+//
	3131	+// }
	3132	+
2877	3133	} else
2878	3134	if (source == threeButton)
2879	3135	{
2880	3136	radio.layout = threeButton;
	3137	+
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
2881	3140
2882	3141	// bigThree.remove(scenePanel);
2883	3142	// bigThree.remove(centralPanel);
..	..	@@ -2910,10 +3169,15 @@
2910	3169	bigThree.add(centralPanel);
2911	3170	bigThree.add(XYZPanel);
2912	3171	bigThree.FlushUI();
	3172	+
	3173	+ cameraView.requestFocusInWindow();
2913	3174	} else
2914	3175	if (source == fourButton)
2915	3176	{
2916	3177	radio.layout = fourButton;
	3178	+
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
2917	3181
2918	3182	// bigThree.remove(scenePanel);
2919	3183	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3209,15 @@
2945	3209	bigThree.ClearUI();
2946	3210	bigThree.add(scenePanel);
2947	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2948	3214	} else
2949	3215	if (source == sixButton)
2950	3216	{
2951	3217	radio.layout = sixButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2952	3221
2953	3222	// bigThree.remove(scenePanel);
2954	3223	// bigThree.remove(centralPanel);
..	..	@@ -2981,10 +3250,15 @@
2981	3250	bigThree.add(scenePanel);
2982	3251	bigThree.add(centralPanel);
2983	3252	bigThree.FlushUI();
	3253	+
	3254	+ cameraView.requestFocusInWindow();
2984	3255	} else
2985	3256	if (source == sevenButton)
2986	3257	{
2987	3258	radio.layout = sevenButton;
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
2988	3262
2989	3263	// bigThree.remove(scenePanel);
2990	3264	// bigThree.remove(centralPanel);
..	..	@@ -3018,6 +3292,8 @@
3018	3292	bigThree.add(centralPanel);
3019	3293	bigThree.add(XYZPanel);
3020	3294	bigThree.FlushUI();
	3295	+
	3296	+ cameraView.requestFocusInWindow();
3021	3297	} else
3022	3298	if (source == rootButton)
3023	3299	{
..	..	@@ -3029,6 +3305,7 @@
3029	3305	EditObject(obj);
3030	3306	}
3031	3307
	3308	+ cameraView.requestFocusInWindow();
3032	3309	refreshContents(true);
3033	3310	} else
3034	3311	if (source == closeButton)
..	..	@@ -3038,22 +3315,37 @@
3038	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	3316	{
3040	3317	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
3043	3326	buttonGroup.remove(ab);
3044	3327	radioPanel.remove(ab);
3045	3328
3046		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
3047	3331	// ab.GetObject().objectUI = null; // ?????????
3048	3332
3049	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	3334	break;
3051	3335	}
3052	3336	}
	3337	+
	3338	+ cameraView.requestFocusInWindow();
3053	3339	refreshContents(true);
3054	3340	} else
3055	3341	if (source == editItem \|\| source == editButton)
3056	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
3057	3349	EditSelection(false);
3058	3350	} else
3059	3351	if (source == uneditButton)
..	..	@@ -3063,6 +3355,7 @@
3063	3355	Object3D child = (Object3D)e.nextElement();
3064	3356	if(child.editWindow != null)
3065	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
3066	3359	child.CloseUI();
3067	3360	listUI.remove(child);
3068	3361
..	..	@@ -3079,6 +3372,7 @@
3079	3372	//copy.ClearUI();
3080	3373	for (Object3D obj : listUI)
3081	3374	{
	3375	+ obj.pinned = true;
3082	3376	obj.CloseUI();
3083	3377	}
3084	3378	listUI.clear();
..	..	@@ -3088,7 +3382,7 @@
3088	3382	{
3089	3383	assert(copy == group);
3090	3384
3091		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3092	3386
3093	3387	for (Object3D obj : listUI)
3094	3388	{
..	..	@@ -3154,7 +3448,8 @@
3154	3448	}
3155	3449
3156	3450	// fix "+" issue
3157		- group.editWindow = this;
	3451	+ //group.editWindow = this;
	3452	+ group.manipWindow = this;
3158	3453
3159	3454	/*
3160	3455	currentLayout = radio.layout;
..	..	@@ -3167,13 +3462,15 @@
3167	3462	//group.parent = null; // ROOT
3168	3463	//group.attributes = -1;
3169	3464	ResetModel();
	3465	+
	3466	+ cameraView.requestFocusInWindow();
3170	3467	refreshContents(true);
3171	3468	} else if (event.getSource() == editCameraItem)
3172	3469	{
3173	3470	cameraView.ProtectCamera();
3174	3471	cameraView.repaint();
3175	3472	return;
3176		- } else if (event.getSource() == revertCameraItem)
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	3474	{
3178	3475	cameraView.RevertCamera();
3179	3476	cameraView.repaint();
..	..	@@ -3190,7 +3487,6 @@
3190	3487	}
3191	3488
3192	3489	boolean useclient = false;
3193		- cRadio radio;
3194	3490
3195	3491	void ToggleRoot()
3196	3492	{
..	..	@@ -4145,6 +4441,18 @@
4145	4441	refreshContents();
4146	4442	}
4147	4443
	4444	+ void RewindLeaves(boolean hide)
	4445	+ {
	4446	+ group.selection.RewindLeaves(hide);
	4447	+ refreshContents();
	4448	+ }
	4449	+
	4450	+ void RandomLeaves(boolean hide)
	4451	+ {
	4452	+ group.selection.RandomLeaves(hide);
	4453	+ refreshContents();
	4454	+ }
	4455	+
4148	4456	void SetTexRes(int tr)
4149	4457	{
4150	4458	group.selection.SetTexRes(tr);
..	..	@@ -4216,10 +4524,6 @@
4216	4524	// }
4217	4525	// }
4218	4526
4219		- static boolean allparams = true;
4220		-
4221		- static Vector<Object3D> listUI = new Vector<Object3D>();
4222		-
4223	4527	void EditSelection(boolean newWindow)
4224	4528	{
4225	4529	// aConstraints.gridy = 0;
..	..	@@ -4227,7 +4531,7 @@
4227	4531	{
4228	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4229	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4230		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4231	4535
4232	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
4233	4537	if(elem != group \|\| !newWindow)
..	..	@@ -4313,6 +4617,17 @@
4313	4617
4314	4618	freezemodel = true;
4315	4619
	4620	+ //for (Object3D obj : listUI)
	4621	+ for (int i=listUI.size(); --i>=0;)
	4622	+ {
	4623	+ Object3D obj = listUI.elementAt(i);
	4624	+ if (!obj.pinned)
	4625	+ {
	4626	+ obj.CloseUI();
	4627	+ listUI.remove(i);
	4628	+ }
	4629	+ }
	4630	+
4316	4631	/**/
4317	4632	//switch (event.id)
4318	4633	{
..	..	@@ -4320,7 +4635,6 @@
4320	4635	//case 702: // Event.LIST_DESELECT
4321	4636	group.deselectAll();
4322	4637	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4323		- objEditor.ClearInfo(); // .GetMaterial());
4324	4638	if (tps != null)
4325	4639	{
4326	4640	for (int i=0; i < tps.length; i++)
..	..	@@ -4329,10 +4643,8 @@
4329	4643
4330	4644	//if (child.parent != null)
4331	4645	//child.parent.addSelectee(child);
	4646	+ objEditor.SetMaterial(child);
4332	4647	group.addSelectee(child);
4333		- objEditor.SetMaterial(child); // .GetMaterial());
4334		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4335		- System.err.println("info : " + child.GetPath());
4336	4648	}
4337	4649	}
4338	4650	// else
..	..	@@ -4342,15 +4654,13 @@
4342	4654	// System.err.println("info : " + group.GetPath());
4343	4655	// }
4344	4656
4345		- objEditor.SetText(); // jan 2014
4346		-
4347	4657	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4348	4658	CameraPane.flash = true;
4349	4659
4350	4660	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4351	4661	// a camera
4352	4662	{
4353		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4354	4664	{
4355	4665	CameraPane.camerachangeframe = 0; // don't refuse it
4356	4666	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4359,6 +4669,13 @@
4359	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4360	4670	}
4361	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4362	4679	refreshContents();
4363	4680	//return true;
4364	4681	}
..	..	@@ -4367,6 +4684,33 @@
4367	4684
4368	4685	freezemodel = false;
4369	4686	}
	4687	+
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
	4694	+ void refreshContents(boolean cp)
	4695	+ {
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4698	+ {
	4699	+ objEditor.ClearInfo(); // .GetMaterial());
	4700	+
	4701	+ for (int i=0; i < group.selection.Size(); i++)
	4702	+ {
	4703	+ Object3D child = (Object3D) group.selection.get(i);
	4704	+
	4705	+ objEditor.AddInfo(child, this, true);
	4706	+ System.err.println("info : " + child.GetPath());
	4707	+ }
	4708	+
	4709	+ objEditor.SetText(); // jan 2014
	4710	+ }
	4711	+
	4712	+ super.refreshContents(cp);
	4713	+ }
4370	4714
4371	4715	void linkSomething(Object3D thing)
4372	4716	{
..	..	@@ -4449,6 +4793,7 @@
4449	4793
4450	4794	if (cut)
4451	4795	{
	4796	+ if (Globals.SAVEONMAKE)
4452	4797	Save();
4453	4798	//int indices[] = jList.getSelectedIndices();
4454	4799	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5167,10 +5512,31 @@
5167	5512	cButton clearpanelButton;
5168	5513	cButton unselectButton;
5169	5514
	5515	+ cButton restoreCameraButton;
	5516	+
	5517	+ cButton minButton;
	5518	+ cButton maxButton;
	5519	+ cButton fullButton;
5170	5520	cButton saveButton;
5171		- cButton undoButton;
5172		- cButton redoButton;
5173	5521	cButton oneStepButton;
	5522	+
	5523	+ cButton groupButton;
	5524	+ cButton ungroupButton;
	5525	+ cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
	5529	+
	5530	+ cButton gridButton;
	5531	+ cButton boxButton;
	5532	+ cButton sphereButton;
	5533	+ cButton coneButton;
	5534	+ cButton torusButton;
	5535	+ cButton superButton;
	5536	+ cButton kleinButton;
	5537	+ cButton particlesButton;
	5538	+ cButton overlayButton;
	5539	+ cButton lightButton;
5174	5540
5175	5541	cButton screenfitButton;
5176	5542	cButton screenfitpointButton;
..	..	@@ -5183,14 +5549,6 @@
5183	5549
5184	5550	cButton setsupportButton;
5185	5551
5186		- cButton twoButton;
5187		- cButton sixButton;
5188		- cButton threeButton;
5189		- cButton sevenButton;
5190		- cButton fourButton; // full panel
5191		- cButton oneButton; // full XYZ
5192		- //cButton currentLayout;
5193		-
5194	5552	//
5195	5553	//Composite
5196	5554	Object3D // to do !!
..	..	@@ -5200,11 +5558,11 @@
5200	5558	//JTree jTree;
5201	5559	private MenuItem lookAtItem;
5202	5560	private MenuItem lookFromItem;
5203		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
5204	5562	private MenuItem cutItem;
5205	5563	private MenuItem undoItem;
5206	5564	private MenuItem redoItem;
5207		- private MenuItem duplicateItem;
	5565	+ private JMenuItem duplicateItem;
5208	5566	private MenuItem cloneItem;
5209	5567	private MenuItem cloneSupportItem;
5210	5568	private MenuItem overwriteGeoItem;
..	..	@@ -5267,6 +5625,10 @@
5267	5625	private MenuItem showleavesItem;
5268	5626	private MenuItem markleavesItem;
5269	5627	private MenuItem unmarkleavesItem;
	5628	+ private MenuItem rewindleavesItem;
	5629	+ private MenuItem unrewindleavesItem;
	5630	+ private MenuItem randomleavesItem;
	5631	+ private MenuItem unrandomleavesItem;
5270	5632
5271	5633	private MenuItem flipVItem;
5272	5634	private MenuItem unflipVItem;
..	..	@@ -5288,7 +5650,7 @@
5288	5650	private MenuItem frontItem;
5289	5651	private MenuItem cameraItem;
5290	5652	private MenuItem compositeItem;
5291		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5292	5654	private MenuItem physicsItem;
5293	5655	private MenuItem frameselectorItem;
5294	5656	private MenuItem scriptNodeItem;
..	..	@@ -5362,5 +5724,5 @@
5362	5724
5363	5725	Menu cameraMenu;
5364	5726	MenuItem editCameraItem;
5365		- MenuItem revertCameraItem;
	5727	+ MenuItem restoreCameraItem;
5366	5728	}