~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -28,9 +29,9 @@
28	29	{
29	30	cButton skyboxButton;
30	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
31		- row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
	32	+ row.add(skyboxButton = GetButton(path + "/preview.jpg", !Globals.NIMBUSLAF));
32	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
33		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
34	35	skyboxButton.addActionListener(new ActionListener()
35	36	{
36	37	@Override
..	..	@@ -41,6 +42,22 @@
41	42	});
42	43	}
43	44
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Globals.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
44	61	public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45	62	{
46	63	cGridBag tab0 = new cGridBag().setVertical(true);
..	..	@@ -56,7 +73,7 @@
56	73	cGridBag row5 = new cGridBag();
57	74	cGridBag row6 = new cGridBag();
58	75
59		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
60	77	//AddSkyboxButton("default", "cornell", row0);
61	78	AddSkyboxButton("penguins", "dust", row0);
62	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -311,14 +328,46 @@
311	328	}
312	329	}
313	330
314		- public void ChangeSkybox(String name)
	331	+ public void ChangeSkybox(String skybox)
315	332	{
316		- //cameraView.envyoff = false;
317		- group.skyboxname = name;
318		- group.skyboxext = "jpg";
319		- 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	+ }
	346	+ }
	347	+
	348	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	349	+ {
	350	+ JTabbedPane skyboxpane = new JTabbedPane(JTabbedPane.LEFT);
	351	+
	352	+ AddSkyboxTab0(skyboxpane);
	353	+ AddSkyboxTab1(skyboxpane);
	354	+ AddSkyboxTab2(skyboxpane);
	355	+ AddSkyboxTab3(skyboxpane);
	356	+
	357	+ skyboxPanel.add(skyboxpane);
320	358	}
321	359
	360	+ public void ChangeTexture(String texture)
	361	+ {
	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();
	369	+ }
	370	+
322	371	//ObjEditor objEditor;
323	372	public void closeUI2()
324	373	{
..	..	@@ -356,11 +405,15 @@
356	405	this.copy = this.group = group;
357	406	//selectees = this.group.selectees;
358	407
359		- if (copy.versionlist == null)
360		- {
361		- copy.versionlist = new Object3D[100];
362		- copy.versionindex = -1;
363		- }
	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	+// }
364	417
365	418	if(ui)
366	419	SetupUI(objEditor);
..	..	@@ -383,13 +436,13 @@
383	436
384	437	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385	438
386		- if (copy.versionlist == null)
387		- {
388		- copy.versionlist = new Object3D[100];
389		- copy.versionindex = -1;
390		-
391		- Save(true);
392		- }
	439	+// if (copy.versionlist == null)
	440	+// {
	441	+// copy.versionlist = new Object3D[100];
	442	+// copy.versionindex = -1;
	443	+//
	444	+// //Save(true);
	445	+// }
393	446	}
394	447
395	448	void CloneSelection(boolean supports)
..	..	@@ -430,11 +483,16 @@
430	483
431	484	Object3D parent = obj.parent;
432	485	obj.parent = null;
	486	+
433	487	// Object3D support = obj.support;
434	488	// obj.support = null;
435	489	if (!supports)
436	490	obj.SaveSupports();
	491	+
437	492	Object3D clone = (Object3D)Grafreed.clone(obj);
	493	+
	494	+ clone.ResetUUIDs();
	495	+
438	496	obj.parent = parent;
439	497	// obj.support = support;
440	498	// clone.support = support; // aout 2013
..	..	@@ -479,33 +537,37 @@
479	537	// menu.add("-");
480	538	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
481	539	duplicateItem.addActionListener(this);
482		- cloneItem = menu.add(new MenuItem("Clone"));
	540	+
	541	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
483	542	cloneItem.addActionListener(this);
484		- if (Globals.ADVANCED)
	543	+ //if (Globals.ADVANCED)
485	544	{
486	545	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
487	546	cloneSupportItem.addActionListener(this);
488	547	}
	548	+ oe.jTree.popup.addSeparator();
489	549	menu.add("-");
490		- cutItem = menu.add(new MenuItem("Cut"));
	550	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
491	551	cutItem.addActionListener(this);
492		- copyItem = menu.add(new MenuItem("Copy"));
	552	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
493	553	copyItem.addActionListener(this);
494	554	pasteItem = menu.add(new MenuItem("Paste"));
495	555	pasteItem.addActionListener(this);
496	556
497		- menu.add("-");
498		- 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"));
499	560	pasteIntoItem.addActionListener(this);
500		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	561	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
501	562	pasteLinkItem.addActionListener(this);
502		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	563	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
503	564	pasteCloneItem.addActionListener(this);
504		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
505		-// pasteExpandItem.addActionListener(this);
506		- menu.add("-");
507		- deleteItem = menu.add(new MenuItem("Delete"));
508		- 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();
509	571
510	572	if (Globals.ADVANCED)
511	573	{
..	..	@@ -591,11 +653,9 @@
591	653	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
592	654	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
593	655	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
594		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
595	656	oe.cameraMenu.add("-");
596	657	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
597	658	openWindowItem.addActionListener(this);
598		- editLeafItem.addActionListener(this);
599	659	lookAtItem.addActionListener(this);
600	660	//lookFromItem.addActinoListener(this);
601	661	//switchViewItem.addActionListener(this);
..	..	@@ -642,9 +702,8 @@
642	702	setMasterItem.addActionListener(this);
643	703	}
644	704
645		- oe.menuBar.add(menu = new Menu("Group"));
646		-// grabItem = menu.add(new MenuItem("Grab"));
647		-// grabItem.addActionListener(this);
	705	+ oe.menuBar.add(menu = new Menu("Order"));
	706	+
