~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
..	..	@@ -42,12 +42,12 @@
42	42	});
43	43	}
44	44
45		- public void AddTextureButton(String f, final String t, cGridBag row)
	45	+ public void AddTextureButton(String f, String c, final String t, int count, cGridBag row)
46	46	{
47	47	cButton textureButton;
48		- final String path = "textures/" + f + "/"; // + t;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
49	49	row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
50		- textureButton.setToolTipText(f + "s");
	50	+ textureButton.setToolTipText(c + count);
51	51	textureButton.addActionListener(new ActionListener()
52	52	{
53	53	@Override
..	..	@@ -73,7 +73,7 @@
73	73	cGridBag row5 = new cGridBag();
74	74	cGridBag row6 = new cGridBag();
75	75
76		- AddSkyboxButton("default", "rgb", row0);
	76	+ AddSkyboxButton("default", "", row0);
77	77	//AddSkyboxButton("default", "cornell", row0);
78	78	AddSkyboxButton("penguins", "dust", row0);
79	79	AddSkyboxButton("penguins", "tropic", row0);
..	..	@@ -330,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)
..	..	@@ -350,7 +359,23 @@
350	359
351	360	public void ChangeTexture(String texture)
352	361	{
353		- cameraView.repaint();
	362	+ for (int i=0; i<group.selection.size(); i++)
	363	+ {
	364	+ Object3D obj = group.selection.get(i);
	365	+ obj.SetPigmentTexture("@" + texture);
	366	+ }
	367	+
	368	+ refreshContents();
	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();
354	379	}
355	380
356	381	//ObjEditor objEditor;
..	..	@@ -394,6 +419,8 @@
394	419	{
395	420	copy.versionlist = new Object3D[100];
396	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
397	424	}
398	425
399	426	if(ui)
..	..	@@ -625,11 +652,9 @@
625	652	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
626	653	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
627	654	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
628		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
629	655	oe.cameraMenu.add("-");
630	656	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
631	657	openWindowItem.addActionListener(this);
632		- editLeafItem.addActionListener(this);
633	658	lookAtItem.addActionListener(this);
634	659	//lookFromItem.addActinoListener(this);
635	660	//switchViewItem.addActionListener(this);
..	..	@@ -877,6 +902,9 @@
877	902	shareGeometriesItem.addActionListener(this);
878	903	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
879	904	mergeGeometriesItem.addActionListener(this);
	905	+ menu.add("-");
	906	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	907	+ editLeafItem.addActionListener(this);
880	908	if (Globals.ADVANCED)
881	909	{
882	910	// Pretty much the same as duplicate and clone.
..	..	@@ -900,35 +928,41 @@
900	928	int tabcount = 0;
901	929	int colcount = 0;
902	930	int rowcount = 0;
	931	+ int texturecount = 0;
903	932
904	933	int columns = 5;
905	934	int rows = 7;
906	935
907	936	public void ResourceCallBack(String[] path)
908	937	{
909		- for (int i = 0; i < path.length; i++)
910		- System.out.print(path[i] + "/");
911		- System.out.println();
912		- if (rowcount == 0)
	938	+// for (int i = 0; i < path.length; i++)
	939	+// System.out.print(path[i] + "/");
	940	+// System.out.println();
	941	+
	942	+ if (//rowcount == 0 \|\|
	943	+ path.length == 1)
913	944	{
914	945	currenttab = new cGridBag();
915	946	added = false;
916		- String tabname = String.valueOf((char)('A'+tabcount));
	947	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
917	948	currenttab.setName(tabname);
918	949	rowcount = 1;
	950	+ colcount = 0;
	951	+ texturecount = 0;
919	952	}
920	953
921		- if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	954	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
922	955	{
923	956	if (!added)
924	957	{
925	958	added = true;
926	959	resourcecontainer.add(currenttab);
927		- String tabname = String.valueOf((char)('A'+tabcount));
	960	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
928	961	resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
929	962	}
930	963
931		- AddTextureButton(path[0], path[1], currenttab);
	964	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	965	+
932	966	if (++colcount >= columns)
933	967	{
934	968	colcount = 0;
..	..	@@ -949,7 +983,7 @@
949	983
950	984	void CreateTexturePanel(cGridBag container)
951	985	{
952		- resourcecontainer = new JTabbedPane();
	986	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
953	987	container.add(resourcecontainer);
954	988
955	989	Grafreed.ParseResources("textures", this);
..	..	@@ -972,11 +1006,6 @@
972	1006	//new Exception().printStackTrace();
973	1007
974	1008	oe.radioPanel = new JPanel(new GridBagLayout());
975		- oe.aConstraints.weightx = 1;
976		- oe.aConstraints.weighty = 0;
977		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
978		- oe.aConstraints.gridwidth = 100;
979		- oe.aConstraints.gridheight = 1;
980	1009	// oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
981	1010
982	1011	oe.buttonGroup = new ButtonGroup();
..	..	@@ -1009,10 +1038,49 @@
1009	1038
1010	1039	if (Globals.ADVANCED)
1011	1040	{
1012		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1013		- maxButton.setToolTipText("Maximize window");
1014		- maxButton.addActionListener(this);
	1041	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+// maxButton.setToolTipText("Maximize window");
	1043	+// maxButton.addActionListener(this);
1015	1044	}
	1045	+
	1046	+// cButton gcButton;
	1047	+//
	1048	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1049	+// gcButton.setToolTipText("Garbage collect");
	1050	+// gcButton.addActionListener(new ActionListener()
	1051	+// {
	1052	+// public void actionPerformed(ActionEvent e)
	1053	+// {
	1054	+// System.gc();
	1055	+// }
	1056	+// });
	1057	+
	1058	+ oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1059	+ collapseButton.setToolTipText("Collapse toolbar");
	1060	+ collapseButton.addActionListener(this);
	1061	+
	1062	+ oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1063	+ maximize3DButton.setToolTipText("Maximize 3D view");
	1064	+ maximize3DButton.addActionListener(this);
	1065	+
	1066	+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1067	+ twoButton.setToolTipText("Show 3D view only");
	1068	+ twoButton.addActionListener(this);
	1069	+ this.fullscreenLayout = twoButton;
	1070	+
	1071	+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ threeButton.setToolTipText("Show controls and 3D view");
	1073	+ threeButton.addActionListener(this);
	1074	+ if (Globals.ADVANCED)
	1075	+ {
	1076	+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1077	+ sixButton.setToolTipText("Show 3D view and controls");
	1078	+ sixButton.addActionListener(this);
	1079	+ }
	1080	+// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1081	+// sevenButton.setToolTipText("3-column layout");
	1082	+// sevenButton.addActionListener(this);
	1083	+ //
1016	1084
1017	1085	oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1018	1086	fullButton.setToolTipText("Full-screen window");
..	..	@@ -1057,14 +1125,14 @@
1057	1125	nextVersionButton.addActionListener(this);
1058	1126	nextVersionButton.setEnabled(false);
1059	1127
1060		- oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
1061		- liveCB.setToolTipText("Enable animation");
1062		- liveCB.addItemListener(this);
1063		-
1064	1128	oe.toolbarPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1065	1129	oneStepButton.setToolTipText("Animate one step forward");
1066	1130	oneStepButton.addActionListener(this);
1067	1131
	1132	+ oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
	1133	+ liveCB.setToolTipText("Enable animation");
	1134	+ liveCB.addItemListener(this);
	1135	+
1068	1136	oe.toolbarPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
1069	1137	fastCB.setToolTipText("Fast mode");
1070	1138	fastCB.addItemListener(this);
..	..	@@ -1091,21 +1159,6 @@
1091	1159
1092	1160	//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
1093	1161
1094		- oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1095		- twoButton.setToolTipText("Show 3D view only");
1096		- twoButton.addActionListener(this);
1097		- this.fullscreenLayout = twoButton;
1098		-
1099		- oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100		- threeButton.setToolTipText("Show controls and 3D view");
1101		- threeButton.addActionListener(this);
1102		- oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103		- sixButton.setToolTipText("Show 3D view and controls");
1104		- sixButton.addActionListener(this);
1105		-// oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1106		-// sevenButton.setToolTipText("3-column layout");
1107		-// sevenButton.addActionListener(this);
1108		- //
1109	1162
1110	1163	oe.toolbarPanel.add(rootButton = GetButton("icons/openwindow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1111	1164	rootButton.setToolTipText("Open selection in new tab");
..	..	@@ -1121,7 +1174,7 @@
1121	1174
1122	1175	// INSERT
1123	1176	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1124		- gridButton.setToolTipText("Create grid");
	1177	+ gridButton.setToolTipText("Create ground");
1125	1178	gridButton.addActionListener(this);
1126	1179
1127	1180	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1413,6 +1466,14 @@
1413	1466
1414	1467	void EditObject(Object3D obj)
1415	1468	{
	1469	+ assert(obj instanceof Composite);
	1470	+
	1471	+// if (obj.versionlist == null)
	1472	+// {
	1473	+// obj.versionlist = new Object3D[100];
	1474	+// obj.versionindex = -1;
	1475	+// }
	1476	+
1416	1477	cRadio radioButton = new cRadio(obj.name);
1417	1478
1418	1479	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1803,7 +1864,12 @@
1803	1864	TreePath path;
1804	1865
1805	1866	public TransferableTreePath(TreePath tp) {
1806		- path = tp;
	1867	+ Object[] objs = new Object[tp.getPathCount()];
	1868	+ for (int i=0; i<objs.length; i++)
	1869	+ {
	1870	+ objs[i] = ((Object3D)tp.getPathComponent(i)).GetUUID();
	1871	+ }
	1872	+ path = new TreePath(objs);
1807	1873	}
1808	1874
1809	1875	public synchronized DataFlavor[] getTransferDataFlavors() {
..	..	@@ -2696,6 +2762,18 @@
2696	2762	if (source == fullButton)
2697	2763	{
2698	2764	ToggleFullScreen();
	2765	+ } else
	2766	+ if (source == collapseButton)
	2767	+ {
	2768	+ this.expandedLayout = radio.layout;
	2769	+ CollapseToolbar();
	2770	+ } else
	2771	+ if (source == maximize3DButton)
	2772	+ {
	2773	+ this.expandedLayout = radio.layout;
	2774	+ radio.layout = twoButton;
	2775	+ Show3DView();
	2776	+ CollapseToolbar();
2699	2777	} else
2700	2778	if (source == previousVersionButton)
2701	2779	{
..	..	@@ -3648,38 +3726,7 @@
3648	3726	if (CameraPane.FULLSCREEN)
3649	3727	fullscreenLayout = radio.layout;
3650	3728
3651		- // bug
3652		- //gridPanel.setDividerLocation(1.0);
3653		- //bigPanel.setDividerLocation(0.0);
3654		-// bigThree.remove(scenePanel);
3655		-// bigThree.remove(centralPanel);
3656		-// bigThree.remove(XYZPanel);
3657		-// aWindowConstraints.gridx = 0;
3658		-// aWindowConstraints.gridy = 0;
3659		-// aWindowConstraints.gridwidth = 1;
3660		-// // aConstraints.gridheight = 3;
3661		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3662		-// aWindowConstraints.weightx = 0;
3663		-// aWindowConstraints.weighty = 1;
3664		-// //bigThree.add(jtp, aWindowConstraints);
3665		-// aWindowConstraints.weightx = 1;
3666		-// aWindowConstraints.gridwidth = 3;
3667		-// // aConstraints.gridheight = 3;
3668		-// aWindowConstraints.gridx = 1;
3669		-// aWindowConstraints.fill = GridBagConstraints.BOTH;
3670		-// bigThree.add(centralPanel, aWindowConstraints);
3671		-// aWindowConstraints.weightx = 0;
3672		-// aWindowConstraints.gridx = 4;
3673		-// aWindowConstraints.gridwidth = 1;
3674		-// // aConstraints.gridheight = 3;
3675		-// aWindowConstraints.fill = GridBagConstraints.VERTICAL;
3676		-// //bigThree.add(XYZPanel, aWindowConstraints);
3677		-// scenePanel.setVisible(false);
3678		-// centralPanel.setVisible(true);
3679		-// XYZPanel.setVisible(false);
3680		- bigThree.ClearUI();
3681		- bigThree.add(centralPanel);
3682		- bigThree.FlushUI();
	3729	+ Show3DView();
3683	3730
3684	3731	cameraView.requestFocusInWindow();
3685	3732
..	..	@@ -3865,6 +3912,7 @@
3865	3912	} else
3866	3913	if (source == rootButton)
3867	3914	{
	3915	+ Replace();
3868	3916	Object3D obj;
3869	3917	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3870	3918	{
..	..	@@ -4001,8 +4049,6 @@
4001	4049
4002	4050	copy = group;
4003	4051
4004		- SetUndoStates();
4005		-
4006	4052	//Globals.theRenderer.object = group;
4007	4053	if(!useclient)
4008	4054	{
..	..	@@ -4030,6 +4076,18 @@
4030	4076	*/
4031	4077	radio.layout.doClick();
4032	4078
	4079	+ assert(copy instanceof Composite);
	4080	+
	4081	+ if (copy.versionlist == null)
	4082	+ {
	4083	+ copy.versionlist = new Object3D[100];
	4084	+ copy.versionindex = -1;
	4085	+
	4086	+ Save(true);
	4087	+ }
	4088	+
	4089	+ SetVersionStates();
	4090	+
4033	4091	ClearUnpinned();
4034	4092
4035	4093	//Grafreed.Assert(group != null);
..	..	@@ -5264,6 +5322,19 @@
5264	5322	flashSelectionButton.setEnabled(enabled);
5265	5323
5266	5324	clearPanelButton.setEnabled(!listUI.isEmpty());
	5325	+
	5326	+ boolean allComposites = true;
	5327	+
	5328	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5329	+ {
	5330	+ if (!(e.nextElement() instanceof Composite))
	5331	+ {
	5332	+ allComposites = false;
	5333	+ break;
	5334	+ }
	5335	+ }
	5336	+
	5337	+ rootButton.setEnabled(allComposites);
5267	5338	}
5268	5339
5269	5340	void refreshContents(boolean cp)
..	..	@@ -5278,7 +5349,7 @@
5278	5349	Object3D child = (Object3D) group.selection.get(i);
5279	5350
5280	5351	objEditor.AddInfo(child, this, true);
5281		- System.err.println("info : " + child.GetPath());
	5352	+// System.err.println("info : " + child.GetPath());
5282	5353	}
5283	5354
5284	5355	objEditor.SetText(); // jan 2014