~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,63 @@
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	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
555	620	liveCB.setToolTipText("Enable animation");
556	621	liveCB.addItemListener(this);
557	622
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	624	oneStepButton.setToolTipText("Animate one step forward");
560	625	oneStepButton.addActionListener(this);
561	626
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	628	fastCB.setToolTipText("Fast mode");
564	629	fastCB.addItemListener(this);
565	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571	634	screenfitButton.setToolTipText("Screen fit");
572	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
573	640
574	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -581,65 +648,144 @@
581	648	snapobjectButton.setToolTipText("Snap Object");
582	649	}
583	650
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	652
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591	654	twoButton.setToolTipText("Show center view only");
592	655	twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594	659	fourButton.addActionListener(this);
595	660	fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	662	sixButton.setToolTipText("2-column layout left");
598	663	sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	665	threeButton.setToolTipText("2-column layout right");
601	666	threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603	668	sevenButton.setToolTipText("3-column layout");
604	669	sevenButton.addActionListener(this);
605	670	//
606	671
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	673	rootButton.setToolTipText("Edit selection in new tab");
609	674	rootButton.addActionListener(this);
610	675
611		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	677	closeButton.setToolTipText("Close tab");
613	678	closeButton.addActionListener(this);
614	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	680	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
618	713
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create switch");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	754	+ oe.toolboxPanel.add(new cGridBag());
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620	762	editButton.setToolTipText("Edit selection");
621	763	editButton.addActionListener(this);
622	764
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editCommandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624	766	uneditButton.setToolTipText("Unedit selection");
625	767	uneditButton.addActionListener(this);
626	768
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628	770	allParamsButton.setToolTipText("Edit all params");
629	771	allParamsButton.addActionListener(this);
630	772
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	774	clearPanelButton.setToolTipText("Clear edit panel");
633	775	clearPanelButton.addActionListener(this);
634	776
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	778	unselectButton.setToolTipText("Unselect");
637	779	unselectButton.addActionListener(this);
638	780
639		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
640	784
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+// oe.treePanel.add(commandsPanel);
	788	+// oe.treePanel.Return();
643	789
644	790	// oe.aConstraints.gridx += 1;
645	791	// oe.aConstraints.weighty = 0;
..	..	@@ -656,27 +802,12 @@
656	802
657	803	JScrollPane jSP;
658	804	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	805	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	806	ResetModel();
661	807
662	808	oe.treePanel.add(jSPPanel);
663	809	oe.treePanel.Return();
664	810
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	811	oe.treePanel.add(copyOptionsPanel);
681	812	oe.treePanel.Return();
682	813
..	..	@@ -707,6 +838,20 @@
707	838
708	839	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	840	{
	841	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	842	+ colorCB.setToolTipText("Copy color when dropped");
	843	+ colorCB.addItemListener(this);
	844	+
	845	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	846	+ materialCB.setToolTipText("Copy material when dropped");
	847	+ materialCB.addItemListener(this);
	848	+
	849	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	850	+ textureCB.setToolTipText("Copy texture when dropped");
	851	+ textureCB.addItemListener(this);
	852	+
	853	+ panel.Return();
	854	+
710	855	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	856	boxCB.setToolTipText("Display bounding boxes");
712	857	boxCB.addItemListener(this);
..	..	@@ -724,6 +869,8 @@
724	869	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	870	// localCB.addItemListener(this);
726	871
	872	+ panel.Return();
	873	+
727	874	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	875	crowdCB.setToolTipText("Used for crowds");
729	876	crowdCB.addItemListener(this);
..	..	@@ -740,6 +887,8 @@
740	887	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	888	// speakerMocapCB.addItemListener(this);
742	889
	890	+ panel.Return();
	891	+
743	892	if (false)
744	893	{
745	894	// handled in scripts
..	..	@@ -754,32 +903,72 @@
754	903	//constraints.gridy += 1;
755	904	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	905	smoothfocusCB.addItemListener(this);
	906	+ panel.Return();
757	907	}
758	908
759	909	//constraints.gridx += 1;
760	910	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	911	// debugCB.addItemListener(this);
762	912
	913	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	914	+ trackCB.setToolTipText("Enable tracking target");
	915	+ trackCB.addItemListener(this);
	916	+
763	917	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	918	+ oeilCB.setToolTipText("Move camera when tracking");
764	919	oeilCB.addItemListener(this);
765	920
	921	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	922	+ shadowCB.setToolTipText("Compute shadows when live");
	923	+ shadowCB.addItemListener(this);
	924	+
	925	+ panel.Return();
	926	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	927	+ toggleTextureCB.setToolTipText("Load textures");
	928	+ toggleTextureCB.addItemListener(this);
	929	+
	930	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	931	+ toggleSwitchCB.setToolTipText("Use switch");
	932	+ toggleSwitchCB.addItemListener(this);
	933	+
	934	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	935	+ autosaveCB.setToolTipText("Auto-save on structure change");
	936	+ autosaveCB.addItemListener(this);
	937	+
	938	+ panel.Return();
	939	+ if (Globals.ADVANCED)
	940	+ {
766	941	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	942	lookAtCB.setToolTipText("Look-at target");
768	943	lookAtCB.addItemListener(this);
	944	+ }
769	945
770	946	}
771	947
772	948	cGridBag fill = new cGridBag();
773		-
774	949	fill.preferredHeight = 200;
	950	+ cGridBag fill2 = new cGridBag();
	951	+ fill2.preferredHeight = 200;
	952	+ cGridBag fill3 = new cGridBag();
	953	+ fill3.preferredHeight = 200;
