~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,11 +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		- 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"));
158	166	duplicateItem.addActionListener(this);
159	167	cloneItem = menu.add(new MenuItem("Clone"));
160	168	cloneItem.addActionListener(this);
..	..	@@ -170,7 +178,6 @@
170	178	copyItem.addActionListener(this);
171	179	pasteItem = menu.add(new MenuItem("Paste"));
172	180	pasteItem.addActionListener(this);
173		- menu.add("-");
174	181
175	182	menu.add("-");
176	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,21 +204,21 @@
197	204	//zBufferItem.addActionListener(this);
198	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	206	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
202	209
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- cameraMenu.add("-");
207		-
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- 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);
215	222
216	223	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
217	224	toggleHandleItem.addItemListener(this);
..	..	@@ -240,7 +247,7 @@
240	247
241	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	249	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
244	251
245	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,14 +268,14 @@
261	268	// animationItem.addItemListener(this);
262	269	// animationItem.setState(CameraPane.ANIMATION);
263	270	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	272	editCameraItem.addActionListener(this);
266	273
267	274	if (Globals.ADVANCED)
268	275	{
269	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273	280	oe.cameraMenu.add("-");
274	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -276,7 +283,7 @@
276	283	editLeafItem.addActionListener(this);
277	284	lookAtItem.addActionListener(this);
278	285	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
280	287	}
281	288
282	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +328,29 @@
321	328	}
322	329
323	330	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
326	333	backItem = menu.add(new MenuItem("Back"));
327	334	backItem.addActionListener(this);
328	335	frontItem = menu.add(new MenuItem("Front"));
329	336	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
332	342	hideItem = menu.add(new MenuItem("Hidden Group"));
333	343	hideItem.addActionListener(this);
	344	+ }
334	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	346	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- 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	+ {
339	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	355	switchGeoItem.addActionListener(this);
341	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +358,6 @@
343	358	morphItem = menu.add(new MenuItem("Morph Group"));
344	359	morphItem.addActionListener(this);
345	360
346		- if (Globals.ADVANCED)
347		- {
348	361	menu.add("-");
349	362	physicsItem = menu.add(new MenuItem("Physics"));
350	363	physicsItem.addActionListener(this);
..	..	@@ -352,22 +365,20 @@
352	365	frameselectorItem.addActionListener(this);
353	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	367	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	368	}
358	369
359	370	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
362	373	billboardItem = menu.add(new MenuItem("Billboard"));
363	374	billboardItem.addActionListener(this);
364	375	csgItem = menu.add(new MenuItem("CSG"));
365	376	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	378	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	380	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	382	shadowZItem.addActionListener(this);
372	383	if (Globals.ADVANCED)
373	384	{
..	..	@@ -464,6 +475,14 @@
464	475	markleavesItem.addActionListener(this);
465	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	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);
467	486	menu.add("-");
468	487	flipVItem = menu.add(new MenuItem("Flip V"));
469	488	flipVItem.addActionListener(this);
..	..	@@ -521,6 +540,18 @@
521	540
522	541	void SetupUI2(ObjEditor oe)
523	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	+
524	555	//new Exception().printStackTrace();
525	556
526	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -549,27 +580,61 @@
549	580	oe.radioPanel.add(dummyButton);
550	581	oe.buttonGroup.add(dummyButton);
551	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 2;
	586	+
552	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	588
554		- 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);
555	618	liveCB.setToolTipText("Enable animation");
556	619	liveCB.addItemListener(this);
557	620
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	621	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	622	oneStepButton.setToolTipText("Animate one step forward");
560	623	oneStepButton.addActionListener(this);
561	624
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	625	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	626	fastCB.setToolTipText("Fast mode");
564	627	fastCB.addItemListener(this);
565	628
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- 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);
571	632	screenfitButton.setToolTipText("Screen fit");
572	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);
573	638
574	639	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	640	// screenfitpointButton.addActionListener(this);
..	..	@@ -581,65 +646,132 @@
581	646	snapobjectButton.setToolTipText("Snap Object");
582	647	}
583	648
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	649	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	650
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	651	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591	652	twoButton.setToolTipText("Show center view only");
592	653	twoButton.addActionListener(this);
593		- 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);
594	657	fourButton.addActionListener(this);
595	658	fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	660	sixButton.setToolTipText("2-column layout left");
598	661	sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	662	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	663	threeButton.setToolTipText("2-column layout right");
601	664	threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603	666	sevenButton.setToolTipText("3-column layout");
604	667	sevenButton.addActionListener(this);
605	668	//
606	669
607		- 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);
608	671	rootButton.setToolTipText("Edit selection in new tab");
609	672	rootButton.addActionListener(this);
610	673
611		- 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);
612	675	closeButton.setToolTipText("Close tab");
613	676	closeButton.addActionListener(this);
614	677	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	678	//clearButton.addActionListener(this);
616		-
617		- 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	+ }
618	711
619		- 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);
620	748	editButton.setToolTipText("Edit selection");
621	749	editButton.addActionListener(this);
622	750
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	751	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	752	uneditButton.setToolTipText("Unedit selection");
625	753	uneditButton.addActionListener(this);
626	754
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	755	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628	756	allParamsButton.setToolTipText("Edit all params");
629	757	allParamsButton.addActionListener(this);
630	758
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	759	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	760	clearPanelButton.setToolTipText("Clear edit panel");
633	761	clearPanelButton.addActionListener(this);
634	762
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	763	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	764	unselectButton.setToolTipText("Unselect");
637	765	unselectButton.addActionListener(this);
638	766
639		- 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);
640	770
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	771	+ editCommandsPanel.preferredHeight = 1;
	772	+
	773	+// oe.treePanel.add(commandsPanel);
	774	+// oe.treePanel.Return();
