~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.
..	..	@@ -911,7 +928,7 @@
911	928
912	929	JTabbedPane resourcecontainer;
913	930	cGridBag currenttab;
914		- boolean added; // patch for jar
	931	+ //boolean added; // patch for jar
915	932
916	933	int tabcount = 0;
917	934	int colcount = 0;
..	..	@@ -928,12 +945,14 @@
928	945	// System.out.println();
929	946
930	947	if (//rowcount == 0 \|\|
931		- path.length == 1)
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
932	949	{
933	950	currenttab = new cGridBag();
934		- added = false;
935	951	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
936	952	currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
937	956	rowcount = 1;
938	957	colcount = 0;
939	958	texturecount = 0;
..	..	@@ -941,12 +960,11 @@
941	960
942	961	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
943	962	{
944		- if (!added)
	963	+ //if (!added)
945	964	{
946		- added = true;
947		- resourcecontainer.add(currenttab);
	965	+ //added = true;
948	966	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
949		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
950	968	}
951	969
952	970	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -1026,22 +1044,22 @@
1026	1044
1027	1045	if (Globals.ADVANCED)
1028	1046	{
1029		- oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1030		- maxButton.setToolTipText("Maximize window");
1031		- maxButton.addActionListener(this);
	1047	+// oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1048	+// maxButton.setToolTipText("Maximize window");
	1049	+// maxButton.addActionListener(this);
1032	1050	}
1033	1051
1034	1052	cButton gcButton;
1035	1053
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		- });
	1054	+// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1055	+// gcButton.setToolTipText("Garbage collect");
	1056	+// gcButton.addActionListener(new ActionListener()
	1057	+// {
	1058	+// public void actionPerformed(ActionEvent e)
	1059	+// {
	1060	+// System.gc();
	1061	+// }
	1062	+// });
1045	1063
1046	1064	oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1047	1065	collapseButton.setToolTipText("Collapse toolbar");
..	..	@@ -1162,12 +1180,16 @@
1162	1180
1163	1181	// INSERT
1164	1182	row1.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1165		- gridButton.setToolTipText("Create grid");
	1183	+ gridButton.setToolTipText("Create ground");
1166	1184	gridButton.addActionListener(this);
1167	1185
1168	1186	row1.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1169	1187	boxButton.setToolTipText("Create box");
1170	1188	boxButton.addActionListener(this);
	1189	+
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
1171	1193
1172	1194	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1173	1195	sphereButton.setToolTipText("Create sphere");
..	..	@@ -1180,10 +1202,6 @@
1180	1202	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1181	1203	torusButton.setToolTipText("Create torus");
1182	1204	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	1205
1188	1206	if (Globals.ADVANCED)
1189	1207	{
..	..	@@ -1454,6 +1472,14 @@
1454	1472
1455	1473	void EditObject(Object3D obj)
1456	1474	{
	1475	+ assert(obj instanceof Composite);
	1476	+
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
	1482	+
1457	1483	cRadio radioButton = new cRadio(obj.name);
1458	1484
1459	1485	// June 2019. Patch to avoid bug with transparency.
..	..	@@ -2139,7 +2165,11 @@
2139	2165	shadow.material = new cMaterial(obj.material);
2140	2166	shadow.material.diffuse = 0.0001f;
2141	2167	shadow.material.specular = 0.0001f;
2142		- //shadow.projectedVertices[1].x = 300;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
2143	2173
2144	2174	makeSomething(shadow);
2145	2175	}
..	..	@@ -2660,27 +2690,35 @@
2660	2690	} else
2661	2691	if (source == loopItem \|\| source == loopButton)
2662	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
2663	2695	Composite csg = new GroupLeaf();
2664	2696	csg.count = 5;
2665		- group(csg);
2666	2697	Composite child = new cGroup("Branch");
2667	2698	csg.addChild(child);
2668	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
2669	2702	} else
2670	2703	if (source == doubleItem)
2671	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2672	2707	Composite csg = new GroupLeaf("Fork");
2673	2708	csg.count = 5;
2674		- group(csg);
2675	2709	Composite child = new cGroup("Branch A");
2676	2710	csg.addChild(child);
2677	2711	child.addChild(csg);
2678	2712	child = new cGroup("Branch B");
2679	2713	csg.addChild(child);
2680	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2681	2717	} else
2682	2718	if (source == tripleItem)
2683	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2684	2722	Composite csg = new GroupLeaf("Trident");
2685	2723	csg.count = 4;
2686	2724	group(csg);
..	..	@@ -2693,6 +2731,7 @@
2693	2731	child = new cGroup();
2694	2732	csg.addChild(child);
2695	2733	child.addChild(csg);
	2734	+ }
