~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -29,9 +29,9 @@
29	29	{
30	30	cButton skyboxButton;
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32		- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.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
..	..	@@ -46,7 +46,7 @@
46	46	{
47	47	cButton textureButton;
48	48	final String path = "textures/" + f + "/" + c + "/"; // + t;
49		- row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
50	50	textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
..	..	@@ -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,15 +330,24 @@
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)
340	349	{
341		- JTabbedPane skyboxpane = new JTabbedPane();
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
342	351
343	352	AddSkyboxTab0(skyboxpane);
344	353	AddSkyboxTab1(skyboxpane);
..	..	@@ -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;
..	..	@@ -396,11 +415,15 @@
396	415	this.copy = this.group = group;
397	416	//selectees = this.group.selectees;
398	417
399		- if (copy.versionlist == null)
400		- {
401		- copy.versionlist = new Object3D[100];
402		- copy.versionindex = -1;
403		- }
	418	+ assert(false);
	419	+
	420	+// if (copy.versionlist == null)
	421	+// {
	422	+// copy.versionlist = new Object3D[100];
	423	+// copy.versionindex = -1;
	424	+//
	425	+// //Save(true);
	426	+// }
404	427
405	428	if(ui)
406	429	SetupUI(objEditor);
..	..	@@ -423,13 +446,13 @@
423	446
424	447	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
425	448
426		- if (copy.versionlist == null)
427		- {
428		- copy.versionlist = new Object3D[100];
429		- copy.versionindex = -1;
430		-
431		- Save(true);
432		- }
	449	+// if (copy.versionlist == null)
	450	+// {
	451	+// copy.versionlist = new Object3D[100];
	452	+// copy.versionindex = -1;
	453	+//
	454	+// //Save(true);
	455	+// }
433	456	}
434	457
435	458	void CloneSelection(boolean supports)
..	..	@@ -519,33 +542,35 @@
519	542	// menu.add("-");
520	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
521	544	duplicateItem.addActionListener(this);
522		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
523	547	cloneItem.addActionListener(this);
524		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
525	549	{
526	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
527	551	cloneSupportItem.addActionListener(this);
528	552	}
	553	+ oe.jTree.popup.addSeparator();
529	554	menu.add("-");
530		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
531	556	cutItem.addActionListener(this);
532		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
533	558	copyItem.addActionListener(this);
534	559	pasteItem = menu.add(new MenuItem("Paste"));
535	560	pasteItem.addActionListener(this);
536	561
537		- menu.add("-");
538		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
539	565	pasteIntoItem.addActionListener(this);
540		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
541	567	pasteLinkItem.addActionListener(this);
542		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
543	569	pasteCloneItem.addActionListener(this);
544		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
545	571	// pasteExpandItem.addActionListener(this);
546		- menu.add("-");
547		- deleteItem = menu.add(new MenuItem("Delete"));
548		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
549	574
550	575	if (Globals.ADVANCED)
551	576	{
..	..	@@ -631,11 +656,9 @@
631	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
632	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
633	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
634		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
635	659	oe.cameraMenu.add("-");
636	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
637	661	openWindowItem.addActionListener(this);
638		- editLeafItem.addActionListener(this);
639	662	lookAtItem.addActionListener(this);
640	663	//lookFromItem.addActinoListener(this);
641	664	//switchViewItem.addActionListener(this);
..	..	@@ -682,9 +705,8 @@
682	705	setMasterItem.addActionListener(this);
683	706	}
684	707
685		- oe.menuBar.add(menu = new Menu("Group"));
686		-// grabItem = menu.add(new MenuItem("Grab"));
687		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
688	710	backItem = menu.add(new MenuItem("Back"));
689	711	backItem.addActionListener(this);
690	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -692,13 +714,21 @@
692	714	// compositeItem = menu.add(new MenuItem("Composite"));
693	715	// compositeItem.addActionListener(this);
694	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
695	720	if (Globals.ADVANCED)
696	721	{
697	722	hideItem = menu.add(new MenuItem("Hidden Group"));
698	723	hideItem.addActionListener(this);
699	724	}
700		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
701	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
702	732
703	733	// menu.add("-");
704	734	//
..	..	@@ -735,11 +765,11 @@
735	765	shadowYItem.addActionListener(this);
736	766	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
737	767	shadowZItem.addActionListener(this);
738		- attributeItem = menu.add(new MenuItem("Attribute"));
739		- attributeItem.addActionListener(this);
740	768
741	769	if (Globals.ADVANCED)
742	770	{
	771	+ attributeItem = menu.add(new MenuItem("Attribute"));
	772	+ attributeItem.addActionListener(this);
743	773	menu.add("-");
744	774	linkerItem = menu.add(new MenuItem("Linker"));
745	775	linkerItem.addActionListener(this);
..	..	@@ -749,11 +779,18 @@
749	779	pointflowItem.addActionListener(this);
750	780	}
751	781	menu.add("-");
	782	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	783	+ textureRatioRItem.addActionListener(this);
	784	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	785	+ textureRatioGItem.addActionListener(this);
	786	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	787	+ textureRatioBItem.addActionListener(this);
	788	+ menu.add("-");
752	789	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
753	790	resetTransformItem.addActionListener(this);
754	791	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
755	792	resetCentroidItem.addActionListener(this);
756		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	793	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
757	794	resetCentroidXZItem.addActionListener(this);
758	795	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
759	796	transformGeometryItem.addActionListener(this);
..	..	@@ -805,6 +842,8 @@
805	842	}
806	843
807	844	oe.menuBar.add(menu = new Menu("Attributes"));
	845	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	846	+ clearVersionsItem.addActionListener(this);
