~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,7 +31,7 @@
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32	32	row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35	35	skyboxButton.addActionListener(new ActionListener()
36	36	{
37	37	@Override
..	..	@@ -73,7 +73,7 @@
73	73	cGridBag row5 = new cGridBag();
74	74	cGridBag row6 = new cGridBag();
75	75
76		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
77	77	//AddSkyboxButton("default", "cornell", row0);
78	78	AddSkyboxButton("penguins", "dust", row0);
79	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -330,10 +330,19 @@
330	330
331	331	public void ChangeSkybox(String skybox)
332	332	{
333		- //cameraView.envyoff = false;
334		- group.skyboxname = skybox;
335		- group.skyboxext = "jpg";
336		- cameraView.repaint();
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
337	346	}
338	347
339	348	public void CreateSkyboxPanel(cGridBag skyboxPanel)
..	..	@@ -357,6 +366,16 @@
357	366	}
358	367
359	368	refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
360	379	}
361	380
362	381	//ObjEditor objEditor;
..	..	@@ -400,6 +419,8 @@
400	419	{
401	420	copy.versionlist = new Object3D[100];
402	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
403	424	}
404	425
405	426	if(ui)
..	..	@@ -519,33 +540,35 @@
519	540	// menu.add("-");
520	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
521	542	duplicateItem.addActionListener(this);
522		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
523	545	cloneItem.addActionListener(this);
524		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
525	547	{
526	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
527	549	cloneSupportItem.addActionListener(this);
528	550	}
	551	+ oe.jTree.popup.addSeparator();
529	552	menu.add("-");
530		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
531	554	cutItem.addActionListener(this);
532		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
533	556	copyItem.addActionListener(this);
534	557	pasteItem = menu.add(new MenuItem("Paste"));
535	558	pasteItem.addActionListener(this);
536	559
537		- menu.add("-");
538		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
539	563	pasteIntoItem.addActionListener(this);
540		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
541	565	pasteLinkItem.addActionListener(this);
542		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
543	567	pasteCloneItem.addActionListener(this);
544		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
545	569	// pasteExpandItem.addActionListener(this);
546		- menu.add("-");
547		- deleteItem = menu.add(new MenuItem("Delete"));
548		- deleteItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
549	572
550	573	if (Globals.ADVANCED)
551	574	{
..	..	@@ -631,11 +654,9 @@
631	654	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
632	655	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
633	656	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
634		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
635	657	oe.cameraMenu.add("-");
636	658	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
637	659	openWindowItem.addActionListener(this);
638		- editLeafItem.addActionListener(this);
639	660	lookAtItem.addActionListener(this);
640	661	//lookFromItem.addActinoListener(this);
641	662	//switchViewItem.addActionListener(this);
..	..	@@ -682,9 +703,8 @@
682	703	setMasterItem.addActionListener(this);
683	704	}
684	705
685		- oe.menuBar.add(menu = new Menu("Group"));
686		-// grabItem = menu.add(new MenuItem("Grab"));
687		-// grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
688	708	backItem = menu.add(new MenuItem("Back"));
689	709	backItem.addActionListener(this);
690	710	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -692,13 +712,21 @@
692	712	// compositeItem = menu.add(new MenuItem("Composite"));
693	713	// compositeItem.addActionListener(this);
694	714
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
695	718	if (Globals.ADVANCED)
696	719	{
697	720	hideItem = menu.add(new MenuItem("Hidden Group"));
698	721	hideItem.addActionListener(this);
699	722	}
700		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
701	724	ungroupItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
702	730
703	731	// menu.add("-");
704	732	//
..	..	@@ -883,6 +911,9 @@
883	911	shareGeometriesItem.addActionListener(this);
884	912	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
885	913	mergeGeometriesItem.addActionListener(this);
	914	+ menu.add("-");
	915	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	916	+ editLeafItem.addActionListener(this);
