~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);
..	..	@@ -396,11 +405,15 @@
396	405	this.copy = this.group = group;
397	406	//selectees = this.group.selectees;
398	407
399		- if (copy.versionlist == null)
400		- {
401		- copy.versionlist = new Object3D[100];
402		- copy.versionindex = -1;
403		- }
	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	+// }
404	417
405	418	if(ui)
406	419	SetupUI(objEditor);
..	..	@@ -423,13 +436,13 @@
423	436
424	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
425	438
426		- if (copy.versionlist == null)
427		- {
428		- copy.versionlist = new Object3D[100];
429		- copy.versionindex = -1;
430		-
431		- Save(true);
432		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
433	446	}
434	447
435	448	void CloneSelection(boolean supports)
..	..	@@ -470,11 +483,16 @@
470	483
471	484	Object3D parent = obj.parent;
472	485	obj.parent = null;
	486	+
473	487	// Object3D support = obj.support;
474	488	// obj.support = null;
475	489	if (!supports)
476	490	obj.SaveSupports();
	491	+
477	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
478	496	obj.parent = parent;
479	497	// obj.support = support;
480	498	// clone.support = support; // aout 2013
..	..	@@ -519,33 +537,37 @@
519	537	// menu.add("-");
520	538	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
521	539	duplicateItem.addActionListener(this);
522		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
523	542	cloneItem.addActionListener(this);
524		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
525	544	{
526	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
527	546	cloneSupportItem.addActionListener(this);
528	547	}
	548	+ oe.jTree.popup.addSeparator();
529	549	menu.add("-");
530		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
531	551	cutItem.addActionListener(this);
532		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
533	553	copyItem.addActionListener(this);
534	554	pasteItem = menu.add(new MenuItem("Paste"));
535	555	pasteItem.addActionListener(this);
536	556
537		- menu.add("-");
538		- 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"));
539	560	pasteIntoItem.addActionListener(this);
540		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
541	562	pasteLinkItem.addActionListener(this);
542		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
543	564	pasteCloneItem.addActionListener(this);
544		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
545		-// pasteExpandItem.addActionListener(this);
546		- menu.add("-");
547		- deleteItem = menu.add(new MenuItem("Delete"));
548		- 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();
549	571
550	572	if (Globals.ADVANCED)
551	573	{
..	..	@@ -631,11 +653,9 @@
631	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
632	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
633	655	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
634		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
635	656	oe.cameraMenu.add("-");
636	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
637	658	openWindowItem.addActionListener(this);
638		- editLeafItem.addActionListener(this);
639	659	lookAtItem.addActionListener(this);
640	660	//lookFromItem.addActinoListener(this);
641	661	//switchViewItem.addActionListener(this);
..	..	@@ -682,9 +702,8 @@
682	702	setMasterItem.addActionListener(this);
683	703	}
684	704
685		- oe.menuBar.add(menu = new Menu("Group"));
686		-// grabItem = menu.add(new MenuItem("Grab"));
687		-// grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
688	707	backItem = menu.add(new MenuItem("Back"));
689	708	backItem.addActionListener(this);
690	709	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -692,13 +711,21 @@
692	711	// compositeItem = menu.add(new MenuItem("Composite"));
693	712	// compositeItem.addActionListener(this);
694	713
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
695	717	if (Globals.ADVANCED)
696	718	{
697	719	hideItem = menu.add(new MenuItem("Hidden Group"));
698	720	hideItem.addActionListener(this);
699	721	}
700		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
701	723	ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
702	729
703	730	// menu.add("-");
704	731	//
..	..	@@ -735,9 +762,9 @@
735	762	shadowYItem.addActionListener(this);
736	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
737	764	shadowZItem.addActionListener(this);
	765	+