775	954
776	955	panel.add(fill);
	956	+ panel.add(fill2);
	957	+ panel.add(fill3);
777	958
778	959	}
779	960
780	961	void EditObject(Object3D obj)
781	962	{
782	963	cRadio radioButton = new cRadio(obj.name);
	964	+
	965	+ // Patch to avoid bug with transparency.
	966	+ radioButton.hadMaterial = obj.material != null;
	967	+ if (!radioButton.hadMaterial)
	968	+ {
	969	+ obj.material = new cMaterial();
	970	+ }
	971	+
783	972	radioButton.SetObject(obj);
784	973	radioButton.layout = sevenButton;
785	974	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -791,6 +980,8 @@
791	980
792	981	void SetupViews(ObjEditor oe)
793	982	{
	983	+ theFrame = this;
	984	+
794	985	oe.SetupViews();
795	986
796	987	System.out.println("SetupViews");
..	..	@@ -799,23 +990,27 @@
799	990	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	991	}
801	992
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;
	993	+ cToggleButton liveCB;
	994	+ cCheckBox supportCB;
	995	+ cCheckBox localCB;
	996	+ cCheckBox crowdCB;
	997	+ cCheckBox smoothCB;
	998	+ cToggleButton fastCB;
	999	+ cCheckBox slowCB;
	1000	+ cCheckBox boxCB;
	1001	+ cCheckBox zoomBoxCB;
	1002	+ //cToggleButton trackCB;
	1003	+ cCheckBox trackCB;
	1004	+ cCheckBox smoothfocusCB;
813	1005	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1006	+ cCheckBox speakerCameraCB;
	1007	+ cCheckBox speakerFocusCB;
	1008	+ cCheckBox debugCB;
	1009	+
	1010	+ cCheckBox oeilCB;
	1011	+ cCheckBox shadowCB;
	1012	+ cCheckBox autosaveCB;
	1013	+ cCheckBox lookAtCB;
819	1014
820	1015	// static int COLOR = 1;
821	1016	// static int MATERIAL = 2;
..	..	@@ -823,9 +1018,9 @@
823	1018
824	1019	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1020
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1021	+ cCheckBox colorCB;
	1022	+ cCheckBox materialCB;
	1023	+ cCheckBox textureCB;
829	1024
830	1025	public void itemStateChanged(ItemEvent e)
831	1026	{
..	..	@@ -853,6 +1048,7 @@
853	1048	} else if(e.getSource() == liveCB)
854	1049	{
855	1050	cameraView.ToggleLive();
	1051	+ refreshContents(false);
856	1052	}
857	1053	else if(e.getSource() == supportCB)
858	1054	{
..	..	@@ -917,6 +1113,14 @@
917	1113	{
918	1114	cameraView.ToggleOeil();
919	1115	}
	1116	+ else if(e.getSource() == shadowCB)
	1117	+ {
	1118	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1119	+ }
	1120	+ else if(e.getSource() == autosaveCB)
	1121	+ {
	1122	+ Globals.SAVEONMAKE ^= true;
	1123	+ }
920	1124	else if(e.getSource() == lookAtCB)
921	1125	{
922	1126	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1137,8 @@
933	1137
934	1138	/**/
935	1139	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1140	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1141	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1142	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1143	// We can't move the root node or an empty selection
939	1144	return;
..	..	@@ -1050,23 +1255,33 @@
1050	1255
1051	1256	assert target == objEditor.jTree;
1052	1257	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1258	+ Object3D destinationLeaf;
1053	1259	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1260	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1261	} catch (Exception e) {
1056	1262	System.out.println("destinationPath : " + destinationPath);
1057	1263	return;
1058	1264	}
1059	1265
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1266	+ for (int i=group.selection.size(); --i>=0;)
1061	1267	{
	1268	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1269	+
	1270	+ // Cannot move into itself
	1271	+ if (child == destinationLeaf)
	1272	+ return;
	1273	+ }
	1274	+
	1275	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+// {
1062	1277	loadClipboard(true);
1063	1278	objEditor.jTree.setSelectionPath(destinationPath);
1064	1279	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1280	+// } else {
	1281	+// loadClipboard(false);
	1282	+// objEditor.jTree.setSelectionPath(destinationPath);
	1283	+// pasteInto(false, false); // true); // ???
	1284	+// }
1070	1285	}
1071	1286	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1287	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1386,30 @@
1171	1386	{
1172	1387	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1388	//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);
	1389	+// gridItem = menu.add(new MenuItem("Grid"));
	1390	+// gridItem.addActionListener(this);
	1391	+// rectoidItem = menu.add(new MenuItem("Box"));
	1392	+// rectoidItem.addActionListener(this);
	1393	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1394	+// ellipsoidItem.addActionListener(this);
	1395	+// coneItem = menu.add(new MenuItem("Cone"));
	1396	+// coneItem.addActionListener(this);
	1397	+// torusItem = menu.add(new MenuItem("Torus"));
	1398	+// torusItem.addActionListener(this);
	1399	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1400	+// superItem.addActionListener(this);
	1401	+
	1402	+ cameraItem = menu.add(new MenuItem("Camera"));
	1403	+ cameraItem.addActionListener(this);
	1404	+
	1405	+ if (!Globals.ADVANCED)
	1406	+ {
1186	1407	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1408	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1409	+ }
	1410	+
	1411	+// particleItem = menu.add(new MenuItem("Particle system"));
	1412	+// particleItem.addActionListener(this);
1190	1413	if (Globals.ADVANCED)
1191	1414	{
1192	1415	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1435,15 @@
1212	1435	}
1213	1436	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1437	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);
	1438	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1439	+// overlayItem.addActionListener(this);
	1440	+// lightItem = menu.add(new MenuItem("Light"));
	1441	+// lightItem.addActionListener(this);
1219	1442	menu.add("-");
1220	1443	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1444	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1445	+// loopItem = menu.add(new MenuItem("Loop"));
	1446	+// loopItem.addActionListener(this);
1224	1447	doubleItem = menu.add(new MenuItem("Fork"));
1225	1448	doubleItem.addActionListener(this);
1226	1449	if (Globals.ADVANCED)
..	..	@@ -1260,7 +1483,7 @@
1260	1483	memoryItem.addActionListener(this);
1261	1484	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1485	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1486	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1487	dumpItem.addActionListener(this);
1265	1488	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1489	// pathItem.addActionListener(this);
..	..	@@ -1401,6 +1624,7 @@
1401	1624	shadow.material = new cMaterial(obj.material);
1402	1625	shadow.material.diffuse = 0.0001f;
1403	1626	shadow.material.specular = 0.0001f;
	1627	+ //shadow.projectedVertices[1].x = 300;
1404	1628
1405	1629	makeSomething(shadow);
1406	1630	}
..	..	@@ -1648,7 +1872,7 @@
1648	1872	{
1649	1873	ScreenFit();
1650	1874	} else
1651		- if (source == switchItem)
	1875	+ if (source == switchViewItem)