808	847	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
809	848	clearMaterialsItem.addActionListener(this);
810	849	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -827,9 +866,9 @@
827	866	hideleavesItem.addActionListener(this);
828	867	showleavesItem = menu.add(new MenuItem("Show Leaves"));
829	868	showleavesItem.addActionListener(this);
830		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	869	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
831	870	markleavesItem.addActionListener(this);
832		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	871	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
833	872	unmarkleavesItem.addActionListener(this);
834	873	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
835	874	rewindleavesItem.addActionListener(this);
..	..	@@ -883,6 +922,9 @@
883	922	shareGeometriesItem.addActionListener(this);
884	923	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
885	924	mergeGeometriesItem.addActionListener(this);
	925	+ menu.add("-");
	926	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	927	+ editLeafItem.addActionListener(this);
886	928	if (Globals.ADVANCED)
887	929	{
888	930	// Pretty much the same as duplicate and clone.
..	..	@@ -901,8 +943,10 @@
901	943
902	944	JTabbedPane resourcecontainer;
903	945	cGridBag currenttab;
904		- boolean added; // patch for jar
	946	+ //boolean added; // patch for jar
905	947
	948	+ int totalcount = 0;
	949	+
906	950	int tabcount = 0;
907	951	int colcount = 0;
908	952	int rowcount = 0;
..	..	@@ -918,28 +962,30 @@
918	962	// System.out.println();
919	963
920	964	if (//rowcount == 0 \|\|
921		- path.length == 1)
	965	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
922	966	{
923	967	currenttab = new cGridBag();
924		- added = false;
925	968	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
926	969	currenttab.setName(tabname);
	970	+ //added = false;
	971	+ resourcecontainer.add(currenttab);
	972	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
927	973	rowcount = 1;
928	974	colcount = 0;
929	975	texturecount = 0;
930	976	}
931	977
932		- if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	978	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
933	979	{
934		- if (!added)
	980	+ //if (!added)
935	981	{
936		- added = true;
937		- resourcecontainer.add(currenttab);
	982	+ //added = true;
938	983	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	984	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
940	985	}
941	986
942		- AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	987	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	988	+ totalcount++;
943	989
944	990	if (++colcount >= columns)
945	991	{
..	..	@@ -965,6 +1011,8 @@
965	1011	container.add(resourcecontainer);
966	1012
967	1013	Grafreed.ParseResources("textures", this);
	1014	+
	1015	+ // 935. System.out.println("Total = " + totalcount);
968	1016	}
969	1017
970	1018	void SetupUI2(ObjEditor oe)
..	..	@@ -984,11 +1032,6 @@
984	1032	//new Exception().printStackTrace();
985	1033
986	1034	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	1035	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
993	1036
994	1037	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1009,9 +1052,9 @@
1009	1052	oe.radioPanel.add(dummyButton);
1010	1053	oe.buttonGroup.add(dummyButton);
1011	1054	*/
1012		- cGridBag copyOptionsPanel = new cGridBag();
	1055	+ cGridBag versionManagerPanel = new cGridBag();
1013	1056
1014		- copyOptionsPanel.preferredHeight = 2;
	1057	+ versionManagerPanel.preferredHeight = 4;
1015	1058
1016	1059	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1017	1060
..	..	@@ -1021,62 +1064,102 @@
1021	1064
1022	1065	if (Globals.ADVANCED)
1023	1066	{
1024		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- maxButton.setToolTipText("Maximize window");
1026		- maxButton.addActionListener(this);
	1067	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+// maxButton.setToolTipText("Maximize window");
	1069	+// maxButton.addActionListener(this);
1027	1070	}
1028	1071
1029		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ cButton gcButton;
	1073	+
	1074	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+// gcButton.setToolTipText("Garbage collect");
	1076	+// gcButton.addActionListener(new ActionListener()
	1077	+// {
	1078	+// public void actionPerformed(ActionEvent e)
	1079	+// {
	1080	+// System.gc();
	1081	+// }
	1082	+// });
	1083	+
	1084	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1085	+ collapseButton.setToolTipText("Collapse toolbar");
	1086	+ collapseButton.addActionListener(this);
	1087	+
	1088	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1090	+ maximize3DButton.addActionListener(this);
	1091	+
	1092	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1093	+ twoButton.setToolTipText("Show 3D view only");
	1094	+ twoButton.addActionListener(this);
	1095	+ this.fullscreenLayout = twoButton;
	1096	+
	1097	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1098	+ threeButton.setToolTipText("Show controls and 3D view");
	1099	+ threeButton.addActionListener(this);
	1100	+ if (Globals.ADVANCED)
	1101	+ {
	1102	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1103	+ sixButton.setToolTipText("Show 3D view and controls");
	1104	+ sixButton.addActionListener(this);
	1105	+ }
	1106	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1107	+// sevenButton.setToolTipText("3-column layout");
	1108	+// sevenButton.addActionListener(this);
	1109	+ //
	1110	+
	1111	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1030	1112	fullButton.setToolTipText("Full-screen window");
1031	1113	fullButton.addActionListener(this);
1032	1114
1033		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1115	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1034	1116	screenfitButton.setToolTipText("Screen fit");
1035	1117	screenfitButton.addActionListener(this);
1036	1118
1037		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1119	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1038	1120	restoreCameraButton.setToolTipText("Restore viewpoint");
1039	1121	restoreCameraButton.addActionListener(this);
1040	1122
1041		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1123	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1042	1124	saveVersionButton.setToolTipText("Duplicate current version");
1043	1125	saveVersionButton.addActionListener(this);
1044	1126
1045		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1127	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1046	1128	deleteVersionButton.setToolTipText("Delete current version");
1047	1129	deleteVersionButton.addActionListener(this);
	1130	+ deleteVersionButton.setEnabled(false);
1048	1131
1049		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1132	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1050	1133	previousVersionButton.setToolTipText("Previous version");
1051	1134	previousVersionButton.addActionListener(this);
1052	1135	previousVersionButton.setEnabled(false);
1053	1136
1054	1137	cGridBag updown = new cGridBag().setVertical(true);
1055		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1138	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1056	1139	restoreButton.setToolTipText("Undo (restore current version)");
1057	1140	restoreButton.addActionListener(this);
1058		- //restoreButton.setEnabled(false);
	1141	+ restoreButton.setEnabled(false);
1059	1142
1060		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1143	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1061	1144	replaceButton.setToolTipText("Save (replace current version)");
1062	1145	replaceButton.addActionListener(this);
1063		- //replaceButton.setEnabled(false);
	1146	+ replaceButton.setEnabled(false);
1064	1147
1065		- copyOptionsPanel.add(updown);
	1148	+ versionManagerPanel.add(updown);
1066	1149
1067		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1150	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1068	1151	nextVersionButton.setToolTipText("Next version");
1069	1152	nextVersionButton.addActionListener(this);
1070	1153	nextVersionButton.setEnabled(false);
	1154	+
	1155	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1156	+ oneStepButton.setToolTipText("Animate one step forward");
	1157	+ oneStepButton.addActionListener(this);
1071	1158
1072	1159	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1073	1160	liveCB.setToolTipText("Enable animation");
1074	1161	liveCB.addItemListener(this);
1075	1162
1076		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1077		- oneStepButton.setToolTipText("Animate one step forward");
1078		- oneStepButton.addActionListener(this);
1079		-
1080	1163	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1081	1164	fastCB.setToolTipText("Fast mode");
1082	1165	fastCB.addItemListener(this);
..	..	@@ -1092,38 +1175,23 @@
1092	1175
1093	1176	if (Globals.ADVANCED)
1094	1177	{
1095		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1178	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096	1179	snapobjectButton.addActionListener(this);
1097	1180	snapobjectButton.setToolTipText("Snap Object");
1098	1181
1099		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1182	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1100	1183	fourButton.addActionListener(this);
1101	1184	fourButton.setToolTipText("Show control panel only");
1102	1185	}
1103	1186
1104	1187	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1105	1188
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	1189
1122		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1190	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1123	1191	rootButton.setToolTipText("Open selection in new tab");
1124	1192	rootButton.addActionListener(this);
1125	1193
1126		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1194	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1127	1195	closeButton.setToolTipText("Close tab");
1128	1196	closeButton.addActionListener(this);
1129	1197	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
..	..	@@ -1132,38 +1200,38 @@
1132	1200	cGridBag row1 = new cGridBag();
1133	1201
1134	1202	// INSERT
1135		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136		- gridButton.setToolTipText("Create grid");
	1203	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1204	+ gridButton.setToolTipText("Create ground");
1137	1205	gridButton.addActionListener(this);
1138	1206
1139		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1140	1208	boxButton.setToolTipText("Create box");
1141	1209	boxButton.addActionListener(this);
1142	1210
1143		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144		- sphereButton.setToolTipText("Create sphere");
1145		- sphereButton.addActionListener(this);
1146		-
1147		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1148		- coneButton.setToolTipText("Create cone");
1149		- coneButton.addActionListener(this);
1150		-
1151		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152		- torusButton.setToolTipText("Create torus");
1153		- torusButton.addActionListener(this);
1154		-
1155		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1211	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1156	1212	superButton.setToolTipText("Create superellipsoid");
1157	1213	superButton.addActionListener(this);
1158	1214
1159		- if (Globals.ADVANCED)
	1215	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ sphereButton.setToolTipText("Create sphere");
	1217	+ sphereButton.addActionListener(this);
	1218	+
	1219	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ coneButton.setToolTipText("Create cone");
	1221	+ coneButton.addActionListener(this);
	1222	+
	1223	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1224	+ torusButton.setToolTipText("Create torus");
	1225	+ torusButton.addActionListener(this);
	1226	+
	1227	+ if (false) //Globals.ADVANCED)
1160	1228	{
1161		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1229	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1162	1230	kleinButton.setToolTipText("Create Klein bottle");
1163	1231	kleinButton.addActionListener(this);
1164	1232	}
1165	1233
1166		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1234	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1167	1235	particlesButton.setToolTipText("Create particle system");
1168	1236	particlesButton.addActionListener(this);
1169	1237
..	..	@@ -1171,31 +1239,31 @@
1171	1239
1172	1240	cGridBag row2 = new cGridBag();
1173	1241
1174		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1242	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1175	1243	groupButton.setToolTipText("Create group");
1176	1244	groupButton.addActionListener(this);
1177	1245
1178		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1179	1247	compositeButton.setToolTipText("Create composite");
1180	1248	compositeButton.addActionListener(this);
1181	1249
1182		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183	1251	switchButton.setToolTipText("Create item switcher");
1184	1252	switchButton.addActionListener(this);
1185	1253
1186		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187	1255	loopButton.setToolTipText("Create loop");
1188	1256	loopButton.addActionListener(this);
1189	1257
1190		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191	1259	textureButton.setToolTipText("Create texture");
1192	1260	textureButton.addActionListener(this);
1193	1261
1194		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195	1263	overlayButton.setToolTipText("Create overlay");
1196	1264	overlayButton.addActionListener(this);
1197	1265
1198		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1199	1267	lightButton.setToolTipText("Create light");
1200	1268	lightButton.addActionListener(this);
1201	1269
..	..	@@ -1205,6 +1273,11 @@
1205	1273
1206	1274	CreateTexturePanel(textures);
1207	1275
	1276	+ int tabCount = resourcecontainer.getTabCount();
	1277	+
	1278	+ if (tabCount > 0)
	1279	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1280	+
1208	1281	oe.toolboxPanel.add(textures);
1209	1282
1210	1283	textures.preferredHeight = 100;
..	..	@@ -1212,11 +1285,11 @@
1212	1285	CreateSkyboxPanel(oe.skyboxPanel);
1213	1286
1214	1287	// EDIT panel
1215		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1288	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1289	editButton.setToolTipText("Pin selection controls");
1217	1290	editButton.addActionListener(this);
1218	1291
1219		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220	1293	uneditButton.setToolTipText("Unpin and remove selection controls");
1221	1294	uneditButton.addActionListener(this);
1222	1295
..	..	@@ -1224,7 +1297,7 @@
1224	1297	allParamsButton.setToolTipText("Show all controls");
1225	1298	allParamsButton.addActionListener(this);
1226	1299
1227		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1300	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228	1301	clearPanelButton.setToolTipText("Clear all controls");
1229	1302	clearPanelButton.addActionListener(this);
1230	1303
..	..	@@ -1232,7 +1305,7 @@
1232	1305	//unselectButton.setToolTipText("Unselect");
1233	1306	//unselectButton.addActionListener(this);
1234	1307
1235		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1308	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1236	1309	flashSelectionButton.setToolTipText("Highlight selection");
1237	1310	flashSelectionButton.addActionListener(this);
1238	1311
..	..	@@ -1255,6 +1328,8 @@
1255	1328
1256	1329	cGridBag jSPPanel = new cGridBag();
1257	1330
	1331	+ jSPPanel.preferredHeight = 20;
	1332	+
1258	1333	JScrollPane jSP;
1259	1334	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1260	1335	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1263,11 +1338,11 @@
1263	1338	oe.treePanel.add(jSPPanel);
1264	1339	oe.treePanel.Return();
1265	1340
1266		- oe.treePanel.add(copyOptionsPanel);
	1341	+ oe.treePanel.add(versionManagerPanel);
1267	1342	oe.treePanel.Return();
1268		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1269		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1270		- sliderPane.preferredHeight = 1;
	1343	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1344	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1345	+ versionSliderPane.preferredHeight = 3;
1271	1346
1272	1347	// mainPanel.setDividerLocation(0.1); //1.0);
1273	1348	mainPanel.setResizeWeight(0.4);
..	..	@@ -1425,6 +1500,14 @@
1425	1500
1426	1501	void EditObject(Object3D obj)
1427	1502	{
	1503	+ //assert(obj instanceof Composite);
	1504	+
	1505	+// if (obj.versionlist == null)
	1506	+// {
	1507	+// obj.versionlist = new Object3D[100];
	1508	+// obj.versionindex = -1;
	1509	+// }
	1510	+
1428	1511	cRadio radioButton = new cRadio(obj.name);
1429	1512
1430	1513	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1449,6 +1532,7 @@
1449	1532
1450	1533	oe.SetupViews();
1451	1534
	1535	+ if (Globals.DEBUG)
1452	1536	System.out.println("SetupViews");
1453	1537	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1454	1538	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1815,7 +1899,12 @@
1815	1899	TreePath path;
1816	1900
1817	1901	public TransferableTreePath(TreePath tp) {
1818		- path = tp;
	1902	+ Object[] objs = new Object[tp.getPathCount()];
	1903	+ for (int i=0; i<objs.length; i++)
	1904	+ {
	1905	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1906	+ }
	1907	+ path = new TreePath(objs);
1819	1908	}
1820	1909
1821	1910	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2047,24 +2136,24 @@
2047	2136	switch(axis)
2048	2137	{
2049	2138	case 0 :
2050		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2051		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2052		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2053		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2139	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2140	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2141	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2142	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2054	2143	norm = cVector.X;
2055	2144	break;
2056	2145	case 1 :
2057		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2058		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2059		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2060		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2146	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2147	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2148	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2149	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2061	2150	norm = cVector.Y;
2062	2151	break;
2063	2152	case 2 :
2064		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2065		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2066		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2067		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2153	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2154	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2155	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2156	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2068	2157	norm = cVector.Z;
2069	2158	break;
2070	2159	}
..	..	@@ -2105,7 +2194,11 @@
2105	2194	shadow.material = new cMaterial(obj.material);
2106	2195	shadow.material.diffuse = 0.0001f;
2107	2196	shadow.material.specular = 0.0001f;
2108		- //shadow.projectedVertices[1].x = 300;
	2197	+ shadow.material.opacity = 0.75f;
	2198	+
	2199	+ AllocProjectedVertices(shadow);
	2200	+
	2201	+ shadow.projectedVertices[1].x = 300;
2109	2202
2110	2203	makeSomething(shadow);
2111	2204	}
..	..	@@ -2626,27 +2719,35 @@
2626	2719	} else
2627	2720	if (source == loopItem \|\| source == loopButton)
2628	2721	{
	2722	+ if (!group.selection.isEmpty())
	2723	+ {
2629	2724	Composite csg = new GroupLeaf();
2630	2725	csg.count = 5;
2631		- group(csg);
2632	2726	Composite child = new cGroup("Branch");
2633	2727	csg.addChild(child);
2634	2728	child.addChild(csg);
	2729	+ group(csg);
	2730	+ }
2635	2731	} else
2636	2732	if (source == doubleItem)
2637	2733	{
	2734	+ if (!group.selection.isEmpty())
	2735	+ {
2638	2736	Composite csg = new GroupLeaf("Fork");
2639	2737	csg.count = 5;
2640		- group(csg);
2641	2738	Composite child = new cGroup("Branch A");
2642	2739	csg.addChild(child);
2643	2740	child.addChild(csg);
2644	2741	child = new cGroup("Branch B");
2645	2742	csg.addChild(child);
2646	2743	child.addChild(csg);
	2744	+ group(csg);
	2745	+ }
2647	2746	} else
2648	2747	if (source == tripleItem)
2649	2748	{
	2749	+ if (!group.selection.isEmpty())
	2750	+ {
2650	2751	Composite csg = new GroupLeaf("Trident");
2651	2752	csg.count = 4;
2652	2753	group(csg);
..	..	@@ -2659,6 +2760,7 @@
2659	2760	child = new cGroup();
2660	2761	csg.addChild(child);
2661	2762	child.addChild(csg);
	2763	+ }
2662	2764	} else
2663	2765	if (source == computeAOItem)
2664	2766	{
..	..	@@ -2708,6 +2810,18 @@
2708	2810	if (source == fullButton)
2709	2811	{
2710	2812	ToggleFullScreen();
	2813	+ } else
	2814	+ if (source == collapseButton)
	2815	+ {
	2816	+ this.expandedLayout = radio.layout;
	2817	+ CollapseToolbar();
	2818	+ } else
	2819	+ if (source == maximize3DButton)
	2820	+ {
	2821	+ this.expandedLayout = radio.layout;
	2822	+ radio.layout = twoButton;
	2823	+ Show3DView();
	2824	+ CollapseToolbar();
2711	2825	} else
2712	2826	if (source == previousVersionButton)
2713	2827	{
..	..	@@ -3282,22 +3396,34 @@
3282	3396	} else
3283	3397	if (source == ungroupItem \|\| source == ungroupButton)
3284	3398	{
3285		- boolean hasRoot = false;
	3399	+ boolean canUngroup = true;
3286	3400
3287	3401	for (int i=0; i<group.selection.size(); i++)
3288	3402	{
3289		- if (group.selection.get(i) == group)
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ if (selectedItem.Size() == 0)
3290	3406	{
3291		- hasRoot = true;
	3407	+ // Cannot ungroup leaves
	3408	+ canUngroup = false;
	3409	+ break;
	3410	+ }
	3411	+
	3412	+ if (selectedItem == group)
	3413	+ {
	3414	+ // Cannot ungroup root
	3415	+ canUngroup = false;
3292	3416	break;
3293	3417	}
3294	3418	}
3295	3419
3296		- if (!hasRoot)
	3420	+ if (canUngroup)
3297	3421	{
3298	3422	for (int i=0; i<group.selection.size(); i++)
3299	3423	{
3300		- Ungroup(group.selection.get(i));
	3424	+ Object3D selectedItem = group.selection.get(i);
	3425	+
	3426	+ Ungroup(selectedItem);
3301	3427	}
3302	3428
3303	3429	ClearSelection(false);
..	..	@@ -3348,6 +3474,10 @@
3348	3474	if (source == clearMaterialsItem)
3349	3475	{
3350	3476	ClearMaterials();
	3477	+ } else
	3478	+ if (source == clearVersionsItem)
	3479	+ {
	3480	+ ClearVersions();
3351	3481	} else
3352	3482	if (source == liveleavesItem)
3353	3483	{
..	..	@@ -3488,6 +3618,18 @@
3488	3618	if (source == transformChildrenItem)
3489	3619	{
3490	3620	TransformChildren();
	3621	+ } else
	3622	+ if (source == textureRatioRItem)
	3623	+ {
	3624	+ TextureRatio(0);
	3625	+ } else
	3626	+ if (source == textureRatioGItem)
	3627	+ {
	3628	+ TextureRatio(1);
	3629	+ } else
	3630	+ if (source == textureRatioBItem)
	3631	+ {
	3632	+ TextureRatio(2);
3491	3633	} else
3492	3634	if (source == resetTransformItem)
3493	3635	{
..	..	@@ -3660,38 +3802,7 @@
3660	3802	if (CameraPane.FULLSCREEN)
3661	3803	fullscreenLayout = radio.layout;
3662	3804
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();
	3805	+ Show3DView();
3695	3806
3696	3807	cameraView.requestFocusInWindow();
3697	3808
..	..	@@ -3877,6 +3988,7 @@
3877	3988	} else
3878	3989	if (source == rootButton)
3879	3990	{
	3991	+ Replace();
3880	3992	Object3D obj;
3881	3993	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3882	3994	{
..	..	@@ -3891,6 +4003,9 @@
3891	4003	if (source == closeButton)
3892	4004	{
3893	4005	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4006	+ if (copy.versionlist != null)
	4007	+ Replace();
	4008	+
3894	4009	cRadio ab;
3895	4010	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3896	4011	{
..	..	@@ -3989,6 +4104,9 @@
3989	4104	} else
3990	4105	if(source instanceof cRadio)
3991	4106	{
	4107	+ if (copy.versionlist != null)
	4108	+ Replace();
	4109	+
3992	4110	group.parent = keepparent;
3993	4111	group.attributes = 0;
3994	4112	//group.editWindow = null;
..	..	@@ -4013,8 +4131,6 @@
4013	4131
4014	4132	copy = group;
4015	4133
4016		- SetUndoStates();
4017		-
4018	4134	//Globals.theRenderer.object = group;
4019	4135	if(!useclient)
4020	4136	{
..	..	@@ -4042,6 +4158,31 @@
4042	4158	*/
4043	4159	radio.layout.doClick();
4044	4160
	4161	+ //assert(copy instanceof Composite);
	4162	+
	4163	+ if (copy.versionlist == null)
	4164	+ {
	4165	+ copy.versionindex = -1;
	4166	+
	4167	+ // Cannot work with loops
	4168	+ // To fix this issue, we first mark all nodes above the root,
	4169	+ // and check if any of these nodes are reachable below the root.
	4170	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4171	+
	4172	+ if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
	4173	+ {
	4174	+ copy.versionlist = new Object3D[100];
	4175	+
	4176	+ //Save(true);
	4177	+ }
	4178	+ else
	4179	+ copy.versionindex = -2;
	4180	+
	4181	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4182	+ }
	4183	+
	4184	+ SetVersionStates();
	4185	+
4045	4186	ClearUnpinned();
4046	4187
4047	4188	//Grafreed.Assert(group != null);
..	..	@@ -4155,6 +4296,18 @@
4155	4296	refreshContents();
4156	4297	}
4157	4298
	4299	+ void TextureRatio(int axis)
	4300	+ {
	4301	+ Object3D obj;
	4302	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4303	+ {
	4304	+ obj = (Object3D)e.nextElement();
	4305	+ obj.TextureRatio(axis);
	4306	+ }
	4307	+
	4308	+ refreshContents();
	4309	+ }
	4310	+
4158	4311	void ResetTransform()
4159	4312	{
4160	4313	ResetTransform(-1);
..	..	@@ -4170,42 +4323,8 @@
4170	4323	if (obj.toParent == null)
4171	4324	continue;
4172	4325
4173		- if (mask == -1)
4174		- {
4175		- if (obj instanceof Camera) // jan 2014
4176		- {
4177		- LA.matIdentity(obj.toParent);
4178		- LA.matIdentity(obj.fromParent);
4179		- }
4180		- else
4181		- {
4182		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4183		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4184		- }
4185		- TouchTransform(obj);
4186		- continue;
4187		- }
4188		- if ((mask&2) != 0) // Scale
4189		- {
4190		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4191		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4192		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4193		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4194		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4195		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4196		- }
4197		- if ((mask&4) != 0) // Rotation
4198		- {
4199		- // ?
4200		- }
4201		- if ((mask&1) != 0) // Translation
4202		- {
4203		- if (obj.toParent != null)
4204		- {
4205		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4206		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4207		- }
4208		- }
	4326	+ obj.ResetTransform(mask);
	4327	+
4209	4328	if (obj.parent == null)
4210	4329	{
4211	4330	System.out.println("NULL PARENT!");
..	..	@@ -4714,6 +4833,12 @@
4714	4833	{
4715	4834	Object3D obj = group.selection.get(i);
4716	4835
	4836	+ if (obj.toParent == null)
	4837	+ {
	4838	+ obj.toParent = LA.newMatrix();
	4839	+ obj.fromParent = LA.newMatrix();
	4840	+ }
	4841	+
4717	4842	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4718	4843	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4719	4844	}
..	..	@@ -5005,6 +5130,12 @@
5005	5130	refreshContents();
5006	5131	}
5007	5132
	5133	+ void ClearVersions()
	5134	+ {
	5135	+ group.selection.ClearVersions();
	5136	+ refreshContents();
	5137	+ }
	5138	+
5008	5139	void FlipV(boolean flip)
5009	5140	{
5010	5141	group.selection.FlipV(flip);
..	..	@@ -5276,10 +5407,26 @@
5276	5407	flashSelectionButton.setEnabled(enabled);
5277	5408
5278	5409	clearPanelButton.setEnabled(!listUI.isEmpty());
	5410	+
	5411	+ boolean allComposites = true;
	5412	+
	5413	+ if (group.selection != null)
	5414	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5415	+ {
	5416	+ Object next = e.nextElement();
	5417	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5418	+ {
	5419	+ allComposites = false;
	5420	+ break;
	5421	+ }
	5422	+ }
	5423	+
	5424	+ rootButton.setEnabled(true); // allComposites);
5279	5425	}
5280	5426
5281	5427	void refreshContents(boolean cp)
5282	5428	{
	5429	+ if (Globals.ADVANCED)
5283	5430	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5284	5431	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5285	5432	{
..	..	@@ -5290,7 +5437,7 @@
5290	5437	Object3D child = (Object3D) group.selection.get(i);
5291	5438
5292	5439	objEditor.AddInfo(child, this, true);
5293		- System.err.println("info : " + child.GetPath());
	5440	+// System.err.println("info : " + child.GetPath());
5294	5441	}
5295	5442
5296	5443	objEditor.SetText(); // jan 2014
..	..	@@ -6173,11 +6320,11 @@
6173	6320	private MenuItem lookAtItem;
6174	6321	private MenuItem lookFromItem;
6175	6322	private MenuItem switchViewItem;
6176		- private MenuItem cutItem;
	6323	+ private JMenuItem cutItem;
6177	6324	private MenuItem undoItem;
6178	6325	private MenuItem redoItem;
6179	6326	private JMenuItem duplicateItem;
6180		- private MenuItem cloneItem;
	6327	+ private JMenuItem cloneItem;
6181	6328	private MenuItem cloneSupportItem;
6182	6329	private MenuItem overwriteGeoItem;
6183	6330	private MenuItem overwriteMatItem;
..	..	@@ -6198,13 +6345,13 @@
6198	6345	private MenuItem cloneGeometriesItem;
6199	6346	private MenuItem shareGeometriesItem;
6200	6347	private MenuItem mergeGeometriesItem;
6201		- private MenuItem copyItem;
	6348	+ private JMenuItem copyItem;
6202	6349	private MenuItem pasteItem;
6203		- private MenuItem pasteIntoItem;
6204		- private MenuItem pasteLinkItem;
6205		- private MenuItem pasteCloneItem;
6206		- private MenuItem pasteExpandItem;
6207		- private MenuItem deleteItem;
	6350	+ private JMenuItem pasteIntoItem;
	6351	+ private JMenuItem pasteLinkItem;
	6352	+ private JMenuItem pasteCloneItem;
	6353	+ private JMenuItem pasteExpandItem;
	6354	+ private JMenuItem deleteItem;
6208	6355	private MenuItem clearAllItem;
6209	6356	private MenuItem genUVItem;
6210	6357	private MenuItem genNormalsMESHItem;
..	..	@@ -6230,6 +6377,7 @@
6230	6377	private MenuItem clipMeshItem;
6231	6378	private MenuItem smoothMeshItem;
6232	6379	private MenuItem clearMaterialsItem;
	6380	+ private MenuItem clearVersionsItem;
6233	6381
6234	6382	private MenuItem liveleavesItem;
6235	6383	private MenuItem unliveleavesItem;
..	..	@@ -6253,13 +6401,16 @@
6253	6401	private MenuItem maxTexturesItem;
6254	6402	private MenuItem panoTexturesItem;
6255	6403
	6404	+ private MenuItem textureRatioRItem;
	6405	+ private MenuItem textureRatioGItem;
	6406	+ private MenuItem textureRatioBItem;
6256	6407	private MenuItem resetCentroidItem;
6257	6408	private MenuItem resetCentroidXZItem;
6258	6409	private MenuItem resetTransformItem;
6259	6410	private MenuItem transformGeometryItem;
6260	6411	private MenuItem transformChildrenItem;
6261	6412	private MenuItem hideItem;
6262		- private MenuItem grabItem;
	6413	+ private JMenuItem grabItem;
6263	6414	private MenuItem backItem;
6264	6415	private MenuItem frontItem;
6265	6416	private MenuItem cameraItem;
..	..	@@ -6272,7 +6423,7 @@
6272	6423	private MenuItem switchTransfoItem;
6273	6424	private MenuItem morphItem;
6274	6425	private MenuItem linkerItem;
6275		- private MenuItem ungroupItem;
	6426	+ private JMenuItem ungroupItem;
6276	6427	private MenuItem editItem;
6277	6428	private MenuItem openWindowItem;
6278	6429	private MenuItem editLeafItem;