738	766	attributeItem = menu.add(new MenuItem("Attribute"));
739	767	attributeItem.addActionListener(this);
740		-
741	768	if (Globals.ADVANCED)
742	769	{
743	770	menu.add("-");
..	..	@@ -749,11 +776,18 @@
749	776	pointflowItem.addActionListener(this);
750	777	}
751	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("-");
752	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
753	787	resetTransformItem.addActionListener(this);
754	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
755	789	resetCentroidItem.addActionListener(this);
756		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
757	791	resetCentroidXZItem.addActionListener(this);
758	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
759	793	transformGeometryItem.addActionListener(this);
..	..	@@ -769,7 +803,7 @@
769	803	genNormalsCADItem.addActionListener(this);
770	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
771	805	genNormalsMESHItem.addActionListener(this);
772		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
773	807	{
774	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
775	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -805,6 +839,8 @@
805	839	}
806	840
807	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
808	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
809	845	clearMaterialsItem.addActionListener(this);
810	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -827,9 +863,9 @@
827	863	hideleavesItem.addActionListener(this);
828	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
829	865	showleavesItem.addActionListener(this);
830		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
831	867	markleavesItem.addActionListener(this);
832		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
833	869	unmarkleavesItem.addActionListener(this);
834	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
835	871	rewindleavesItem.addActionListener(this);
..	..	@@ -883,6 +919,9 @@
883	919	shareGeometriesItem.addActionListener(this);
884	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
885	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
886	925	if (Globals.ADVANCED)
887	926	{
888	927	// Pretty much the same as duplicate and clone.
..	..	@@ -901,8 +940,10 @@
901	940
902	941	JTabbedPane resourcecontainer;
903	942	cGridBag currenttab;
904		- boolean added; // patch for jar
	943	+ //boolean added; // patch for jar
905	944
	945	+ int totalcount = 0;
	946	+
906	947	int tabcount = 0;
907	948	int colcount = 0;
908	949	int rowcount = 0;
..	..	@@ -918,28 +959,35 @@
918	959	// System.out.println();
919	960
920	961	if (//rowcount == 0 \|\|
921		- path.length == 1)
	962	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
922	963	{
923	964	currenttab = new cGridBag();
924		- added = false;
925	965	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
926	966	currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
927	970	rowcount = 1;
928	971	colcount = 0;
929	972	texturecount = 0;
930	973	}
931	974
932		- if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
933	976	{
934		- if (!added)
	977	+ //if (!added)
935	978	{
936		- added = true;
937		- resourcecontainer.add(currenttab);
	979	+ //added = true;
938	980	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
940	982	}
941	983
942		- AddTextureButton(path[0], path[1], path[2], texturecount++, 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++;
943	991
944	992	if (++colcount >= columns)
945	993	{
..	..	@@ -965,6 +1013,8 @@
965	1013	container.add(resourcecontainer);
966	1014
967	1015	Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
968	1018	}
969	1019
970	1020	void SetupUI2(ObjEditor oe)
..	..	@@ -984,11 +1034,6 @@
984	1034	//new Exception().printStackTrace();
985	1035
986	1036	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	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
993	1038
994	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1009,9 +1054,9 @@
1009	1054	oe.radioPanel.add(dummyButton);
1010	1055	oe.buttonGroup.add(dummyButton);
1011	1056	*/
1012		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
1013	1058
1014		- copyOptionsPanel.preferredHeight = 2;
	1059	+ versionManagerPanel.preferredHeight = 4;
1015	1060
1016	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1017	1062
..	..	@@ -1021,62 +1066,102 @@
1021	1066
1022	1067	if (Globals.ADVANCED)
1023	1068	{
1024		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- maxButton.setToolTipText("Maximize window");
1026		- 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);
1027	1072	}
1028	1073
1029		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030		- fullButton.setToolTipText("Full-screen window");
1031		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
1032	1075
1033		- 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);
1034	1118	screenfitButton.setToolTipText("Screen fit");
1035	1119	screenfitButton.addActionListener(this);
1036	1120
1037		- 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);
1038	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
1039	1123	restoreCameraButton.addActionListener(this);
1040	1124
1041		- 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);
1042	1126	saveVersionButton.setToolTipText("Duplicate current version");
1043	1127	saveVersionButton.addActionListener(this);
1044	1128
1045		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1046	1130	deleteVersionButton.setToolTipText("Delete current version");
1047	1131	deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
1048	1133
1049		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1050	1135	previousVersionButton.setToolTipText("Previous version");
1051	1136	previousVersionButton.addActionListener(this);
1052	1137	previousVersionButton.setEnabled(false);
1053	1138
1054	1139	cGridBag updown = new cGridBag().setVertical(true);
1055		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1056	1141	restoreButton.setToolTipText("Undo (restore current version)");
1057	1142	restoreButton.addActionListener(this);
1058		- //restoreButton.setEnabled(false);
	1143	+ restoreButton.setEnabled(false);
