~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,16 +150,19 @@
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"));
156	158	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	166	duplicateItem.addActionListener(this);
164	167	cloneItem = menu.add(new MenuItem("Clone"));
165	168	cloneItem.addActionListener(this);
..	..	@@ -175,7 +178,6 @@
175	178	copyItem.addActionListener(this);
176	179	pasteItem = menu.add(new MenuItem("Paste"));
177	180	pasteItem.addActionListener(this);
178		- menu.add("-");
179	181
180	182	menu.add("-");
181	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -202,21 +204,21 @@
202	204	//zBufferItem.addActionListener(this);
203	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	206	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
207	209
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
212		-
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- 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);
220	222
221	223	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
222	224	toggleHandleItem.addItemListener(this);
..	..	@@ -245,7 +247,7 @@
245	247
246	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	249	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
249	251
250	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +268,14 @@
266	268	// animationItem.addItemListener(this);
267	269	// animationItem.setState(CameraPane.ANIMATION);
268	270	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	272	editCameraItem.addActionListener(this);
271	273
272	274	if (Globals.ADVANCED)
273	275	{
274	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	280	oe.cameraMenu.add("-");
279	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +283,7 @@
281	283	editLeafItem.addActionListener(this);
282	284	lookAtItem.addActionListener(this);
283	285	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
285	287	}
286	288
287	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +328,29 @@
326	328	}
327	329
328	330	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
331	333	backItem = menu.add(new MenuItem("Back"));
332	334	backItem.addActionListener(this);
333	335	frontItem = menu.add(new MenuItem("Front"));
334	336	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
337	342	hideItem = menu.add(new MenuItem("Hidden Group"));
338	343	hideItem.addActionListener(this);
	344	+ }
339	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	346	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- 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	+ {
344	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	355	switchGeoItem.addActionListener(this);
346	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +358,6 @@
348	358	morphItem = menu.add(new MenuItem("Morph Group"));
349	359	morphItem.addActionListener(this);
350	360
351		- if (Globals.ADVANCED)
352		- {
353	361	menu.add("-");
354	362	physicsItem = menu.add(new MenuItem("Physics"));
355	363	physicsItem.addActionListener(this);
..	..	@@ -357,22 +365,20 @@
357	365	frameselectorItem.addActionListener(this);
358	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	367	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	368	}
363	369
364	370	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
367	373	billboardItem = menu.add(new MenuItem("Billboard"));
368	374	billboardItem.addActionListener(this);
369	375	csgItem = menu.add(new MenuItem("CSG"));
370	376	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	378	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	380	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	382	shadowZItem.addActionListener(this);
377	383	if (Globals.ADVANCED)
378	384	{
..	..	@@ -469,6 +475,14 @@
469	475	markleavesItem.addActionListener(this);
470	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	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);
472	486	menu.add("-");
473	487	flipVItem = menu.add(new MenuItem("Flip V"));
474	488	flipVItem.addActionListener(this);
..	..	@@ -526,6 +540,18 @@
526	540
527	541	void SetupUI2(ObjEditor oe)
528	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	+
529	555	//new Exception().printStackTrace();
530	556
531	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +580,61 @@
554	580	oe.radioPanel.add(dummyButton);
555	581	oe.buttonGroup.add(dummyButton);
556	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
557	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	588
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, 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);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+
	609	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ redoButton.setToolTipText("Redo changes");
	611	+ redoButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ saveButton.setToolTipText("Save changes");
	615	+ saveButton.addActionListener(this);
	616	+
	617	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	618	liveCB.setToolTipText("Enable animation");
