~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)
..	..	@@ -410,6 +419,8 @@
410	419	{
411	420	copy.versionlist = new Object3D[100];
412	421	copy.versionindex = -1;
	422	+
	423	+ Save(true);
413	424	}
414	425
415	426	if(ui)
..	..	@@ -529,32 +540,37 @@
529	540	// menu.add("-");
530	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
531	542	duplicateItem.addActionListener(this);
532		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
533	545	cloneItem.addActionListener(this);
534		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
535	547	{
536	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
537	549	cloneSupportItem.addActionListener(this);
538	550	}
	551	+ oe.jTree.popup.addSeparator();
539	552	menu.add("-");
540		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
541	554	cutItem.addActionListener(this);
542		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
543	556	copyItem.addActionListener(this);
544	557	pasteItem = menu.add(new MenuItem("Paste"));
545	558	pasteItem.addActionListener(this);
546	559
547		- menu.add("-");
548		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	560	+ oe.jTree.popup.addSeparator();
	561	+ //menu.add("-");
	562	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
549	563	pasteIntoItem.addActionListener(this);
550		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
551	565	pasteLinkItem.addActionListener(this);
552		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
553	567	pasteCloneItem.addActionListener(this);
554		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
555	569	// pasteExpandItem.addActionListener(this);
556		- menu.add("-");
557		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
558	574	deleteItem.addActionListener(this);
559	575
560	576	if (Globals.ADVANCED)
..	..	@@ -641,11 +657,9 @@
641	657	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
642	658	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
643	659	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
644		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
645	660	oe.cameraMenu.add("-");
646	661	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
647	662	openWindowItem.addActionListener(this);
648		- editLeafItem.addActionListener(this);
649	663	lookAtItem.addActionListener(this);
650	664	//lookFromItem.addActinoListener(this);
651	665	//switchViewItem.addActionListener(this);
..	..	@@ -707,7 +721,7 @@
707	721	hideItem = menu.add(new MenuItem("Hidden Group"));
708	722	hideItem.addActionListener(this);
709	723	}
710		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711	725	ungroupItem.addActionListener(this);
712	726
713	727	// menu.add("-");
..	..	@@ -893,6 +907,9 @@
893	907	shareGeometriesItem.addActionListener(this);
894	908	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
895	909	mergeGeometriesItem.addActionListener(this);
	910	+ menu.add("-");
	911	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	912	+ editLeafItem.addActionListener(this);