1059	1144
1060		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1061	1146	replaceButton.setToolTipText("Save (replace current version)");
1062	1147	replaceButton.addActionListener(this);
1063		- //replaceButton.setEnabled(false);
	1148	+ replaceButton.setEnabled(false);
1064	1149
1065		- copyOptionsPanel.add(updown);
	1150	+ versionManagerPanel.add(updown);
1066	1151
1067		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1068	1153	nextVersionButton.setToolTipText("Next version");
1069	1154	nextVersionButton.addActionListener(this);
1070	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);
1071	1160
1072	1161	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1073	1162	liveCB.setToolTipText("Enable animation");
1074	1163	liveCB.addItemListener(this);
1075	1164
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	1165	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1081	1166	fastCB.setToolTipText("Fast mode");
1082	1167	fastCB.addItemListener(this);
..	..	@@ -1092,110 +1177,97 @@
1092	1177
1093	1178	if (Globals.ADVANCED)
1094	1179	{
1095		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1096	1181	snapobjectButton.addActionListener(this);
1097	1182	snapobjectButton.setToolTipText("Snap Object");
1098	1183
1099		- 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);
1100	1185	fourButton.addActionListener(this);
1101	1186	fourButton.setToolTipText("Show control panel only");
1102	1187	}
1103	1188
1104	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1105	1190
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	1191
1122		- 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);
1123	1193	rootButton.setToolTipText("Open selection in new tab");
1124	1194	rootButton.addActionListener(this);
1125	1195
1126		- 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);
1127	1197	closeButton.setToolTipText("Close tab");
1128	1198	closeButton.addActionListener(this);
1129	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
1130	1200	//clearButton.addActionListener(this);
1131	1201
1132	1202	cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
1133	1204
1134	1205	// INSERT
1135		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136		- gridButton.setToolTipText("Create grid");
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
1137	1208	gridButton.addActionListener(this);
1138	1209
1139		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1140	1211	boxButton.setToolTipText("Create box");
1141	1212	boxButton.addActionListener(this);
1142	1213
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);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1156	1215	superButton.setToolTipText("Create superellipsoid");
1157	1216	superButton.addActionListener(this);
1158	1217
1159		- 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)
1160	1231	{
1161		- 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);
1162	1233	kleinButton.setToolTipText("Create Klein bottle");
1163	1234	kleinButton.addActionListener(this);
1164	1235	}
1165	1236
1166		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1167	1238	particlesButton.setToolTipText("Create particle system");
1168	1239	particlesButton.addActionListener(this);
1169	1240
1170	1241	oe.toolboxPanel.add(row1);
1171	1242
1172	1243	cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
1173	1245
1174		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1175	1247	groupButton.setToolTipText("Create group");
1176	1248	groupButton.addActionListener(this);
1177	1249
1178		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1179	1251	compositeButton.setToolTipText("Create composite");
1180	1252	compositeButton.addActionListener(this);
1181	1253
1182		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1183	1255	switchButton.setToolTipText("Create item switcher");
1184	1256	switchButton.addActionListener(this);
1185	1257
1186		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1187	1259	loopButton.setToolTipText("Create loop");
1188	1260	loopButton.addActionListener(this);
1189	1261
1190		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1191	1263	textureButton.setToolTipText("Create texture");
1192	1264	textureButton.addActionListener(this);
1193	1265
1194		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1195	1267	overlayButton.setToolTipText("Create overlay");
1196	1268	overlayButton.addActionListener(this);
1197	1269
1198		- 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);
1199	1271	lightButton.setToolTipText("Create light");
1200	1272	lightButton.addActionListener(this);
1201	1273
..	..	@@ -1205,6 +1277,11 @@
1205	1277
1206	1278	CreateTexturePanel(textures);
1207	1279
	1280	+ int tabCount = resourcecontainer.getTabCount();
	1281	+
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
1208	1285	oe.toolboxPanel.add(textures);
1209	1286
1210	1287	textures.preferredHeight = 100;
..	..	@@ -1212,11 +1289,11 @@
1212	1289	CreateSkyboxPanel(oe.skyboxPanel);
1213	1290
1214	1291	// EDIT panel
1215		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1216	1293	editButton.setToolTipText("Pin selection controls");
1217	1294	editButton.addActionListener(this);
1218	1295
1219		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1220	1297	uneditButton.setToolTipText("Unpin and remove selection controls");
1221	1298	uneditButton.addActionListener(this);
1222	1299
..	..	@@ -1224,7 +1301,7 @@
1224	1301	allParamsButton.setToolTipText("Show all controls");
1225	1302	allParamsButton.addActionListener(this);
1226	1303
1227		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1228	1305	clearPanelButton.setToolTipText("Clear all controls");
1229	1306	clearPanelButton.addActionListener(this);
1230	1307
..	..	@@ -1232,7 +1309,7 @@
1232	1309	//unselectButton.setToolTipText("Unselect");
1233	1310	//unselectButton.addActionListener(this);
1234	1311
1235		- 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);
1236	1313	flashSelectionButton.setToolTipText("Highlight selection");
1237	1314	flashSelectionButton.addActionListener(this);
1238	1315
..	..	@@ -1255,6 +1332,8 @@
1255	1332
1256	1333	cGridBag jSPPanel = new cGridBag();
1257	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
1258	1337	JScrollPane jSP;
1259	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1260	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1263,11 +1342,12 @@
1263	1342	oe.treePanel.add(jSPPanel);
1264	1343	oe.treePanel.Return();
1265	1344
1266		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
1267	1346	oe.treePanel.Return();
1268		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1269		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1270		- sliderPane.preferredHeight = 1;
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
1271	1351
1272	1352	// mainPanel.setDividerLocation(0.1); //1.0);
1273	1353	mainPanel.setResizeWeight(0.4);
..	..	@@ -1324,7 +1404,7 @@
1324	1404	// supportCB.setToolTipText("Enable rigging");
1325	1405	// supportCB.addItemListener(this);
1326	1406
1327		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1328	1408	freezeCB.setToolTipText("Fast moving camera");
1329	1409	freezeCB.addItemListener(this);
1330	1410
..	..	@@ -1333,9 +1413,12 @@
1333	1413
1334	1414	panel.Return();
1335	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
1336	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1337	1419	crowdCB.setToolTipText("Used for crowds");
1338	1420	crowdCB.addItemListener(this);
	1421	+ }