643	775
644	776	// oe.aConstraints.gridx += 1;
645	777	// oe.aConstraints.weighty = 0;
..	..	@@ -656,27 +788,12 @@
656	788
657	789	JScrollPane jSP;
658	790	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	791	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	792	ResetModel();
661	793
662	794	oe.treePanel.add(jSPPanel);
663	795	oe.treePanel.Return();
664	796
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	797	oe.treePanel.add(copyOptionsPanel);
681	798	oe.treePanel.Return();
682	799
..	..	@@ -707,6 +824,20 @@
707	824
708	825	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	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	+
710	841	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	842	boxCB.setToolTipText("Display bounding boxes");
712	843	boxCB.addItemListener(this);
..	..	@@ -724,6 +855,8 @@
724	855	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	856	// localCB.addItemListener(this);
726	857
	858	+ panel.Return();
	859	+
727	860	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	861	crowdCB.setToolTipText("Used for crowds");
729	862	crowdCB.addItemListener(this);
..	..	@@ -740,6 +873,8 @@
740	873	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	874	// speakerMocapCB.addItemListener(this);
742	875
	876	+ panel.Return();
	877	+
743	878	if (false)
744	879	{
745	880	// handled in scripts
..	..	@@ -754,32 +889,72 @@
754	889	//constraints.gridy += 1;
755	890	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	891	smoothfocusCB.addItemListener(this);
	892	+ panel.Return();
757	893	}
758	894
759	895	//constraints.gridx += 1;
760	896	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	897	// debugCB.addItemListener(this);
762	898
	899	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	900	+ trackCB.setToolTipText("Enable tracking target");
	901	+ trackCB.addItemListener(this);
	902	+
763	903	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	904	+ oeilCB.setToolTipText("Move camera when tracking");
764	905	oeilCB.addItemListener(this);
765	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	+ {
766	927	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	928	lookAtCB.setToolTipText("Look-at target");
768	929	lookAtCB.addItemListener(this);
	930	+ }
769	931
770	932	}
771	933
772	934	cGridBag fill = new cGridBag();
773		-
774	935	fill.preferredHeight = 200;
	936	+ cGridBag fill2 = new cGridBag();
	937	+ fill2.preferredHeight = 200;
	938	+ cGridBag fill3 = new cGridBag();
	939	+ fill3.preferredHeight = 200;
775	940
776	941	panel.add(fill);
	942	+ panel.add(fill2);
	943	+ panel.add(fill3);
