~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -31,7 +31,7 @@
31	31	final String path = "cubemaps/" + f + "-skyboxes/" + s;
32	32	row.add(skyboxButton = GetButton(path + "/preview.jpg", !Grafreed.NIMBUSLAF));
33	33	//row.add(skyboxButton = GetButton(path + "/negx.jpg", !Grafreed.NIMBUSLAF));
34		- skyboxButton.setToolTipText(s);
	34	+ skyboxButton.setToolTipText(s.equals("") ? "No background" : s);
35	35	skyboxButton.addActionListener(new ActionListener()
36	36	{
37	37	@Override
..	..	@@ -73,7 +73,7 @@
73	73	cGridBag row5 = new cGridBag();
74	74	cGridBag row6 = new cGridBag();
75	75
76		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
77	77	//AddSkyboxButton("default", "cornell", row0);
78	78	AddSkyboxButton("penguins", "dust", row0);
79	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -330,10 +330,19 @@
330	330
331	331	public void ChangeSkybox(String skybox)
332	332	{
333		- //cameraView.envyoff = false;
334		- group.skyboxname = skybox;
335		- group.skyboxext = "jpg";
336		- cameraView.repaint();
	333	+ if (skybox.endsWith("/"))
	334	+ {
	335	+ group.skyboxname = null;
	336	+ group.skyboxext = null;
	337	+ cameraView.repaint();
	338	+ }
	339	+ else
	340	+ {
	341	+ //cameraView.envyoff = false;
	342	+ group.skyboxname = skybox;
	343	+ group.skyboxext = "jpg";
	344	+ cameraView.repaint();
	345	+ }
337	346	}
338	347
339	348	public void CreateSkyboxPanel(cGridBag skyboxPanel)
..	..	@@ -357,6 +366,16 @@
357	366	}
358	367
359	368	refreshContents();
	369	+ }
	370	+
	371	+ public void Show3DView()
	372	+ {
	373	+ // bug
	374	+ //gridPanel.setDividerLocation(1.0);
	375	+ //bigPanel.setDividerLocation(0.0);
	376	+ bigThree.ClearUI();
	377	+ bigThree.add(centralPanel);
	378	+ bigThree.FlushUI();
360	379	}
361	380
362	381	//ObjEditor objEditor;
..	..	@@ -396,10 +415,14 @@
396	415	this.copy = this.group = group;
397	416	//selectees = this.group.selectees;
398	417
	418	+ assert(false);
	419	+
399	420	if (copy.versionlist == null)
400	421	{
401	422	copy.versionlist = new Object3D[100];
402	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
403	426	}
404	427
405	428	if(ui)
..	..	@@ -428,7 +451,7 @@
428	451	copy.versionlist = new Object3D[100];
429	452	copy.versionindex = -1;
430	453
431		- Save(true);
	454	+ //Save(true);
432	455	}
433	456	}
434	457
..	..	@@ -519,33 +542,35 @@
519	542	// menu.add("-");
520	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
521	544	duplicateItem.addActionListener(this);
522		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
523	547	cloneItem.addActionListener(this);
524		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
525	549	{
526	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
527	551	cloneSupportItem.addActionListener(this);
528	552	}
	553	+ oe.jTree.popup.addSeparator();