1339	1422
1340	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1341	1424	smoothCB.setToolTipText("Snapping delay");
..	..	@@ -1348,30 +1431,26 @@
1348	1431	minshaderCB.setToolTipText("Minimal fast shader");
1349	1432	minshaderCB.addItemListener(this);
1350	1433
1351		-// constraints.gridy += 1;
1352	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1353	1435	// speakerMocapCB.addItemListener(this);
1354	1436
1355		- panel.Return();
1356		-
1357	1437	if (false)
1358	1438	{
1359	1439	// handled in scripts
1360		- //constraints.gridy += 1;
1361	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1362	1441	speakerCameraCB.addItemListener(this);
1363	1442
1364		- //constraints.gridy += 1;
1365	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1366	1444	speakerFocusCB.addItemListener(this);
1367	1445
1368		- //constraints.gridy += 1;
1369		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1370		- smoothfocusCB.addItemListener(this);
1371	1446	panel.Return();
1372	1447	}
1373	1448
1374		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
1375	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1376	1455	// debugCB.addItemListener(this);
1377	1456
..	..	@@ -1425,6 +1504,14 @@
1425	1504
1426	1505	void EditObject(Object3D obj)
1427	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	+
1428	1515	cRadio radioButton = new cRadio(obj.name);
1429	1516
1430	1517	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1449,6 +1536,7 @@
1449	1536
1450	1537	oe.SetupViews();
1451	1538
	1539	+ if (Globals.DEBUG)