561	619	liveCB.addItemListener(this);
562	620
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	622	oneStepButton.setToolTipText("Animate one step forward");
565	623	oneStepButton.addActionListener(this);
566	624
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	626	fastCB.setToolTipText("Fast mode");
569	627	fastCB.addItemListener(this);
570	628
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- 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);
576	632	screenfitButton.setToolTipText("Screen fit");
577	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);
578	638
579	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	640	// screenfitpointButton.addActionListener(this);
..	..	@@ -586,65 +646,132 @@
586	646	snapobjectButton.setToolTipText("Snap Object");
587	647	}
588	648
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	650
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	652	twoButton.setToolTipText("Show center view only");
597	653	twoButton.addActionListener(this);
598		- 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);
599	657	fourButton.addActionListener(this);
600	658	fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	660	sixButton.setToolTipText("2-column layout left");
603	661	sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	663	threeButton.setToolTipText("2-column layout right");
606	664	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	666	sevenButton.setToolTipText("3-column layout");
609	667	sevenButton.addActionListener(this);
610	668	//
611	669
612		- 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);
613	671	rootButton.setToolTipText("Edit selection in new tab");
614	672	rootButton.addActionListener(this);
615	673
616		- 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);
617	675	closeButton.setToolTipText("Close tab");
618	676	closeButton.addActionListener(this);
619	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	678	//clearButton.addActionListener(this);
621		-
622		- 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	+ }
623	711
624		- 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);
625	748	editButton.setToolTipText("Edit selection");
626	749	editButton.addActionListener(this);
627	750
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629	752	uneditButton.setToolTipText("Unedit selection");
630	753	uneditButton.addActionListener(this);
631	754
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633	756	allParamsButton.setToolTipText("Edit all params");
634	757	allParamsButton.addActionListener(this);
635	758
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	760	clearPanelButton.setToolTipText("Clear edit panel");
638	761	clearPanelButton.addActionListener(this);
639	762
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	764	unselectButton.setToolTipText("Unselect");
642	765	unselectButton.addActionListener(this);
643	766
644		- 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);
645	770
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
648	775
649	776	// oe.aConstraints.gridx += 1;
650	777	// oe.aConstraints.weighty = 0;
..	..	@@ -661,27 +788,12 @@
661	788
662	789	JScrollPane jSP;
663	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	792	ResetModel();
666	793
667	794	oe.treePanel.add(jSPPanel);
668	795	oe.treePanel.Return();
669	796
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	797	oe.treePanel.add(copyOptionsPanel);
686	798	oe.treePanel.Return();
687	799
..	..	@@ -712,6 +824,20 @@
712	824
713	825	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	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	+
715	841	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	842	boxCB.setToolTipText("Display bounding boxes");
717	843	boxCB.addItemListener(this);
..	..	@@ -729,6 +855,8 @@
729	855	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	856	// localCB.addItemListener(this);
731	857
	858	+ panel.Return();
	859	+
732	860	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	861	crowdCB.setToolTipText("Used for crowds");
734	862	crowdCB.addItemListener(this);
..	..	@@ -745,6 +873,8 @@
745	873	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	874	// speakerMocapCB.addItemListener(this);
747	875
	876	+ panel.Return();
	877	+
748	878	if (false)
749	879	{
750	880	// handled in scripts
..	..	@@ -759,32 +889,72 @@
759	889	//constraints.gridy += 1;
760	890	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	891	smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
762	893	}
763	894
764	895	//constraints.gridx += 1;
765	896	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	897	// debugCB.addItemListener(this);
767	898
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
768	903	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
769	905	oeilCB.addItemListener(this);
770	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	+ {
771	927	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	928	lookAtCB.setToolTipText("Look-at target");
773	929	lookAtCB.addItemListener(this);
	930	+ }