896	913	if (Globals.ADVANCED)
897	914	{
898	915	// Pretty much the same as duplicate and clone.
..	..	@@ -923,9 +940,9 @@
923	940
924	941	public void ResourceCallBack(String[] path)
925	942	{
926		-// for (int i = 0; i < path.length; i++)
927		-// System.out.print(path[i] + "/");
928		-// System.out.println();
	943	+ for (int i = 0; i < path.length; i++)
	944	+ System.out.print(path[i] + "/");
	945	+ System.out.println();
929	946
930	947	if (//rowcount == 0 \|\|
931	948	path.length == 1)
..	..	@@ -1026,22 +1043,22 @@
1026	1043
1027	1044	if (Globals.ADVANCED)
1028	1045	{
1029		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030		- maxButton.setToolTipText("Maximize window");
1031		- maxButton.addActionListener(this);
	1046	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1047	+// maxButton.setToolTipText("Maximize window");
	1048	+// maxButton.addActionListener(this);
1032	1049	}
1033	1050
1034	1051	cButton gcButton;
1035	1052
1036		- oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1037		- gcButton.setToolTipText("Garbage collect");
1038		- gcButton.addActionListener(new ActionListener()
1039		- {
1040		- public void actionPerformed(ActionEvent e)
1041		- {
1042		- System.gc();
1043		- }
1044		- });
	1053	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1054	+// gcButton.setToolTipText("Garbage collect");
	1055	+// gcButton.addActionListener(new ActionListener()
	1056	+// {
	1057	+// public void actionPerformed(ActionEvent e)
	1058	+// {
	1059	+// System.gc();
	1060	+// }
	1061	+// });
1045	1062
1046	1063	oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047	1064	collapseButton.setToolTipText("Collapse toolbar");
..	..	@@ -1162,7 +1179,7 @@
1162	1179
1163	1180	// INSERT
1164	1181	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1165		- gridButton.setToolTipText("Create grid");
	1182	+ gridButton.setToolTipText("Create ground");
1166	1183	gridButton.addActionListener(this);
1167	1184
1168	1185	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1454,6 +1471,14 @@
1454	1471
1455	1472	void EditObject(Object3D obj)
1456	1473	{
	1474	+ assert(obj instanceof Composite);
	1475	+
	1476	+// if (obj.versionlist == null)
	1477	+// {
	1478	+// obj.versionlist = new Object3D[100];
	1479	+// obj.versionindex = -1;
	1480	+// }
	1481	+
1457	1482	cRadio radioButton = new cRadio(obj.name);
1458	1483
1459	1484	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -2660,27 +2685,35 @@
2660	2685	} else
2661	2686	if (source == loopItem \|\| source == loopButton)
2662	2687	{
	2688	+ if (!group.selection.isEmpty())
	2689	+ {
2663	2690	Composite csg = new GroupLeaf();
2664	2691	csg.count = 5;
2665		- group(csg);
2666	2692	Composite child = new cGroup("Branch");
2667	2693	csg.addChild(child);
2668	2694	child.addChild(csg);
	2695	+ group(csg);
	2696	+ }
2669	2697	} else
2670	2698	if (source == doubleItem)
2671	2699	{
	2700	+ if (!group.selection.isEmpty())
	2701	+ {
2672	2702	Composite csg = new GroupLeaf("Fork");
2673	2703	csg.count = 5;
2674		- group(csg);
2675	2704	Composite child = new cGroup("Branch A");
2676	2705	csg.addChild(child);
2677	2706	child.addChild(csg);
2678	2707	child = new cGroup("Branch B");
2679	2708	csg.addChild(child);
2680	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
2681	2712	} else
2682	2713	if (source == tripleItem)
2683	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2684	2717	Composite csg = new GroupLeaf("Trident");
2685	2718	csg.count = 4;
2686	2719	group(csg);
..	..	@@ -2693,6 +2726,7 @@
2693	2726	child = new cGroup();
2694	2727	csg.addChild(child);
2695	2728	child.addChild(csg);
	2729	+ }
2696	2730	} else
2697	2731	if (source == computeAOItem)
2698	2732	{
..	..	@@ -3328,22 +3362,34 @@
3328	3362	} else
3329	3363	if (source == ungroupItem \|\| source == ungroupButton)
3330	3364	{
3331		- boolean hasRoot = false;
	3365	+ boolean canUngroup = true;
3332	3366
3333	3367	for (int i=0; i<group.selection.size(); i++)
3334	3368	{
3335		- if (group.selection.get(i) == group)
	3369	+ Object3D selectedItem = group.selection.get(i);
	3370	+
	3371	+ if (selectedItem.Size() == 0)
3336	3372	{
3337		- hasRoot = true;
	3373	+ // Cannot ungroup leaves
	3374	+ canUngroup = false;
	3375	+ break;
	3376	+ }
	3377	+
	3378	+ if (selectedItem == group)
	3379	+ {
	3380	+ // Cannot ungroup root
	3381	+ canUngroup = false;
3338	3382	break;
3339	3383	}
3340	3384	}
3341	3385
3342		- if (!hasRoot)
	3386	+ if (canUngroup)
3343	3387	{
3344	3388	for (int i=0; i<group.selection.size(); i++)
3345	3389	{
3346		- Ungroup(group.selection.get(i));
	3390	+ Object3D selectedItem = group.selection.get(i);
	3391	+
	3392	+ Ungroup(selectedItem);
3347	3393	}
3348	3394
3349	3395	ClearSelection(false);
..	..	@@ -3892,6 +3938,7 @@
3892	3938	} else
3893	3939	if (source == rootButton)
3894	3940	{
	3941	+ Replace();
3895	3942	Object3D obj;
3896	3943	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3897	3944	{
..	..	@@ -4028,8 +4075,6 @@
4028	4075
4029	4076	copy = group;
4030	4077
4031		- SetUndoStates();
4032		-
4033	4078	//Globals.theRenderer.object = group;
4034	4079	if(!useclient)
4035	4080	{
..	..	@@ -4057,6 +4102,18 @@
4057	4102	*/
4058	4103	radio.layout.doClick();
4059	4104
	4105	+ assert(copy instanceof Composite);
	4106	+
	4107	+ if (copy.versionlist == null)
	4108	+ {
	4109	+ copy.versionlist = new Object3D[100];
	4110	+ copy.versionindex = -1;
	4111	+
	4112	+ Save(true);
	4113	+ }
	4114	+
	4115	+ SetVersionStates();
	4116	+
4060	4117	ClearUnpinned();
4061	4118
4062	4119	//Grafreed.Assert(group != null);
..	..	@@ -5291,6 +5348,20 @@
5291	5348	flashSelectionButton.setEnabled(enabled);
5292	5349
5293	5350	clearPanelButton.setEnabled(!listUI.isEmpty());
	5351	+
	5352	+ boolean allComposites = true;
	5353	+
	5354	+ if (group.selection != null)
	5355	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5356	+ {
	5357	+ if (!(e.nextElement() instanceof Composite))
	5358	+ {
	5359	+ allComposites = false;
	5360	+ break;
	5361	+ }
	5362	+ }
	5363	+
	5364	+ rootButton.setEnabled(allComposites);
5294	5365	}
5295	5366
5296	5367	void refreshContents(boolean cp)
..	..	@@ -6188,11 +6259,11 @@
6188	6259	private MenuItem lookAtItem;
6189	6260	private MenuItem lookFromItem;
6190	6261	private MenuItem switchViewItem;
6191		- private MenuItem cutItem;
	6262	+ private JMenuItem cutItem;
6192	6263	private MenuItem undoItem;
6193	6264	private MenuItem redoItem;
6194	6265	private JMenuItem duplicateItem;
6195		- private MenuItem cloneItem;
	6266	+ private JMenuItem cloneItem;
6196	6267	private MenuItem cloneSupportItem;
6197	6268	private MenuItem overwriteGeoItem;
6198	6269	private MenuItem overwriteMatItem;
..	..	@@ -6213,13 +6284,13 @@
6213	6284	private MenuItem cloneGeometriesItem;
6214	6285	private MenuItem shareGeometriesItem;
6215	6286	private MenuItem mergeGeometriesItem;
6216		- private MenuItem copyItem;
	6287	+ private JMenuItem copyItem;
6217	6288	private MenuItem pasteItem;
6218		- private MenuItem pasteIntoItem;
6219		- private MenuItem pasteLinkItem;
6220		- private MenuItem pasteCloneItem;
6221		- private MenuItem pasteExpandItem;
6222		- private MenuItem deleteItem;
	6289	+ private JMenuItem pasteIntoItem;
	6290	+ private JMenuItem pasteLinkItem;
	6291	+ private JMenuItem pasteCloneItem;
	6292	+ private JMenuItem pasteExpandItem;
	6293	+ private JMenuItem deleteItem;
6223	6294	private MenuItem clearAllItem;
6224	6295	private MenuItem genUVItem;
6225	6296	private MenuItem genNormalsMESHItem;
..	..	@@ -6287,7 +6358,7 @@
6287	6358	private MenuItem switchTransfoItem;
6288	6359	private MenuItem morphItem;
6289	6360	private MenuItem linkerItem;
6290		- private MenuItem ungroupItem;
	6361	+ private JMenuItem ungroupItem;
6291	6362	private MenuItem editItem;
6292	6363	private MenuItem openWindowItem;
6293	6364	private MenuItem editLeafItem;