2696	2735	} else
2697	2736	if (source == computeAOItem)
2698	2737	{
..	..	@@ -3328,22 +3367,34 @@
3328	3367	} else
3329	3368	if (source == ungroupItem \|\| source == ungroupButton)
3330	3369	{
3331		- boolean hasRoot = false;
	3370	+ boolean canUngroup = true;
3332	3371
3333	3372	for (int i=0; i<group.selection.size(); i++)
3334	3373	{
3335		- if (group.selection.get(i) == group)
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
3336	3377	{
3337		- hasRoot = true;
	3378	+ // Cannot ungroup leaves
	3379	+ canUngroup = false;
	3380	+ break;
	3381	+ }
	3382	+
	3383	+ if (selectedItem == group)
	3384	+ {
	3385	+ // Cannot ungroup root
	3386	+ canUngroup = false;
3338	3387	break;
3339	3388	}
3340	3389	}
3341	3390
3342		- if (!hasRoot)
	3391	+ if (canUngroup)
3343	3392	{
3344	3393	for (int i=0; i<group.selection.size(); i++)
3345	3394	{
3346		- Ungroup(group.selection.get(i));
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
3347	3398	}
3348	3399
3349	3400	ClearSelection(false);
..	..	@@ -3892,6 +3943,7 @@
3892	3943	} else
3893	3944	if (source == rootButton)
3894	3945	{
	3946	+ Replace();
3895	3947	Object3D obj;
3896	3948	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
3897	3949	{
..	..	@@ -4028,8 +4080,6 @@
4028	4080
4029	4081	copy = group;
4030	4082
4031		- SetUndoStates();
4032		-
4033	4083	//Globals.theRenderer.object = group;
4034	4084	if(!useclient)
4035	4085	{
..	..	@@ -4057,6 +4107,18 @@
4057	4107	*/
4058	4108	radio.layout.doClick();
4059	4109
	4110	+ assert(copy instanceof Composite);
	4111	+
	4112	+ if (copy.versionlist == null)
	4113	+ {
	4114	+ copy.versionlist = new Object3D[100];
	4115	+ copy.versionindex = -1;
	4116	+
	4117	+ Save(true);
	4118	+ }
	4119	+
	4120	+ SetVersionStates();
	4121	+
4060	4122	ClearUnpinned();
4061	4123
4062	4124	//Grafreed.Assert(group != null);
..	..	@@ -5291,6 +5353,20 @@
5291	5353	flashSelectionButton.setEnabled(enabled);
5292	5354
5293	5355	clearPanelButton.setEnabled(!listUI.isEmpty());
	5356	+
	5357	+ boolean allComposites = true;
	5358	+
	5359	+ if (group.selection != null)
	5360	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	5361	+ {
	5362	+ if (!(e.nextElement() instanceof Composite))
	5363	+ {
	5364	+ allComposites = false;
	5365	+ break;
	5366	+ }
	5367	+ }
	5368	+
	5369	+ rootButton.setEnabled(allComposites);
5294	5370	}
5295	5371
5296	5372	void refreshContents(boolean cp)
..	..	@@ -6188,11 +6264,11 @@
6188	6264	private MenuItem lookAtItem;
6189	6265	private MenuItem lookFromItem;
6190	6266	private MenuItem switchViewItem;
6191		- private MenuItem cutItem;
	6267	+ private JMenuItem cutItem;
6192	6268	private MenuItem undoItem;
6193	6269	private MenuItem redoItem;
6194	6270	private JMenuItem duplicateItem;
6195		- private MenuItem cloneItem;
	6271	+ private JMenuItem cloneItem;
6196	6272	private MenuItem cloneSupportItem;
6197	6273	private MenuItem overwriteGeoItem;
6198	6274	private MenuItem overwriteMatItem;
..	..	@@ -6213,13 +6289,13 @@
6213	6289	private MenuItem cloneGeometriesItem;
6214	6290	private MenuItem shareGeometriesItem;
6215	6291	private MenuItem mergeGeometriesItem;
6216		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
6217	6293	private MenuItem pasteItem;
6218		- private MenuItem pasteIntoItem;
6219		- private MenuItem pasteLinkItem;
6220		- private MenuItem pasteCloneItem;
6221		- private MenuItem pasteExpandItem;
6222		- private MenuItem deleteItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
6223	6299	private MenuItem clearAllItem;
6224	6300	private MenuItem genUVItem;
6225	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -6287,7 +6363,7 @@
6287	6363	private MenuItem switchTransfoItem;
6288	6364	private MenuItem morphItem;
6289	6365	private MenuItem linkerItem;
6290		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
6291	6367	private MenuItem editItem;
6292	6368	private MenuItem openWindowItem;
6293	6369	private MenuItem editLeafItem;