774	931
775	932	}
776	933
777	934	cGridBag fill = new cGridBag();
778		-
779	935	fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
780	940
781	941	panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
782	944
783	945	}
784	946
785	947	void EditObject(Object3D obj)
786	948	{
787	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	+
788	958	radioButton.SetObject(obj);
789	959	radioButton.layout = sevenButton;
790	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -796,6 +966,8 @@
796	966
797	967	void SetupViews(ObjEditor oe)
798	968	{
	969	+ theFrame = this;
	970	+
799	971	oe.SetupViews();
800	972
801	973	System.out.println("SetupViews");
..	..	@@ -804,23 +976,27 @@
804	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	977	}
806	978
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- 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;
818	991	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
824	1000
825	1001	// static int COLOR = 1;
826	1002	// static int MATERIAL = 2;
..	..	@@ -828,9 +1004,9 @@
828	1004
829	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1006
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
834	1010
835	1011	public void itemStateChanged(ItemEvent e)
836	1012	{
..	..	@@ -858,6 +1034,7 @@
858	1034	} else if(e.getSource() == liveCB)
859	1035	{
860	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
861	1038	}
862	1039	else if(e.getSource() == supportCB)
863	1040	{
..	..	@@ -922,6 +1099,14 @@
922	1099	{
923	1100	cameraView.ToggleOeil();
924	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	+ }
925	1110	else if(e.getSource() == lookAtCB)
926	1111	{
927	1112	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1123,8 @@
938	1123
939	1124	/**/
940	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1129	// We can't move the root node or an empty selection
944	1130	return;
..	..	@@ -1055,23 +1241,33 @@
1055	1241
1056	1242	assert target == objEditor.jTree;
1057	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
1058	1245	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1247	} catch (Exception e) {
1061	1248	System.out.println("destinationPath : " + destinationPath);
1062	1249	return;
1063	1250	}
1064	1251
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
1066	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	+// {
1067	1263	loadClipboard(true);
1068	1264	objEditor.jTree.setSelectionPath(destinationPath);
1069	1265	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
1075	1271	}
1076	1272	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1372,30 @@
1176	1372	{
1177	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1374	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- 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	+ {
1191	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1394	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
1195	1399	if (Globals.ADVANCED)
1196	1400	{
1197	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1421,15 @@
1217	1421	}
1218	1422	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1423	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- 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);
1224	1428	menu.add("-");
1225	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1430	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1229	1433	doubleItem = menu.add(new MenuItem("Fork"));
1230	1434	doubleItem.addActionListener(this);
1231	1435	if (Globals.ADVANCED)
..	..	@@ -1265,7 +1469,7 @@
1265	1469	memoryItem.addActionListener(this);
1266	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1471	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1473	dumpItem.addActionListener(this);
1270	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1475	// pathItem.addActionListener(this);
..	..	@@ -1406,6 +1610,7 @@
1406	1610	shadow.material = new cMaterial(obj.material);
1407	1611	shadow.material.diffuse = 0.0001f;
1408	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1409	1614
1410	1615	makeSomething(shadow);
1411	1616	}
..	..	@@ -1653,7 +1858,7 @@
1653	1858	{
1654	1859	ScreenFit();
1655	1860	} else
1656		- if (source == switchItem)
	1861	+ if (source == switchViewItem)
1657	1862	{
1658	1863	cVector v1 = new cVector();
1659	1864	cVector v2 = new cVector();
..	..	@@ -1662,11 +1867,11 @@
1662	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	1868	objEditor.cameraView.repaint();
1664	1869	} else
1665		- if (source == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1666	1871	{
1667	1872	makeSomething(new Box());
1668	1873	} else
1669		- if (source == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1670	1875	{
1671	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +1950,27 @@
1745	1950
1746	1951	makeSomething(obj);
1747	1952	} else
1748		- if (source == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1749	1954	{
1750	1955	makeSomething(new Grid());
1751	1956	} else
1752		- if (source == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	1958	{
1754	1959	makeSomething(new Sphere());
1755	1960	} else
1756		- if (source == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1757	1962	{
1758	1963	makeSomething(new Cone());
1759	1964	} else
1760		- if (source == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1761	1966	{
1762	1967	makeSomething(new Torus());
1763	1968	} else
1764		- if (source == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1765	1970	{
1766	1971	makeSomething(new Superellipsoid());
1767	1972	} else
1768		- if (source == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1769	1974	{
1770	1975	makeSomething(new Klein());
1771	1976	} else
..	..	@@ -1785,7 +1990,7 @@
1785	1990	{
1786	1991	makeSomething(new BezierSurface());
1787	1992	} else
1788		- if (source == overlayItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1789	1994	{
1790	1995	/*
1791	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,7 +2038,7 @@
1833	2038	s.setup();
1834	2039	makeSomething(s);
1835	2040	} else
1836		- if (source == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1837	2042	{
1838	2043	makeSomething(new Light());
1839	2044	} else
..	..	@@ -1883,7 +2088,7 @@
1883	2088
1884	2089	group(g);
1885	2090	} else
1886		- if (source == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1887	2092	{
1888	2093	Composite csg = new GroupLeaf();
1889	2094	csg.count = 5;
..	..	@@ -1955,6 +2160,30 @@
1955	2160	if (source == dumpItem)
1956	2161	{
1957	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();
	2175	+ } else
	2176	+ if (source == undoButton)
	2177	+ {
	2178	+ Undo();
	2179	+ } else
	2180	+ if (source == redoButton)
	2181	+ {
	2182	+ Redo();
	2183	+ } else
	2184	+ if (source == saveButton)
	2185	+ {
	2186	+ Save();
1958	2187	} else
1959	2188	if (source == oneStepButton)
1960	2189	{
..	..	@@ -2349,9 +2578,9 @@
2349	2578	{
2350	2579	ClearSelection(true);
2351	2580	} else
2352		- if (source == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2353	2582	{
2354		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2355	2584	} else
2356	2585	if (source == hideItem)
2357	2586	{
..	..	@@ -2369,11 +2598,11 @@
2369	2598	{
2370	2599	makeSomething(new Camera());
2371	2600	} else
2372		- if (source == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2373	2602	{
2374	2603	group(new Composite());
2375	2604	} else
2376		- if (source == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2377	2606	{
2378	2607	RandomNode random = new RandomNode();
2379	2608	group(random);
..	..	@@ -2475,7 +2704,7 @@
2475	2704	{
2476	2705	group(new cLinker());
2477	2706	} else
2478		- if (source == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2479	2708	{
2480	2709	group(new TextureNode());
2481	2710	} else
..	..	@@ -2495,7 +2724,7 @@
2495	2724	{
2496	2725	CastShadow(2);
2497	2726	} else
2498		- if (source == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	2728	{
2500	2729	//ungroup();
2501	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2517,7 +2746,7 @@
2517	2746	} else
2518	2747	if (source == genNormalsMESHItem)
2519	2748	{
2520		- GenNormals(true); // TODO
	2749	+ GenNormalsMESH();
2521	2750	} else
2522	2751	if (source == genNormalsORGANItem)
2523	2752	{
..	..	@@ -2582,6 +2811,22 @@
2582	2811	if (source == unmarkleavesItem)
2583	2812	{
2584	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);
2585	2830	} else
2586	2831	if (source == flipVItem)
2587	2832	{
..	..	@@ -2817,6 +3062,10 @@
2817	3062	if (source == twoButton)
2818	3063	{
2819	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2820	3069	// bug
2821	3070	//gridPanel.setDividerLocation(1.0);
2822	3071	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3098,31 @@
2849	3098	bigThree.ClearUI();
2850	3099	bigThree.add(centralPanel);
2851	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	+
2852	3119	} else
2853	3120	if (source == threeButton)
2854	3121	{
2855	3122	radio.layout = threeButton;
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
2856	3126
2857	3127	// bigThree.remove(scenePanel);
2858	3128	// bigThree.remove(centralPanel);
..	..	@@ -2885,10 +3155,15 @@
2885	3155	bigThree.add(centralPanel);
2886	3156	bigThree.add(XYZPanel);
2887	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2888	3160	} else
2889	3161	if (source == fourButton)
2890	3162	{
2891	3163	radio.layout = fourButton;
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
2892	3167
2893	3168	// bigThree.remove(scenePanel);
2894	3169	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3195,15 @@
2920	3195	bigThree.ClearUI();
2921	3196	bigThree.add(scenePanel);
2922	3197	bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2923	3200	} else
2924	3201	if (source == sixButton)
2925	3202	{
2926	3203	radio.layout = sixButton;
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
2927	3207
2928	3208	// bigThree.remove(scenePanel);
2929	3209	// bigThree.remove(centralPanel);
..	..	@@ -2956,10 +3236,15 @@
2956	3236	bigThree.add(scenePanel);
2957	3237	bigThree.add(centralPanel);
2958	3238	bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2959	3241	} else
2960	3242	if (source == sevenButton)
2961	3243	{
2962	3244	radio.layout = sevenButton;
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
2963	3248
2964	3249	// bigThree.remove(scenePanel);
2965	3250	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3278,8 @@
2993	3278	bigThree.add(centralPanel);
2994	3279	bigThree.add(XYZPanel);
2995	3280	bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
2996	3283	} else
2997	3284	if (source == rootButton)
2998	3285	{
..	..	@@ -3004,6 +3291,7 @@
3004	3291	EditObject(obj);
3005	3292	}
3006	3293
	3294	+ cameraView.requestFocusInWindow();
3007	3295	refreshContents(true);
3008	3296	} else
3009	3297	if (source == closeButton)
..	..	@@ -3013,18 +3301,27 @@
3013	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3302	{
3015	3303	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
3018	3312	buttonGroup.remove(ab);
3019	3313	radioPanel.remove(ab);
3020	3314
3021		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
3022	3317	// ab.GetObject().objectUI = null; // ?????????
3023	3318
3024	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3320	break;
3026	3321	}
3027	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
3028	3325	refreshContents(true);
3029	3326	} else
3030	3327	if (source == editItem \|\| source == editButton)
..	..	@@ -3041,7 +3338,7 @@
3041	3338	child.CloseUI();
3042	3339	listUI.remove(child);
3043	3340
3044		- child.editWindow = null; // ???????????
	3341	+ //child.editWindow = null; // ???????????
3045	3342	}
3046	3343	objEditor.ctrlPanel.FlushUI();
3047	3344	//objEditor.jTree.clearSelection();
..	..	@@ -3128,7 +3425,9 @@
3128	3425	sideView.object = group;
3129	3426	}
3130	3427
3131		-// fix "+" issue group.editWindow = this;
	3428	+// fix "+" issue
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
3132	3431
3133	3432	/*
3134	3433	currentLayout = radio.layout;
..	..	@@ -3141,13 +3440,15 @@
3141	3440	//group.parent = null; // ROOT
3142	3441	//group.attributes = -1;
3143	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
3144	3445	refreshContents(true);
3145	3446	} else if (event.getSource() == editCameraItem)
3146	3447	{
3147	3448	cameraView.ProtectCamera();
3148	3449	cameraView.repaint();
3149	3450	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3451	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3452	{
3152	3453	cameraView.RevertCamera();
3153	3454	cameraView.repaint();
..	..	@@ -3164,7 +3465,6 @@
3164	3465	}
3165	3466
3166	3467	boolean useclient = false;
3167		- cRadio radio;
3168	3468
3169	3469	void ToggleRoot()
3170	3470	{
..	..	@@ -3403,7 +3703,8 @@
3403	3703
3404	3704	int size = obj.MemorySize();
3405	3705
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	3706	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3707	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	3708	}
3408	3709	}
3409	3710	catch (Exception e)
..	..	@@ -3484,6 +3785,13 @@
3484	3785	void GenNormals(boolean crease)
3485	3786	{
3486	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
3487	3795
3488	3796	refreshContents();
3489	3797	}
..	..	@@ -4111,6 +4419,18 @@
4111	4419	refreshContents();
4112	4420	}
4113	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	+
4114	4434	void SetTexRes(int tr)
4115	4435	{
4116	4436	group.selection.SetTexRes(tr);
..	..	@@ -4193,7 +4513,7 @@
4193	4513	{
4194	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	4517
4198	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	4519	if(elem != group \|\| !newWindow)
..	..	@@ -4286,7 +4606,6 @@
4286	4606	//case 702: // Event.LIST_DESELECT
4287	4607	group.deselectAll();
4288	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4609	if (tps != null)
4291	4610	{
4292	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4614,8 @@
4295	4614
4296	4615	//if (child.parent != null)
4297	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
4298	4618	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4619	}
4303	4620	}
4304	4621	// else
..	..	@@ -4308,17 +4625,13 @@
4308	4625	// System.err.println("info : " + group.GetPath());
4309	4626	// }
4310	4627
4311		- objEditor.SetText(); // jan 2014
4312		-
4313		- Object3D object = (Object3D) tps[0].getLastPathComponent();
4314		-
4315		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(object instanceof Camera))
	4628	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4316	4629	CameraPane.flash = true;
4317	4630
4318		- if (tps != null && tps.length > 0 && object instanceof Camera)
	4631	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4319	4632	// a camera
4320	4633	{
4321		- if (object != Globals.theRenderer.LightCamera())
	4634	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
4322	4635	{
4323	4636	CameraPane.camerachangeframe = 0; // don't refuse it
4324	4637	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4335,6 +4648,27 @@
4335	4648
4336	4649	freezemodel = false;
4337	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	+ }
4338	4672
4339	4673	void linkSomething(Object3D thing)
4340	4674	{
..	..	@@ -4406,6 +4740,7 @@
4406	4740	{
4407	4741	if (group.selection.isEmpty())
4408	4742	return;
	4743	+
4409	4744	Grafreed.clipboardIsTempGroup = false;
4410	4745	Composite tGroup = null;
4411	4746	if (group.selection.size() > 0) // 1)
..	..	@@ -4416,6 +4751,8 @@
4416	4751
4417	4752	if (cut)
4418	4753	{
	4754	+ if (Globals.SAVEONMAKE)
	4755	+ Save();
4419	4756	//int indices[] = jList.getSelectedIndices();
4420	4757	//for (int i = indices.length - 1; i >= 0; i--)
4421	4758	//jList.remove(indices[i]);
..	..	@@ -4505,8 +4842,10 @@
4505	4842	}
4506	4843
4507	4844	}
	4845	+
4508	4846	if (Grafreed.clipboardIsTempGroup)
4509	4847	Grafreed.clipboard = tGroup;
	4848	+
4510	4849	if (cut)
4511	4850	{
4512	4851	ResetModel();
..	..	@@ -5131,7 +5470,33 @@
5131	5470	cButton clearpanelButton;
5132	5471	cButton unselectButton;
5133	5472
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
	5478	+ cButton undoButton;
	5479	+ cButton redoButton;
	5480	+ cButton saveButton;
5134	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;
5135	5500
5136	5501	cButton screenfitButton;
5137	5502	cButton screenfitpointButton;
..	..	@@ -5144,14 +5509,6 @@
5144	5509
5145	5510	cButton setsupportButton;
5146	5511
5147		- cButton twoButton;
5148		- cButton sixButton;
5149		- cButton threeButton;
5150		- cButton sevenButton;
5151		- cButton fourButton; // full panel
5152		- cButton oneButton; // full XYZ
5153		- //cButton currentLayout;
5154		-
5155	5512	//
5156	5513	//Composite
5157	5514	Object3D // to do !!
..	..	@@ -5161,11 +5518,11 @@
5161	5518	//JTree jTree;
5162	5519	private MenuItem lookAtItem;
5163	5520	private MenuItem lookFromItem;
5164		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
5165	5522	private MenuItem cutItem;
5166	5523	private MenuItem undoItem;
5167	5524	private MenuItem redoItem;
5168		- private MenuItem duplicateItem;
	5525	+ private JMenuItem duplicateItem;
5169	5526	private MenuItem cloneItem;
5170	5527	private MenuItem cloneSupportItem;
5171	5528	private MenuItem overwriteGeoItem;
..	..	@@ -5228,6 +5585,10 @@
5228	5585	private MenuItem showleavesItem;
5229	5586	private MenuItem markleavesItem;
5230	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
5231	5592
5232	5593	private MenuItem flipVItem;
5233	5594	private MenuItem unflipVItem;
..	..	@@ -5249,7 +5610,7 @@
5249	5610	private MenuItem frontItem;
5250	5611	private MenuItem cameraItem;
5251	5612	private MenuItem compositeItem;
5252		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5253	5614	private MenuItem physicsItem;
5254	5615	private MenuItem frameselectorItem;
5255	5616	private MenuItem scriptNodeItem;
..	..	@@ -5323,5 +5684,5 @@
5323	5684
5324	5685	Menu cameraMenu;
5325	5686	MenuItem editCameraItem;
5326		- MenuItem revertCameraItem;
	5687	+ MenuItem restoreCameraItem;
5327	5688	}