~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,61 @@
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);
563	608
564		- oe.toolbarPanel.add(redoButton = new cButton("Redo", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
565	610	redoButton.setToolTipText("Redo changes");
566	611	redoButton.addActionListener(this);
567	612
568		- oe.toolbarPanel.add(saveButton = new cButton("Save", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	613	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
569	614	saveButton.setToolTipText("Save changes");
570	615	saveButton.addActionListener(this);
571	616
572		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	617	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
573	618	liveCB.setToolTipText("Enable animation");
574	619	liveCB.addItemListener(this);
575	620
576		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
577	622	oneStepButton.setToolTipText("Animate one step forward");
578	623	oneStepButton.addActionListener(this);
579	624
580		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
581	626	fastCB.setToolTipText("Fast mode");
582	627	fastCB.addItemListener(this);
583	628
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);
	629	+ //oe.toolboxPanel.Return();
	630	+
	631	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
589	632	screenfitButton.setToolTipText("Screen fit");
590	633	screenfitButton.addActionListener(this);
	634	+
	635	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	636	+// trackCB.setToolTipText("Enable tracking");
	637	+// trackCB.addItemListener(this);
591	638
592	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
593	640	// screenfitpointButton.addActionListener(this);
..	..	@@ -599,65 +646,132 @@
599	646	snapobjectButton.setToolTipText("Snap Object");
600	647	}
601	648
602		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603		- flashSelectionButton.setToolTipText("Show selection");
604		- flashSelectionButton.addActionListener(this);
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
605	650
606		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
607		-
608		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
609	652	twoButton.setToolTipText("Show center view only");
610	653	twoButton.addActionListener(this);
611		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	654	+ this.fullscreenLayout = twoButton;
	655	+
	656	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	657	fourButton.addActionListener(this);
613	658	fourButton.setToolTipText("Show left panel only");
614		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
615	660	sixButton.setToolTipText("2-column layout left");
616	661	sixButton.addActionListener(this);
617		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
618	663	threeButton.setToolTipText("2-column layout right");
619	664	threeButton.addActionListener(this);
620		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
621	666	sevenButton.setToolTipText("3-column layout");
622	667	sevenButton.addActionListener(this);
623	668	//
624	669
625		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
626	671	rootButton.setToolTipText("Edit selection in new tab");
627	672	rootButton.addActionListener(this);
628	673
629		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	674	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
630	675	closeButton.setToolTipText("Close tab");
631	676	closeButton.addActionListener(this);
632	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
633	678	//clearButton.addActionListener(this);
634		-
635		- cGridBag commandsPanel = new cGridBag();
	679	+
	680	+ // INSERT
	681	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	682	+ gridButton.setToolTipText("Create grid");
	683	+ gridButton.addActionListener(this);
	684	+
	685	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	686	+ boxButton.setToolTipText("Create box");
	687	+ boxButton.addActionListener(this);
	688	+
	689	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	690	+ sphereButton.setToolTipText("Create sphere");
	691	+ sphereButton.addActionListener(this);
	692	+
	693	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	694	+ coneButton.setToolTipText("Create cone");
	695	+ coneButton.addActionListener(this);
	696	+
	697	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	698	+ torusButton.setToolTipText("Create torus");
	699	+ torusButton.addActionListener(this);
	700	+
	701	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	702	+ superButton.setToolTipText("Create superellipsoid");
	703	+ superButton.addActionListener(this);
	704	+
	705	+ if (Globals.ADVANCED)
	706	+ {
	707	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ kleinButton.setToolTipText("Create Klein bottle");
	709	+ kleinButton.addActionListener(this);
	710	+ }
636	711
637		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	712	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ particlesButton.setToolTipText("Create particle system");
	714	+ particlesButton.addActionListener(this);
	715	+
	716	+ oe.toolboxPanel.Return();
	717	+
	718	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ groupButton.setToolTipText("Create group");
	720	+ groupButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	723	+ compositeButton.setToolTipText("Create composite");
	724	+ compositeButton.addActionListener(this);
	725	+
	726	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	727	+ switchButton.setToolTipText("Create switch");
	728	+ switchButton.addActionListener(this);
	729	+
	730	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	731	+ loopButton.setToolTipText("Create loop");
	732	+ loopButton.addActionListener(this);
	733	+
	734	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	735	+ textureButton.setToolTipText("Create texture");
	736	+ textureButton.addActionListener(this);
	737	+
	738	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	739	+ overlayButton.setToolTipText("Create overlay");
	740	+ overlayButton.addActionListener(this);
	741	+
	742	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	743	+ lightButton.setToolTipText("Create light");
	744	+ lightButton.addActionListener(this);
	745	+
	746	+ // EDIT panel
	747	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
638	748	editButton.setToolTipText("Edit selection");
639	749	editButton.addActionListener(this);
640	750
641		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
642	752	uneditButton.setToolTipText("Unedit selection");
643	753	uneditButton.addActionListener(this);
644	754
645		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
646	756	allParamsButton.setToolTipText("Edit all params");
647	757	allParamsButton.addActionListener(this);
648	758
649		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
650	760	clearPanelButton.setToolTipText("Clear edit panel");
651	761	clearPanelButton.addActionListener(this);
652	762
653		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
654	764	unselectButton.setToolTipText("Unselect");
655	765	unselectButton.addActionListener(this);
656	766
657		- commandsPanel.preferredHeight = 1;
	767	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	768	+ flashSelectionButton.setToolTipText("Highlight selection");
	769	+ flashSelectionButton.addActionListener(this);
658	770
659		- oe.treePanel.add(commandsPanel);
660		- oe.treePanel.Return();
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
661	775
662	776	// oe.aConstraints.gridx += 1;
663	777	// oe.aConstraints.weighty = 0;
..	..	@@ -674,27 +788,12 @@
674	788
675	789	JScrollPane jSP;
676	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
677		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
678	792	ResetModel();
679	793
680	794	oe.treePanel.add(jSPPanel);
681	795	oe.treePanel.Return();
682	796
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	797	oe.treePanel.add(copyOptionsPanel);
699	798	oe.treePanel.Return();
700	799
..	..	@@ -725,6 +824,20 @@
725	824
726	825	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
727	826	{
	827	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	828	+ colorCB.setToolTipText("Copy color when dropped");
	829	+ colorCB.addItemListener(this);
	830	+
	831	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	832	+ materialCB.setToolTipText("Copy material when dropped");
	833	+ materialCB.addItemListener(this);
	834	+
	835	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	836	+ textureCB.setToolTipText("Copy texture when dropped");
	837	+ textureCB.addItemListener(this);
	838	+
	839	+ panel.Return();
	840	+
728	841	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
729	842	boxCB.setToolTipText("Display bounding boxes");
730	843	boxCB.addItemListener(this);
..	..	@@ -742,6 +855,8 @@
742	855	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
743	856	// localCB.addItemListener(this);
744	857
	858	+ panel.Return();
	859	+
745	860	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
746	861	crowdCB.setToolTipText("Used for crowds");
747	862	crowdCB.addItemListener(this);
..	..	@@ -758,6 +873,8 @@
758	873	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
759	874	// speakerMocapCB.addItemListener(this);
760	875
	876	+ panel.Return();
	877	+
761	878	if (false)
762	879	{
763	880	// handled in scripts
..	..	@@ -772,32 +889,72 @@
772	889	//constraints.gridy += 1;
773	890	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
774	891	smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
775	893	}
776	894
777	895	//constraints.gridx += 1;
778	896	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
779	897	// debugCB.addItemListener(this);
780	898
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
781	903	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
782	905	oeilCB.addItemListener(this);
783	906
	907	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	908	+ shadowCB.setToolTipText("Compute shadows when live");
	909	+ shadowCB.addItemListener(this);
	910	+
	911	+ panel.Return();
	912	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	913	+ toggleTextureCB.setToolTipText("Load textures");
	914	+ toggleTextureCB.addItemListener(this);
	915	+
	916	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	917	+ toggleSwitchCB.setToolTipText("Use switch");
	918	+ toggleSwitchCB.addItemListener(this);
	919	+
	920	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	921	+ autosaveCB.setToolTipText("Auto-save on structure change");
	922	+ autosaveCB.addItemListener(this);
	923	+
	924	+ panel.Return();
	925	+ if (Globals.ADVANCED)
	926	+ {
784	927	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
785	928	lookAtCB.setToolTipText("Look-at target");
786	929	lookAtCB.addItemListener(this);
	930	+ }
787	931
788	932	}
789	933
790	934	cGridBag fill = new cGridBag();
791		-
792	935	fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
793	940
794	941	panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
795	944
796	945	}
797	946
798	947	void EditObject(Object3D obj)
799	948	{
800	949	cRadio radioButton = new cRadio(obj.name);
	950	+
	951	+ // Patch to avoid bug with transparency.
	952	+ radioButton.hadMaterial = obj.material != null;
	953	+ if (!radioButton.hadMaterial)
	954	+ {
	955	+ obj.material = new cMaterial();
	956	+ }
	957	+
801	958	radioButton.SetObject(obj);
802	959	radioButton.layout = sevenButton;
803	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -809,6 +966,8 @@
809	966
810	967	void SetupViews(ObjEditor oe)
811	968	{
	969	+ theFrame = this;
	970	+
812	971	oe.SetupViews();
813	972
814	973	System.out.println("SetupViews");
..	..	@@ -817,23 +976,27 @@
817	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
818	977	}
819	978
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;
	979	+ cToggleButton liveCB;
	980	+ cCheckBox supportCB;
	981	+ cCheckBox localCB;
	982	+ cCheckBox crowdCB;
	983	+ cCheckBox smoothCB;
	984	+ cToggleButton fastCB;
	985	+ cCheckBox slowCB;
	986	+ cCheckBox boxCB;
	987	+ cCheckBox zoomBoxCB;
	988	+ //cToggleButton trackCB;
	989	+ cCheckBox trackCB;
	990	+ cCheckBox smoothfocusCB;
831	991	// JCheckBox speakerMocapCB;
832		- JCheckBox speakerCameraCB;
833		- JCheckBox speakerFocusCB;
834		- JCheckBox debugCB;
835		- JCheckBox oeilCB;
836		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
837	1000
838	1001	// static int COLOR = 1;
839	1002	// static int MATERIAL = 2;
..	..	@@ -841,9 +1004,9 @@
841	1004
842	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
843	1006
844		- JCheckBox colorCB;
845		- JCheckBox materialCB;
846		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
847	1010
848	1011	public void itemStateChanged(ItemEvent e)
849	1012	{
..	..	@@ -871,6 +1034,7 @@
871	1034	} else if(e.getSource() == liveCB)
872	1035	{
873	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
874	1038	}
875	1039	else if(e.getSource() == supportCB)
876	1040	{
..	..	@@ -935,6 +1099,14 @@
935	1099	{
936	1100	cameraView.ToggleOeil();
937	1101	}
	1102	+ else if(e.getSource() == shadowCB)
	1103	+ {
	1104	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1105	+ }
	1106	+ else if(e.getSource() == autosaveCB)
	1107	+ {
	1108	+ Globals.SAVEONMAKE ^= true;
	1109	+ }
938	1110	else if(e.getSource() == lookAtCB)
939	1111	{
940	1112	cameraView.ToggleLookAt();
..	..	@@ -951,7 +1123,8 @@
951	1123
952	1124	/**/
953	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
954		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
955	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
956	1129	// We can't move the root node or an empty selection
957	1130	return;
..	..	@@ -1068,23 +1241,33 @@
1068	1241
1069	1242	assert target == objEditor.jTree;
1070	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
1071	1245	try {
1072		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1073	1247	} catch (Exception e) {
1074	1248	System.out.println("destinationPath : " + destinationPath);
1075	1249	return;
1076	1250	}
1077	1251
1078		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
1079	1253	{
	1254	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1255	+
	1256	+ // Cannot move into itself
	1257	+ if (child == destinationLeaf)
	1258	+ return;
	1259	+ }
	1260	+
	1261	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1262	+// {
1080	1263	loadClipboard(true);
1081	1264	objEditor.jTree.setSelectionPath(destinationPath);
1082	1265	pasteInto(false, false);
1083		- } else {
1084		- loadClipboard(false);
1085		- objEditor.jTree.setSelectionPath(destinationPath);
1086		- pasteInto(false, false); // true); // ???
1087		- }
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
1088	1271	}
1089	1272	public void dropActionChanged(DropTargetDragEvent dtde)
1090	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1189,22 +1372,30 @@
1189	1372	{
1190	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1191	1374	//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);
	1375	+// gridItem = menu.add(new MenuItem("Grid"));
	1376	+// gridItem.addActionListener(this);
	1377	+// rectoidItem = menu.add(new MenuItem("Box"));
	1378	+// rectoidItem.addActionListener(this);
	1379	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1380	+// ellipsoidItem.addActionListener(this);
	1381	+// coneItem = menu.add(new MenuItem("Cone"));
	1382	+// coneItem.addActionListener(this);
	1383	+// torusItem = menu.add(new MenuItem("Torus"));
	1384	+// torusItem.addActionListener(this);
	1385	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1386	+// superItem.addActionListener(this);
	1387	+
	1388	+ cameraItem = menu.add(new MenuItem("Camera"));
	1389	+ cameraItem.addActionListener(this);
	1390	+
	1391	+ if (!Globals.ADVANCED)
	1392	+ {
1204	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1205	1394	kleinItem.addActionListener(this);
1206		- particleItem = menu.add(new MenuItem("Particle system"));
1207		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
1208	1399	if (Globals.ADVANCED)
1209	1400	{
1210	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1230,15 +1421,15 @@
1230	1421	}
1231	1422	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1232	1423	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);
	1424	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1425	+// overlayItem.addActionListener(this);
	1426	+// lightItem = menu.add(new MenuItem("Light"));
	1427	+// lightItem.addActionListener(this);
1237	1428	menu.add("-");
1238	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1239	1430	//superLoopItem.addActionListener(this);
1240		- loopItem = menu.add(new MenuItem("Loop"));
1241		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1242	1433	doubleItem = menu.add(new MenuItem("Fork"));
1243	1434	doubleItem.addActionListener(this);
1244	1435	if (Globals.ADVANCED)
..	..	@@ -1278,7 +1469,7 @@
1278	1469	memoryItem.addActionListener(this);
1279	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1280	1471	analyzeItem.addActionListener(this);
1281		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1282	1473	dumpItem.addActionListener(this);
1283	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1284	1475	// pathItem.addActionListener(this);
..	..	@@ -1419,6 +1610,7 @@
1419	1610	shadow.material = new cMaterial(obj.material);
1420	1611	shadow.material.diffuse = 0.0001f;
1421	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1422	1614
1423	1615	makeSomething(shadow);
1424	1616	}
..	..	@@ -1666,7 +1858,7 @@
1666	1858	{
1667	1859	ScreenFit();
1668	1860	} else
1669		- if (source == switchItem)
	1861	+ if (source == switchViewItem)
1670	1862	{
1671	1863	cVector v1 = new cVector();
1672	1864	cVector v2 = new cVector();
..	..	@@ -1675,11 +1867,11 @@
1675	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1676	1868	objEditor.cameraView.repaint();
1677	1869	} else
1678		- if (source == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1679	1871	{
1680	1872	makeSomething(new Box());
1681	1873	} else
1682		- if (source == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1683	1875	{
1684	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1685	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1758,27 +1950,27 @@
1758	1950
1759	1951	makeSomething(obj);
1760	1952	} else
1761		- if (source == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1762	1954	{
1763	1955	makeSomething(new Grid());
1764	1956	} else
1765		- if (source == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1766	1958	{
1767	1959	makeSomething(new Sphere());
1768	1960	} else
1769		- if (source == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1770	1962	{
1771	1963	makeSomething(new Cone());
1772	1964	} else
1773		- if (source == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1774	1966	{
1775	1967	makeSomething(new Torus());
1776	1968	} else
1777		- if (source == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1778	1970	{
1779	1971	makeSomething(new Superellipsoid());
1780	1972	} else
1781		- if (source == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1782	1974	{
1783	1975	makeSomething(new Klein());
1784	1976	} else
..	..	@@ -1798,7 +1990,7 @@
1798	1990	{
1799	1991	makeSomething(new BezierSurface());
1800	1992	} else
1801		- if (source == overlayItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1802	1994	{
1803	1995	/*
1804	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1846,7 +2038,7 @@
1846	2038	s.setup();
1847	2039	makeSomething(s);
1848	2040	} else
1849		- if (source == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1850	2042	{
1851	2043	makeSomething(new Light());
1852	2044	} else
..	..	@@ -1896,7 +2088,7 @@
1896	2088
1897	2089	group(g);
1898	2090	} else
1899		- if (source == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1900	2092	{
1901	2093	Composite csg = new GroupLeaf();
1902	2094	csg.count = 5;
..	..	@@ -1968,6 +2160,18 @@
1968	2160	if (source == dumpItem)
1969	2161	{
1970	2162	DumpObject();
	2163	+ } else
	2164	+ if (source == minButton)
	2165	+ {
	2166	+ Minimize();
	2167	+ } else
	2168	+ if (source == maxButton)
	2169	+ {
	2170	+ Maximize();
	2171	+ } else
	2172	+ if (source == fullButton)
	2173	+ {
	2174	+ ToggleFullScreen();
1971	2175	} else
1972	2176	if (source == undoButton)
1973	2177	{
..	..	@@ -2374,9 +2578,9 @@
2374	2578	{
2375	2579	ClearSelection(true);
2376	2580	} else
2377		- if (source == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2378	2582	{
2379		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2380	2584	} else
2381	2585	if (source == hideItem)
2382	2586	{
..	..	@@ -2394,11 +2598,11 @@
2394	2598	{
2395	2599	makeSomething(new Camera());
2396	2600	} else
2397		- if (source == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2398	2602	{
2399	2603	group(new Composite());
2400	2604	} else
2401		- if (source == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2402	2606	{
2403	2607	RandomNode random = new RandomNode();
2404	2608	group(random);
..	..	@@ -2500,7 +2704,7 @@
2500	2704	{
2501	2705	group(new cLinker());
2502	2706	} else
2503		- if (source == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2504	2708	{
2505	2709	group(new TextureNode());
2506	2710	} else
..	..	@@ -2520,7 +2724,7 @@
2520	2724	{
2521	2725	CastShadow(2);
2522	2726	} else
2523		- if (source == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2524	2728	{
2525	2729	//ungroup();
2526	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2542,7 +2746,7 @@
2542	2746	} else
2543	2747	if (source == genNormalsMESHItem)
2544	2748	{
2545		- GenNormals(true); // TODO
	2749	+ GenNormalsMESH();
2546	2750	} else
2547	2751	if (source == genNormalsORGANItem)
2548	2752	{
..	..	@@ -2607,6 +2811,22 @@
2607	2811	if (source == unmarkleavesItem)
2608	2812	{
2609	2813	MarkLeaves(false);
	2814	+ } else
	2815	+ if (source == rewindleavesItem)
	2816	+ {
	2817	+ RewindLeaves(true);
	2818	+ } else
	2819	+ if (source == unrewindleavesItem)
	2820	+ {
	2821	+ RewindLeaves(false);
	2822	+ } else
	2823	+ if (source == randomleavesItem)
	2824	+ {
	2825	+ RandomLeaves(true);
	2826	+ } else
	2827	+ if (source == unrandomleavesItem)
	2828	+ {
	2829	+ RandomLeaves(false);
2610	2830	} else
2611	2831	if (source == flipVItem)
2612	2832	{
..	..	@@ -2842,6 +3062,10 @@
2842	3062	if (source == twoButton)
2843	3063	{
2844	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2845	3069	// bug
2846	3070	//gridPanel.setDividerLocation(1.0);
2847	3071	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2874,10 +3098,31 @@
2874	3098	bigThree.ClearUI();
2875	3099	bigThree.add(centralPanel);
2876	3100	bigThree.FlushUI();
	3101	+
	3102	+ cameraView.requestFocusInWindow();
	3103	+
	3104	+// refreshContents(true);
	3105	+//
	3106	+// try
	3107	+// {
	3108	+// java.awt.Robot bot = new java.awt.Robot();
	3109	+// int mask = InputEvent.BUTTON1_MASK;
	3110	+// bot.mouseMove(100, 100);
	3111	+// bot.mousePress(mask);
	3112	+// bot.mouseRelease(mask);
	3113	+// }
	3114	+// catch (Exception e)
	3115	+// {
	3116	+//
	3117	+// }
	3118	+
2877	3119	} else
2878	3120	if (source == threeButton)
2879	3121	{
2880	3122	radio.layout = threeButton;
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
2881	3126
2882	3127	// bigThree.remove(scenePanel);
2883	3128	// bigThree.remove(centralPanel);
..	..	@@ -2910,10 +3155,15 @@
2910	3155	bigThree.add(centralPanel);
2911	3156	bigThree.add(XYZPanel);
2912	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2913	3160	} else
2914	3161	if (source == fourButton)
2915	3162	{
2916	3163	radio.layout = fourButton;
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
2917	3167
2918	3168	// bigThree.remove(scenePanel);
2919	3169	// bigThree.remove(centralPanel);
..	..	@@ -2945,10 +3195,15 @@
2945	3195	bigThree.ClearUI();
2946	3196	bigThree.add(scenePanel);
2947	3197	bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2948	3200	} else
2949	3201	if (source == sixButton)
2950	3202	{
2951	3203	radio.layout = sixButton;
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
2952	3207
2953	3208	// bigThree.remove(scenePanel);
2954	3209	// bigThree.remove(centralPanel);
..	..	@@ -2981,10 +3236,15 @@
2981	3236	bigThree.add(scenePanel);
2982	3237	bigThree.add(centralPanel);
2983	3238	bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2984	3241	} else
2985	3242	if (source == sevenButton)
2986	3243	{
2987	3244	radio.layout = sevenButton;
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
2988	3248
2989	3249	// bigThree.remove(scenePanel);
2990	3250	// bigThree.remove(centralPanel);
..	..	@@ -3018,6 +3278,8 @@
3018	3278	bigThree.add(centralPanel);
3019	3279	bigThree.add(XYZPanel);
3020	3280	bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
3021	3283	} else
3022	3284	if (source == rootButton)
3023	3285	{
..	..	@@ -3029,6 +3291,7 @@
3029	3291	EditObject(obj);
3030	3292	}
3031	3293
	3294	+ cameraView.requestFocusInWindow();
3032	3295	refreshContents(true);
3033	3296	} else
3034	3297	if (source == closeButton)
..	..	@@ -3038,18 +3301,27 @@
3038	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3039	3302	{
3040	3303	ab = (cRadio)e.nextElement();
3041		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3042	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
3043	3312	buttonGroup.remove(ab);
3044	3313	radioPanel.remove(ab);
3045	3314
3046		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
3047	3317	// ab.GetObject().objectUI = null; // ?????????
3048	3318
3049	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3050	3320	break;
3051	3321	}
3052	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
3053	3325	refreshContents(true);
3054	3326	} else
3055	3327	if (source == editItem \|\| source == editButton)
..	..	@@ -3154,7 +3426,8 @@
3154	3426	}
3155	3427
3156	3428	// fix "+" issue
3157		- group.editWindow = this;
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
3158	3431
3159	3432	/*
3160	3433	currentLayout = radio.layout;
..	..	@@ -3167,13 +3440,15 @@
3167	3440	//group.parent = null; // ROOT
3168	3441	//group.attributes = -1;
3169	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
3170	3445	refreshContents(true);
3171	3446	} else if (event.getSource() == editCameraItem)
3172	3447	{
3173	3448	cameraView.ProtectCamera();
3174	3449	cameraView.repaint();
3175	3450	return;
3176		- } else if (event.getSource() == revertCameraItem)
	3451	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3177	3452	{
3178	3453	cameraView.RevertCamera();
3179	3454	cameraView.repaint();
..	..	@@ -3190,7 +3465,6 @@
3190	3465	}
3191	3466
3192	3467	boolean useclient = false;
3193		- cRadio radio;
3194	3468
3195	3469	void ToggleRoot()
3196	3470	{
..	..	@@ -3511,6 +3785,13 @@
3511	3785	void GenNormals(boolean crease)
3512	3786	{
3513	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
3514	3795
3515	3796	refreshContents();
3516	3797	}
..	..	@@ -4138,6 +4419,18 @@
4138	4419	refreshContents();
4139	4420	}
4140	4421
	4422	+ void RewindLeaves(boolean hide)
	4423	+ {
	4424	+ group.selection.RewindLeaves(hide);
	4425	+ refreshContents();
	4426	+ }
	4427	+
	4428	+ void RandomLeaves(boolean hide)
	4429	+ {
	4430	+ group.selection.RandomLeaves(hide);
	4431	+ refreshContents();
	4432	+ }
	4433	+
4141	4434	void SetTexRes(int tr)
4142	4435	{
4143	4436	group.selection.SetTexRes(tr);
..	..	@@ -4220,7 +4513,7 @@
4220	4513	{
4221	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4222	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4223		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4224	4517
4225	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
4226	4519	if(elem != group \|\| !newWindow)
..	..	@@ -4313,7 +4606,6 @@
4313	4606	//case 702: // Event.LIST_DESELECT
4314	4607	group.deselectAll();
4315	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4316		- objEditor.ClearInfo(); // .GetMaterial());
4317	4609	if (tps != null)
4318	4610	{
4319	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -4322,10 +4614,8 @@
4322	4614
4323	4615	//if (child.parent != null)
4324	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
4325	4618	group.addSelectee(child);
4326		- objEditor.SetMaterial(child); // .GetMaterial());
4327		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4328		- System.err.println("info : " + child.GetPath());
4329	4619	}
4330	4620	}
4331	4621	// else
..	..	@@ -4335,8 +4625,6 @@
4335	4625	// System.err.println("info : " + group.GetPath());
4336	4626	// }
4337	4627
4338		- objEditor.SetText(); // jan 2014
4339		-
4340	4628	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4341	4629	CameraPane.flash = true;
4342	4630
..	..	@@ -4360,6 +4648,27 @@
4360	4648
4361	4649	freezemodel = false;
4362	4650	}
	4651	+
	4652	+ void refreshContents(boolean cp)
	4653	+ {
	4654	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4655	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4656	+ {
	4657	+ objEditor.ClearInfo(); // .GetMaterial());
	4658	+
	4659	+ for (int i=0; i < group.selection.Size(); i++)
	4660	+ {
	4661	+ Object3D child = (Object3D) group.selection.get(i);
	4662	+
	4663	+ objEditor.AddInfo(child, this, true);
	4664	+ System.err.println("info : " + child.GetPath());
	4665	+ }
	4666	+
	4667	+ objEditor.SetText(); // jan 2014
	4668	+ }
	4669	+
	4670	+ super.refreshContents(cp);
	4671	+ }
4363	4672
4364	4673	void linkSomething(Object3D thing)
4365	4674	{
..	..	@@ -4442,6 +4751,7 @@
4442	4751
4443	4752	if (cut)
4444	4753	{
	4754	+ if (Globals.SAVEONMAKE)
4445	4755	Save();
4446	4756	//int indices[] = jList.getSelectedIndices();
4447	4757	//for (int i = indices.length - 1; i >= 0; i--)
..	..	@@ -5160,10 +5470,33 @@
5160	5470	cButton clearpanelButton;
5161	5471	cButton unselectButton;
5162	5472
5163		- cButton saveButton;
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
5164	5478	cButton undoButton;
5165	5479	cButton redoButton;
	5480	+ cButton saveButton;
5166	5481	cButton oneStepButton;
	5482	+
	5483	+ cButton groupButton;
	5484	+ cButton ungroupButton;
	5485	+ cButton compositeButton;
	5486	+ cButton switchButton;
	5487	+ cButton loopButton;
	5488	+ cButton textureButton;
	5489	+
	5490	+ cButton gridButton;
	5491	+ cButton boxButton;
	5492	+ cButton sphereButton;
	5493	+ cButton coneButton;
	5494	+ cButton torusButton;
	5495	+ cButton superButton;
	5496	+ cButton kleinButton;
	5497	+ cButton particlesButton;
	5498	+ cButton overlayButton;
	5499	+ cButton lightButton;
5167	5500
5168	5501	cButton screenfitButton;
5169	5502	cButton screenfitpointButton;
..	..	@@ -5176,14 +5509,6 @@
5176	5509
5177	5510	cButton setsupportButton;
5178	5511
5179		- cButton twoButton;
5180		- cButton sixButton;
5181		- cButton threeButton;
5182		- cButton sevenButton;
5183		- cButton fourButton; // full panel
5184		- cButton oneButton; // full XYZ
5185		- //cButton currentLayout;
5186		-
5187	5512	//
5188	5513	//Composite
5189	5514	Object3D // to do !!
..	..	@@ -5193,11 +5518,11 @@
5193	5518	//JTree jTree;
5194	5519	private MenuItem lookAtItem;
5195	5520	private MenuItem lookFromItem;
5196		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
5197	5522	private MenuItem cutItem;
5198	5523	private MenuItem undoItem;
5199	5524	private MenuItem redoItem;
5200		- private MenuItem duplicateItem;
	5525	+ private JMenuItem duplicateItem;
5201	5526	private MenuItem cloneItem;
5202	5527	private MenuItem cloneSupportItem;
5203	5528	private MenuItem overwriteGeoItem;
..	..	@@ -5260,6 +5585,10 @@
5260	5585	private MenuItem showleavesItem;
5261	5586	private MenuItem markleavesItem;
5262	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
5263	5592
5264	5593	private MenuItem flipVItem;
5265	5594	private MenuItem unflipVItem;
..	..	@@ -5281,7 +5610,7 @@
5281	5610	private MenuItem frontItem;
5282	5611	private MenuItem cameraItem;
5283	5612	private MenuItem compositeItem;
5284		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5285	5614	private MenuItem physicsItem;
5286	5615	private MenuItem frameselectorItem;
5287	5616	private MenuItem scriptNodeItem;
..	..	@@ -5355,5 +5684,5 @@
5355	5684
5356	5685	Menu cameraMenu;
5357	5686	MenuItem editCameraItem;
5358		- MenuItem revertCameraItem;
	5687	+ MenuItem restoreCameraItem;
5359	5688	}