1652	1876	{
1653	1877	cVector v1 = new cVector();
1654	1878	cVector v2 = new cVector();
..	..	@@ -1657,11 +1881,11 @@
1657	1881	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	1882	objEditor.cameraView.repaint();
1659	1883	} else
1660		- if (source == rectoidItem)
	1884	+ if (source == rectoidItem \|\| source == boxButton)
1661	1885	{
1662	1886	makeSomething(new Box());
1663	1887	} else
1664		- if (source == particleItem)
	1888	+ if (source == particleItem \|\| source == particlesButton)
1665	1889	{
1666	1890	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	1891	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +1964,27 @@
1740	1964
1741	1965	makeSomething(obj);
1742	1966	} else
1743		- if (source == gridItem)
	1967	+ if (source == gridItem \|\| source == gridButton)
1744	1968	{
1745	1969	makeSomething(new Grid());
1746	1970	} else
1747		- if (source == ellipsoidItem)
	1971	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	1972	{
1749	1973	makeSomething(new Sphere());
1750	1974	} else
1751		- if (source == coneItem)
	1975	+ if (source == coneItem \|\| source == coneButton)
1752	1976	{
1753	1977	makeSomething(new Cone());
1754	1978	} else
1755		- if (source == torusItem)
	1979	+ if (source == torusItem \|\| source == torusButton)
