~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)
..	..	@@ -531,32 +540,37 @@
531	540	// menu.add("-");
532	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
533	542	duplicateItem.addActionListener(this);
534		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
535	545	cloneItem.addActionListener(this);
536		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
537	547	{
538	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
539	549	cloneSupportItem.addActionListener(this);
540	550	}
	551	+ oe.jTree.popup.addSeparator();
541	552	menu.add("-");
542		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
543	554	cutItem.addActionListener(this);
544		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
545	556	copyItem.addActionListener(this);
546	557	pasteItem = menu.add(new MenuItem("Paste"));
547	558	pasteItem.addActionListener(this);
548	559
549		- menu.add("-");
550		- 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"));
551	563	pasteIntoItem.addActionListener(this);
552		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
553	565	pasteLinkItem.addActionListener(this);
554		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
555	567	pasteCloneItem.addActionListener(this);
556		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
557	569	// pasteExpandItem.addActionListener(this);
558		- menu.add("-");
559		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
560	574	deleteItem.addActionListener(this);
561	575
562	576	if (Globals.ADVANCED)
..	..	@@ -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("-");
..	..	@@ -914,7 +928,7 @@
914	928
915	929	JTabbedPane resourcecontainer;
916	930	cGridBag currenttab;
917		- boolean added; // patch for jar
	931	+ //boolean added; // patch for jar
918	932
919	933	int tabcount = 0;
920	934	int colcount = 0;
..	..	@@ -931,12 +945,14 @@
931	945	// System.out.println();
932	946
933	947	if (//rowcount == 0 \|\|
934		- path.length == 1)
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
935	949	{
936	950	currenttab = new cGridBag();
937		- added = false;
938	951	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939	952	currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
940	956	rowcount = 1;
941	957	colcount = 0;
942	958	texturecount = 0;
..	..	@@ -944,12 +960,11 @@
944	960
945	961	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
946	962	{
947		- if (!added)
	963	+ //if (!added)
948	964	{
949		- added = true;
950		- resourcecontainer.add(currenttab);
	965	+ //added = true;
951	966	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
952		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
953	968	}
954	969
955	970	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -1034,8 +1049,8 @@
1034	1049	// maxButton.addActionListener(this);
1035	1050	}
1036	1051
1037		-// cButton gcButton;
1038		-//
	1052	+ cButton gcButton;
	1053	+
1039	1054	// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040	1055	// gcButton.setToolTipText("Garbage collect");
1041	1056	// gcButton.addActionListener(new ActionListener()
..	..	@@ -1172,6 +1187,10 @@
1172	1187	boxButton.setToolTipText("Create box");
1173	1188	boxButton.addActionListener(this);
1174	1189
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
	1193	+
1175	1194	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176	1195	sphereButton.setToolTipText("Create sphere");
1177	1196	sphereButton.addActionListener(this);
..	..	@@ -1183,10 +1202,6 @@
1183	1202	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184	1203	torusButton.setToolTipText("Create torus");
1185	1204	torusButton.addActionListener(this);
1186		-
1187		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1188		- superButton.setToolTipText("Create superellipsoid");
1189		- superButton.addActionListener(this);
1190	1205
1191	1206	if (Globals.ADVANCED)
1192	1207	{
..	..	@@ -1459,11 +1474,11 @@
1459	1474	{
1460	1475	assert(obj instanceof Composite);
1461	1476
1462		- if (obj.versionlist == null)
1463		- {
1464		- obj.versionlist = new Object3D[100];
1465		- obj.versionindex = -1;
1466		- }
	1477	+// if (obj.versionlist == null)
	1478	+// {
	1479	+// obj.versionlist = new Object3D[100];
	1480	+// obj.versionindex = -1;
	1481	+// }
1467	1482
1468	1483	cRadio radioButton = new cRadio(obj.name);
1469	1484
..	..	@@ -2150,7 +2165,11 @@
2150	2165	shadow.material = new cMaterial(obj.material);
2151	2166	shadow.material.diffuse = 0.0001f;
2152	2167	shadow.material.specular = 0.0001f;
2153		- //shadow.projectedVertices[1].x = 300;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
2154	2173
2155	2174	makeSomething(shadow);
2156	2175	}
..	..	@@ -2671,27 +2690,35 @@
2671	2690	} else
2672	2691	if (source == loopItem \|\| source == loopButton)
2673	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
2674	2695	Composite csg = new GroupLeaf();
2675	2696	csg.count = 5;
2676		- group(csg);
2677	2697	Composite child = new cGroup("Branch");
2678	2698	csg.addChild(child);
2679	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
2680	2702	} else
2681	2703	if (source == doubleItem)
2682	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2683	2707	Composite csg = new GroupLeaf("Fork");
2684	2708	csg.count = 5;
2685		- group(csg);
2686	2709	Composite child = new cGroup("Branch A");
2687	2710	csg.addChild(child);
2688	2711	child.addChild(csg);
2689	2712	child = new cGroup("Branch B");
2690	2713	csg.addChild(child);
2691	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2692	2717	} else
2693	2718	if (source == tripleItem)
2694	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2695	2722	Composite csg = new GroupLeaf("Trident");
2696	2723	csg.count = 4;
2697	2724	group(csg);
..	..	@@ -2704,6 +2731,7 @@
2704	2731	child = new cGroup();
2705	2732	csg.addChild(child);
2706	2733	child.addChild(csg);
	2734	+ }