1452	1540	System.out.println("SetupViews");
1453	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1454	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1815,7 +1903,12 @@
1815	1903	TreePath path;
1816	1904
1817	1905	public TransferableTreePath(TreePath tp) {
1818		- 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);
1819	1912	}
1820	1913
1821	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1996,7 +2089,7 @@
1996	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1997	2090	objEditor.ScreenFit(obj, false);
1998	2091
1999		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
2000	2093	refreshContents();
2001	2094	}
2002	2095
..	..	@@ -2033,7 +2126,7 @@
2033	2126	obj.parent.TransformToWorld(maxima); //, maxima);
2034	2127	}
2035	2128
2036		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
2037	2130
2038	2131	shadow.toParent = LA.newMatrix();
2039	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -2047,24 +2140,24 @@
2047	2140	switch(axis)
2048	2141	{
2049	2142	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;
	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;
2054	2147	norm = cVector.X;
2055	2148	break;
2056	2149	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;
	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;
2061	2154	norm = cVector.Y;
2062	2155	break;
2063	2156	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;
	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;
2068	2161	norm = cVector.Z;
2069	2162	break;
2070	2163	}
..	..	@@ -2105,7 +2198,11 @@
2105	2198	shadow.material = new cMaterial(obj.material);
2106	2199	shadow.material.diffuse = 0.0001f;
2107	2200	shadow.material.specular = 0.0001f;
2108		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
2109	2206
2110	2207	makeSomething(shadow);
2111	2208	}
..	..	@@ -2626,27 +2723,35 @@
2626	2723	} else
2627	2724	if (source == loopItem \|\| source == loopButton)
2628	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
2629	2728	Composite csg = new GroupLeaf();
2630		- csg.count = 5;
2631	2729	group(csg);
	2730	+ csg.count = 5;
2632	2731	Composite child = new cGroup("Branch");
2633	2732	csg.addChild(child);
2634	2733	child.addChild(csg);
	2734	+ }
2635	2735	} else
2636	2736	if (source == doubleItem)
2637	2737	{
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
2638	2740	Composite csg = new GroupLeaf("Fork");
2639		- csg.count = 5;
2640	2741	group(csg);
	2742	+ csg.count = 5;
2641	2743	Composite child = new cGroup("Branch A");
2642	2744	csg.addChild(child);
2643	2745	child.addChild(csg);
2644	2746	child = new cGroup("Branch B");
2645	2747	csg.addChild(child);
2646	2748	child.addChild(csg);
	2749	+ }
2647	2750	} else
2648	2751	if (source == tripleItem)
2649	2752	{
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
2650	2755	Composite csg = new GroupLeaf("Trident");
2651	2756	csg.count = 4;
2652	2757	group(csg);
..	..	@@ -2659,6 +2764,7 @@
2659	2764	child = new cGroup();
2660	2765	csg.addChild(child);
2661	2766	child.addChild(csg);
	2767	+ }