1756	1980	{
1757	1981	makeSomething(new Torus());
1758	1982	} else
1759		- if (source == superItem)
	1983	+ if (source == superItem \|\| source == superButton)
1760	1984	{
1761	1985	makeSomething(new Superellipsoid());
1762	1986	} else
1763		- if (source == kleinItem)
	1987	+ if (source == kleinItem \|\| source == kleinButton)
1764	1988	{
1765	1989	makeSomething(new Klein());
1766	1990	} else
..	..	@@ -1780,7 +2004,7 @@
1780	2004	{
1781	2005	makeSomething(new BezierSurface());
1782	2006	} else
1783		- if (source == overlayItem)
	2007	+ if (source == overlayItem \|\| source == overlayButton)
1784	2008	{
1785	2009	/*
1786	2010	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,7 +2052,7 @@
1828	2052	s.setup();
1829	2053	makeSomething(s);
1830	2054	} else
1831		- if (source == lightItem)
	2055	+ if (source == lightItem \|\| source == lightButton)
1832	2056	{
1833	2057	makeSomething(new Light());
1834	2058	} else
..	..	@@ -1878,7 +2102,7 @@
1878	2102
1879	2103	group(g);
1880	2104	} else
1881		- if (source == loopItem)
	2105	+ if (source == loopItem \|\| source == loopButton)
1882	2106	{
1883	2107	Composite csg = new GroupLeaf();
1884	2108	csg.count = 5;
..	..	@@ -1951,6 +2175,30 @@
1951	2175	{
1952	2176	DumpObject();
1953	2177	} else
	2178	+ if (source == minButton)
	2179	+ {
	2180	+ Minimize();
	2181	+ } else
	2182	+ if (source == maxButton)
	2183	+ {
	2184	+ Maximize();
	2185	+ } else
	2186	+ if (source == fullButton)
	2187	+ {
	2188	+ ToggleFullScreen();
	2189	+ } else
	2190	+ if (source == undoButton)
	2191	+ {
	2192	+ Undo();
	2193	+ } else
	2194	+ if (source == redoButton)
	2195	+ {
	2196	+ Redo();
	2197	+ } else
	2198	+ if (source == saveButton)
	2199	+ {
	2200	+ Save();
	2201	+ } else
1954	2202	if (source == oneStepButton)
1955	2203	{
1956	2204	Globals.ONESTEP = true;
..	..	@@ -2004,6 +2252,14 @@
2004	2252	if (source == cutItem \|\| source == clearButton)
2005	2253	{
2006	2254	loadClipboard(true);
	2255	+ } else
	2256	+ if (source == undoItem)
	2257	+ {
	2258	+ Undo();
	2259	+ } else
	2260	+ if (source == redoItem)
	2261	+ {
	2262	+ Redo();
2007	2263	} else
2008	2264	if (source == duplicateItem)
2009	2265	{
..	..	@@ -2336,9 +2592,9 @@
2336	2592	{
2337	2593	ClearSelection(true);
2338	2594	} else
2339		- if (source == grabItem)
	2595	+ if (source == grabItem \|\| source == groupButton)
2340	2596	{
2341		- group(new cGroup(), true);
	2597	+ group(new cGroup(), false); // true);
2342	2598	} else
2343	2599	if (source == hideItem)
2344	2600	{
..	..	@@ -2356,11 +2612,11 @@
2356	2612	{
2357	2613	makeSomething(new Camera());
2358	2614	} else
2359		- if (source == compositeItem)
	2615	+ if (source == compositeItem \|\| source == compositeButton)
2360	2616	{
2361	2617	group(new Composite());
2362	2618	} else
2363		- if (source == randomItem)
	2619	+ if (source == switchItem \|\| source == switchButton)
2364	2620	{
2365	2621	RandomNode random = new RandomNode();
2366	2622	group(random);
..	..	@@ -2462,7 +2718,7 @@
2462	2718	{
2463	2719	group(new cLinker());
2464	2720	} else
2465		- if (source == textureItem)
	2721	+ if (source == textureItem \|\| source == textureButton)
2466	2722	{
2467	2723	group(new TextureNode());
2468	2724	} else
..	..	@@ -2482,7 +2738,7 @@
2482	2738	{
2483	2739	CastShadow(2);
2484	2740	} else
2485		- if (source == ungroupItem)
	2741	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	2742	{
2487	2743	//ungroup();
2488	2744	for (int i=0; i<group.selection.size(); i++)
..	..	@@ -2504,7 +2760,7 @@
2504	2760	} else
2505	2761	if (source == genNormalsMESHItem)
2506	2762	{
2507		- GenNormals(true); // TODO
	2763	+ GenNormalsMESH();
2508	2764	} else
2509	2765	if (source == genNormalsORGANItem)
2510	2766	{
..	..	@@ -2569,6 +2825,22 @@
2569	2825	if (source == unmarkleavesItem)
2570	2826	{
2571	2827	MarkLeaves(false);
	2828	+ } else
	2829	+ if (source == rewindleavesItem)
	2830	+ {
	2831	+ RewindLeaves(true);
	2832	+ } else
	2833	+ if (source == unrewindleavesItem)
	2834	+ {
	2835	+ RewindLeaves(false);
	2836	+ } else
	2837	+ if (source == randomleavesItem)
	2838	+ {
	2839	+ RandomLeaves(true);
	2840	+ } else
	2841	+ if (source == unrandomleavesItem)
	2842	+ {
	2843	+ RandomLeaves(false);
2572	2844	} else
2573	2845	if (source == flipVItem)
2574	2846	{
..	..	@@ -2804,6 +3076,10 @@
2804	3076	if (source == twoButton)
2805	3077	{
2806	3078	radio.layout = twoButton;
	3079	+
	3080	+ if (CameraPane.FULLSCREEN)
	3081	+ fullscreenLayout = radio.layout;
	3082	+
2807	3083	// bug
2808	3084	//gridPanel.setDividerLocation(1.0);
2809	3085	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3112,31 @@
2836	3112	bigThree.ClearUI();
2837	3113	bigThree.add(centralPanel);
2838	3114	bigThree.FlushUI();
	3115	+
	3116	+ cameraView.requestFocusInWindow();
	3117	+
	3118	+// refreshContents(true);
	3119	+//
	3120	+// try
	3121	+// {
	3122	+// java.awt.Robot bot = new java.awt.Robot();
	3123	+// int mask = InputEvent.BUTTON1_MASK;
	3124	+// bot.mouseMove(100, 100);
	3125	+// bot.mousePress(mask);
	3126	+// bot.mouseRelease(mask);
	3127	+// }
	3128	+// catch (Exception e)
	3129	+// {
	3130	+//
	3131	+// }
	3132	+
2839	3133	} else
2840	3134	if (source == threeButton)
2841	3135	{
2842	3136	radio.layout = threeButton;
	3137	+
	3138	+ if (CameraPane.FULLSCREEN)
	3139	+ fullscreenLayout = radio.layout;
2843	3140
2844	3141	// bigThree.remove(scenePanel);
2845	3142	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3169,15 @@
2872	3169	bigThree.add(centralPanel);
2873	3170	bigThree.add(XYZPanel);
2874	3171	bigThree.FlushUI();
	3172	+
	3173	+ cameraView.requestFocusInWindow();
2875	3174	} else
2876	3175	if (source == fourButton)
2877	3176	{
2878	3177	radio.layout = fourButton;
	3178	+
	3179	+ if (CameraPane.FULLSCREEN)
	3180	+ fullscreenLayout = radio.layout;
2879	3181
2880	3182	// bigThree.remove(scenePanel);
2881	3183	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3209,15 @@
2907	3209	bigThree.ClearUI();
2908	3210	bigThree.add(scenePanel);
2909	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2910	3214	} else
2911	3215	if (source == sixButton)
2912	3216	{
2913	3217	radio.layout = sixButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2914	3221
2915	3222	// bigThree.remove(scenePanel);
2916	3223	// bigThree.remove(centralPanel);
..	..	@@ -2943,10 +3250,15 @@
2943	3250	bigThree.add(scenePanel);
2944	3251	bigThree.add(centralPanel);
2945	3252	bigThree.FlushUI();
	3253	+
	3254	+ cameraView.requestFocusInWindow();
2946	3255	} else
2947	3256	if (source == sevenButton)
2948	3257	{
2949	3258	radio.layout = sevenButton;
	3259	+
	3260	+ if (CameraPane.FULLSCREEN)
	3261	+ fullscreenLayout = radio.layout;
2950	3262
2951	3263	// bigThree.remove(scenePanel);
2952	3264	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3292,8 @@
2980	3292	bigThree.add(centralPanel);
2981	3293	bigThree.add(XYZPanel);
2982	3294	bigThree.FlushUI();
	3295	+
	3296	+ cameraView.requestFocusInWindow();
2983	3297	} else
2984	3298	if (source == rootButton)
2985	3299	{
..	..	@@ -2991,6 +3305,7 @@
2991	3305	EditObject(obj);
2992	3306	}
2993	3307
	3308	+ cameraView.requestFocusInWindow();
2994	3309	refreshContents(true);
2995	3310	} else
2996	3311	if (source == closeButton)
..	..	@@ -3000,22 +3315,37 @@
3000	3315	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3316	{
3002	3317	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3318	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3319	{
	3320	+ // Patch to avoid bug with transparency.
	3321	+ if (!ab.hadMaterial)
	3322	+ {
	3323	+ ab.object.material = null;
	3324	+ }
	3325	+
3005	3326	buttonGroup.remove(ab);
3006	3327	radioPanel.remove(ab);
3007	3328
3008		- ab.GetObject().editWindow = null;
	3329	+ //ab.GetObject().editWindow = null;
	3330	+ ab.GetObject().manipWindow = null;
3009	3331	// ab.GetObject().objectUI = null; // ?????????
3010	3332
3011	3333	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3334	break;
3013	3335	}
3014	3336	}
	3337	+
	3338	+ cameraView.requestFocusInWindow();
3015	3339	refreshContents(true);
3016	3340	} else
3017	3341	if (source == editItem \|\| source == editButton)
3018	3342	{
	3343	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3344	+ {
	3345	+ Object3D child = (Object3D)e.nextElement();
	3346	+ child.pinned = true;
	3347	+ }
	3348	+
3019	3349	EditSelection(false);
3020	3350	} else
3021	3351	if (source == uneditButton)
..	..	@@ -3025,10 +3355,11 @@
3025	3355	Object3D child = (Object3D)e.nextElement();
3026	3356	if(child.editWindow != null)
3027	3357	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3358	+ child.pinned = false;
3028	3359	child.CloseUI();
3029	3360	listUI.remove(child);
3030	3361
3031		- child.editWindow = null; // ???????????
	3362	+ //child.editWindow = null; // ???????????
3032	3363	}
3033	3364	objEditor.ctrlPanel.FlushUI();
3034	3365	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3372,7 @@
3041	3372	//copy.ClearUI();
3042	3373	for (Object3D obj : listUI)
3043	3374	{
	3375	+ obj.pinned = true;
3044	3376	obj.CloseUI();
3045	3377	}
3046	3378	listUI.clear();
..	..	@@ -3050,7 +3382,7 @@
3050	3382	{
3051	3383	assert(copy == group);
3052	3384
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3385	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3386
3055	3387	for (Object3D obj : listUI)
3056	3388	{
..	..	@@ -3115,7 +3447,9 @@
3115	3447	sideView.object = group;
3116	3448	}
3117	3449
3118		-// fix "+" issue group.editWindow = this;
	3450	+// fix "+" issue
	3451	+ //group.editWindow = this;
	3452	+ group.manipWindow = this;
3119	3453
3120	3454	/*
3121	3455	currentLayout = radio.layout;
..	..	@@ -3128,13 +3462,15 @@
3128	3462	//group.parent = null; // ROOT
3129	3463	//group.attributes = -1;
3130	3464	ResetModel();
	3465	+
	3466	+ cameraView.requestFocusInWindow();
3131	3467	refreshContents(true);
3132	3468	} else if (event.getSource() == editCameraItem)
3133	3469	{
3134	3470	cameraView.ProtectCamera();
3135	3471	cameraView.repaint();
3136	3472	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3473	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3474	{
3139	3475	cameraView.RevertCamera();
3140	3476	cameraView.repaint();
..	..	@@ -3151,7 +3487,6 @@
3151	3487	}
3152	3488
3153	3489	boolean useclient = false;
3154		- cRadio radio;
3155	3490
3156	3491	void ToggleRoot()
3157	3492	{
..	..	@@ -3390,7 +3725,8 @@
3390	3725
3391	3726	int size = obj.MemorySize();
3392	3727
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	3728	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3729	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	3730	}
3395	3731	}
3396	3732	catch (Exception e)
..	..	@@ -3471,6 +3807,13 @@
3471	3807	void GenNormals(boolean crease)
3472	3808	{
3473	3809	group.GenNormalsS(crease);
	3810	+
	3811	+ refreshContents();
	3812	+ }
	3813	+
	3814	+ void GenNormalsMESH()
	3815	+ {
	3816	+ group.GenNormalsMeshS();
3474	3817
3475	3818	refreshContents();
3476	3819	}
..	..	@@ -4098,6 +4441,18 @@
4098	4441	refreshContents();
4099	4442	}
4100	4443
	4444	+ void RewindLeaves(boolean hide)
	4445	+ {
	4446	+ group.selection.RewindLeaves(hide);
	4447	+ refreshContents();
	4448	+ }
	4449	+
	4450	+ void RandomLeaves(boolean hide)
	4451	+ {
	4452	+ group.selection.RandomLeaves(hide);
	4453	+ refreshContents();
	4454	+ }
	4455	+
4101	4456	void SetTexRes(int tr)
4102	4457	{
4103	4458	group.selection.SetTexRes(tr);
..	..	@@ -4169,10 +4524,6 @@
4169	4524	// }
4170	4525	// }
4171	4526
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	4527	void EditSelection(boolean newWindow)
4177	4528	{
4178	4529	// aConstraints.gridy = 0;
..	..	@@ -4180,7 +4531,7 @@
4180	4531	{
4181	4532	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4533	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4534	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4535
4185	4536	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4537	if(elem != group \|\| !newWindow)
..	..	@@ -4266,6 +4617,17 @@
4266	4617
4267	4618	freezemodel = true;
4268	4619
	4620	+ //for (Object3D obj : listUI)
	4621	+ for (int i=listUI.size(); --i>=0;)
	4622	+ {
	4623	+ Object3D obj = listUI.elementAt(i);
	4624	+ if (!obj.pinned)
	4625	+ {
	4626	+ obj.CloseUI();
	4627	+ listUI.remove(i);
	4628	+ }
	4629	+ }
	4630	+
4269	4631	/**/
4270	4632	//switch (event.id)
4271	4633	{
..	..	@@ -4273,7 +4635,6 @@
4273	4635	//case 702: // Event.LIST_DESELECT
4274	4636	group.deselectAll();
4275	4637	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	4638	if (tps != null)
4278	4639	{
4279	4640	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +4643,8 @@
4282	4643
4283	4644	//if (child.parent != null)
4284	4645	//child.parent.addSelectee(child);
	4646	+ objEditor.SetMaterial(child);
4285	4647	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	4648	}
4290	4649	}
4291	4650	// else
..	..	@@ -4295,20 +4654,28 @@
4295	4654	// System.err.println("info : " + group.GetPath());
4296	4655	// }
4297	4656
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4657	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	4658	CameraPane.flash = true;
4302	4659
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4660	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	4661	// a camera
4305	4662	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4663	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4664	+ {
	4665	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4666	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4667	+ }
4308	4668	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	4669	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	4670	}
4311	4671
	4672	+ if (tps != null && tps.length == 1)
	4673	+ {
	4674	+ EditSelection(false);
	4675	+ }
	4676	+
	4677	+ SetPinStates(tps != null && tps.length > 0);
	4678	+