648	707	backItem = menu.add(new MenuItem("Back"));
649	708	backItem.addActionListener(this);
650	709	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -652,13 +711,21 @@
652	711	// compositeItem = menu.add(new MenuItem("Composite"));
653	712	// compositeItem.addActionListener(this);
654	713
	714	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	715	+ grabItem.addActionListener(this);
	716	+
655	717	if (Globals.ADVANCED)
656	718	{
657	719	hideItem = menu.add(new MenuItem("Hidden Group"));
658	720	hideItem.addActionListener(this);
659	721	}
660		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	722	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
661	723	ungroupItem.addActionListener(this);
	724	+
	725	+ oe.jTree.popup.addSeparator();
	726	+
	727	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	728	+ deleteItem.addActionListener(this);
662	729
663	730	// menu.add("-");
664	731	//
..	..	@@ -695,9 +762,9 @@
695	762	shadowYItem.addActionListener(this);
696	763	shadowZItem = menu.add(new MenuItem("Shadow Blue"));
697	764	shadowZItem.addActionListener(this);
	765	+
698	766	attributeItem = menu.add(new MenuItem("Attribute"));
699	767	attributeItem.addActionListener(this);
700		-
701	768	if (Globals.ADVANCED)
702	769	{
703	770	menu.add("-");
..	..	@@ -709,11 +776,18 @@
709	776	pointflowItem.addActionListener(this);
710	777	}
711	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("-");
712	786	resetTransformItem = menu.add(new MenuItem("Reset Transform"));
713	787	resetTransformItem.addActionListener(this);
714	788	resetCentroidItem = menu.add(new MenuItem("Reset Centroid"));
715	789	resetCentroidItem.addActionListener(this);
716		- resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XY"));
	790	+ resetCentroidXZItem = menu.add(new MenuItem("Reset Centroid XZ"));
717	791	resetCentroidXZItem.addActionListener(this);
718	792	transformGeometryItem = menu.add(new MenuItem("Transform Geometry"));
719	793	transformGeometryItem.addActionListener(this);
..	..	@@ -729,7 +803,7 @@
729	803	genNormalsCADItem.addActionListener(this);
730	804	genNormalsMESHItem = menu.add(new MenuItem("Mesh Normals"));
731	805	genNormalsMESHItem.addActionListener(this);
732		- if (Globals.ADVANCED)
	806	+ //if (Globals.ADVANCED)
733	807	{
734	808	genNormalsMINEItem = menu.add(new MenuItem("Stitch Normals"));
735	809	genNormalsMINEItem.addActionListener(this);
..	..	@@ -765,6 +839,8 @@
765	839	}
766	840
767	841	oe.menuBar.add(menu = new Menu("Attributes"));
	842	+ clearVersionsItem = menu.add(new MenuItem("Clear Versions"));
	843	+ clearVersionsItem.addActionListener(this);
768	844	clearMaterialsItem = menu.add(new MenuItem("Clear Materials"));
769	845	clearMaterialsItem.addActionListener(this);
770	846	resetAllItem = menu.add(new MenuItem("Reset All"));
..	..	@@ -787,9 +863,9 @@
787	863	hideleavesItem.addActionListener(this);
788	864	showleavesItem = menu.add(new MenuItem("Show Leaves"));
789	865	showleavesItem.addActionListener(this);
790		- markleavesItem = menu.add(new MenuItem("Mark Leaves"));
	866	+ markleavesItem = menu.add(new MenuItem("Anim Leaves"));
791	867	markleavesItem.addActionListener(this);
792		- unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
	868	+ unmarkleavesItem = menu.add(new MenuItem("Unanim Leaves"));
793	869	unmarkleavesItem.addActionListener(this);
794	870	rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
795	871	rewindleavesItem.addActionListener(this);
..	..	@@ -843,6 +919,9 @@
843	919	shareGeometriesItem.addActionListener(this);
844	920	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
845	921	mergeGeometriesItem.addActionListener(this);
	922	+ menu.add("-");
	923	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	924	+ editLeafItem.addActionListener(this);
846	925	if (Globals.ADVANCED)
847	926	{
848	927	// Pretty much the same as duplicate and clone.
..	..	@@ -859,6 +938,84 @@
859	938	buildToolsMenu(menu);
860	939	}
861	940
	941	+ JTabbedPane resourcecontainer;
	942	+ cGridBag currenttab;
	943	+ //boolean added; // patch for jar
	944	+
	945	+ int totalcount = 0;
	946	+
	947	+ int tabcount = 0;
	948	+ int colcount = 0;
	949	+ int rowcount = 0;
	950	+ int texturecount = 0;
	951	+
	952	+ int columns = 5;
	953	+ int rows = 7;
	954	+
	955	+ public void ResourceCallBack(String[] path)
	956	+ {
	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"))
	963	+ {
	964	+ currenttab = new cGridBag();
	965	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	966	+ currenttab.setName(tabname);
	967	+ //added = false;
	968	+ resourcecontainer.add(currenttab);
	969	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture " + tabname);
	970	+ rowcount = 1;
	971	+ colcount = 0;
	972	+ texturecount = 0;
	973	+ }
	974	+
	975	+ if (path.length > 2 && (path[2].toLowerCase().endsWith(".jpg") \|\| path[2].toLowerCase().endsWith(".png")))
	976	+ {
	977	+ //if (!added)
	978	+ {
	979	+ //added = true;
	980	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	981	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
	982	+ }
	983	+
	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	+
	992	+ if (++colcount >= columns)
	993	+ {
	994	+ colcount = 0;
	995	+ currenttab.Return();
	996	+
	997	+ if (rowcount++ >= rows)
	998	+ {
	999	+ rowcount = 0;
	1000	+ }
	1001	+ }
	1002	+ }
	1003	+ else
	1004	+ {
	1005	+// if (!path[path.length-1].equals("icons"))
	1006	+// resourcecontainer.Return();
	1007	+ }
	1008	+ }
	1009	+
	1010	+ void CreateTexturePanel(cGridBag container)
	1011	+ {
	1012	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	1013	+ container.add(resourcecontainer);
	1014	+
	1015	+ Grafreed.ParseResources("textures", this);
	1016	+
	1017	+ // 935. System.out.println("Total = " + totalcount);
	1018	+ }