777	944
778	945	}
779	946
780	947	void EditObject(Object3D obj)
781	948	{
782	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	+
783	958	radioButton.SetObject(obj);
784	959	radioButton.layout = sevenButton;
785	960	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -791,6 +966,8 @@
791	966
792	967	void SetupViews(ObjEditor oe)
793	968	{
	969	+ theFrame = this;
	970	+
794	971	oe.SetupViews();
795	972
796	973	System.out.println("SetupViews");
..	..	@@ -799,23 +976,27 @@
799	976	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	977	}
801	978
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- 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;
813	991	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	992	+ cCheckBox speakerCameraCB;
	993	+ cCheckBox speakerFocusCB;
	994	+ cCheckBox debugCB;
	995	+
	996	+ cCheckBox oeilCB;
	997	+ cCheckBox shadowCB;
	998	+ cCheckBox autosaveCB;
	999	+ cCheckBox lookAtCB;
819	1000
820	1001	// static int COLOR = 1;
821	1002	// static int MATERIAL = 2;
..	..	@@ -823,9 +1004,9 @@
823	1004
824	1005	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1006
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1007	+ cCheckBox colorCB;
	1008	+ cCheckBox materialCB;
	1009	+ cCheckBox textureCB;
829	1010
830	1011	public void itemStateChanged(ItemEvent e)
831	1012	{
..	..	@@ -853,6 +1034,7 @@
853	1034	} else if(e.getSource() == liveCB)
854	1035	{
855	1036	cameraView.ToggleLive();
	1037	+ refreshContents(false);
856	1038	}
857	1039	else if(e.getSource() == supportCB)
858	1040	{
..	..	@@ -917,6 +1099,14 @@
917	1099	{
918	1100	cameraView.ToggleOeil();
919	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	+ }
920	1110	else if(e.getSource() == lookAtCB)
921	1111	{
922	1112	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1123,8 @@
933	1123
934	1124	/**/
935	1125	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1126	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1127	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1128	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1129	// We can't move the root node or an empty selection
939	1130	return;
..	..	@@ -1050,23 +1241,33 @@
1050	1241
1051	1242	assert target == objEditor.jTree;
1052	1243	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1244	+ Object3D destinationLeaf;
1053	1245	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1246	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1247	} catch (Exception e) {
1056	1248	System.out.println("destinationPath : " + destinationPath);
1057	1249	return;
1058	1250	}
1059	1251
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1252	+ for (int i=group.selection.size(); --i>=0;)
1061	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	+// {
1062	1263	loadClipboard(true);
1063	1264	objEditor.jTree.setSelectionPath(destinationPath);
1064	1265	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1266	+// } else {
	1267	+// loadClipboard(false);
	1268	+// objEditor.jTree.setSelectionPath(destinationPath);
	1269	+// pasteInto(false, false); // true); // ???
	1270	+// }
1070	1271	}
1071	1272	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1273	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1372,30 @@
1171	1372	{
1172	1373	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1374	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- 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	+ {
1186	1393	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1394	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1395	+ }
	1396	+
	1397	+// particleItem = menu.add(new MenuItem("Particle system"));
	1398	+// particleItem.addActionListener(this);
1190	1399	if (Globals.ADVANCED)
1191	1400	{
1192	1401	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1421,15 @@
1212	1421	}
1213	1422	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1423	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- 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);
1219	1428	menu.add("-");
1220	1429	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1430	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1431	+// loopItem = menu.add(new MenuItem("Loop"));
	1432	+// loopItem.addActionListener(this);
1224	1433	doubleItem = menu.add(new MenuItem("Fork"));
1225	1434	doubleItem.addActionListener(this);
1226	1435	if (Globals.ADVANCED)
..	..	@@ -1260,7 +1469,7 @@
1260	1469	memoryItem.addActionListener(this);
1261	1470	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1471	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1472	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1473	dumpItem.addActionListener(this);
1265	1474	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1475	// pathItem.addActionListener(this);
..	..	@@ -1401,6 +1610,7 @@
1401	1610	shadow.material = new cMaterial(obj.material);
1402	1611	shadow.material.diffuse = 0.0001f;
1403	1612	shadow.material.specular = 0.0001f;
	1613	+ //shadow.projectedVertices[1].x = 300;
1404	1614
1405	1615	makeSomething(shadow);
1406	1616	}
..	..	@@ -1648,7 +1858,7 @@
1648	1858	{
1649	1859	ScreenFit();
1650	1860	} else
1651		- if (source == switchItem)
	1861	+ if (source == switchViewItem)
