~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
..	..	@@ -42,12 +42,12 @@
42	42	});
43	43	}
44	44
45		- public void AddTextureButton(String f, final String t, cGridBag row)
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46	46	{
47	47	cButton textureButton;
48		- final String path = "textures/" + f + "/"; // + t;
49		- row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50		- textureButton.setToolTipText(f + "s");
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
53	53	@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,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);
..	..	@@ -350,7 +359,13 @@
350	359
351	360	public void ChangeTexture(String texture)
352	361	{
353		- cameraView.repaint();
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
354	369	}
355	370
356	371	//ObjEditor objEditor;
..	..	@@ -390,11 +405,15 @@
390	405	this.copy = this.group = group;
391	406	//selectees = this.group.selectees;
392	407
393		- if (copy.versionlist == null)
394		- {
395		- copy.versionlist = new Object3D[100];
396		- copy.versionindex = -1;
397		- }
	408	+ assert(false);
	409	+
	410	+// if (copy.versionlist == null)
	411	+// {
	412	+// copy.versionlist = new Object3D[100];
	413	+// copy.versionindex = -1;
	414	+//
	415	+// //Save(true);
	416	+// }
398	417
399	418	if(ui)
400	419	SetupUI(objEditor);
..	..	@@ -417,13 +436,13 @@
417	436
418	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
419	438
420		- if (copy.versionlist == null)
421		- {
422		- copy.versionlist = new Object3D[100];
423		- copy.versionindex = -1;
424		-
425		- Save(true);
426		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
427	446	}
428	447
429	448	void CloneSelection(boolean supports)
..	..	@@ -464,11 +483,16 @@
464	483
465	484	Object3D parent = obj.parent;
466	485	obj.parent = null;
	486	+
467	487	// Object3D support = obj.support;
468	488	// obj.support = null;
469	489	if (!supports)
470	490	obj.SaveSupports();
	491	+
471	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
472	496	obj.parent = parent;
473	497	// obj.support = support;
474	498	// clone.support = support; // aout 2013
..	..	@@ -513,33 +537,37 @@
513	537	// menu.add("-");
514	538	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
515	539	duplicateItem.addActionListener(this);
516		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
517	542	cloneItem.addActionListener(this);
518		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
519	544	{
520	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
521	546	cloneSupportItem.addActionListener(this);
522	547	}
	548	+ oe.jTree.popup.addSeparator();
523	549	menu.add("-");
524		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
525	551	cutItem.addActionListener(this);
526		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
527	553	copyItem.addActionListener(this);
528	554	pasteItem = menu.add(new MenuItem("Paste"));
529	555	pasteItem.addActionListener(this);
530	556
531		- menu.add("-");
532		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	557	+ oe.jTree.popup.addSeparator();
	558	+ //menu.add("-");
	559	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
533	560	pasteIntoItem.addActionListener(this);
534		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
535	562	pasteLinkItem.addActionListener(this);
536		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
537	564	pasteCloneItem.addActionListener(this);
538		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
539		-// pasteExpandItem.addActionListener(this);
540		- menu.add("-");
541		- deleteItem = menu.add(new MenuItem("Delete"));
542		- deleteItem.addActionListener(this);
	565	+// CRASH
	566	+ pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
	567	+//
	568	+ pasteExpandItem.addActionListener(this);
	569	+ //menu.add("-");
	570	+ oe.jTree.popup.addSeparator();
543	571
544	572	if (Globals.ADVANCED)
545	573	{
..	..	@@ -625,11 +653,9 @@
625	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
626	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
627	655	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
628		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
629	656	oe.cameraMenu.add("-");
630	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
631	658	openWindowItem.addActionListener(this);
632		- editLeafItem.addActionListener(this);
633	659	lookAtItem.addActionListener(this);
634	660	//lookFromItem.addActinoListener(this);
635	661	//switchViewItem.addActionListener(this);
..	..	@@ -676,9 +702,8 @@
676	702	setMasterItem.addActionListener(this);
677	703	}
678	704
679		- oe.menuBar.add(menu = new Menu("Group"));
680		-// grabItem = menu.add(new MenuItem("Grab"));
681		-// grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
682	707	backItem = menu.add(new MenuItem("Back"));
683	708	backItem.addActionListener(this);
684	709	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -686,13 +711,21 @@
686	711	// compositeItem = menu.add(new MenuItem("Composite"));
687	712	// compositeItem.addActionListener(this);
688	713
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
689	717	if (Globals.ADVANCED)
690	718	{
691	719	hideItem = menu.add(new MenuItem("Hidden Group"));
692	720	hideItem.addActionListener(this);
693	721	}
694		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
695	723	ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
696	729
697	730	// menu.add("-");
698	731	//
..	..	@@ -729,9 +762,9 @@
729	762	shadowYItem.addActionListener(this);
730	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
731	764	shadowZItem.addActionListener(this);
	765	+