2662	2768	} else
2663	2769	if (source == computeAOItem)
2664	2770	{
..	..	@@ -2705,10 +2811,22 @@
2705	2811	{
2706	2812	Maximize();
2707	2813	} else
2708		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2709	2815	{
2710	2816	ToggleFullScreen();
2711	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
2712	2830	if (source == previousVersionButton)
2713	2831	{
2714	2832	// Go to previous version
..	..	@@ -2736,7 +2854,7 @@
2736	2854	if (source == saveVersionButton)
2737	2855	{
2738	2856	// Save a new version
2739		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2740	2858	java.awt.Toolkit.getDefaultToolkit().beep();
2741	2859	} else
2742	2860	if (source == deleteVersionButton)
..	..	@@ -3282,22 +3400,34 @@
3282	3400	} else
3283	3401	if (source == ungroupItem \|\| source == ungroupButton)
3284	3402	{
3285		- boolean hasRoot = false;
	3403	+ boolean canUngroup = true;
3286	3404
3287	3405	for (int i=0; i<group.selection.size(); i++)
3288	3406	{
3289		- if (group.selection.get(i) == group)
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
3290	3410	{
3291		- 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;
3292	3420	break;
3293	3421	}
3294	3422	}
3295	3423
3296		- if (!hasRoot)
	3424	+ if (canUngroup)
3297	3425	{
3298	3426	for (int i=0; i<group.selection.size(); i++)
3299	3427	{
3300		- Ungroup(group.selection.get(i));
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
3301	3431	}
3302	3432
3303	3433	ClearSelection(false);
..	..	@@ -3348,6 +3478,10 @@
3348	3478	if (source == clearMaterialsItem)
3349	3479	{
3350	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
3351	3485	} else
3352	3486	if (source == liveleavesItem)
3353	3487	{
..	..	@@ -3488,6 +3622,18 @@
3488	3622	if (source == transformChildrenItem)
3489	3623	{
3490	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);
3491	3637	} else
3492	3638	if (source == resetTransformItem)
3493	3639	{
..	..	@@ -3660,38 +3806,7 @@
3660	3806	if (CameraPane.FULLSCREEN)
3661	3807	fullscreenLayout = radio.layout;
3662	3808
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();
	3809	+ Show3DView();
3695	3810
3696	3811	cameraView.requestFocusInWindow();
3697	3812
..	..	@@ -3877,6 +3992,7 @@
3877	3992	} else
3878	3993	if (source == rootButton)
3879	3994	{
	3995	+ Replace();
3880	3996	Object3D obj;
3881	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3882	3998	{
..	..	@@ -3891,6 +4007,9 @@
3891	4007	if (source == closeButton)
3892	4008	{
3893	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3894	4013	cRadio ab;
3895	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3896	4015	{
..	..	@@ -3989,6 +4108,9 @@
3989	4108	} else
3990	4109	if(source instanceof cRadio)
3991	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3992	4114	group.parent = keepparent;
3993	4115	group.attributes = 0;
3994	4116	//group.editWindow = null;
..	..	@@ -4013,8 +4135,6 @@
4013	4135
4014	4136	copy = group;
4015	4137
4016		- SetUndoStates();
4017		-
4018	4138	//Globals.theRenderer.object = group;
4019	4139	if(!useclient)
4020	4140	{
..	..	@@ -4042,6 +4162,32 @@
4042	4162	*/
4043	4163	radio.layout.doClick();
4044	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	+
4045	4191	ClearUnpinned();
4046	4192
4047	4193	//Grafreed.Assert(group != null);
..	..	@@ -4155,9 +4301,46 @@
4155	4301	refreshContents();
4156	4302	}
4157	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	+
4158	4316	void ResetTransform()
4159	4317	{
4160	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();
4161	4344	}
4162	4345
4163	4346	void ResetTransform(int mask)
..	..	@@ -4170,42 +4353,8 @@
4170	4353	if (obj.toParent == null)
4171	4354	continue;
4172	4355
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		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
4209	4358	if (obj.parent == null)
4210	4359	{
4211	4360	System.out.println("NULL PARENT!");
..	..	@@ -4714,10 +4863,17 @@
4714	4863	{
4715	4864	Object3D obj = group.selection.get(i);
4716	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4717	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4718	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4719	4874	}
4720	4875
	4876	+ Globals.lighttouched = true;
4721	4877	refreshContents();
4722	4878	}
4723	4879
..	..	@@ -5005,6 +5161,12 @@
5005	5161	refreshContents();
5006	5162	}
5007	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
5008	5170	void FlipV(boolean flip)
5009	5171	{
5010	5172	group.selection.FlipV(flip);
..	..	@@ -5243,10 +5405,10 @@
5243	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5244	5406	// a camera
5245	5407	{
5246		- 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
5247	5409	{
5248	5410	CameraPane.camerachangeframe = 0; // don't refuse it
5249		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5250	5412	}
5251	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5252	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -5276,10 +5438,26 @@
5276	5438	flashSelectionButton.setEnabled(enabled);
5277	5439
5278	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);
5279	5456	}
5280	5457
5281	5458	void refreshContents(boolean cp)
5282	5459	{
	5460	+ if (Globals.SHOWINFO)
5283	5461	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5284	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5285	5463	{
..	..	@@ -5290,7 +5468,7 @@
5290	5468	Object3D child = (Object3D) group.selection.get(i);
5291	5469
5292	5470	objEditor.AddInfo(child, this, true);
5293		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
5294	5472	}
5295	5473
5296	5474	objEditor.SetText(); // jan 2014
..	..	@@ -6173,11 +6351,11 @@
6173	6351	private MenuItem lookAtItem;
6174	6352	private MenuItem lookFromItem;
6175	6353	private MenuItem switchViewItem;
6176		- private MenuItem cutItem;
	6354	+ private JMenuItem cutItem;
6177	6355	private MenuItem undoItem;
6178	6356	private MenuItem redoItem;
6179	6357	private JMenuItem duplicateItem;
6180		- private MenuItem cloneItem;
	6358	+ private JMenuItem cloneItem;
6181	6359	private MenuItem cloneSupportItem;
6182	6360	private MenuItem overwriteGeoItem;
6183	6361	private MenuItem overwriteMatItem;
..	..	@@ -6198,13 +6376,13 @@
6198	6376	private MenuItem cloneGeometriesItem;
6199	6377	private MenuItem shareGeometriesItem;
6200	6378	private MenuItem mergeGeometriesItem;
6201		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
6202	6380	private MenuItem pasteItem;
6203		- private MenuItem pasteIntoItem;
6204		- private MenuItem pasteLinkItem;
6205		- private MenuItem pasteCloneItem;
6206		- private MenuItem pasteExpandItem;
6207		- private MenuItem deleteItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
6208	6386	private MenuItem clearAllItem;
6209	6387	private MenuItem genUVItem;
6210	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -6230,6 +6408,7 @@
6230	6408	private MenuItem clipMeshItem;
6231	6409	private MenuItem smoothMeshItem;
6232	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
6233	6412
6234	6413	private MenuItem liveleavesItem;
6235	6414	private MenuItem unliveleavesItem;
..	..	@@ -6253,13 +6432,16 @@
6253	6432	private MenuItem maxTexturesItem;
6254	6433	private MenuItem panoTexturesItem;
6255	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
6256	6438	private MenuItem resetCentroidItem;
6257	6439	private MenuItem resetCentroidXZItem;
6258	6440	private MenuItem resetTransformItem;
6259	6441	private MenuItem transformGeometryItem;
6260	6442	private MenuItem transformChildrenItem;
6261	6443	private MenuItem hideItem;
6262		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
6263	6445	private MenuItem backItem;
6264	6446	private MenuItem frontItem;
6265	6447	private MenuItem cameraItem;
..	..	@@ -6272,7 +6454,7 @@
6272	6454	private MenuItem switchTransfoItem;
6273	6455	private MenuItem morphItem;
6274	6456	private MenuItem linkerItem;
6275		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
6276	6458	private MenuItem editItem;
6277	6459	private MenuItem openWindowItem;
6278	6460	private MenuItem editLeafItem;