1652	1862	{
1653	1863	cVector v1 = new cVector();
1654	1864	cVector v2 = new cVector();
..	..	@@ -1657,11 +1867,11 @@
1657	1867	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	1868	objEditor.cameraView.repaint();
1659	1869	} else
1660		- if (source == rectoidItem)
	1870	+ if (source == rectoidItem \|\| source == boxButton)
1661	1871	{
1662	1872	makeSomething(new Box());
1663	1873	} else
1664		- if (source == particleItem)
	1874	+ if (source == particleItem \|\| source == particlesButton)
1665	1875	{
1666	1876	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	1877	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +1950,27 @@
1740	1950
1741	1951	makeSomething(obj);
1742	1952	} else
1743		- if (source == gridItem)
	1953	+ if (source == gridItem \|\| source == gridButton)
1744	1954	{
1745	1955	makeSomething(new Grid());
1746	1956	} else
1747		- if (source == ellipsoidItem)
	1957	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	1958	{
1749	1959	makeSomething(new Sphere());
1750	1960	} else
1751		- if (source == coneItem)
	1961	+ if (source == coneItem \|\| source == coneButton)
1752	1962	{
1753	1963	makeSomething(new Cone());
1754	1964	} else
1755		- if (source == torusItem)
	1965	+ if (source == torusItem \|\| source == torusButton)
1756	1966	{
1757	1967	makeSomething(new Torus());
1758	1968	} else
1759		- if (source == superItem)
	1969	+ if (source == superItem \|\| source == superButton)
1760	1970	{
1761	1971	makeSomething(new Superellipsoid());
1762	1972	} else
1763		- if (source == kleinItem)
	1973	+ if (source == kleinItem \|\| source == kleinButton)
1764	1974	{
1765	1975	makeSomething(new Klein());
1766	1976	} else
..	..	@@ -1780,7 +1990,7 @@
1780	1990	{
1781	1991	makeSomething(new BezierSurface());
1782	1992	} else
1783		- if (source == overlayItem)
	1993	+ if (source == overlayItem \|\| source == overlayButton)
