~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)
..	..	@@ -406,10 +415,14 @@
406	415	this.copy = this.group = group;
407	416	//selectees = this.group.selectees;
408	417
	418	+ assert(false);
	419	+
409	420	if (copy.versionlist == null)
410	421	{
411	422	copy.versionlist = new Object3D[100];
412	423	copy.versionindex = -1;
	424	+
	425	+ //Save(true);
413	426	}
414	427
415	428	if(ui)
..	..	@@ -438,7 +451,7 @@
438	451	copy.versionlist = new Object3D[100];
439	452	copy.versionindex = -1;
440	453
441		- Save(true);
	454	+ //Save(true);
442	455	}
443	456	}
444	457
..	..	@@ -529,33 +542,35 @@
529	542	// menu.add("-");
530	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
531	544	duplicateItem.addActionListener(this);
532		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
533	547	cloneItem.addActionListener(this);
534		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
535	549	{
536	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
537	551	cloneSupportItem.addActionListener(this);
538	552	}
	553	+ oe.jTree.popup.addSeparator();
539	554	menu.add("-");
540		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
541	556	cutItem.addActionListener(this);
542		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
543	558	copyItem.addActionListener(this);
544	559	pasteItem = menu.add(new MenuItem("Paste"));
545	560	pasteItem.addActionListener(this);
546	561
547		- menu.add("-");
548		- 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"));
549	565	pasteIntoItem.addActionListener(this);
550		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
551	567	pasteLinkItem.addActionListener(this);
552		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
553	569	pasteCloneItem.addActionListener(this);
554		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
555	571	// pasteExpandItem.addActionListener(this);
556		- menu.add("-");
557		- deleteItem = menu.add(new MenuItem("Delete"));
558		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
559	574
560	575	if (Globals.ADVANCED)
561	576	{
..	..	@@ -641,11 +656,9 @@
641	656	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
642	657	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
643	658	//cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
644		- editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
645	659	oe.cameraMenu.add("-");
646	660	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
647	661	openWindowItem.addActionListener(this);
648		- editLeafItem.addActionListener(this);
649	662	lookAtItem.addActionListener(this);
650	663	//lookFromItem.addActinoListener(this);
651	664	//switchViewItem.addActionListener(this);
..	..	@@ -692,9 +705,8 @@
692	705	setMasterItem.addActionListener(this);
693	706	}
694	707
695		- oe.menuBar.add(menu = new Menu("Group"));
696		-// grabItem = menu.add(new MenuItem("Grab"));
697		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
698	710	backItem = menu.add(new MenuItem("Back"));
699	711	backItem.addActionListener(this);
700	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -702,13 +714,21 @@
702	714	// compositeItem = menu.add(new MenuItem("Composite"));
703	715	// compositeItem.addActionListener(this);
704	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
705	720	if (Globals.ADVANCED)
706	721	{
707	722	hideItem = menu.add(new MenuItem("Hidden Group"));
708	723	hideItem.addActionListener(this);
709	724	}
710		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
712	732
713	733	// menu.add("-");
714	734	//
..	..	@@ -893,6 +913,9 @@
893	913	shareGeometriesItem.addActionListener(this);
894	914	mergeGeometriesItem = menu.add(new MenuItem("Merge Geometries"));
895	915	mergeGeometriesItem.addActionListener(this);
	916	+ menu.add("-");
	917	+ editLeafItem = menu.add(new MenuItem("Edit leaf..."));
	918	+ editLeafItem.addActionListener(this);