2707	2735	} else
2708	2736	if (source == computeAOItem)
2709	2737	{
..	..	@@ -3339,22 +3367,34 @@
3339	3367	} else
3340	3368	if (source == ungroupItem \|\| source == ungroupButton)
3341	3369	{
3342		- boolean hasRoot = false;
	3370	+ boolean canUngroup = true;
3343	3371
3344	3372	for (int i=0; i<group.selection.size(); i++)
3345	3373	{
3346		- if (group.selection.get(i) == group)
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
3347	3377	{
3348		- 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;
3349	3387	break;
3350	3388	}
3351	3389	}
3352	3390
3353		- if (!hasRoot)
	3391	+ if (canUngroup)
3354	3392	{
3355	3393	for (int i=0; i<group.selection.size(); i++)
3356	3394	{
3357		- Ungroup(group.selection.get(i));
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
3358	3398	}
3359	3399
3360	3400	ClearSelection(false);
..	..	@@ -4067,7 +4107,17 @@
4067	4107	*/
4068	4108	radio.layout.doClick();
4069	4109
4070		- SetUndoStates();
	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();
4071	4121
4072	4122	ClearUnpinned();
4073	4123
..	..	@@ -5306,6 +5356,7 @@
5306	5356
5307	5357	boolean allComposites = true;
5308	5358
	5359	+ if (group.selection != null)
5309	5360	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310	5361	{
5311	5362	if (!(e.nextElement() instanceof Composite))
..	..	@@ -6213,11 +6264,11 @@
6213	6264	private MenuItem lookAtItem;
6214	6265	private MenuItem lookFromItem;
6215	6266	private MenuItem switchViewItem;
6216		- private MenuItem cutItem;
	6267	+ private JMenuItem cutItem;
6217	6268	private MenuItem undoItem;
6218	6269	private MenuItem redoItem;
6219	6270	private JMenuItem duplicateItem;
6220		- private MenuItem cloneItem;
	6271	+ private JMenuItem cloneItem;
6221	6272	private MenuItem cloneSupportItem;
6222	6273	private MenuItem overwriteGeoItem;
6223	6274	private MenuItem overwriteMatItem;
..	..	@@ -6238,13 +6289,13 @@
6238	6289	private MenuItem cloneGeometriesItem;
6239	6290	private MenuItem shareGeometriesItem;
6240	6291	private MenuItem mergeGeometriesItem;
6241		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
6242	6293	private MenuItem pasteItem;
6243		- private MenuItem pasteIntoItem;
6244		- private MenuItem pasteLinkItem;
6245		- private MenuItem pasteCloneItem;
6246		- private MenuItem pasteExpandItem;
6247		- private MenuItem deleteItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
6248	6299	private MenuItem clearAllItem;
6249	6300	private MenuItem genUVItem;
6250	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -6312,7 +6363,7 @@
6312	6363	private MenuItem switchTransfoItem;
6313	6364	private MenuItem morphItem;
6314	6365	private MenuItem linkerItem;
6315		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
6316	6367	private MenuItem editItem;
6317	6368	private MenuItem openWindowItem;
6318	6369	private MenuItem editLeafItem;