1784	1994	{
1785	1995	/*
1786	1996	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,7 +2038,7 @@
1828	2038	s.setup();
1829	2039	makeSomething(s);
1830	2040	} else
1831		- if (source == lightItem)
	2041	+ if (source == lightItem \|\| source == lightButton)
1832	2042	{
1833	2043	makeSomething(new Light());
1834	2044	} else
..	..	@@ -1878,7 +2088,7 @@
1878	2088
1879	2089	group(g);
1880	2090	} else
1881		- if (source == loopItem)
	2091	+ if (source == loopItem \|\| source == loopButton)
1882	2092	{
1883	2093	Composite csg = new GroupLeaf();
1884	2094	csg.count = 5;
..	..	@@ -1951,6 +2161,30 @@
1951	2161	{
1952	2162	DumpObject();
1953	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();
	2187	+ } else
1954	2188	if (source == oneStepButton)
1955	2189	{
1956	2190	Globals.ONESTEP = true;
..	..	@@ -2004,6 +2238,14 @@
2004	2238	if (source == cutItem \|\| source == clearButton)
2005	2239	{
2006	2240	loadClipboard(true);
	2241	+ } else
	2242	+ if (source == undoItem)
	2243	+ {
	2244	+ Undo();
	2245	+ } else
	2246	+ if (source == redoItem)
	2247	+ {
	2248	+ Redo();
2007	2249	} else
2008	2250	if (source == duplicateItem)
2009	2251	{
..	..	@@ -2336,9 +2578,9 @@
2336	2578	{
2337	2579	ClearSelection(true);
2338	2580	} else
2339		- if (source == grabItem)
	2581	+ if (source == grabItem \|\| source == groupButton)
2340	2582	{
2341		- group(new cGroup(), true);
	2583	+ group(new cGroup(), false); // true);
2342	2584	} else
2343	2585	if (source == hideItem)
2344	2586	{
..	..	@@ -2356,11 +2598,11 @@
2356	2598	{
2357	2599	makeSomething(new Camera());
2358	2600	} else
2359		- if (source == compositeItem)
	2601	+ if (source == compositeItem \|\| source == compositeButton)
2360	2602	{
2361	2603	group(new Composite());
2362	2604	} else
2363		- if (source == randomItem)
	2605	+ if (source == switchItem \|\| source == switchButton)
2364	2606	{
2365	2607	RandomNode random = new RandomNode();
2366	2608	group(random);
..	..	@@ -2462,7 +2704,7 @@
2462	2704	{
2463	2705	group(new cLinker());
2464	2706	} else
2465		- if (source == textureItem)
	2707	+ if (source == textureItem \|\| source == textureButton)
2466	2708	{
2467	2709	group(new TextureNode());
2468	2710	} else
..	..	@@ -2482,7 +2724,7 @@
2482	2724	{
2483	2725	CastShadow(2);
2484	2726	} else
2485		- if (source == ungroupItem)
	2727	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	2728	{
2487	2729	//ungroup();
2488	2730	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2504,7 +2746,7 @@
2504	2746	} else
2505	2747	if (source == genNormalsMESHItem)
2506	2748	{
2507		- GenNormals(true); // TODO
	2749	+ GenNormalsMESH();
2508	2750	} else
2509	2751	if (source == genNormalsORGANItem)
2510	2752	{
..	..	@@ -2569,6 +2811,22 @@
2569	2811	if (source == unmarkleavesItem)
2570	2812	{
2571	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);
2572	2830	} else
2573	2831	if (source == flipVItem)
2574	2832	{
..	..	@@ -2804,6 +3062,10 @@
2804	3062	if (source == twoButton)
2805	3063	{
2806	3064	radio.layout = twoButton;
	3065	+
	3066	+ if (CameraPane.FULLSCREEN)
	3067	+ fullscreenLayout = radio.layout;
	3068	+
2807	3069	// bug
2808	3070	//gridPanel.setDividerLocation(1.0);
2809	3071	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3098,31 @@
2836	3098	bigThree.ClearUI();
2837	3099	bigThree.add(centralPanel);
2838	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	+
2839	3119	} else
2840	3120	if (source == threeButton)
2841	3121	{
2842	3122	radio.layout = threeButton;
	3123	+
	3124	+ if (CameraPane.FULLSCREEN)
	3125	+ fullscreenLayout = radio.layout;
2843	3126
2844	3127	// bigThree.remove(scenePanel);
2845	3128	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3155,15 @@
2872	3155	bigThree.add(centralPanel);
2873	3156	bigThree.add(XYZPanel);
2874	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
2875	3160	} else
2876	3161	if (source == fourButton)
2877	3162	{
2878	3163	radio.layout = fourButton;
	3164	+
	3165	+ if (CameraPane.FULLSCREEN)
	3166	+ fullscreenLayout = radio.layout;
2879	3167
2880	3168	// bigThree.remove(scenePanel);
2881	3169	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3195,15 @@
2907	3195	bigThree.ClearUI();
2908	3196	bigThree.add(scenePanel);
2909	3197	bigThree.FlushUI();
	3198	+
	3199	+ cameraView.requestFocusInWindow();
2910	3200	} else
2911	3201	if (source == sixButton)
2912	3202	{
2913	3203	radio.layout = sixButton;
	3204	+
	3205	+ if (CameraPane.FULLSCREEN)
	3206	+ fullscreenLayout = radio.layout;
2914	3207
2915	3208	// bigThree.remove(scenePanel);
2916	3209	// bigThree.remove(centralPanel);
..	..	@@ -2943,10 +3236,15 @@
2943	3236	bigThree.add(scenePanel);
2944	3237	bigThree.add(centralPanel);
2945	3238	bigThree.FlushUI();
	3239	+
	3240	+ cameraView.requestFocusInWindow();
2946	3241	} else
2947	3242	if (source == sevenButton)
2948	3243	{
2949	3244	radio.layout = sevenButton;
	3245	+
	3246	+ if (CameraPane.FULLSCREEN)
	3247	+ fullscreenLayout = radio.layout;
2950	3248
2951	3249	// bigThree.remove(scenePanel);
2952	3250	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3278,8 @@
2980	3278	bigThree.add(centralPanel);
2981	3279	bigThree.add(XYZPanel);
2982	3280	bigThree.FlushUI();
	3281	+
	3282	+ cameraView.requestFocusInWindow();
2983	3283	} else
2984	3284	if (source == rootButton)
2985	3285	{
..	..	@@ -2991,6 +3291,7 @@
2991	3291	EditObject(obj);
2992	3292	}
2993	3293
	3294	+ cameraView.requestFocusInWindow();
2994	3295	refreshContents(true);
2995	3296	} else
2996	3297	if (source == closeButton)
..	..	@@ -3000,18 +3301,27 @@
3000	3301	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3302	{
3002	3303	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3304	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3305	{
	3306	+ // Patch to avoid bug with transparency.
	3307	+ if (!ab.hadMaterial)
	3308	+ {
	3309	+ ab.object.material = null;
	3310	+ }
	3311	+
3005	3312	buttonGroup.remove(ab);
3006	3313	radioPanel.remove(ab);
3007	3314
3008		- ab.GetObject().editWindow = null;
	3315	+ //ab.GetObject().editWindow = null;
	3316	+ ab.GetObject().manipWindow = null;
3009	3317	// ab.GetObject().objectUI = null; // ?????????
3010	3318
3011	3319	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3320	break;
3013	3321	}
3014	3322	}
	3323	+
	3324	+ cameraView.requestFocusInWindow();
3015	3325	refreshContents(true);
3016	3326	} else
3017	3327	if (source == editItem \|\| source == editButton)
..	..	@@ -3028,7 +3338,7 @@
3028	3338	child.CloseUI();
3029	3339	listUI.remove(child);
3030	3340
3031		- child.editWindow = null; // ???????????
	3341	+ //child.editWindow = null; // ???????????
3032	3342	}
3033	3343	objEditor.ctrlPanel.FlushUI();
3034	3344	//objEditor.jTree.clearSelection();
..	..	@@ -3115,7 +3425,9 @@
3115	3425	sideView.object = group;
3116	3426	}
3117	3427
3118		-// fix "+" issue group.editWindow = this;
	3428	+// fix "+" issue
	3429	+ //group.editWindow = this;
	3430	+ group.manipWindow = this;
3119	3431
3120	3432	/*
3121	3433	currentLayout = radio.layout;
..	..	@@ -3128,13 +3440,15 @@
3128	3440	//group.parent = null; // ROOT
3129	3441	//group.attributes = -1;
3130	3442	ResetModel();
	3443	+
	3444	+ cameraView.requestFocusInWindow();
3131	3445	refreshContents(true);
3132	3446	} else if (event.getSource() == editCameraItem)
3133	3447	{
3134	3448	cameraView.ProtectCamera();
3135	3449	cameraView.repaint();
3136	3450	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3451	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3452	{
3139	3453	cameraView.RevertCamera();
3140	3454	cameraView.repaint();
..	..	@@ -3151,7 +3465,6 @@
3151	3465	}
3152	3466
3153	3467	boolean useclient = false;
3154		- cRadio radio;
3155	3468
3156	3469	void ToggleRoot()
3157	3470	{
..	..	@@ -3390,7 +3703,8 @@
3390	3703
3391	3704	int size = obj.MemorySize();
3392	3705
3393		- 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)");
3394	3708	}
3395	3709	}
3396	3710	catch (Exception e)
..	..	@@ -3471,6 +3785,13 @@
3471	3785	void GenNormals(boolean crease)
3472	3786	{
3473	3787	group.GenNormalsS(crease);
	3788	+
	3789	+ refreshContents();
	3790	+ }
	3791	+
	3792	+ void GenNormalsMESH()
	3793	+ {
	3794	+ group.GenNormalsMeshS();
3474	3795
3475	3796	refreshContents();
3476	3797	}
..	..	@@ -4098,6 +4419,18 @@
4098	4419	refreshContents();
4099	4420	}
4100	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	+
4101	4434	void SetTexRes(int tr)
4102	4435	{
4103	4436	group.selection.SetTexRes(tr);
..	..	@@ -4180,7 +4513,7 @@
4180	4513	{
4181	4514	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4515	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4516	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4517
4185	4518	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4519	if(elem != group \|\| !newWindow)
..	..	@@ -4273,7 +4606,6 @@
4273	4606	//case 702: // Event.LIST_DESELECT
4274	4607	group.deselectAll();
4275	4608	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	4609	if (tps != null)
4278	4610	{
4279	4611	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +4614,8 @@
4282	4614
4283	4615	//if (child.parent != null)
4284	4616	//child.parent.addSelectee(child);
	4617	+ objEditor.SetMaterial(child);
4285	4618	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	4619	}
4290	4620	}
4291	4621	// else
..	..	@@ -4295,16 +4625,17 @@
4295	4625	// System.err.println("info : " + group.GetPath());
4296	4626	// }
4297	4627
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4628	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	4629	CameraPane.flash = true;
4302	4630
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4631	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	4632	// a camera
4305	4633	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4634	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4635	+ {
	4636	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4637	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4638	+ }
4308	4639	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	4640	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	4641	}
..	..	@@ -4317,6 +4648,27 @@
4317	4648
4318	4649	freezemodel = false;
4319	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	+ }
4320	4672
4321	4673	void linkSomething(Object3D thing)
4322	4674	{
..	..	@@ -4388,6 +4740,7 @@
4388	4740	{
4389	4741	if (group.selection.isEmpty())
4390	4742	return;
	4743	+
4391	4744	Grafreed.clipboardIsTempGroup = false;
4392	4745	Composite tGroup = null;
4393	4746	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +4751,8 @@
4398	4751
4399	4752	if (cut)
4400	4753	{
	4754	+ if (Globals.SAVEONMAKE)
	4755	+ Save();
4401	4756	//int indices[] = jList.getSelectedIndices();
4402	4757	//for (int i = indices.length - 1; i >= 0; i--)
4403	4758	//jList.remove(indices[i]);
..	..	@@ -4487,8 +4842,10 @@
4487	4842	}
4488	4843
4489	4844	}
	4845	+
4490	4846	if (Grafreed.clipboardIsTempGroup)
4491	4847	Grafreed.clipboard = tGroup;
	4848	+
4492	4849	if (cut)
4493	4850	{
4494	4851	ResetModel();
..	..	@@ -5113,7 +5470,33 @@
5113	5470	cButton clearpanelButton;
5114	5471	cButton unselectButton;
5115	5472
	5473	+ cButton restoreCameraButton;
	5474	+
	5475	+ cButton minButton;
	5476	+ cButton maxButton;
	5477	+ cButton fullButton;
	5478	+ cButton undoButton;
	5479	+ cButton redoButton;
	5480	+ cButton saveButton;
5116	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;
5117	5500
5118	5501	cButton screenfitButton;
5119	5502	cButton screenfitpointButton;
..	..	@@ -5126,14 +5509,6 @@
5126	5509
5127	5510	cButton setsupportButton;
5128	5511
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	5512	//
5138	5513	//Composite
5139	5514	Object3D // to do !!
..	..	@@ -5143,9 +5518,11 @@
5143	5518	//JTree jTree;
5144	5519	private MenuItem lookAtItem;
5145	5520	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5521	+ private MenuItem switchViewItem;
5147	5522	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5523	+ private MenuItem undoItem;
	5524	+ private MenuItem redoItem;
	5525	+ private JMenuItem duplicateItem;
5149	5526	private MenuItem cloneItem;
5150	5527	private MenuItem cloneSupportItem;
5151	5528	private MenuItem overwriteGeoItem;
..	..	@@ -5208,6 +5585,10 @@
5208	5585	private MenuItem showleavesItem;
5209	5586	private MenuItem markleavesItem;
5210	5587	private MenuItem unmarkleavesItem;
	5588	+ private MenuItem rewindleavesItem;
	5589	+ private MenuItem unrewindleavesItem;
	5590	+ private MenuItem randomleavesItem;
	5591	+ private MenuItem unrandomleavesItem;
5211	5592
5212	5593	private MenuItem flipVItem;
5213	5594	private MenuItem unflipVItem;
..	..	@@ -5229,7 +5610,7 @@
5229	5610	private MenuItem frontItem;
5230	5611	private MenuItem cameraItem;
5231	5612	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	5613	+ private MenuItem switchItem;
5233	5614	private MenuItem physicsItem;
5234	5615	private MenuItem frameselectorItem;
5235	5616	private MenuItem scriptNodeItem;
..	..	@@ -5303,5 +5684,5 @@
5303	5684
5304	5685	Menu cameraMenu;
5305	5686	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	5687	+ MenuItem restoreCameraItem;
5307	5688	}