862	1019
863	1020	void SetupUI2(ObjEditor oe)
864	1021	{
..	..	@@ -877,11 +1034,6 @@
877	1034	//new Exception().printStackTrace();
878	1035
879	1036	oe.radioPanel = new JPanel(new GridBagLayout());
880		- oe.aConstraints.weightx = 1;
881		- oe.aConstraints.weighty = 0;
882		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
883		- oe.aConstraints.gridwidth = 100;
884		- oe.aConstraints.gridheight = 1;
885	1037	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
886	1038
887	1039	oe.buttonGroup = new ButtonGroup();
..	..	@@ -902,9 +1054,9 @@
902	1054	oe.radioPanel.add(dummyButton);
903	1055	oe.buttonGroup.add(dummyButton);
904	1056	*/
905		- cGridBag copyOptionsPanel = new cGridBag();
	1057	+ cGridBag versionManagerPanel = new cGridBag();
906	1058
907		- copyOptionsPanel.preferredHeight = 2;
	1059	+ versionManagerPanel.preferredHeight = 4;
908	1060
909	1061	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
910	1062
..	..	@@ -914,62 +1066,102 @@
914	1066
915	1067	if (Globals.ADVANCED)
916	1068	{
917		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
918		- maxButton.setToolTipText("Maximize window");
919		- 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);
920	1072	}
921	1073
922		- oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
923		- fullButton.setToolTipText("Full-screen window");
924		- fullButton.addActionListener(this);
	1074	+ cButton gcButton;
925	1075
926		- 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);
927	1118	screenfitButton.setToolTipText("Screen fit");
928	1119	screenfitButton.addActionListener(this);
929	1120
930		- 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);
931	1122	restoreCameraButton.setToolTipText("Restore viewpoint");
932	1123	restoreCameraButton.addActionListener(this);
933	1124
934		- 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);
935	1126	saveVersionButton.setToolTipText("Duplicate current version");
936	1127	saveVersionButton.addActionListener(this);
937	1128
938		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1129	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
939	1130	deleteVersionButton.setToolTipText("Delete current version");
940	1131	deleteVersionButton.addActionListener(this);
	1132	+ deleteVersionButton.setEnabled(false);
941	1133
942		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1134	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
943	1135	previousVersionButton.setToolTipText("Previous version");
944	1136	previousVersionButton.addActionListener(this);
945	1137	previousVersionButton.setEnabled(false);
946	1138
947	1139	cGridBag updown = new cGridBag().setVertical(true);
948		- updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1140	+ updown.add(restoreButton = GetButton("icons/restore.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
949	1141	restoreButton.setToolTipText("Undo (restore current version)");
950	1142	restoreButton.addActionListener(this);
951	1143	restoreButton.setEnabled(false);
952	1144
953		- updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1145	+ updown.add(replaceButton = GetButton("icons/replace.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
954	1146	replaceButton.setToolTipText("Save (replace current version)");
955	1147	replaceButton.addActionListener(this);
956	1148	replaceButton.setEnabled(false);
957	1149
958		- copyOptionsPanel.add(updown);
	1150	+ versionManagerPanel.add(updown);
959	1151
960		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1152	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
961	1153	nextVersionButton.setToolTipText("Next version");
962	1154	nextVersionButton.addActionListener(this);
963	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);
964	1160
965	1161	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
966	1162	liveCB.setToolTipText("Enable animation");
967	1163	liveCB.addItemListener(this);
968	1164
969		- oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
970		- oneStepButton.setToolTipText("Animate one step forward");
971		- oneStepButton.addActionListener(this);
972		-
973	1165	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
974	1166	fastCB.setToolTipText("Fast mode");
975	1167	fastCB.addItemListener(this);
..	..	@@ -985,151 +1177,139 @@
985	1177
986	1178	if (Globals.ADVANCED)
987	1179	{
988		- oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1180	+ oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Globals.NIMBUSLAF)); //, oe.aConstraints);
989	1181	snapobjectButton.addActionListener(this);
990	1182	snapobjectButton.setToolTipText("Snap Object");
991	1183
992		- 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);
993	1185	fourButton.addActionListener(this);
994	1186	fourButton.setToolTipText("Show control panel only");
995	1187	}
996	1188
997	1189	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
998	1190
999		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1000		- twoButton.setToolTipText("Show 3D view only");
1001		- twoButton.addActionListener(this);
1002		- this.fullscreenLayout = twoButton;
1003		-
1004		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1005		- threeButton.setToolTipText("Show controls and 3D view");
1006		- threeButton.addActionListener(this);
1007		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1008		- sixButton.setToolTipText("Show 3D view and controls");
1009		- sixButton.addActionListener(this);
1010		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1011		-// sevenButton.setToolTipText("3-column layout");
1012		-// sevenButton.addActionListener(this);
1013		- //
1014	1191
1015		- 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);
1016	1193	rootButton.setToolTipText("Open selection in new tab");
1017	1194	rootButton.addActionListener(this);
1018	1195
1019		- 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);
1020	1197	closeButton.setToolTipText("Close tab");
1021	1198	closeButton.addActionListener(this);
1022	1199	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
1023	1200	//clearButton.addActionListener(this);
1024	1201
1025	1202	cGridBag row1 = new cGridBag();
	1203	+ row1.preferredHeight = 8;