529	554	menu.add("-");
530		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
531	556	cutItem.addActionListener(this);
532		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
533	558	copyItem.addActionListener(this);
534	559	pasteItem = menu.add(new MenuItem("Paste"));
535	560	pasteItem.addActionListener(this);
536	561
537		- menu.add("-");
538		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
539	565	pasteIntoItem.addActionListener(this);
540		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
541	567	pasteLinkItem.addActionListener(this);
542		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
543	569	pasteCloneItem.addActionListener(this);
544		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
545	571	// pasteExpandItem.addActionListener(this);
546		- menu.add("-");
547		- deleteItem = menu.add(new MenuItem("Delete"));
548		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
549	574
550	575	if (Globals.ADVANCED)
551	576	{
..	..	@@ -631,11 +656,9 @@
631	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
632	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
633	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
634		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
635	659	oe.cameraMenu.add("-");
636	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
637	661	openWindowItem.addActionListener(this);
638		- editLeafItem.addActionListener(this);
639	662	lookAtItem.addActionListener(this);
640	663	//lookFromItem.addActinoListener(this);
641	664	//switchViewItem.addActionListener(this);
..	..	@@ -682,9 +705,8 @@
682	705	setMasterItem.addActionListener(this);
683	706	}
684	707
685		- oe.menuBar.add(menu = new Menu("Group"));
686		-// grabItem = menu.add(new MenuItem("Grab"));
687		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
688	710	backItem = menu.add(new MenuItem("Back"));
689	711	backItem.addActionListener(this);
690	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -692,13 +714,21 @@
692	714	// compositeItem = menu.add(new MenuItem("Composite"));
693	715	// compositeItem.addActionListener(this);
694	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
695	720	if (Globals.ADVANCED)
696	721	{
697	722	hideItem = menu.add(new MenuItem("Hidden Group"));
698	723	hideItem.addActionListener(this);
699	724	}
700		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
701	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
702	732
703	733	// menu.add("-");
704	734	//
..	..	@@ -883,6 +913,9 @@
883	913	shareGeometriesItem.addActionListener(this);
884	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
885	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
886	919	if (Globals.ADVANCED)
887	920	{
888	921	// Pretty much the same as duplicate and clone.
..	..	@@ -901,7 +934,7 @@
901	934
902	935	JTabbedPane resourcecontainer;
903	936	cGridBag currenttab;
904		- boolean added; // patch for jar
	937	+ //boolean added; // patch for jar
905	938
906	939	int tabcount = 0;
907	940	int colcount = 0;
..	..	@@ -918,12 +951,14 @@
918	951	// System.out.println();
919	952
920	953	if (//rowcount == 0 \|\|
921		- path.length == 1)
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
922	955	{
923	956	currenttab = new cGridBag();
924		- added = false;
925	957	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
926	958	currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
927	962	rowcount = 1;
928	963	colcount = 0;
929	964	texturecount = 0;
..	..	@@ -931,12 +966,11 @@
931	966
932	967	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
933	968	{
934		- if (!added)
	969	+ //if (!added)
935	970	{
936		- added = true;
937		- resourcecontainer.add(currenttab);
	971	+ //added = true;
938	972	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
940	974	}
941	975
942	976	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -984,11 +1018,6 @@
984	1018	//new Exception().printStackTrace();
985	1019
986	1020	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	1021	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
993	1022
994	1023	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1009,9 +1038,9 @@
1009	1038	oe.radioPanel.add(dummyButton);
1010	1039	oe.buttonGroup.add(dummyButton);
1011	1040	*/
1012		- cGridBag copyOptionsPanel = new cGridBag();
	1041	+ cGridBag versionManagerPanel = new cGridBag();
1013	1042
1014		- copyOptionsPanel.preferredHeight = 2;
	1043	+ versionManagerPanel.preferredHeight = 4;
1015	1044
1016	1045	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
1017	1046
..	..	@@ -1021,10 +1050,49 @@
1021	1050
1022	1051	if (Globals.ADVANCED)
1023	1052	{
1024		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1025		- maxButton.setToolTipText("Maximize window");
1026		- maxButton.addActionListener(this);
	1053	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// maxButton.setToolTipText("Maximize window");
	1055	+// maxButton.addActionListener(this);
1027	1056	}
	1057	+
	1058	+ cButton gcButton;
	1059	+
	1060	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1061	+// gcButton.setToolTipText("Garbage collect");
	1062	+// gcButton.addActionListener(new ActionListener()
	1063	+// {
	1064	+// public void actionPerformed(ActionEvent e)
	1065	+// {
	1066	+// System.gc();
	1067	+// }
	1068	+// });
	1069	+
	1070	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1071	+ collapseButton.setToolTipText("Collapse toolbar");
	1072	+ collapseButton.addActionListener(this);
	1073	+
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1075	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1076	+ maximize3DButton.addActionListener(this);
	1077	+
	1078	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1079	+ twoButton.setToolTipText("Show 3D view only");
	1080	+ twoButton.addActionListener(this);
	1081	+ this.fullscreenLayout = twoButton;
	1082	+
	1083	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1084	+ threeButton.setToolTipText("Show controls and 3D view");
	1085	+ threeButton.addActionListener(this);
	1086	+ if (Globals.ADVANCED)
	1087	+ {
	1088	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1089	+ sixButton.setToolTipText("Show 3D view and controls");
	1090	+ sixButton.addActionListener(this);
	1091	+ }
	1092	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1093	+// sevenButton.setToolTipText("3-column layout");
	1094	+// sevenButton.addActionListener(this);
	1095	+ //
1028	1096
1029	1097	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030	1098	fullButton.setToolTipText("Full-screen window");
..	..	@@ -1038,15 +1106,16 @@
1038	1106	restoreCameraButton.setToolTipText("Restore viewpoint");
1039	1107	restoreCameraButton.addActionListener(this);
1040	1108
1041		- copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1109	+ versionManagerPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1042	1110	saveVersionButton.setToolTipText("Duplicate current version");
1043	1111	saveVersionButton.addActionListener(this);
1044	1112
1045		- copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1113	+ versionManagerPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1046	1114	deleteVersionButton.setToolTipText("Delete current version");
1047	1115	deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
1048	1117
1049		- copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1118	+ versionManagerPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050	1119	previousVersionButton.setToolTipText("Previous version");
1051	1120	previousVersionButton.addActionListener(this);
1052	1121	previousVersionButton.setEnabled(false);
..	..	@@ -1055,28 +1124,28 @@
1055	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1056	1125	restoreButton.setToolTipText("Undo (restore current version)");
1057	1126	restoreButton.addActionListener(this);
1058		- //restoreButton.setEnabled(false);
	1127	+ restoreButton.setEnabled(false);
1059	1128
1060	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1061	1130	replaceButton.setToolTipText("Save (replace current version)");
1062	1131	replaceButton.addActionListener(this);
1063		- //replaceButton.setEnabled(false);
	1132	+ replaceButton.setEnabled(false);
1064	1133
1065		- copyOptionsPanel.add(updown);
	1134	+ versionManagerPanel.add(updown);
1066	1135
1067		- copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1136	+ versionManagerPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1068	1137	nextVersionButton.setToolTipText("Next version");
1069	1138	nextVersionButton.addActionListener(this);
1070	1139	nextVersionButton.setEnabled(false);
	1140	+
	1141	+ oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1142	+ oneStepButton.setToolTipText("Animate one step forward");
	1143	+ oneStepButton.addActionListener(this);
1071	1144
1072	1145	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1073	1146	liveCB.setToolTipText("Enable animation");
1074	1147	liveCB.addItemListener(this);
1075	1148
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	1149	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1081	1150	fastCB.setToolTipText("Fast mode");
1082	1151	fastCB.addItemListener(this);
..	..	@@ -1103,21 +1172,6 @@
1103	1172
1104	1173	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1105	1174
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	1175
1122	1176	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1123	1177	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1133,12 +1187,16 @@
1133	1187
1134	1188	// INSERT
1135	1189	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1136		- gridButton.setToolTipText("Create grid");
	1190	+ gridButton.setToolTipText("Create ground");
1137	1191	gridButton.addActionListener(this);
1138	1192
1139	1193	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1140	1194	boxButton.setToolTipText("Create box");
1141	1195	boxButton.addActionListener(this);
	1196	+
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
1142	1200
1143	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1144	1202	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1151,10 +1209,6 @@
1151	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1152	1210	torusButton.setToolTipText("Create torus");
1153	1211	torusButton.addActionListener(this);
1154		-
1155		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1156		- superButton.setToolTipText("Create superellipsoid");
1157		- superButton.addActionListener(this);
1158	1212
1159	1213	if (Globals.ADVANCED)
1160	1214	{
..	..	@@ -1204,6 +1258,8 @@
1204	1258	cGridBag textures = new cGridBag();
1205	1259
1206	1260	CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1207	1263
1208	1264	oe.toolboxPanel.add(textures);
1209	1265
..	..	@@ -1255,6 +1311,8 @@
1255	1311
1256	1312	cGridBag jSPPanel = new cGridBag();
1257	1313
	1314	+ jSPPanel.preferredHeight = 20;
	1315	+
1258	1316	JScrollPane jSP;
1259	1317	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
1260	1318	jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
..	..	@@ -1263,11 +1321,11 @@
1263	1321	oe.treePanel.add(jSPPanel);
1264	1322	oe.treePanel.Return();
1265	1323
1266		- oe.treePanel.add(copyOptionsPanel);
	1324	+ oe.treePanel.add(versionManagerPanel);
1267	1325	oe.treePanel.Return();
1268		- cGridBag sliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1269		- versionSlider = (cNumberSlider)sliderPane.getComponent(1);
1270		- sliderPane.preferredHeight = 1;
	1326	+ versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
	1327	+ versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
	1328	+ versionSliderPane.preferredHeight = 3;
1271	1329
1272	1330	// mainPanel.setDividerLocation(0.1); //1.0);
1273	1331	mainPanel.setResizeWeight(0.4);
..	..	@@ -1425,6 +1483,14 @@
1425	1483
1426	1484	void EditObject(Object3D obj)
1427	1485	{
	1486	+ assert(obj instanceof Composite);
	1487	+
	1488	+// if (obj.versionlist == null)
	1489	+// {
	1490	+// obj.versionlist = new Object3D[100];
	1491	+// obj.versionindex = -1;
	1492	+// }
	1493	+
1428	1494	cRadio radioButton = new cRadio(obj.name);
1429	1495
1430	1496	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1449,6 +1515,7 @@
1449	1515
1450	1516	oe.SetupViews();
1451	1517
	1518	+ if (Globals.DEBUG)
1452	1519	System.out.println("SetupViews");
1453	1520	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1454	1521	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -1815,7 +1882,12 @@
1815	1882	TreePath path;
1816	1883
1817	1884	public TransferableTreePath(TreePath tp) {
1818		- path = tp;
	1885	+ Object[] objs = new Object[tp.getPathCount()];
	1886	+ for (int i=0; i<objs.length; i++)
	1887	+ {
	1888	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1889	+ }
	1890	+ path = new TreePath(objs);
1819	1891	}
1820	1892
1821	1893	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2105,7 +2177,11 @@
2105	2177	shadow.material = new cMaterial(obj.material);
2106	2178	shadow.material.diffuse = 0.0001f;
2107	2179	shadow.material.specular = 0.0001f;
2108		- //shadow.projectedVertices[1].x = 300;
	2180	+ shadow.material.opacity = 0.75f;
	2181	+
	2182	+ AllocProjectedVertices(shadow);
	2183	+
	2184	+ shadow.projectedVertices[1].x = 300;
2109	2185
2110	2186	makeSomething(shadow);
2111	2187	}
..	..	@@ -2626,27 +2702,35 @@
2626	2702	} else
2627	2703	if (source == loopItem \|\| source == loopButton)
2628	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2629	2707	Composite csg = new GroupLeaf();
2630	2708	csg.count = 5;
2631		- group(csg);
2632	2709	Composite child = new cGroup("Branch");
2633	2710	csg.addChild(child);
2634	2711	child.addChild(csg);
	2712	+ group(csg);
	2713	+ }
2635	2714	} else
2636	2715	if (source == doubleItem)
2637	2716	{
	2717	+ if (!group.selection.isEmpty())
	2718	+ {
2638	2719	Composite csg = new GroupLeaf("Fork");
2639	2720	csg.count = 5;
2640		- group(csg);
2641	2721	Composite child = new cGroup("Branch A");
2642	2722	csg.addChild(child);
2643	2723	child.addChild(csg);
2644	2724	child = new cGroup("Branch B");
2645	2725	csg.addChild(child);
2646	2726	child.addChild(csg);
	2727	+ group(csg);
	2728	+ }
2647	2729	} else
2648	2730	if (source == tripleItem)
2649	2731	{
	2732	+ if (!group.selection.isEmpty())
	2733	+ {
2650	2734	Composite csg = new GroupLeaf("Trident");
2651	2735	csg.count = 4;
2652	2736	group(csg);
..	..	@@ -2659,6 +2743,7 @@
2659	2743	child = new cGroup();
2660	2744	csg.addChild(child);
2661	2745	child.addChild(csg);
	2746	+ }
2662	2747	} else
2663	2748	if (source == computeAOItem)
2664	2749	{
..	..	@@ -2708,6 +2793,18 @@
2708	2793	if (source == fullButton)
2709	2794	{
2710	2795	ToggleFullScreen();
	2796	+ } else
	2797	+ if (source == collapseButton)
	2798	+ {
	2799	+ this.expandedLayout = radio.layout;
	2800	+ CollapseToolbar();
	2801	+ } else
	2802	+ if (source == maximize3DButton)
	2803	+ {
	2804	+ this.expandedLayout = radio.layout;
	2805	+ radio.layout = twoButton;
	2806	+ Show3DView();
	2807	+ CollapseToolbar();
2711	2808	} else
2712	2809	if (source == previousVersionButton)
2713	2810	{
..	..	@@ -3282,22 +3379,34 @@
3282	3379	} else
3283	3380	if (source == ungroupItem \|\| source == ungroupButton)
3284	3381	{
3285		- boolean hasRoot = false;
	3382	+ boolean canUngroup = true;
3286	3383
3287	3384	for (int i=0; i<group.selection.size(); i++)
3288	3385	{
3289		- if (group.selection.get(i) == group)
	3386	+ Object3D selectedItem = group.selection.get(i);
	3387	+
	3388	+ if (selectedItem.Size() == 0)
3290	3389	{
3291		- hasRoot = true;
	3390	+ // Cannot ungroup leaves
	3391	+ canUngroup = false;
	3392	+ break;
	3393	+ }
	3394	+
	3395	+ if (selectedItem == group)
	3396	+ {
	3397	+ // Cannot ungroup root
	3398	+ canUngroup = false;
3292	3399	break;
3293	3400	}
3294	3401	}
3295	3402
3296		- if (!hasRoot)
	3403	+ if (canUngroup)
3297	3404	{
3298	3405	for (int i=0; i<group.selection.size(); i++)
3299	3406	{
3300		- Ungroup(group.selection.get(i));
	3407	+ Object3D selectedItem = group.selection.get(i);
	3408	+
	3409	+ Ungroup(selectedItem);
3301	3410	}
3302	3411
3303	3412	ClearSelection(false);
..	..	@@ -3660,38 +3769,7 @@
3660	3769	if (CameraPane.FULLSCREEN)
3661	3770	fullscreenLayout = radio.layout;
3662	3771
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();
	3772	+ Show3DView();
3695	3773
3696	3774	cameraView.requestFocusInWindow();
3697	3775
..	..	@@ -3877,6 +3955,7 @@
3877	3955	} else
3878	3956	if (source == rootButton)
3879	3957	{
	3958	+ Replace();
3880	3959	Object3D obj;
3881	3960	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3882	3961	{
..	..	@@ -3891,6 +3970,8 @@
3891	3970	if (source == closeButton)
3892	3971	{
3893	3972	//System.out.println("CLOSE: " + buttonGroup.getSelection());
	3973	+ Replace();
	3974	+
3894	3975	cRadio ab;
3895	3976	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3896	3977	{
..	..	@@ -3989,6 +4070,8 @@
3989	4070	} else
3990	4071	if(source instanceof cRadio)
3991	4072	{
	4073	+ Replace();
	4074	+
3992	4075	group.parent = keepparent;
3993	4076	group.attributes = 0;
3994	4077	//group.editWindow = null;
..	..	@@ -4013,8 +4096,6 @@
4013	4096
4014	4097	copy = group;
4015	4098
4016		- SetUndoStates();
4017		-
4018	4099	//Globals.theRenderer.object = group;
4019	4100	if(!useclient)
4020	4101	{
..	..	@@ -4042,6 +4123,29 @@
4042	4123	*/
4043	4124	radio.layout.doClick();
4044	4125
	4126	+ assert(copy instanceof Composite);
	4127	+
	4128	+ if (copy.versionlist == null)
	4129	+ {
	4130	+ copy.versionindex = -1;
	4131	+
	4132	+ // Cannot work with loops
	4133	+ // To fix this issue, we first mark all nodes above the root,
	4134	+ // and check if any of these nodes are reachable below the root.
	4135	+ Grafreed.grafreed.universe.TagObjects(copy, true);
	4136	+
	4137	+ if (!copy.HasTags())
	4138	+ {
	4139	+ copy.versionlist = new Object3D[100];
	4140	+
	4141	+ Save(true);
	4142	+ }
	4143	+
	4144	+ Grafreed.grafreed.universe.TagObjects(copy, false);
	4145	+ }
	4146	+
	4147	+ SetVersionStates();
	4148	+
4045	4149	ClearUnpinned();
4046	4150
4047	4151	//Grafreed.Assert(group != null);
..	..	@@ -4185,7 +4289,7 @@
4185	4289	TouchTransform(obj);
4186	4290	continue;
4187	4291	}
4188		- if ((mask&2) != 0) // Scale
	4292	+ if ((mask&2) != 0) // Scale/rotation
4189	4293	{
4190	4294	obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = 1;
4191	4295	obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
..	..	@@ -4193,10 +4297,6 @@
4193	4297	obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1;
4194	4298	obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
4195	4299	obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
4196		- }
4197		- if ((mask&4) != 0) // Rotation
4198		- {
4199		- // ?
4200	4300	}
4201	4301	if ((mask&1) != 0) // Translation
4202	4302	{
..	..	@@ -5276,10 +5376,26 @@
5276	5376	flashSelectionButton.setEnabled(enabled);
5277	5377
5278	5378	clearPanelButton.setEnabled(!listUI.isEmpty());
	5379	+
	5380	+ boolean allComposites = true;
	5381	+
	5382	+ if (group.selection != null)
	5383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5384	+ {
	5385	+ Object next = e.nextElement();
	5386	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5387	+ {
	5388	+ allComposites = false;
	5389	+ break;
	5390	+ }
	5391	+ }
	5392	+
	5393	+ rootButton.setEnabled(allComposites);
5279	5394	}
5280	5395
5281	5396	void refreshContents(boolean cp)
5282	5397	{
	5398	+ if (false)
5283	5399	//if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5284	5400	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5285	5401	{
..	..	@@ -5290,7 +5406,7 @@
5290	5406	Object3D child = (Object3D) group.selection.get(i);
5291	5407
5292	5408	objEditor.AddInfo(child, this, true);
5293		- System.err.println("info : " + child.GetPath());
	5409	+// System.err.println("info : " + child.GetPath());
5294	5410	}
5295	5411
5296	5412	objEditor.SetText(); // jan 2014
..	..	@@ -6173,11 +6289,11 @@
6173	6289	private MenuItem lookAtItem;
6174	6290	private MenuItem lookFromItem;
6175	6291	private MenuItem switchViewItem;
6176		- private MenuItem cutItem;
	6292	+ private JMenuItem cutItem;
6177	6293	private MenuItem undoItem;
6178	6294	private MenuItem redoItem;
6179	6295	private JMenuItem duplicateItem;
6180		- private MenuItem cloneItem;
	6296	+ private JMenuItem cloneItem;
6181	6297	private MenuItem cloneSupportItem;
6182	6298	private MenuItem overwriteGeoItem;
6183	6299	private MenuItem overwriteMatItem;
..	..	@@ -6198,13 +6314,13 @@
6198	6314	private MenuItem cloneGeometriesItem;
6199	6315	private MenuItem shareGeometriesItem;
6200	6316	private MenuItem mergeGeometriesItem;
6201		- private MenuItem copyItem;
	6317	+ private JMenuItem copyItem;
6202	6318	private MenuItem pasteItem;
6203		- private MenuItem pasteIntoItem;
6204		- private MenuItem pasteLinkItem;
6205		- private MenuItem pasteCloneItem;
6206		- private MenuItem pasteExpandItem;
6207		- private MenuItem deleteItem;
	6319	+ private JMenuItem pasteIntoItem;
	6320	+ private JMenuItem pasteLinkItem;
	6321	+ private JMenuItem pasteCloneItem;
	6322	+ private JMenuItem pasteExpandItem;
	6323	+ private JMenuItem deleteItem;
6208	6324	private MenuItem clearAllItem;
6209	6325	private MenuItem genUVItem;
6210	6326	private MenuItem genNormalsMESHItem;
..	..	@@ -6259,7 +6375,7 @@
6259	6375	private MenuItem transformGeometryItem;
6260	6376	private MenuItem transformChildrenItem;
6261	6377	private MenuItem hideItem;
6262		- private MenuItem grabItem;
	6378	+ private JMenuItem grabItem;
6263	6379	private MenuItem backItem;
6264	6380	private MenuItem frontItem;
6265	6381	private MenuItem cameraItem;
..	..	@@ -6272,7 +6388,7 @@
6272	6388	private MenuItem switchTransfoItem;
6273	6389	private MenuItem morphItem;
6274	6390	private MenuItem linkerItem;
6275		- private MenuItem ungroupItem;
	6391	+ private JMenuItem ungroupItem;
6276	6392	private MenuItem editItem;
6277	6393	private MenuItem openWindowItem;
6278	6394	private MenuItem editLeafItem;