732	766	attributeItem = menu.add(new MenuItem("Attribute"));
733	767	attributeItem.addActionListener(this);
734		-
735	768	if (Globals.ADVANCED)
736	769	{
737	770	menu.add("-");
..	..	@@ -743,11 +776,18 @@
743	776	pointflowItem.addActionListener(this);
744	777	}
745	778	menu.add("-");
	779	+ textureRatioRItem = menu.add(new MenuItem("Texture Ratio Red"));
	780	+ textureRatioRItem.addActionListener(this);
	781	+ textureRatioGItem = menu.add(new MenuItem("Texture Ratio Green"));
	782	+ textureRatioGItem.addActionListener(this);
	783	+ textureRatioBItem = menu.add(new MenuItem("Texture Ratio Blue"));
	784	+ textureRatioBItem.addActionListener(this);
	785	+ menu.add("-");
746	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
747	787	resetTransformItem.addActionListener(this);
748	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
749	789	resetCentroidItem.addActionListener(this);
750		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
751	791	resetCentroidXZItem.addActionListener(this);
752	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
753	793	transformGeometryItem.addActionListener(this);
..	..	@@ -763,7 +803,7 @@
763	803	genNormalsCADItem.addActionListener(this);
764	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
765	805	genNormalsMESHItem.addActionListener(this);
766		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
767	807	{
768	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
769	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -799,6 +839,8 @@
799	839	}
800	840
801	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
802	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
803	845	clearMaterialsItem.addActionListener(this);
804	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -821,9 +863,9 @@
821	863	hideleavesItem.addActionListener(this);
822	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
823	865	showleavesItem.addActionListener(this);
824		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
825	867	markleavesItem.addActionListener(this);
826		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
827	869	unmarkleavesItem.addActionListener(this);
828	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
829	871	rewindleavesItem.addActionListener(this);
..	..	@@ -877,6 +919,9 @@
877	919	shareGeometriesItem.addActionListener(this);
878	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
879	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
880	925	if (Globals.ADVANCED)
881	926	{
882	927	// Pretty much the same as duplicate and clone.
..	..	@@ -895,40 +940,55 @@
895	940
896	941	JTabbedPane resourcecontainer;
897	942	cGridBag currenttab;
898		- boolean added; // patch for jar
	943	+ //boolean added; // patch for jar
899	944
	945	+ int totalcount = 0;
	946	+
900	947	int tabcount = 0;
901	948	int colcount = 0;
902	949	int rowcount = 0;
	950	+ int texturecount = 0;
903	951
904	952	int columns = 5;
905	953	int rows = 7;
906	954
907	955	public void ResourceCallBack(String[] path)
908	956	{
909		- for (int i = 0; i < path.length; i++)
910		- System.out.print(path[i] + "/");
911		- System.out.println();
912		- if (rowcount == 0)
	957	+// for (int i = 0; i < path.length; i++)
	958	+// System.out.print(path[i] + "/");
	959	+// System.out.println();
	960	+
	961	+ if (//rowcount == 0 \|\|
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
913	963	{
914	964	currenttab = new cGridBag();
915		- added = false;
916		- String tabname = String.valueOf((char)('A'+tabcount));
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
917	966	currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
918	970	rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
919	973	}
920	974
921		- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
922	976	{
923		- if (!added)
	977	+ //if (!added)
924	978	{
925		- added = true;
926		- resourcecontainer.add(currenttab);
927		- String tabname = String.valueOf((char)('A'+tabcount));
928		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
929	982	}
930	983
931		- AddTextureButton(path[0], path[1], currenttab);
	984	+ columns = 5;
	985	+
	986	+ if (path[0].contains("D&R") \|\| path[0].contains("Paint"))
	987	+ columns = 4;
	988	+
	989	+ AddTextureButton(path[0], path[1], path[2], ++texturecount, currenttab);
	990	+ totalcount++;
	991	+
932	992	if (++colcount >= columns)
933	993	{
934	994	colcount = 0;
..	..	@@ -949,10 +1009,12 @@
949	1009
950	1010	void CreateTexturePanel(cGridBag container)
951	1011	{
952		- resourcecontainer = new JTabbedPane();
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
953	1013	container.add(resourcecontainer);
954	1014
955	1015	Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
956	1018	}
957	1019
958	1020	void SetupUI2(ObjEditor oe)
..	..	@@ -972,11 +1034,6 @@
972	1034	//new Exception().printStackTrace();
973	1035
974	1036	oe.radioPanel = new JPanel(new GridBagLayout());
975		- oe.aConstraints.weightx = 1;
976		- oe.aConstraints.weighty = 0;
977		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
978		- oe.aConstraints.gridwidth = 100;
979		- oe.aConstraints.gridheight = 1;
980	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
981	1038
982	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -997,9 +1054,9 @@
997	1054	oe.radioPanel.add(dummyButton);
998	1055	oe.buttonGroup.add(dummyButton);
999	1056	*/
1000		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
1001	1058
1002		- copyOptionsPanel.preferredHeight = 2;
	1059	+ versionManagerPanel.preferredHeight = 4;
1003	1060
1004	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1005	1062
..	..	@@ -1009,62 +1066,102 @@
1009	1066
1010	1067	if (Globals.ADVANCED)
1011	1068	{
1012		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013		- maxButton.setToolTipText("Maximize window");
1014		- maxButton.addActionListener(this);
	1069	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1070	+// maxButton.setToolTipText("Maximize window");
	1071	+// maxButton.addActionListener(this);
1015	1072	}
1016	1073
1017		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018		- fullButton.setToolTipText("Full-screen window");
1019		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
1020	1075
1021		- oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1076	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+// gcButton.setToolTipText("Garbage collect");
	1078	+// gcButton.addActionListener(new ActionListener()
	1079	+// {
	1080	+// public void actionPerformed(ActionEvent e)
	1081	+// {
	1082	+// System.gc();
	1083	+// }
	1084	+// });
	1085	+
	1086	+ oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1087	+ fullScreenButton.setToolTipText("Full-screen window");
	1088	+ fullScreenButton.addActionListener(this);
	1089	+
	1090	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1091	+ collapseButton.setToolTipText("Collapse toolbar");
	1092	+ collapseButton.addActionListener(this);
	1093	+
	1094	+// oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1095	+// maximize3DButton.setToolTipText("Maximize 3D view");
	1096	+// maximize3DButton.addActionListener(this);
	1097	+
	1098	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1099	+ twoButton.setToolTipText("Show 3D view only");
	1100	+ twoButton.addActionListener(this);
	1101	+ this.fullscreenLayout = twoButton;
	1102	+
	1103	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1104	+ threeButton.setToolTipText("Show controls and 3D view");
	1105	+ threeButton.addActionListener(this);
	1106	+ if (Globals.ADVANCED)
	1107	+ {
	1108	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ sixButton.setToolTipText("Show 3D view and controls");
	1110	+ sixButton.addActionListener(this);
	1111	+ }
	1112	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+// sevenButton.setToolTipText("3-column layout");
	1114	+// sevenButton.addActionListener(this);
	1115	+ //
	1116	+
	1117	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1022	1118	screenfitButton.setToolTipText("Screen fit");
1023	1119	screenfitButton.addActionListener(this);
1024	1120
1025		- oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1121	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1026	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
1027	1123	restoreCameraButton.addActionListener(this);
1028	1124
1029		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1125	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1030	1126	saveVersionButton.setToolTipText("Duplicate current version");
1031	1127	saveVersionButton.addActionListener(this);
1032	1128
1033		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1034	1130	deleteVersionButton.setToolTipText("Delete current version");
1035	1131	deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
1036	1133
1037		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1038	1135	previousVersionButton.setToolTipText("Previous version");
1039	1136	previousVersionButton.addActionListener(this);
1040	1137	previousVersionButton.setEnabled(false);
1041	1138
1042	1139	cGridBag updown = new cGridBag().setVertical(true);
1043		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1044	1141	restoreButton.setToolTipText("Undo (restore current version)");
1045	1142	restoreButton.addActionListener(this);
1046		- //restoreButton.setEnabled(false);
	1143	+ restoreButton.setEnabled(false);
1047	1144
1048		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1049	1146	replaceButton.setToolTipText("Save (replace current version)");
1050	1147	replaceButton.addActionListener(this);
1051		- //replaceButton.setEnabled(false);
	1148	+ replaceButton.setEnabled(false);
1052	1149
1053		- copyOptionsPanel.add(updown);
	1150	+ versionManagerPanel.add(updown);
1054	1151
1055		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1056	1153	nextVersionButton.setToolTipText("Next version");
1057	1154	nextVersionButton.addActionListener(this);
1058	1155	nextVersionButton.setEnabled(false);
	1156	+
	1157	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1158	+ oneStepButton.setToolTipText("Animate one step forward");
	1159	+ oneStepButton.addActionListener(this);
1059	1160
1060	1161	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1061	1162	liveCB.setToolTipText("Enable animation");
1062	1163	liveCB.addItemListener(this);
1063	1164
1064		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065		- oneStepButton.setToolTipText("Animate one step forward");
1066		- oneStepButton.addActionListener(this);
1067		-
1068	1165	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1069	1166	fastCB.setToolTipText("Fast mode");
1070	1167	fastCB.addItemListener(this);
..	..	@@ -1080,110 +1177,97 @@
1080	1177
1081	1178	if (Globals.ADVANCED)
1082	1179	{
1083		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084	1181	snapobjectButton.addActionListener(this);
1085	1182	snapobjectButton.setToolTipText("Snap Object");
1086	1183
1087		- oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1184	+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1088	1185	fourButton.addActionListener(this);
1089	1186	fourButton.setToolTipText("Show control panel only");
1090	1187	}
1091	1188
1092	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1093	1190
1094		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095		- twoButton.setToolTipText("Show 3D view only");
1096		- twoButton.addActionListener(this);
1097		- this.fullscreenLayout = twoButton;
1098		-
1099		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100		- threeButton.setToolTipText("Show controls and 3D view");
1101		- threeButton.addActionListener(this);
1102		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103		- sixButton.setToolTipText("Show 3D view and controls");
1104		- sixButton.addActionListener(this);
1105		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106		-// sevenButton.setToolTipText("3-column layout");
1107		-// sevenButton.addActionListener(this);
1108		- //
1109	1191
1110		- oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1192	+ oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1111	1193	rootButton.setToolTipText("Open selection in new tab");
1112	1194	rootButton.addActionListener(this);
1113	1195
1114		- oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1196	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1115	1197	closeButton.setToolTipText("Close tab");
1116	1198	closeButton.addActionListener(this);
1117	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
1118	1200	//clearButton.addActionListener(this);
1119	1201
1120	1202	cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
1121	1204
1122	1205	// INSERT
1123		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124		- gridButton.setToolTipText("Create grid");
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
1125	1208	gridButton.addActionListener(this);
1126	1209
1127		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1128	1211	boxButton.setToolTipText("Create box");
1129	1212	boxButton.addActionListener(this);
1130	1213
1131		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1132		- sphereButton.setToolTipText("Create sphere");
1133		- sphereButton.addActionListener(this);
1134		-
1135		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136		- coneButton.setToolTipText("Create cone");
1137		- coneButton.addActionListener(this);
1138		-
1139		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140		- torusButton.setToolTipText("Create torus");
1141		- torusButton.addActionListener(this);
1142		-
1143		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1144	1215	superButton.setToolTipText("Create superellipsoid");
1145	1216	superButton.addActionListener(this);
1146	1217
1147		- if (Globals.ADVANCED)
	1218	+ row1.add(sphereButton = GetButton("icons/sphere.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1219	+ sphereButton.setToolTipText("Create sphere");
	1220	+ sphereButton.addActionListener(this);
	1221	+
	1222	+ row1.add(coneButton = GetButton("icons/cone.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1223	+ coneButton.setToolTipText("Create cone");
	1224	+ coneButton.addActionListener(this);
	1225	+
	1226	+ row1.add(torusButton = GetButton("icons/torus.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1227	+ torusButton.setToolTipText("Create torus");
	1228	+ torusButton.addActionListener(this);
	1229	+
	1230	+ if (false) //Globals.ADVANCED)
1148	1231	{
1149		- oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1150	1233	kleinButton.setToolTipText("Create Klein bottle");
1151	1234	kleinButton.addActionListener(this);
1152	1235	}
1153	1236
1154		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1155	1238	particlesButton.setToolTipText("Create particle system");
1156	1239	particlesButton.addActionListener(this);
1157	1240
1158	1241	oe.toolboxPanel.add(row1);
1159	1242
1160	1243	cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
1161	1245
1162		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1163	1247	groupButton.setToolTipText("Create group");
1164	1248	groupButton.addActionListener(this);
1165	1249
1166		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1167	1251	compositeButton.setToolTipText("Create composite");
1168	1252	compositeButton.addActionListener(this);
1169	1253
1170		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1171	1255	switchButton.setToolTipText("Create item switcher");
1172	1256	switchButton.addActionListener(this);
1173	1257
1174		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1175	1259	loopButton.setToolTipText("Create loop");
1176	1260	loopButton.addActionListener(this);
1177	1261
1178		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1179	1263	textureButton.setToolTipText("Create texture");
1180	1264	textureButton.addActionListener(this);
1181	1265
1182		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183	1267	overlayButton.setToolTipText("Create overlay");
1184	1268	overlayButton.addActionListener(this);
1185	1269
1186		- row2.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1270	+ row2.add(lightButton = GetButton("icons/light-bulb.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187	1271	lightButton.setToolTipText("Create light");
1188	1272	lightButton.addActionListener(this);
1189	1273
..	..	@@ -1193,6 +1277,11 @@
1193	1277
1194	1278	CreateTexturePanel(textures);
1195	1279
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
1196	1285	oe.toolboxPanel.add(textures);
1197	1286
1198	1287	textures.preferredHeight = 100;
..	..	@@ -1200,11 +1289,11 @@
1200	1289	CreateSkyboxPanel(oe.skyboxPanel);
1201	1290
1202	1291	// EDIT panel
1203		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1204	1293	editButton.setToolTipText("Pin selection controls");
1205	1294	editButton.addActionListener(this);
1206	1295
1207		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1208	1297	uneditButton.setToolTipText("Unpin and remove selection controls");
1209	1298	uneditButton.addActionListener(this);
1210	1299
..	..	@@ -1212,7 +1301,7 @@
1212	1301	allParamsButton.setToolTipText("Show all controls");
1213	1302	allParamsButton.addActionListener(this);
1214	1303
1215		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1305	clearPanelButton.setToolTipText("Clear all controls");
1217	1306	clearPanelButton.addActionListener(this);
1218	1307
..	..	@@ -1220,7 +1309,7 @@
1220	1309	//unselectButton.setToolTipText("Unselect");
1221	1310	//unselectButton.addActionListener(this);
1222	1311
1223		- editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1312	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1224	1313	flashSelectionButton.setToolTipText("Highlight selection");
1225	1314	flashSelectionButton.addActionListener(this);
1226	1315
..	..	@@ -1243,6 +1332,8 @@
1243	1332
1244	1333	cGridBag jSPPanel = new cGridBag();
1245	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
1246	1337	JScrollPane jSP;
1247	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1248	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1251,11 +1342,12 @@
1251	1342	oe.treePanel.add(jSPPanel);
1252	1343	oe.treePanel.Return();
1253	1344
1254		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
1255	1346	oe.treePanel.Return();
1256		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1257		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1258		- sliderPane.preferredHeight = 1;
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
1259	1351
1260	1352	// mainPanel.setDividerLocation(0.1); //1.0);
1261	1353	mainPanel.setResizeWeight(0.4);
..	..	@@ -1312,7 +1404,7 @@
1312	1404	// supportCB.setToolTipText("Enable rigging");
1313	1405	// supportCB.addItemListener(this);
1314	1406
1315		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1316	1408	freezeCB.setToolTipText("Fast moving camera");
1317	1409	freezeCB.addItemListener(this);
1318	1410
..	..	@@ -1321,9 +1413,12 @@
1321	1413
1322	1414	panel.Return();
1323	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
1324	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1325	1419	crowdCB.setToolTipText("Used for crowds");
1326	1420	crowdCB.addItemListener(this);
	1421	+ }
1327	1422
1328	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1329	1424	smoothCB.setToolTipText("Snapping delay");
..	..	@@ -1336,30 +1431,26 @@
1336	1431	minshaderCB.setToolTipText("Minimal fast shader");
1337	1432	minshaderCB.addItemListener(this);
1338	1433
1339		-// constraints.gridy += 1;
1340	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1341	1435	// speakerMocapCB.addItemListener(this);
1342	1436
1343		- panel.Return();
1344		-
1345	1437	if (false)
1346	1438	{
1347	1439	// handled in scripts
1348		- //constraints.gridy += 1;
1349	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1350	1441	speakerCameraCB.addItemListener(this);
1351	1442
1352		- //constraints.gridy += 1;
1353	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1354	1444	speakerFocusCB.addItemListener(this);
1355	1445
1356		- //constraints.gridy += 1;
1357		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1358		- smoothfocusCB.addItemListener(this);
1359	1446	panel.Return();
1360	1447	}
1361	1448
1362		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
1363	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1364	1455	// debugCB.addItemListener(this);
1365	1456
..	..	@@ -1413,6 +1504,14 @@
1413	1504
1414	1505	void EditObject(Object3D obj)
1415	1506	{
	1507	+ //assert(obj instanceof Composite);
	1508	+
	1509	+// if (obj.versionlist == null)
	1510	+// {
	1511	+// obj.versionlist = new Object3D[100];
	1512	+// obj.versionindex = -1;
	1513	+// }
	1514	+
1416	1515	cRadio radioButton = new cRadio(obj.name);
1417	1516
1418	1517	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1437,6 +1536,7 @@
1437	1536
1438	1537	oe.SetupViews();
1439	1538
	1539	+ if (Globals.DEBUG)
1440	1540	System.out.println("SetupViews");
1441	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1442	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1803,7 +1903,12 @@
1803	1903	TreePath path;
1804	1904
1805	1905	public TransferableTreePath(TreePath tp) {
1806		- path = tp;
	1906	+ Object[] objs = new Object[tp.getPathCount()];
	1907	+ for (int i=0; i<objs.length; i++)
	1908	+ {
	1909	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1910	+ }
	1911	+ path = new TreePath(objs);
1807	1912	}
1808	1913
1809	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1984,7 +2089,7 @@
1984	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1985	2090	objEditor.ScreenFit(obj, false);
1986	2091
1987		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1988	2093	refreshContents();
1989	2094	}
1990	2095
..	..	@@ -2021,7 +2126,7 @@
2021	2126	obj.parent.TransformToWorld(maxima); //, maxima);
2022	2127	}
2023	2128
2024		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
2025	2130
2026	2131	shadow.toParent = LA.newMatrix();
2027	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -2035,24 +2140,24 @@
2035	2140	switch(axis)
2036	2141	{
2037	2142	case 0 :
2038		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2039		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
2040		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2041		- vert4.x = minima.x; vert4.y = maxima.y; vert4.z = maxima.z;
	2143	+ vert1.x = minima.x + 0.001f; vert1.y = minima.y; vert1.z = minima.z;
	2144	+ vert2.x = minima.x + 0.001f; vert2.y = maxima.y; vert2.z = minima.z;
	2145	+ vert3.x = minima.x + 0.001f; vert3.y = minima.y; vert3.z = maxima.z;
	2146	+ vert4.x = minima.x + 0.001f; vert4.y = maxima.y; vert4.z = maxima.z;
2042	2147	norm = cVector.X;
2043	2148	break;
2044	2149	case 1 :
2045		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2046		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2047		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
2048		- vert4.x = maxima.x; vert4.y = minima.y; vert4.z = maxima.z;
	2150	+ vert1.x = minima.x; vert1.y = minima.y + 0.001f; vert1.z = minima.z;
	2151	+ vert2.x = maxima.x; vert2.y = minima.y + 0.001f; vert2.z = minima.z;
	2152	+ vert3.x = minima.x; vert3.y = minima.y + 0.001f; vert3.z = maxima.z;
	2153	+ vert4.x = maxima.x; vert4.y = minima.y + 0.001f; vert4.z = maxima.z;
2049	2154	norm = cVector.Y;
2050	2155	break;
2051	2156	case 2 :
2052		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
2053		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
2054		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
2055		- vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z;
	2157	+ vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z + 0.001f;
	2158	+ vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z + 0.001f;
	2159	+ vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z + 0.001f;
	2160	+ vert4.x = maxima.x; vert4.y = maxima.y; vert4.z = minima.z + 0.001f;
2056	2161	norm = cVector.Z;
2057	2162	break;
2058	2163	}
..	..	@@ -2093,7 +2198,11 @@
2093	2198	shadow.material = new cMaterial(obj.material);
2094	2199	shadow.material.diffuse = 0.0001f;
2095	2200	shadow.material.specular = 0.0001f;
2096		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
2097	2206
2098	2207	makeSomething(shadow);
2099	2208	}
..	..	@@ -2614,27 +2723,35 @@
2614	2723	} else
2615	2724	if (source == loopItem \|\| source == loopButton)
2616	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
2617	2728	Composite csg = new GroupLeaf();
2618		- csg.count = 5;
2619	2729	group(csg);
	2730	+ csg.count = 5;
2620	2731	Composite child = new cGroup("Branch");
2621	2732	csg.addChild(child);
2622	2733	child.addChild(csg);
	2734	+ }
2623	2735	} else
2624	2736	if (source == doubleItem)
2625	2737	{
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
2626	2740	Composite csg = new GroupLeaf("Fork");
2627		- csg.count = 5;
2628	2741	group(csg);
	2742	+ csg.count = 5;
2629	2743	Composite child = new cGroup("Branch A");
2630	2744	csg.addChild(child);
2631	2745	child.addChild(csg);
2632	2746	child = new cGroup("Branch B");
2633	2747	csg.addChild(child);
2634	2748	child.addChild(csg);
	2749	+ }
2635	2750	} else
2636	2751	if (source == tripleItem)
2637	2752	{
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
2638	2755	Composite csg = new GroupLeaf("Trident");
2639	2756	csg.count = 4;
2640	2757	group(csg);
..	..	@@ -2647,6 +2764,7 @@
2647	2764	child = new cGroup();
2648	2765	csg.addChild(child);
2649	2766	child.addChild(csg);
	2767	+ }
2650	2768	} else
2651	2769	if (source == computeAOItem)
2652	2770	{
..	..	@@ -2693,10 +2811,22 @@
2693	2811	{
2694	2812	Maximize();
2695	2813	} else
2696		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2697	2815	{
2698	2816	ToggleFullScreen();
2699	2817	} else
	2818	+ if (source == collapseButton)
	2819	+ {
	2820	+ this.expandedLayout = radio.layout;
	2821	+ CollapseToolbar();
	2822	+ } else
	2823	+// if (source == maximize3DButton)
	2824	+// {
	2825	+// this.expandedLayout = radio.layout;
	2826	+// radio.layout = twoButton;
	2827	+// CollapseToolbar();
	2828	+// Show3DView();
	2829	+// } else
2700	2830	if (source == previousVersionButton)
2701	2831	{
2702	2832	// Go to previous version
..	..	@@ -2724,7 +2854,7 @@
2724	2854	if (source == saveVersionButton)
2725	2855	{
2726	2856	// Save a new version
2727		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2728	2858	java.awt.Toolkit.getDefaultToolkit().beep();
2729	2859	} else
2730	2860	if (source == deleteVersionButton)
..	..	@@ -3270,22 +3400,34 @@
3270	3400	} else
3271	3401	if (source == ungroupItem \|\| source == ungroupButton)
3272	3402	{
3273		- boolean hasRoot = false;
	3403	+ boolean canUngroup = true;
3274	3404
3275	3405	for (int i=0; i<group.selection.size(); i++)
3276	3406	{
3277		- if (group.selection.get(i) == group)
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
3278	3410	{
3279		- hasRoot = true;
	3411	+ // Cannot ungroup leaves
	3412	+ canUngroup = false;
	3413	+ break;
	3414	+ }
	3415	+
	3416	+ if (selectedItem == group)
	3417	+ {
	3418	+ // Cannot ungroup root
	3419	+ canUngroup = false;
3280	3420	break;
3281	3421	}
3282	3422	}
3283	3423
3284		- if (!hasRoot)
	3424	+ if (canUngroup)
3285	3425	{
3286	3426	for (int i=0; i<group.selection.size(); i++)
3287	3427	{
3288		- Ungroup(group.selection.get(i));
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
3289	3431	}
3290	3432
3291	3433	ClearSelection(false);
..	..	@@ -3336,6 +3478,10 @@
3336	3478	if (source == clearMaterialsItem)
3337	3479	{
3338	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
3339	3485	} else
3340	3486	if (source == liveleavesItem)
3341	3487	{
..	..	@@ -3476,6 +3622,18 @@
3476	3622	if (source == transformChildrenItem)
3477	3623	{
3478	3624	TransformChildren();
	3625	+ } else
	3626	+ if (source == textureRatioRItem)
	3627	+ {
	3628	+ TextureRatio(0);
	3629	+ } else
	3630	+ if (source == textureRatioGItem)
	3631	+ {
	3632	+ TextureRatio(1);
	3633	+ } else
	3634	+ if (source == textureRatioBItem)
	3635	+ {
	3636	+ TextureRatio(2);
3479	3637	} else
3480	3638	if (source == resetTransformItem)
3481	3639	{
..	..	@@ -3648,38 +3806,7 @@
3648	3806	if (CameraPane.FULLSCREEN)
3649	3807	fullscreenLayout = radio.layout;
3650	3808
3651		- // bug
3652		- //gridPanel.setDividerLocation(1.0);
3653		- //bigPanel.setDividerLocation(0.0);
3654		-// bigThree.remove(scenePanel);
3655		-// bigThree.remove(centralPanel);
3656		-// bigThree.remove(XYZPanel);
3657		-// aWindowConstraints.gridx = 0;
3658		-// aWindowConstraints.gridy = 0;
3659		-// aWindowConstraints.gridwidth = 1;
3660		-// // aConstraints.gridheight = 3;
3661		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3662		-// aWindowConstraints.weightx = 0;
3663		-// aWindowConstraints.weighty = 1;
3664		-// //bigThree.add(jtp, aWindowConstraints);
3665		-// aWindowConstraints.weightx = 1;
3666		-// aWindowConstraints.gridwidth = 3;
3667		-// // aConstraints.gridheight = 3;
3668		-// aWindowConstraints.gridx = 1;
3669		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3670		-// bigThree.add(centralPanel, aWindowConstraints);
3671		-// aWindowConstraints.weightx = 0;
3672		-// aWindowConstraints.gridx = 4;
3673		-// aWindowConstraints.gridwidth = 1;
3674		-// // aConstraints.gridheight = 3;
3675		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3676		-// //bigThree.add(XYZPanel, aWindowConstraints);
3677		-// scenePanel.setVisible(false);
3678		-// centralPanel.setVisible(true);
3679		-// XYZPanel.setVisible(false);
3680		- bigThree.ClearUI();
3681		- bigThree.add(centralPanel);
3682		- bigThree.FlushUI();
	3809	+ Show3DView();
3683	3810
3684	3811	cameraView.requestFocusInWindow();
3685	3812
..	..	@@ -3865,6 +3992,7 @@
3865	3992	} else
3866	3993	if (source == rootButton)
3867	3994	{
	3995	+ Replace();
3868	3996	Object3D obj;
3869	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3870	3998	{
..	..	@@ -3879,6 +4007,9 @@
3879	4007	if (source == closeButton)
3880	4008	{
3881	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3882	4013	cRadio ab;
3883	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3884	4015	{
..	..	@@ -3977,6 +4108,9 @@
3977	4108	} else
3978	4109	if(source instanceof cRadio)
3979	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3980	4114	group.parent = keepparent;
3981	4115	group.attributes = 0;
3982	4116	//group.editWindow = null;
..	..	@@ -4001,8 +4135,6 @@
4001	4135
4002	4136	copy = group;
4003	4137
4004		- SetUndoStates();
4005		-
4006	4138	//Globals.theRenderer.object = group;
4007	4139	if(!useclient)
4008	4140	{
..	..	@@ -4030,6 +4162,32 @@
4030	4162	*/
4031	4163	radio.layout.doClick();
4032	4164
	4165	+ //assert(copy instanceof Composite);
	4166	+
	4167	+ if (copy.versionlist == null)
	4168	+ {
	4169	+ copy.versionindex = -1;
	4170	+
	4171	+ // Cannot work with loops
	4172	+ // To fix this issue, we first mark all nodes above the root,
	4173	+ // and check if any of these nodes are reachable below the root.
	4174	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4175	+
	4176	+ if (copy instanceof Composite && !copy.HasTags())
	4177	+ {
	4178	+ if (copy.versionlist == null)
	4179	+ copy.versionlist = new Object3D[100];
	4180	+
	4181	+ //Save(true);
	4182	+ }
	4183	+ else
	4184	+ copy.versionindex = -2;
	4185	+
	4186	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4187	+ }
	4188	+
	4189	+ SetVersionStates();
	4190	+
4033	4191	ClearUnpinned();
4034	4192
4035	4193	//Grafreed.Assert(group != null);
..	..	@@ -4143,9 +4301,46 @@
4143	4301	refreshContents();
4144	4302	}
4145	4303
	4304	+ void TextureRatio(int axis)
	4305	+ {
	4306	+ Object3D obj;
	4307	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4308	+ {
	4309	+ obj = (Object3D)e.nextElement();
	4310	+ obj.TextureRatio(axis);
	4311	+ }
	4312	+
	4313	+ refreshContents();
	4314	+ }
	4315	+
4146	4316	void ResetTransform()
4147	4317	{
4148	4318	ResetTransform(-1);
	4319	+ }
	4320	+
	4321	+ void ScaleSelection(int scale)
	4322	+ {
	4323	+ Object3D obj;
	4324	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	4325	+ {
	4326	+ obj = (Object3D)e.nextElement();
	4327	+
	4328	+ if (obj.toParent == null)
	4329	+ continue;
	4330	+
	4331	+ obj.Scale(scale);
	4332	+
	4333	+ if (obj.parent == null)
	4334	+ {
	4335	+ System.out.println("NULL PARENT!");
	4336	+ // new Exception().printStackTrace();
	4337	+ }
	4338	+ else
	4339	+ TouchTransform(obj);
	4340	+ //obj.parent.Touch();
	4341	+ }
	4342	+
	4343	+ refreshContents();
4149	4344	}
4150	4345
4151	4346	void ResetTransform(int mask)
..	..	@@ -4158,42 +4353,8 @@
4158	4353	if (obj.toParent == null)
4159	4354	continue;
4160	4355
4161		- if (mask == -1)
4162		- {
4163		- if (obj instanceof Camera) // jan 2014
4164		- {
4165		- LA.matIdentity(obj.toParent);
4166		- LA.matIdentity(obj.fromParent);
4167		- }
4168		- else
4169		- {
4170		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4171		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4172		- }
4173		- TouchTransform(obj);
4174		- continue;
4175		- }
4176		- if ((mask&2) != 0) // Scale
4177		- {
4178		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4179		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4180		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4181		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4182		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4183		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4184		- }
4185		- if ((mask&4) != 0) // Rotation
4186		- {
4187		- // ?
4188		- }
4189		- if ((mask&1) != 0) // Translation
4190		- {
4191		- if (obj.toParent != null)
4192		- {
4193		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4194		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4195		- }
4196		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
4197	4358	if (obj.parent == null)
4198	4359	{
4199	4360	System.out.println("NULL PARENT!");
..	..	@@ -4702,10 +4863,17 @@
4702	4863	{
4703	4864	Object3D obj = group.selection.get(i);
4704	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4705	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4706	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4707	4874	}
4708	4875
	4876	+ Globals.lighttouched = true;
4709	4877	refreshContents();
4710	4878	}
4711	4879
..	..	@@ -4993,6 +5161,12 @@
4993	5161	refreshContents();
4994	5162	}
4995	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4996	5170	void FlipV(boolean flip)
4997	5171	{
4998	5172	group.selection.FlipV(flip);
..	..	@@ -5231,10 +5405,10 @@
5231	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5232	5406	// a camera
5233	5407	{
5234		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	5408	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crashes the camera because of invalid lightspace
5235	5409	{
5236	5410	CameraPane.camerachangeframe = 0; // don't refuse it
5237		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5238	5412	}
5239	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5240	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -5264,10 +5438,26 @@
5264	5438	flashSelectionButton.setEnabled(enabled);
5265	5439
5266	5440	clearPanelButton.setEnabled(!listUI.isEmpty());
	5441	+
	5442	+ boolean allComposites = true;
	5443	+
	5444	+ if (group.selection != null)
	5445	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5446	+ {
	5447	+ Object next = e.nextElement();
	5448	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5449	+ {
	5450	+ allComposites = false;
	5451	+ break;
	5452	+ }
	5453	+ }
	5454	+
	5455	+ rootButton.setEnabled(true); // allComposites);
5267	5456	}
5268	5457
5269	5458	void refreshContents(boolean cp)
5270	5459	{
	5460	+ if (Globals.SHOWINFO)
5271	5461	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5272	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5273	5463	{
..	..	@@ -5278,7 +5468,7 @@
5278	5468	Object3D child = (Object3D) group.selection.get(i);
5279	5469
5280	5470	objEditor.AddInfo(child, this, true);
5281		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
5282	5472	}
5283	5473
5284	5474	objEditor.SetText(); // jan 2014
..	..	@@ -6161,11 +6351,11 @@
6161	6351	private MenuItem lookAtItem;
6162	6352	private MenuItem lookFromItem;
6163	6353	private MenuItem switchViewItem;
6164		- private MenuItem cutItem;
	6354	+ private JMenuItem cutItem;
6165	6355	private MenuItem undoItem;
6166	6356	private MenuItem redoItem;
6167	6357	private JMenuItem duplicateItem;
6168		- private MenuItem cloneItem;
	6358	+ private JMenuItem cloneItem;
6169	6359	private MenuItem cloneSupportItem;
6170	6360	private MenuItem overwriteGeoItem;
6171	6361	private MenuItem overwriteMatItem;
..	..	@@ -6186,13 +6376,13 @@
6186	6376	private MenuItem cloneGeometriesItem;
6187	6377	private MenuItem shareGeometriesItem;
6188	6378	private MenuItem mergeGeometriesItem;
6189		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
6190	6380	private MenuItem pasteItem;
6191		- private MenuItem pasteIntoItem;
6192		- private MenuItem pasteLinkItem;
6193		- private MenuItem pasteCloneItem;
6194		- private MenuItem pasteExpandItem;
6195		- private MenuItem deleteItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
6196	6386	private MenuItem clearAllItem;
6197	6387	private MenuItem genUVItem;
6198	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -6218,6 +6408,7 @@
6218	6408	private MenuItem clipMeshItem;
6219	6409	private MenuItem smoothMeshItem;
6220	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
6221	6412
6222	6413	private MenuItem liveleavesItem;
6223	6414	private MenuItem unliveleavesItem;
..	..	@@ -6241,13 +6432,16 @@
6241	6432	private MenuItem maxTexturesItem;
6242	6433	private MenuItem panoTexturesItem;
6243	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
6244	6438	private MenuItem resetCentroidItem;
6245	6439	private MenuItem resetCentroidXZItem;
6246	6440	private MenuItem resetTransformItem;
6247	6441	private MenuItem transformGeometryItem;
6248	6442	private MenuItem transformChildrenItem;
6249	6443	private MenuItem hideItem;
6250		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
6251	6445	private MenuItem backItem;
6252	6446	private MenuItem frontItem;
6253	6447	private MenuItem cameraItem;
..	..	@@ -6260,7 +6454,7 @@
6260	6454	private MenuItem switchTransfoItem;
6261	6455	private MenuItem morphItem;
6262	6456	private MenuItem linkerItem;
6263		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
6264	6458	private MenuItem editItem;
6265	6459	private MenuItem openWindowItem;
6266	6460	private MenuItem editLeafItem;