896	919	if (Globals.ADVANCED)
897	920	{
898	921	// Pretty much the same as duplicate and clone.
..	..	@@ -911,7 +934,7 @@
911	934
912	935	JTabbedPane resourcecontainer;
913	936	cGridBag currenttab;
914		- boolean added; // patch for jar
	937	+ //boolean added; // patch for jar
915	938
916	939	int tabcount = 0;
917	940	int colcount = 0;
..	..	@@ -928,12 +951,14 @@
928	951	// System.out.println();
929	952
930	953	if (//rowcount == 0 \|\|
931		- path.length == 1)
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
932	955	{
933	956	currenttab = new cGridBag();
934		- added = false;
935	957	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
936	958	currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
937	962	rowcount = 1;
938	963	colcount = 0;
939	964	texturecount = 0;
..	..	@@ -941,12 +966,11 @@
941	966
942	967	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
943	968	{
944		- if (!added)
	969	+ //if (!added)
945	970	{
946		- added = true;
947		- resourcecontainer.add(currenttab);
	971	+ //added = true;
948	972	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
949		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
950	974	}
951	975
952	976	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -1026,28 +1050,28 @@
1026	1050
1027	1051	if (Globals.ADVANCED)
1028	1052	{
1029		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030		- maxButton.setToolTipText("Maximize window");
1031		- 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);
1032	1056	}
1033	1057
1034	1058	cButton gcButton;
1035	1059
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		- });
	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	+// });
1045	1069
1046	1070	oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047	1071	collapseButton.setToolTipText("Collapse toolbar");
1048	1072	collapseButton.addActionListener(this);
1049	1073
1050		- oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1051	1075	maximize3DButton.setToolTipText("Maximize 3D view");
1052	1076	maximize3DButton.addActionListener(this);
1053	1077
..	..	@@ -1089,6 +1113,7 @@
1089	1113	copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1090	1114	deleteVersionButton.setToolTipText("Delete current version");
1091	1115	deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
1092	1117
1093	1118	copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1094	1119	previousVersionButton.setToolTipText("Previous version");
..	..	@@ -1099,12 +1124,12 @@
1099	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1100	1125	restoreButton.setToolTipText("Undo (restore current version)");
1101	1126	restoreButton.addActionListener(this);
1102		- //restoreButton.setEnabled(false);
	1127	+ restoreButton.setEnabled(false);
1103	1128
1104	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1105	1130	replaceButton.setToolTipText("Save (replace current version)");
1106	1131	replaceButton.addActionListener(this);
1107		- //replaceButton.setEnabled(false);
	1132	+ replaceButton.setEnabled(false);
1108	1133
1109	1134	copyOptionsPanel.add(updown);
1110	1135
..	..	@@ -1162,12 +1187,16 @@
1162	1187
1163	1188	// INSERT
1164	1189	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1165		- gridButton.setToolTipText("Create grid");
	1190	+ gridButton.setToolTipText("Create ground");