1026	1204
1027	1205	// INSERT
1028		- row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1029		- gridButton.setToolTipText("Create grid");
	1206	+ row1.add(gridButton = GetButton("icons/grid.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1207	+ gridButton.setToolTipText("Create ground");
1030	1208	gridButton.addActionListener(this);
1031	1209
1032		- row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1210	+ row1.add(boxButton = GetButton("icons/box.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1033	1211	boxButton.setToolTipText("Create box");
1034	1212	boxButton.addActionListener(this);
1035	1213
1036		- row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037		- sphereButton.setToolTipText("Create sphere");
1038		- sphereButton.addActionListener(this);
1039		-
1040		- row1.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1041		- coneButton.setToolTipText("Create cone");
1042		- coneButton.addActionListener(this);
1043		-
1044		- row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1045		- torusButton.setToolTipText("Create torus");
1046		- torusButton.addActionListener(this);
1047		-
1048		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1214	+ row1.add(superButton = GetButton("icons/super.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1049	1215	superButton.setToolTipText("Create superellipsoid");
1050	1216	superButton.addActionListener(this);
1051	1217
1052		- 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)
1053	1231	{
1054		- 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);
1055	1233	kleinButton.setToolTipText("Create Klein bottle");
1056	1234	kleinButton.addActionListener(this);
1057	1235	}
1058	1236
1059		- row1.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1237	+ row1.add(particlesButton = GetButton("icons/particles.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1060	1238	particlesButton.setToolTipText("Create particle system");
1061	1239	particlesButton.addActionListener(this);
1062	1240
1063	1241	oe.toolboxPanel.add(row1);
1064	1242
1065	1243	cGridBag row2 = new cGridBag();
	1244	+ row2.preferredHeight = 8;
1066	1245
1067		- row2.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1246	+ row2.add(groupButton = GetButton("icons/group.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1068	1247	groupButton.setToolTipText("Create group");
1069	1248	groupButton.addActionListener(this);
1070	1249
1071		- row2.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1250	+ row2.add(compositeButton = GetButton("icons/composite.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1072	1251	compositeButton.setToolTipText("Create composite");
1073	1252	compositeButton.addActionListener(this);
1074	1253
1075		- row2.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1254	+ row2.add(switchButton = GetButton("icons/switch.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1076	1255	switchButton.setToolTipText("Create item switcher");
1077	1256	switchButton.addActionListener(this);
1078	1257
1079		- row2.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1258	+ row2.add(loopButton = GetButton("icons/loop.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1080	1259	loopButton.setToolTipText("Create loop");
1081	1260	loopButton.addActionListener(this);
1082	1261
1083		- row2.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1262	+ row2.add(textureButton = GetButton("icons/texture.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1084	1263	textureButton.setToolTipText("Create texture");
1085	1264	textureButton.addActionListener(this);
1086	1265
1087		- row2.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1266	+ row2.add(overlayButton = GetButton("icons/overlay.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1088	1267	overlayButton.setToolTipText("Create overlay");
1089	1268	overlayButton.addActionListener(this);
1090	1269
1091		- 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);
1092	1271	lightButton.setToolTipText("Create light");
1093	1272	lightButton.addActionListener(this);
1094	1273
1095	1274	oe.toolboxPanel.add(row2);
1096	1275
1097		- // ENVYMAPS
1098		- cGridBag skyboxpane = new cGridBag();
1099		- skyboxpane.preferredHeight = 100;
	1276	+ cGridBag textures = new cGridBag();
1100	1277
1101		- oe.toolboxPanel.add(skyboxpane);
	1278	+ CreateTexturePanel(textures);
1102	1279
1103		- JTabbedPane skyboxpanel = new JTabbedPane();
1104		- skyboxpane.add(skyboxpanel);
	1280	+ int tabCount = resourcecontainer.getTabCount();
1105	1281
1106		- AddSkyboxTab0(skyboxpanel);
1107		- AddSkyboxTab1(skyboxpanel);
1108		- AddSkyboxTab2(skyboxpanel);
1109		- AddSkyboxTab3(skyboxpanel);
	1282	+ if (tabCount > 0)
	1283	+ resourcecontainer.setSelectedIndex((int)(Math.random() * tabCount));
	1284	+
	1285	+ oe.toolboxPanel.add(textures);
	1286	+
	1287	+ textures.preferredHeight = 100;
	1288	+
	1289	+ CreateSkyboxPanel(oe.skyboxPanel);
1110	1290
1111	1291	// EDIT panel
1112		- editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1292	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1113	1293	editButton.setToolTipText("Pin selection controls");
1114	1294	editButton.addActionListener(this);
1115	1295
1116		- editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1296	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1117	1297	uneditButton.setToolTipText("Unpin and remove selection controls");
1118	1298	uneditButton.addActionListener(this);
1119	1299
1120	1300	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1121		- allParamsButton.setToolTipText("Show all controle");
	1301	+ allParamsButton.setToolTipText("Show all controls");
1122	1302	allParamsButton.addActionListener(this);
1123	1303
1124		- editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125		- clearPanelButton.setToolTipText("Clear edit panel");
	1304	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
	1305	+ clearPanelButton.setToolTipText("Clear all controls");
1126	1306	clearPanelButton.addActionListener(this);
1127	1307
1128		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129		- unselectButton.setToolTipText("Unselect");
1130		- unselectButton.addActionListener(this);
	1308	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1309	+ //unselectButton.setToolTipText("Unselect");
	1310	+ //unselectButton.addActionListener(this);
1131	1311
1132		- 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);
1133	1313	flashSelectionButton.setToolTipText("Highlight selection");
1134	1314	flashSelectionButton.addActionListener(this);
1135	1315
..	..	@@ -1152,6 +1332,8 @@
1152	1332
1153	1333	cGridBag jSPPanel = new cGridBag();
1154	1334
	1335	+ jSPPanel.preferredHeight = 20;
	1336	+
1155	1337	JScrollPane jSP;
1156	1338	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1157	1339	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1160,11 +1342,12 @@
1160	1342	oe.treePanel.add(jSPPanel);
1161	1343	oe.treePanel.Return();
1162	1344
1163		- oe.treePanel.add(copyOptionsPanel);
	1345	+ oe.treePanel.add(versionManagerPanel);
1164	1346	oe.treePanel.Return();
1165		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1166		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1167		- sliderPane.preferredHeight = 1;
	1347	+
	1348	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1349	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1350	+ versionSliderPane.preferredHeight = 3;
1168	1351
1169	1352	// mainPanel.setDividerLocation(0.1); //1.0);
1170	1353	mainPanel.setResizeWeight(0.4);
..	..	@@ -1221,7 +1404,7 @@
1221	1404	// supportCB.setToolTipText("Enable rigging");
1222	1405	// supportCB.addItemListener(this);
1223	1406
1224		- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	1407	+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
1225	1408	freezeCB.setToolTipText("Fast moving camera");
1226	1409	freezeCB.addItemListener(this);
1227	1410
..	..	@@ -1230,9 +1413,12 @@
1230	1413
1231	1414	panel.Return();
1232	1415
	1416	+ if (Globals.ADVANCED)
	1417	+ {
1233	1418	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
1234	1419	crowdCB.setToolTipText("Used for crowds");
1235	1420	crowdCB.addItemListener(this);
	1421	+ }
1236	1422
1237	1423	panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
1238	1424	smoothCB.setToolTipText("Snapping delay");
..	..	@@ -1245,30 +1431,26 @@
1245	1431	minshaderCB.setToolTipText("Minimal fast shader");
1246	1432	minshaderCB.addItemListener(this);
1247	1433
1248		-// constraints.gridy += 1;
1249	1434	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
1250	1435	// speakerMocapCB.addItemListener(this);
1251	1436
1252		- panel.Return();
1253		-
1254	1437	if (false)
1255	1438	{
1256	1439	// handled in scripts
1257		- //constraints.gridy += 1;
1258	1440	panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
1259	1441	speakerCameraCB.addItemListener(this);
1260	1442
1261		- //constraints.gridy += 1;
1262	1443	panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
1263	1444	speakerFocusCB.addItemListener(this);
1264	1445
1265		- //constraints.gridy += 1;
1266		- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
1267		- smoothfocusCB.addItemListener(this);
1268	1446	panel.Return();
1269	1447	}
1270	1448
1271		-//constraints.gridx += 1;
	1449	+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
	1450	+ smoothfocusCB.addItemListener(this);
	1451	+
	1452	+ panel.Return();
	1453	+
1272	1454	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
1273	1455	// debugCB.addItemListener(this);
1274	1456
..	..	@@ -1322,6 +1504,14 @@
1322	1504
1323	1505	void EditObject(Object3D obj)
1324	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	+
1325	1515	cRadio radioButton = new cRadio(obj.name);
1326	1516
1327	1517	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1346,6 +1536,7 @@
1346	1536
1347	1537	oe.SetupViews();
1348	1538
	1539	+ if (Globals.DEBUG)
1349	1540	System.out.println("SetupViews");
1350	1541	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1351	1542	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1712,7 +1903,12 @@
1712	1903	TreePath path;
1713	1904
1714	1905	public TransferableTreePath(TreePath tp) {
1715		- 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);
1716	1912	}
1717	1913
1718	1914	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -1893,7 +2089,7 @@
1893	2089	Object3D obj = (Object3D)group.selection.elementAt(0);
1894	2090	objEditor.ScreenFit(obj, false);
1895	2091
1896		- cameraView.pingthread.StepToTarget(true);
	2092	+ cameraView.pingthread.StepToTarget(); //true);
1897	2093	refreshContents();
1898	2094	}
1899	2095
..	..	@@ -1930,7 +2126,7 @@
1930	2126	obj.parent.TransformToWorld(maxima); //, maxima);
1931	2127	}
1932	2128
1933		- Object3D shadow = new Object3D("Shadow " + obj.name);
	2129	+ Object3D shadow = new Object3D("Shadow" + obj.name);
1934	2130
1935	2131	shadow.toParent = LA.newMatrix();
1936	2132	shadow.fromParent = LA.newMatrix();
..	..	@@ -1944,24 +2140,24 @@
1944	2140	switch(axis)
1945	2141	{
1946	2142	case 0 :
1947		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1948		- vert2.x = minima.x; vert2.y = maxima.y; vert2.z = minima.z;
1949		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1950		- 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;
1951	2147	norm = cVector.X;
1952	2148	break;
1953	2149	case 1 :
1954		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1955		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1956		- vert3.x = minima.x; vert3.y = minima.y; vert3.z = maxima.z;
1957		- 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;
1958	2154	norm = cVector.Y;
1959	2155	break;
1960	2156	case 2 :
1961		- vert1.x = minima.x; vert1.y = minima.y; vert1.z = minima.z;
1962		- vert2.x = maxima.x; vert2.y = minima.y; vert2.z = minima.z;
1963		- vert3.x = minima.x; vert3.y = maxima.y; vert3.z = minima.z;
1964		- 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;
1965	2161	norm = cVector.Z;
1966	2162	break;
1967	2163	}
..	..	@@ -2002,7 +2198,11 @@
2002	2198	shadow.material = new cMaterial(obj.material);
2003	2199	shadow.material.diffuse = 0.0001f;
2004	2200	shadow.material.specular = 0.0001f;
2005		- //shadow.projectedVertices[1].x = 300;
	2201	+ shadow.material.opacity = 0.75f;
	2202	+
	2203	+ AllocProjectedVertices(shadow);
	2204	+
	2205	+ shadow.projectedVertices[1].x = 300;
2006	2206
2007	2207	makeSomething(shadow);
2008	2208	}
..	..	@@ -2523,27 +2723,35 @@
2523	2723	} else
2524	2724	if (source == loopItem \|\| source == loopButton)
2525	2725	{
	2726	+ if (!group.selection.isEmpty())
	2727	+ {
2526	2728	Composite csg = new GroupLeaf();
2527		- csg.count = 5;
2528	2729	group(csg);
	2730	+ csg.count = 5;
2529	2731	Composite child = new cGroup("Branch");
2530	2732	csg.addChild(child);
2531	2733	child.addChild(csg);
	2734	+ }
2532	2735	} else
2533	2736	if (source == doubleItem)
2534	2737	{
	2738	+ if (!group.selection.isEmpty())
	2739	+ {
2535	2740	Composite csg = new GroupLeaf("Fork");
2536		- csg.count = 5;
2537	2741	group(csg);
	2742	+ csg.count = 5;
2538	2743	Composite child = new cGroup("Branch A");
2539	2744	csg.addChild(child);
2540	2745	child.addChild(csg);
2541	2746	child = new cGroup("Branch B");
2542	2747	csg.addChild(child);
2543	2748	child.addChild(csg);
	2749	+ }
2544	2750	} else
2545	2751	if (source == tripleItem)
2546	2752	{
	2753	+ if (!group.selection.isEmpty())
	2754	+ {
2547	2755	Composite csg = new GroupLeaf("Trident");
2548	2756	csg.count = 4;
2549	2757	group(csg);
..	..	@@ -2556,6 +2764,7 @@
2556	2764	child = new cGroup();
2557	2765	csg.addChild(child);
2558	2766	child.addChild(csg);
	2767	+ }
2559	2768	} else
2560	2769	if (source == computeAOItem)
2561	2770	{
..	..	@@ -2602,10 +2811,22 @@
2602	2811	{
2603	2812	Maximize();
2604	2813	} else
2605		- if (source == fullButton)
	2814	+ if (source == fullScreenButton)
2606	2815	{
2607	2816	ToggleFullScreen();
2608	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
2609	2830	if (source == previousVersionButton)
2610	2831	{
2611	2832	// Go to previous version
..	..	@@ -2617,13 +2838,13 @@
2617	2838	{
2618	2839	// Restore current version
2619	2840	Restore();
2620		- restoreButton.setEnabled(false);
	2841	+ //restoreButton.setEnabled(false);
2621	2842	} else
2622	2843	if (source == replaceButton)
2623	2844	{
2624	2845	// Overwrite current version
2625	2846	Replace();
2626		- replaceButton.setEnabled(false);
	2847	+ //replaceButton.setEnabled(false);
2627	2848	} else
2628	2849	if (source == nextVersionButton)
2629	2850	{
..	..	@@ -2633,7 +2854,7 @@
2633	2854	if (source == saveVersionButton)
2634	2855	{
2635	2856	// Save a new version
2636		- if (!Save(true))
	2857	+ if (!DuplicateVersion()) //true))
2637	2858	java.awt.Toolkit.getDefaultToolkit().beep();
2638	2859	} else
2639	2860	if (source == deleteVersionButton)
..	..	@@ -3179,22 +3400,34 @@
3179	3400	} else
3180	3401	if (source == ungroupItem \|\| source == ungroupButton)
3181	3402	{
3182		- boolean hasRoot = false;
	3403	+ boolean canUngroup = true;
3183	3404
3184	3405	for (int i=0; i<group.selection.size(); i++)
3185	3406	{
3186		- if (group.selection.get(i) == group)
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ if (selectedItem.Size() == 0)
3187	3410	{
3188		- 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;
3189	3420	break;
3190	3421	}
3191	3422	}
3192	3423
3193		- if (!hasRoot)
	3424	+ if (canUngroup)
3194	3425	{
3195	3426	for (int i=0; i<group.selection.size(); i++)
3196	3427	{
3197		- Ungroup(group.selection.get(i));
	3428	+ Object3D selectedItem = group.selection.get(i);
	3429	+
	3430	+ Ungroup(selectedItem);
3198	3431	}
3199	3432
3200	3433	ClearSelection(false);
..	..	@@ -3245,6 +3478,10 @@
3245	3478	if (source == clearMaterialsItem)
3246	3479	{
3247	3480	ClearMaterials();
	3481	+ } else
	3482	+ if (source == clearVersionsItem)
	3483	+ {
	3484	+ ClearVersions();
3248	3485	} else
3249	3486	if (source == liveleavesItem)
3250	3487	{
..	..	@@ -3385,6 +3622,18 @@
3385	3622	if (source == transformChildrenItem)
3386	3623	{
3387	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);
3388	3637	} else
3389	3638	if (source == resetTransformItem)
3390	3639	{
..	..	@@ -3557,38 +3806,7 @@
3557	3806	if (CameraPane.FULLSCREEN)
3558	3807	fullscreenLayout = radio.layout;
3559	3808
3560		- // bug
3561		- //gridPanel.setDividerLocation(1.0);
3562		- //bigPanel.setDividerLocation(0.0);
3563		-// bigThree.remove(scenePanel);
3564		-// bigThree.remove(centralPanel);
3565		-// bigThree.remove(XYZPanel);
3566		-// aWindowConstraints.gridx = 0;
3567		-// aWindowConstraints.gridy = 0;
3568		-// aWindowConstraints.gridwidth = 1;
3569		-// // aConstraints.gridheight = 3;
3570		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3571		-// aWindowConstraints.weightx = 0;
3572		-// aWindowConstraints.weighty = 1;
3573		-// //bigThree.add(jtp, aWindowConstraints);
3574		-// aWindowConstraints.weightx = 1;
3575		-// aWindowConstraints.gridwidth = 3;
3576		-// // aConstraints.gridheight = 3;
3577		-// aWindowConstraints.gridx = 1;
3578		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3579		-// bigThree.add(centralPanel, aWindowConstraints);
3580		-// aWindowConstraints.weightx = 0;
3581		-// aWindowConstraints.gridx = 4;
3582		-// aWindowConstraints.gridwidth = 1;
3583		-// // aConstraints.gridheight = 3;
3584		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3585		-// //bigThree.add(XYZPanel, aWindowConstraints);
3586		-// scenePanel.setVisible(false);
3587		-// centralPanel.setVisible(true);
3588		-// XYZPanel.setVisible(false);
3589		- bigThree.ClearUI();
3590		- bigThree.add(centralPanel);
3591		- bigThree.FlushUI();
	3809	+ Show3DView();
3592	3810
3593	3811	cameraView.requestFocusInWindow();
3594	3812
..	..	@@ -3774,6 +3992,7 @@
3774	3992	} else
3775	3993	if (source == rootButton)
3776	3994	{
	3995	+ Replace();
3777	3996	Object3D obj;
3778	3997	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3779	3998	{
..	..	@@ -3788,6 +4007,9 @@
3788	4007	if (source == closeButton)
3789	4008	{
3790	4009	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	4010	+ if (copy.versionlist != null)
	4011	+ Replace();
	4012	+
3791	4013	cRadio ab;
3792	4014	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3793	4015	{
..	..	@@ -3886,6 +4108,9 @@
3886	4108	} else
3887	4109	if(source instanceof cRadio)
3888	4110	{
	4111	+ if (copy.versionlist != null)
	4112	+ Replace();
	4113	+
3889	4114	group.parent = keepparent;
3890	4115	group.attributes = 0;
3891	4116	//group.editWindow = null;
..	..	@@ -3910,8 +4135,6 @@
3910	4135
3911	4136	copy = group;
3912	4137
3913		- SetUndoStates();
3914		-
3915	4138	//Globals.theRenderer.object = group;
3916	4139	if(!useclient)
3917	4140	{
..	..	@@ -3939,6 +4162,32 @@
3939	4162	*/
3940	4163	radio.layout.doClick();
3941	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	+
3942	4191	ClearUnpinned();
3943	4192
3944	4193	//Grafreed.Assert(group != null);
..	..	@@ -4052,9 +4301,46 @@
4052	4301	refreshContents();
4053	4302	}
4054	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	+
4055	4316	void ResetTransform()
4056	4317	{
4057	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();
4058	4344	}
4059	4345
4060	4346	void ResetTransform(int mask)
..	..	@@ -4067,42 +4353,8 @@
4067	4353	if (obj.toParent == null)
4068	4354	continue;
4069	4355
4070		- if (mask == -1)
4071		- {
4072		- if (obj instanceof Camera) // jan 2014
4073		- {
4074		- LA.matIdentity(obj.toParent);
4075		- LA.matIdentity(obj.fromParent);
4076		- }
4077		- else
4078		- {
4079		- obj.toParent = null; // jan 2014 LA.matIdentity(obj.toParent);
4080		- obj.fromParent = null; // LA.matIdentity(obj.fromParent);
4081		- }
4082		- TouchTransform(obj);
4083		- continue;
4084		- }
4085		- if ((mask&2) != 0) // Scale
4086		- {
4087		- obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4088		- obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
4089		- obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
4090		- obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4091		- obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4092		- obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4093		- }
4094		- if ((mask&4) != 0) // Rotation
4095		- {
4096		- // ?
4097		- }
4098		- if ((mask&1) != 0) // Translation
4099		- {
4100		- if (obj.toParent != null)
4101		- {
4102		- obj.toParent[3][0] = obj.toParent[3][1] = obj.toParent[3][2] = 0;
4103		- obj.fromParent[3][0] = obj.fromParent[3][1] = obj.fromParent[3][2] = 0;
4104		- }
4105		- }
	4356	+ obj.ResetTransform(mask);
	4357	+
4106	4358	if (obj.parent == null)
4107	4359	{
4108	4360	System.out.println("NULL PARENT!");
..	..	@@ -4611,10 +4863,17 @@
4611	4863	{
4612	4864	Object3D obj = group.selection.get(i);
4613	4865
	4866	+ if (obj.toParent == null)
	4867	+ {
	4868	+ obj.toParent = LA.newMatrix();
	4869	+ obj.fromParent = LA.newMatrix();
	4870	+ }
	4871	+
4614	4872	LA.matTranslate(obj.toParent, i * scale, 0, 0);
4615	4873	LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
4616	4874	}
4617	4875
	4876	+ Globals.lighttouched = true;
4618	4877	refreshContents();
4619	4878	}
4620	4879
..	..	@@ -4902,6 +5161,12 @@
4902	5161	refreshContents();
4903	5162	}
4904	5163
	5164	+ void ClearVersions()
	5165	+ {
	5166	+ group.selection.ClearVersions();
	5167	+ refreshContents();
	5168	+ }
	5169	+
4905	5170	void FlipV(boolean flip)
4906	5171	{
4907	5172	group.selection.FlipV(flip);
..	..	@@ -5140,10 +5405,10 @@
5140	5405	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
5141	5406	// a camera
5142	5407	{
5143		- 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
5144	5409	{
5145	5410	CameraPane.camerachangeframe = 0; // don't refuse it
5146		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	5411	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent(), true);
5147	5412	}
5148	5413	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
5149	5414	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
..	..	@@ -5169,15 +5434,31 @@
5169	5434	{
5170	5435	editButton.setEnabled(enabled);
5171	5436	uneditButton.setEnabled(enabled);
5172		- unselectButton.setEnabled(enabled);
	5437	+ //unselectButton.setEnabled(enabled);
5173	5438	flashSelectionButton.setEnabled(enabled);
5174	5439
5175	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);
5176	5456	}
5177	5457
5178	5458	void refreshContents(boolean cp)
5179	5459	{
5180		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5460	+ if (Globals.SHOWINFO)
	5461	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5181	5462	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5182	5463	{
5183	5464	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5187,7 +5468,7 @@
5187	5468	Object3D child = (Object3D) group.selection.get(i);
5188	5469
5189	5470	objEditor.AddInfo(child, this, true);
5190		- System.err.println("info : " + child.GetPath());
	5471	+// System.err.println("info : " + child.GetPath());
5191	5472	}
5192	5473
5193	5474	objEditor.SetText(); // jan 2014
..	..	@@ -6070,11 +6351,11 @@
6070	6351	private MenuItem lookAtItem;
6071	6352	private MenuItem lookFromItem;
6072	6353	private MenuItem switchViewItem;
6073		- private MenuItem cutItem;
	6354	+ private JMenuItem cutItem;
6074	6355	private MenuItem undoItem;
6075	6356	private MenuItem redoItem;
6076	6357	private JMenuItem duplicateItem;
6077		- private MenuItem cloneItem;
	6358	+ private JMenuItem cloneItem;
6078	6359	private MenuItem cloneSupportItem;
6079	6360	private MenuItem overwriteGeoItem;
6080	6361	private MenuItem overwriteMatItem;
..	..	@@ -6095,13 +6376,13 @@
6095	6376	private MenuItem cloneGeometriesItem;
6096	6377	private MenuItem shareGeometriesItem;
6097	6378	private MenuItem mergeGeometriesItem;
6098		- private MenuItem copyItem;
	6379	+ private JMenuItem copyItem;
6099	6380	private MenuItem pasteItem;
6100		- private MenuItem pasteIntoItem;
6101		- private MenuItem pasteLinkItem;
6102		- private MenuItem pasteCloneItem;
6103		- private MenuItem pasteExpandItem;
6104		- private MenuItem deleteItem;
	6381	+ private JMenuItem pasteIntoItem;
	6382	+ private JMenuItem pasteLinkItem;
	6383	+ private JMenuItem pasteCloneItem;
	6384	+ private JMenuItem pasteExpandItem;
	6385	+ private JMenuItem deleteItem;
6105	6386	private MenuItem clearAllItem;
6106	6387	private MenuItem genUVItem;
6107	6388	private MenuItem genNormalsMESHItem;
..	..	@@ -6127,6 +6408,7 @@
6127	6408	private MenuItem clipMeshItem;
6128	6409	private MenuItem smoothMeshItem;
6129	6410	private MenuItem clearMaterialsItem;
	6411	+ private MenuItem clearVersionsItem;
6130	6412
6131	6413	private MenuItem liveleavesItem;
6132	6414	private MenuItem unliveleavesItem;
..	..	@@ -6150,13 +6432,16 @@
6150	6432	private MenuItem maxTexturesItem;
6151	6433	private MenuItem panoTexturesItem;
6152	6434
	6435	+ private MenuItem textureRatioRItem;
	6436	+ private MenuItem textureRatioGItem;
	6437	+ private MenuItem textureRatioBItem;
6153	6438	private MenuItem resetCentroidItem;
6154	6439	private MenuItem resetCentroidXZItem;
6155	6440	private MenuItem resetTransformItem;
6156	6441	private MenuItem transformGeometryItem;
6157	6442	private MenuItem transformChildrenItem;
6158	6443	private MenuItem hideItem;
6159		- private MenuItem grabItem;
	6444	+ private JMenuItem grabItem;
6160	6445	private MenuItem backItem;
6161	6446	private MenuItem frontItem;
6162	6447	private MenuItem cameraItem;
..	..	@@ -6169,7 +6454,7 @@
6169	6454	private MenuItem switchTransfoItem;
6170	6455	private MenuItem morphItem;
6171	6456	private MenuItem linkerItem;
6172		- private MenuItem ungroupItem;
	6457	+ private JMenuItem ungroupItem;
6173	6458	private MenuItem editItem;
6174	6459	private MenuItem openWindowItem;
6175	6460	private MenuItem editLeafItem;