886	917	if (Globals.ADVANCED)
887	918	{
888	919	// Pretty much the same as duplicate and clone.
..	..	@@ -901,7 +932,7 @@
901	932
902	933	JTabbedPane resourcecontainer;
903	934	cGridBag currenttab;
904		- boolean added; // patch for jar
	935	+ //boolean added; // patch for jar
905	936
906	937	int tabcount = 0;
907	938	int colcount = 0;
..	..	@@ -918,12 +949,14 @@
918	949	// System.out.println();
919	950
920	951	if (//rowcount == 0 \|\|
921		- path.length == 1)
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
922	953	{
923	954	currenttab = new cGridBag();
924		- added = false;
925	955	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
926	956	currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
927	960	rowcount = 1;
928	961	colcount = 0;
929	962	texturecount = 0;
..	..	@@ -931,12 +964,11 @@
931	964
932	965	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
933	966	{
934		- if (!added)
	967	+ //if (!added)
935	968	{
936		- added = true;
937		- resourcecontainer.add(currenttab);
	969	+ //added = true;
938	970	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
940	972	}
941	973
942	974	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -984,11 +1016,6 @@
984	1016	//new Exception().printStackTrace();
985	1017
986	1018	oe.radioPanel = new JPanel(new GridBagLayout());
987		- oe.aConstraints.weightx = 1;
988		- oe.aConstraints.weighty = 0;
989		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
990		- oe.aConstraints.gridwidth = 100;
991		- oe.aConstraints.gridheight = 1;
992	1019	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
993	1020
994	1021	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1021,10 +1048,49 @@
1021	1048
1022	1049	if (Globals.ADVANCED)
1023	1050	{
1024		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- maxButton.setToolTipText("Maximize window");
1026		- maxButton.addActionListener(this);
	1051	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1052	+// maxButton.setToolTipText("Maximize window");
	1053	+// maxButton.addActionListener(this);
1027	1054	}
	1055	+
	1056	+ cButton gcButton;
	1057	+
	1058	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+// gcButton.setToolTipText("Garbage collect");
	1060	+// gcButton.addActionListener(new ActionListener()
	1061	+// {
	1062	+// public void actionPerformed(ActionEvent e)
	1063	+// {
	1064	+// System.gc();
	1065	+// }
	1066	+// });
	1067	+
	1068	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1069	+ collapseButton.setToolTipText("Collapse toolbar");
	1070	+ collapseButton.addActionListener(this);
	1071	+
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1073	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1074	+ maximize3DButton.addActionListener(this);
	1075	+
	1076	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ twoButton.setToolTipText("Show 3D view only");
	1078	+ twoButton.addActionListener(this);
	1079	+ this.fullscreenLayout = twoButton;
	1080	+
	1081	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1082	+ threeButton.setToolTipText("Show controls and 3D view");
	1083	+ threeButton.addActionListener(this);
	1084	+ if (Globals.ADVANCED)
	1085	+ {
	1086	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ sixButton.setToolTipText("Show 3D view and controls");
	1088	+ sixButton.addActionListener(this);
	1089	+ }
	1090	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1091	+// sevenButton.setToolTipText("3-column layout");
	1092	+// sevenButton.addActionListener(this);
	1093	+ //
1028	1094
1029	1095	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030	1096	fullButton.setToolTipText("Full-screen window");
..	..	@@ -1069,14 +1135,14 @@
1069	1135	nextVersionButton.addActionListener(this);
1070	1136	nextVersionButton.setEnabled(false);
1071	1137
1072		- oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1073		- liveCB.setToolTipText("Enable animation");
1074		- liveCB.addItemListener(this);
1075		-
1076	1138	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077	1139	oneStepButton.setToolTipText("Animate one step forward");
1078	1140	oneStepButton.addActionListener(this);
1079	1141
	1142	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1143	+ liveCB.setToolTipText("Enable animation");
	1144	+ liveCB.addItemListener(this);
	1145	+
1080	1146	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1081	1147	fastCB.setToolTipText("Fast mode");
1082	1148	fastCB.addItemListener(this);
..	..	@@ -1103,21 +1169,6 @@
1103	1169
1104	1170	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1105	1171
1106		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1107		- twoButton.setToolTipText("Show 3D view only");
1108		- twoButton.addActionListener(this);
1109		- this.fullscreenLayout = twoButton;
1110		-
1111		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1112		- threeButton.setToolTipText("Show controls and 3D view");
1113		- threeButton.addActionListener(this);
1114		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1115		- sixButton.setToolTipText("Show 3D view and controls");
1116		- sixButton.addActionListener(this);
1117		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1118		-// sevenButton.setToolTipText("3-column layout");
1119		-// sevenButton.addActionListener(this);
1120		- //
1121	1172
1122	1173	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123	1174	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1133,12 +1184,16 @@
1133	1184
1134	1185	// INSERT
1135	1186	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136		- gridButton.setToolTipText("Create grid");
	1187	+ gridButton.setToolTipText("Create ground");
1137	1188	gridButton.addActionListener(this);
1138	1189
1139	1190	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140	1191	boxButton.setToolTipText("Create box");
1141	1192	boxButton.addActionListener(this);
	1193	+
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
1142	1197
1143	1198	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144	1199	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1151,10 +1206,6 @@
1151	1206	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152	1207	torusButton.setToolTipText("Create torus");
1153	1208	torusButton.addActionListener(this);
1154		-
1155		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1156		- superButton.setToolTipText("Create superellipsoid");
1157		- superButton.addActionListener(this);
1158	1209
1159	1210	if (Globals.ADVANCED)
1160	1211	{
..	..	@@ -1425,6 +1476,14 @@
1425	1476
1426	1477	void EditObject(Object3D obj)
1427	1478	{
	1479	+ assert(obj instanceof Composite);
	1480	+
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
	1486	+
1428	1487	cRadio radioButton = new cRadio(obj.name);
1429	1488
1430	1489	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1449,6 +1508,7 @@
1449	1508
1450	1509	oe.SetupViews();
1451	1510
	1511	+ if (Globals.DEBUG)
1452	1512	System.out.println("SetupViews");
1453	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1454	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1815,7 +1875,12 @@
1815	1875	TreePath path;
1816	1876
1817	1877	public TransferableTreePath(TreePath tp) {
1818		- path = tp;
	1878	+ Object[] objs = new Object[tp.getPathCount()];
	1879	+ for (int i=0; i<objs.length; i++)
	1880	+ {
	1881	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1882	+ }
	1883	+ path = new TreePath(objs);
1819	1884	}
1820	1885
1821	1886	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2105,7 +2170,11 @@
2105	2170	shadow.material = new cMaterial(obj.material);
2106	2171	shadow.material.diffuse = 0.0001f;
2107	2172	shadow.material.specular = 0.0001f;
2108		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
2109	2178
2110	2179	makeSomething(shadow);
2111	2180	}
..	..	@@ -2626,27 +2695,35 @@
2626	2695	} else
2627	2696	if (source == loopItem \|\| source == loopButton)
2628	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
2629	2700	Composite csg = new GroupLeaf();
2630	2701	csg.count = 5;
2631		- group(csg);
2632	2702	Composite child = new cGroup("Branch");
2633	2703	csg.addChild(child);
2634	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
2635	2707	} else
2636	2708	if (source == doubleItem)
2637	2709	{
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
2638	2712	Composite csg = new GroupLeaf("Fork");
2639	2713	csg.count = 5;
2640		- group(csg);
2641	2714	Composite child = new cGroup("Branch A");
2642	2715	csg.addChild(child);
2643	2716	child.addChild(csg);
2644	2717	child = new cGroup("Branch B");
2645	2718	csg.addChild(child);
2646	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2647	2722	} else
2648	2723	if (source == tripleItem)
2649	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2650	2727	Composite csg = new GroupLeaf("Trident");
2651	2728	csg.count = 4;
2652	2729	group(csg);
..	..	@@ -2659,6 +2736,7 @@
2659	2736	child = new cGroup();
2660	2737	csg.addChild(child);
2661	2738	child.addChild(csg);
	2739	+ }
2662	2740	} else
2663	2741	if (source == computeAOItem)
2664	2742	{
..	..	@@ -2708,6 +2786,18 @@
2708	2786	if (source == fullButton)
2709	2787	{
2710	2788	ToggleFullScreen();
	2789	+ } else
	2790	+ if (source == collapseButton)
	2791	+ {
	2792	+ this.expandedLayout = radio.layout;
	2793	+ CollapseToolbar();
	2794	+ } else
	2795	+ if (source == maximize3DButton)
	2796	+ {
	2797	+ this.expandedLayout = radio.layout;
	2798	+ radio.layout = twoButton;
	2799	+ Show3DView();
	2800	+ CollapseToolbar();
2711	2801	} else
2712	2802	if (source == previousVersionButton)
2713	2803	{
..	..	@@ -3282,22 +3372,34 @@
3282	3372	} else
3283	3373	if (source == ungroupItem \|\| source == ungroupButton)
3284	3374	{
3285		- boolean hasRoot = false;
	3375	+ boolean canUngroup = true;
3286	3376
3287	3377	for (int i=0; i<group.selection.size(); i++)
3288	3378	{
3289		- if (group.selection.get(i) == group)
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
3290	3382	{
3291		- hasRoot = true;
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
3292	3392	break;
3293	3393	}
3294	3394	}
3295	3395
3296		- if (!hasRoot)
	3396	+ if (canUngroup)
3297	3397	{
3298	3398	for (int i=0; i<group.selection.size(); i++)
3299	3399	{
3300		- Ungroup(group.selection.get(i));
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
3301	3403	}
3302	3404
3303	3405	ClearSelection(false);
..	..	@@ -3660,38 +3762,7 @@
3660	3762	if (CameraPane.FULLSCREEN)
3661	3763	fullscreenLayout = radio.layout;
3662	3764
3663		- // bug
3664		- //gridPanel.setDividerLocation(1.0);
3665		- //bigPanel.setDividerLocation(0.0);
3666		-// bigThree.remove(scenePanel);
3667		-// bigThree.remove(centralPanel);
3668		-// bigThree.remove(XYZPanel);
3669		-// aWindowConstraints.gridx = 0;
3670		-// aWindowConstraints.gridy = 0;
3671		-// aWindowConstraints.gridwidth = 1;
3672		-// // aConstraints.gridheight = 3;
3673		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3674		-// aWindowConstraints.weightx = 0;
3675		-// aWindowConstraints.weighty = 1;
3676		-// //bigThree.add(jtp, aWindowConstraints);
3677		-// aWindowConstraints.weightx = 1;
3678		-// aWindowConstraints.gridwidth = 3;
3679		-// // aConstraints.gridheight = 3;
3680		-// aWindowConstraints.gridx = 1;
3681		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3682		-// bigThree.add(centralPanel, aWindowConstraints);
3683		-// aWindowConstraints.weightx = 0;
3684		-// aWindowConstraints.gridx = 4;
3685		-// aWindowConstraints.gridwidth = 1;
3686		-// // aConstraints.gridheight = 3;
3687		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3688		-// //bigThree.add(XYZPanel, aWindowConstraints);
3689		-// scenePanel.setVisible(false);
3690		-// centralPanel.setVisible(true);
3691		-// XYZPanel.setVisible(false);
3692		- bigThree.ClearUI();
3693		- bigThree.add(centralPanel);
3694		- bigThree.FlushUI();
	3765	+ Show3DView();
3695	3766
3696	3767	cameraView.requestFocusInWindow();
3697	3768
..	..	@@ -3877,6 +3948,7 @@
3877	3948	} else
3878	3949	if (source == rootButton)
3879	3950	{
	3951	+ Replace();
3880	3952	Object3D obj;
3881	3953	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3882	3954	{
..	..	@@ -4013,8 +4085,6 @@
4013	4085
4014	4086	copy = group;
4015	4087
4016		- SetUndoStates();
4017		-
4018	4088	//Globals.theRenderer.object = group;
4019	4089	if(!useclient)
4020	4090	{
..	..	@@ -4042,6 +4112,21 @@
4042	4112	*/
4043	4113	radio.layout.doClick();
4044	4114
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
	4129	+
4045	4130	ClearUnpinned();
4046	4131
4047	4132	//Grafreed.Assert(group != null);
..	..	@@ -5276,6 +5361,21 @@
5276	5361	flashSelectionButton.setEnabled(enabled);
5277	5362
5278	5363	clearPanelButton.setEnabled(!listUI.isEmpty());
	5364	+
	5365	+ boolean allComposites = true;
	5366	+
	5367	+ if (group.selection != null)
	5368	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5369	+ {
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5372	+ {
	5373	+ allComposites = false;
	5374	+ break;
	5375	+ }
	5376	+ }
	5377	+
	5378	+ rootButton.setEnabled(allComposites);
5279	5379	}
5280	5380
5281	5381	void refreshContents(boolean cp)
..	..	@@ -5290,7 +5390,7 @@
5290	5390	Object3D child = (Object3D) group.selection.get(i);
5291	5391
5292	5392	objEditor.AddInfo(child, this, true);
5293		- System.err.println("info : " + child.GetPath());
	5393	+// System.err.println("info : " + child.GetPath());
5294	5394	}
5295	5395
5296	5396	objEditor.SetText(); // jan 2014
..	..	@@ -6173,11 +6273,11 @@
6173	6273	private MenuItem lookAtItem;
6174	6274	private MenuItem lookFromItem;
6175	6275	private MenuItem switchViewItem;
6176		- private MenuItem cutItem;
	6276	+ private JMenuItem cutItem;
6177	6277	private MenuItem undoItem;
6178	6278	private MenuItem redoItem;
6179	6279	private JMenuItem duplicateItem;
6180		- private MenuItem cloneItem;
	6280	+ private JMenuItem cloneItem;
6181	6281	private MenuItem cloneSupportItem;
6182	6282	private MenuItem overwriteGeoItem;
6183	6283	private MenuItem overwriteMatItem;
..	..	@@ -6198,13 +6298,13 @@
6198	6298	private MenuItem cloneGeometriesItem;
6199	6299	private MenuItem shareGeometriesItem;
6200	6300	private MenuItem mergeGeometriesItem;
6201		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
6202	6302	private MenuItem pasteItem;
6203		- private MenuItem pasteIntoItem;
6204		- private MenuItem pasteLinkItem;
6205		- private MenuItem pasteCloneItem;
6206		- private MenuItem pasteExpandItem;
6207		- private MenuItem deleteItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
6208	6308	private MenuItem clearAllItem;
6209	6309	private MenuItem genUVItem;
6210	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -6259,7 +6359,7 @@
6259	6359	private MenuItem transformGeometryItem;
6260	6360	private MenuItem transformChildrenItem;
6261	6361	private MenuItem hideItem;
6262		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
6263	6363	private MenuItem backItem;
6264	6364	private MenuItem frontItem;
6265	6365	private MenuItem cameraItem;
..	..	@@ -6272,7 +6372,7 @@
6272	6372	private MenuItem switchTransfoItem;
6273	6373	private MenuItem morphItem;
6274	6374	private MenuItem linkerItem;
6275		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
6276	6376	private MenuItem editItem;
6277	6377	private MenuItem openWindowItem;
6278	6378	private MenuItem editLeafItem;