1166	1191	gridButton.addActionListener(this);
1167	1192
1168	1193	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169	1194	boxButton.setToolTipText("Create box");
1170	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);
1171	1200
1172	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1173	1202	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1180,10 +1209,6 @@
1180	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1181	1210	torusButton.setToolTipText("Create torus");
1182	1211	torusButton.addActionListener(this);
1183		-
1184		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185		- superButton.setToolTipText("Create superellipsoid");
1186		- superButton.addActionListener(this);
1187	1212
1188	1213	if (Globals.ADVANCED)
1189	1214	{
..	..	@@ -1454,6 +1479,14 @@
1454	1479
1455	1480	void EditObject(Object3D obj)
1456	1481	{
	1482	+ assert(obj instanceof Composite);
	1483	+
	1484	+// if (obj.versionlist == null)
	1485	+// {
	1486	+// obj.versionlist = new Object3D[100];
	1487	+// obj.versionindex = -1;
	1488	+// }
	1489	+
1457	1490	cRadio radioButton = new cRadio(obj.name);
1458	1491
1459	1492	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -1478,6 +1511,7 @@
1478	1511
1479	1512	oe.SetupViews();
1480	1513
	1514	+ if (Globals.DEBUG)
1481	1515	System.out.println("SetupViews");
1482	1516	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1483	1517	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -2139,7 +2173,11 @@
2139	2173	shadow.material = new cMaterial(obj.material);
2140	2174	shadow.material.diffuse = 0.0001f;
2141	2175	shadow.material.specular = 0.0001f;
2142		- //shadow.projectedVertices[1].x = 300;
	2176	+ shadow.material.opacity = 0.75f;
	2177	+
	2178	+ AllocProjectedVertices(shadow);
	2179	+
	2180	+ shadow.projectedVertices[1].x = 300;
2143	2181
2144	2182	makeSomething(shadow);
2145	2183	}
..	..	@@ -2660,27 +2698,35 @@
2660	2698	} else
2661	2699	if (source == loopItem \|\| source == loopButton)
2662	2700	{
	2701	+ if (!group.selection.isEmpty())
	2702	+ {
2663	2703	Composite csg = new GroupLeaf();
2664	2704	csg.count = 5;
2665		- group(csg);
2666	2705	Composite child = new cGroup("Branch");
2667	2706	csg.addChild(child);
2668	2707	child.addChild(csg);
	2708	+ group(csg);
	2709	+ }
2669	2710	} else
2670	2711	if (source == doubleItem)
2671	2712	{
	2713	+ if (!group.selection.isEmpty())
	2714	+ {
2672	2715	Composite csg = new GroupLeaf("Fork");
2673	2716	csg.count = 5;
2674		- group(csg);
2675	2717	Composite child = new cGroup("Branch A");
2676	2718	csg.addChild(child);
2677	2719	child.addChild(csg);
2678	2720	child = new cGroup("Branch B");
2679	2721	csg.addChild(child);
2680	2722	child.addChild(csg);
	2723	+ group(csg);
	2724	+ }
2681	2725	} else
2682	2726	if (source == tripleItem)
2683	2727	{
	2728	+ if (!group.selection.isEmpty())
	2729	+ {
2684	2730	Composite csg = new GroupLeaf("Trident");
2685	2731	csg.count = 4;
2686	2732	group(csg);
..	..	@@ -2693,6 +2739,7 @@
2693	2739	child = new cGroup();
2694	2740	csg.addChild(child);
2695	2741	child.addChild(csg);
	2742	+ }
2696	2743	} else
2697	2744	if (source == computeAOItem)
2698	2745	{
..	..	@@ -3328,22 +3375,34 @@
3328	3375	} else
3329	3376	if (source == ungroupItem \|\| source == ungroupButton)
3330	3377	{
3331		- boolean hasRoot = false;
	3378	+ boolean canUngroup = true;
3332	3379
3333	3380	for (int i=0; i<group.selection.size(); i++)
3334	3381	{
3335		- if (group.selection.get(i) == group)
	3382	+ Object3D selectedItem = group.selection.get(i);
	3383	+
	3384	+ if (selectedItem.Size() == 0)
3336	3385	{
3337		- hasRoot = true;
	3386	+ // Cannot ungroup leaves
	3387	+ canUngroup = false;
	3388	+ break;
	3389	+ }
	3390	+
	3391	+ if (selectedItem == group)
	3392	+ {
	3393	+ // Cannot ungroup root
	3394	+ canUngroup = false;
3338	3395	break;
3339	3396	}
3340	3397	}
3341	3398
3342		- if (!hasRoot)
	3399	+ if (canUngroup)
3343	3400	{
3344	3401	for (int i=0; i<group.selection.size(); i++)
3345	3402	{
3346		- Ungroup(group.selection.get(i));
	3403	+ Object3D selectedItem = group.selection.get(i);
	3404	+
	3405	+ Ungroup(selectedItem);
3347	3406	}
3348	3407
3349	3408	ClearSelection(false);
..	..	@@ -3892,6 +3951,7 @@
3892	3951	} else
3893	3952	if (source == rootButton)
3894	3953	{
	3954	+ Replace();
3895	3955	Object3D obj;
3896	3956	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3897	3957	{
..	..	@@ -4028,8 +4088,6 @@
4028	4088
4029	4089	copy = group;
4030	4090
4031		- SetUndoStates();
4032		-
4033	4091	//Globals.theRenderer.object = group;
4034	4092	if(!useclient)
4035	4093	{
..	..	@@ -4057,6 +4115,21 @@
4057	4115	*/
4058	4116	radio.layout.doClick();
4059	4117
	4118	+ assert(copy instanceof Composite);
	4119	+
	4120	+ if (copy.versionlist == null)
	4121	+ {
	4122	+ copy.versionlist = new Object3D[100];
	4123	+ copy.versionindex = -1;
	4124	+
	4125	+ // Cannot work with loops
	4126	+ // To fix this issue, first mark all nodes above the root,
	4127	+ // and check if any of these nodes are reachable below the root.
	4128	+ //Save(true);
	4129	+ }
	4130	+
	4131	+ SetVersionStates();
	4132	+
4060	4133	ClearUnpinned();
4061	4134
4062	4135	//Grafreed.Assert(group != null);
..	..	@@ -5291,6 +5364,21 @@
5291	5364	flashSelectionButton.setEnabled(enabled);
5292	5365
5293	5366	clearPanelButton.setEnabled(!listUI.isEmpty());
	5367	+
	5368	+ boolean allComposites = true;
	5369	+
	5370	+ if (group.selection != null)
	5371	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5372	+ {
	5373	+ Object next = e.nextElement();
	5374	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
	5375	+ {
	5376	+ allComposites = false;
	5377	+ break;
	5378	+ }
	5379	+ }
	5380	+
	5381	+ rootButton.setEnabled(allComposites);
5294	5382	}
5295	5383
5296	5384	void refreshContents(boolean cp)
..	..	@@ -6188,11 +6276,11 @@
6188	6276	private MenuItem lookAtItem;
6189	6277	private MenuItem lookFromItem;
6190	6278	private MenuItem switchViewItem;
6191		- private MenuItem cutItem;
	6279	+ private JMenuItem cutItem;
6192	6280	private MenuItem undoItem;
6193	6281	private MenuItem redoItem;
6194	6282	private JMenuItem duplicateItem;
6195		- private MenuItem cloneItem;
	6283	+ private JMenuItem cloneItem;
6196	6284	private MenuItem cloneSupportItem;
6197	6285	private MenuItem overwriteGeoItem;
6198	6286	private MenuItem overwriteMatItem;
..	..	@@ -6213,13 +6301,13 @@
6213	6301	private MenuItem cloneGeometriesItem;
6214	6302	private MenuItem shareGeometriesItem;
6215	6303	private MenuItem mergeGeometriesItem;
6216		- private MenuItem copyItem;
	6304	+ private JMenuItem copyItem;
6217	6305	private MenuItem pasteItem;
6218		- private MenuItem pasteIntoItem;
6219		- private MenuItem pasteLinkItem;
6220		- private MenuItem pasteCloneItem;
6221		- private MenuItem pasteExpandItem;
6222		- private MenuItem deleteItem;
	6306	+ private JMenuItem pasteIntoItem;
	6307	+ private JMenuItem pasteLinkItem;
	6308	+ private JMenuItem pasteCloneItem;
	6309	+ private JMenuItem pasteExpandItem;
	6310	+ private JMenuItem deleteItem;
6223	6311	private MenuItem clearAllItem;
6224	6312	private MenuItem genUVItem;
6225	6313	private MenuItem genNormalsMESHItem;
..	..	@@ -6274,7 +6362,7 @@
6274	6362	private MenuItem transformGeometryItem;
6275	6363	private MenuItem transformChildrenItem;
6276	6364	private MenuItem hideItem;
6277		- private MenuItem grabItem;
	6365	+ private JMenuItem grabItem;
6278	6366	private MenuItem backItem;
6279	6367	private MenuItem frontItem;
6280	6368	private MenuItem cameraItem;
..	..	@@ -6287,7 +6375,7 @@
6287	6375	private MenuItem switchTransfoItem;
6288	6376	private MenuItem morphItem;
6289	6377	private MenuItem linkerItem;
6290		- private MenuItem ungroupItem;
	6378	+ private JMenuItem ungroupItem;
6291	6379	private MenuItem editItem;
6292	6380	private MenuItem openWindowItem;
6293	6381	private MenuItem editLeafItem;