4312	4679	refreshContents();
4313	4680	//return true;
4314	4681	}
..	..	@@ -4317,6 +4684,33 @@
4317	4684
4318	4685	freezemodel = false;
4319	4686	}
	4687	+
	4688	+ void SetPinStates(boolean enabled)
	4689	+ {
	4690	+ editButton.setEnabled(enabled);
	4691	+ uneditButton.setEnabled(enabled);
	4692	+ }
	4693	+
	4694	+ void refreshContents(boolean cp)
	4695	+ {
	4696	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4697	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4698	+ {
	4699	+ objEditor.ClearInfo(); // .GetMaterial());
	4700	+
	4701	+ for (int i=0; i < group.selection.Size(); i++)
	4702	+ {
	4703	+ Object3D child = (Object3D) group.selection.get(i);
	4704	+
	4705	+ objEditor.AddInfo(child, this, true);
	4706	+ System.err.println("info : " + child.GetPath());
	4707	+ }
	4708	+
	4709	+ objEditor.SetText(); // jan 2014
	4710	+ }
	4711	+
	4712	+ super.refreshContents(cp);
	4713	+ }
4320	4714
4321	4715	void linkSomething(Object3D thing)
4322	4716	{
..	..	@@ -4388,6 +4782,7 @@
4388	4782	{
4389	4783	if (group.selection.isEmpty())
4390	4784	return;
	4785	+
4391	4786	Grafreed.clipboardIsTempGroup = false;
4392	4787	Composite tGroup = null;
4393	4788	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +4793,8 @@
4398	4793
4399	4794	if (cut)
4400	4795	{
	4796	+ if (Globals.SAVEONMAKE)
	4797	+ Save();
4401	4798	//int indices[] = jList.getSelectedIndices();
4402	4799	//for (int i = indices.length - 1; i >= 0; i--)
4403	4800	//jList.remove(indices[i]);
..	..	@@ -4487,8 +4884,10 @@
4487	4884	}
4488	4885
4489	4886	}
	4887	+
4490	4888	if (Grafreed.clipboardIsTempGroup)
4491	4889	Grafreed.clipboard = tGroup;
	4890	+
4492	4891	if (cut)
4493	4892	{
4494	4893	ResetModel();
..	..	@@ -5113,7 +5512,31 @@
5113	5512	cButton clearpanelButton;
5114	5513	cButton unselectButton;
5115	5514
	5515	+ cButton restoreCameraButton;
	5516	+
	5517	+ cButton minButton;
	5518	+ cButton maxButton;
	5519	+ cButton fullButton;
	5520	+ cButton saveButton;
5116	5521	cButton oneStepButton;
	5522	+
	5523	+ cButton groupButton;
	5524	+ cButton ungroupButton;
	5525	+ cButton compositeButton;
	5526	+ cButton switchButton;
	5527	+ cButton loopButton;
	5528	+ cButton textureButton;
	5529	+
	5530	+ cButton gridButton;
	5531	+ cButton boxButton;
	5532	+ cButton sphereButton;
	5533	+ cButton coneButton;
	5534	+ cButton torusButton;
	5535	+ cButton superButton;
	5536	+ cButton kleinButton;
	5537	+ cButton particlesButton;
	5538	+ cButton overlayButton;
	5539	+ cButton lightButton;
5117	5540
5118	5541	cButton screenfitButton;
5119	5542	cButton screenfitpointButton;
..	..	@@ -5126,14 +5549,6 @@
5126	5549
5127	5550	cButton setsupportButton;
5128	5551
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	5552	//
5138	5553	//Composite
5139	5554	Object3D // to do !!
..	..	@@ -5143,9 +5558,11 @@
5143	5558	//JTree jTree;
5144	5559	private MenuItem lookAtItem;
5145	5560	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5561	+ private MenuItem switchViewItem;
5147	5562	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5563	+ private MenuItem undoItem;
	5564	+ private MenuItem redoItem;
	5565	+ private JMenuItem duplicateItem;
5149	5566	private MenuItem cloneItem;
5150	5567	private MenuItem cloneSupportItem;
5151	5568	private MenuItem overwriteGeoItem;
..	..	@@ -5208,6 +5625,10 @@
5208	5625	private MenuItem showleavesItem;
5209	5626	private MenuItem markleavesItem;
5210	5627	private MenuItem unmarkleavesItem;
	5628	+ private MenuItem rewindleavesItem;
	5629	+ private MenuItem unrewindleavesItem;
	5630	+ private MenuItem randomleavesItem;
	5631	+ private MenuItem unrandomleavesItem;
5211	5632
5212	5633	private MenuItem flipVItem;
5213	5634	private MenuItem unflipVItem;
..	..	@@ -5229,7 +5650,7 @@
5229	5650	private MenuItem frontItem;
5230	5651	private MenuItem cameraItem;
5231	5652	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	5653	+ private MenuItem switchItem;
5233	5654	private MenuItem physicsItem;
5234	5655	private MenuItem frameselectorItem;
5235	5656	private MenuItem scriptNodeItem;
..	..	@@ -5303,5 +5724,5 @@
5303	5724
5304	5725	Menu cameraMenu;
5305	5726	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	5727	+ MenuItem restoreCameraItem;
5307	5728	}