~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -540,32 +540,37 @@
540	540	// menu.add("-");
541	541	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
542	542	duplicateItem.addActionListener(this);
543		- cloneItem = menu.add(new MenuItem("Clone"));
	543	+
	544	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
544	545	cloneItem.addActionListener(this);
545		- if (Globals.ADVANCED)
	546	+ //if (Globals.ADVANCED)
546	547	{
547	548	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
548	549	cloneSupportItem.addActionListener(this);
549	550	}
	551	+ oe.jTree.popup.addSeparator();
550	552	menu.add("-");
551		- cutItem = menu.add(new MenuItem("Cut"));
	553	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
552	554	cutItem.addActionListener(this);
553		- copyItem = menu.add(new MenuItem("Copy"));
	555	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
554	556	copyItem.addActionListener(this);
555	557	pasteItem = menu.add(new MenuItem("Paste"));
556	558	pasteItem.addActionListener(this);
557	559
558		- menu.add("-");
559		- 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"));
560	563	pasteIntoItem.addActionListener(this);
561		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	564	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
562	565	pasteLinkItem.addActionListener(this);
563		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	566	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
564	567	pasteCloneItem.addActionListener(this);
565		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	568	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
566	569	// pasteExpandItem.addActionListener(this);
567		- menu.add("-");
568		- deleteItem = menu.add(new MenuItem("Delete"));
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
	572	+
	573	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
569	574	deleteItem.addActionListener(this);
570	575
571	576	if (Globals.ADVANCED)
..	..	@@ -716,7 +721,7 @@
716	721	hideItem = menu.add(new MenuItem("Hidden Group"));
717	722	hideItem.addActionListener(this);
718	723	}
719		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	724	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
720	725	ungroupItem.addActionListener(this);
721	726
722	727	// menu.add("-");
..	..	@@ -923,7 +928,7 @@
923	928
924	929	JTabbedPane resourcecontainer;
925	930	cGridBag currenttab;
926		- boolean added; // patch for jar
	931	+ //boolean added; // patch for jar
927	932
928	933	int tabcount = 0;
929	934	int colcount = 0;
..	..	@@ -940,12 +945,14 @@
940	945	// System.out.println();
941	946
942	947	if (//rowcount == 0 \|\|
943		- path.length == 1)
	948	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
944	949	{
945	950	currenttab = new cGridBag();
946		- added = false;
947	951	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
948	952	currenttab.setName(tabname);
	953	+ //added = false;
	954	+ resourcecontainer.add(currenttab);
	955	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
949	956	rowcount = 1;
950	957	colcount = 0;
951	958	texturecount = 0;
..	..	@@ -953,12 +960,11 @@
953	960
954	961	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
955	962	{
956		- if (!added)
	963	+ //if (!added)
957	964	{
958		- added = true;
959		- resourcecontainer.add(currenttab);
	965	+ //added = true;
960	966	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
961		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	967	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
962	968	}
963	969
964	970	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -1043,8 +1049,8 @@
1043	1049	// maxButton.addActionListener(this);
1044	1050	}
1045	1051
1046		-// cButton gcButton;
1047		-//
	1052	+ cButton gcButton;
	1053	+
1048	1054	// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1049	1055	// gcButton.setToolTipText("Garbage collect");
1050	1056	// gcButton.addActionListener(new ActionListener()
..	..	@@ -1181,6 +1187,10 @@
1181	1187	boxButton.setToolTipText("Create box");
1182	1188	boxButton.addActionListener(this);
1183	1189
	1190	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1191	+ superButton.setToolTipText("Create superellipsoid");
	1192	+ superButton.addActionListener(this);
	1193	+
1184	1194	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185	1195	sphereButton.setToolTipText("Create sphere");
1186	1196	sphereButton.addActionListener(this);
..	..	@@ -1192,10 +1202,6 @@
1192	1202	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193	1203	torusButton.setToolTipText("Create torus");
1194	1204	torusButton.addActionListener(this);
1195		-
1196		- row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1197		- superButton.setToolTipText("Create superellipsoid");
1198		- superButton.addActionListener(this);
1199	1205
1200	1206	if (Globals.ADVANCED)
1201	1207	{
..	..	@@ -2159,7 +2165,11 @@
2159	2165	shadow.material = new cMaterial(obj.material);
2160	2166	shadow.material.diffuse = 0.0001f;
2161	2167	shadow.material.specular = 0.0001f;
2162		- //shadow.projectedVertices[1].x = 300;
	2168	+ shadow.material.opacity = 0.75f;
	2169	+
	2170	+ AllocProjectedVertices(shadow);
	2171	+
	2172	+ shadow.projectedVertices[1].x = 300;
2163	2173
2164	2174	makeSomething(shadow);
2165	2175	}
..	..	@@ -2680,27 +2690,35 @@
2680	2690	} else
2681	2691	if (source == loopItem \|\| source == loopButton)
2682	2692	{
	2693	+ if (!group.selection.isEmpty())
	2694	+ {
2683	2695	Composite csg = new GroupLeaf();
2684	2696	csg.count = 5;
2685		- group(csg);
2686	2697	Composite child = new cGroup("Branch");
2687	2698	csg.addChild(child);
2688	2699	child.addChild(csg);
	2700	+ group(csg);
	2701	+ }
2689	2702	} else
2690	2703	if (source == doubleItem)
2691	2704	{
	2705	+ if (!group.selection.isEmpty())
	2706	+ {
2692	2707	Composite csg = new GroupLeaf("Fork");
2693	2708	csg.count = 5;
2694		- group(csg);
2695	2709	Composite child = new cGroup("Branch A");
2696	2710	csg.addChild(child);
2697	2711	child.addChild(csg);
2698	2712	child = new cGroup("Branch B");
2699	2713	csg.addChild(child);
2700	2714	child.addChild(csg);
	2715	+ group(csg);
	2716	+ }
2701	2717	} else
2702	2718	if (source == tripleItem)
2703	2719	{
	2720	+ if (!group.selection.isEmpty())
	2721	+ {
2704	2722	Composite csg = new GroupLeaf("Trident");
2705	2723	csg.count = 4;
2706	2724	group(csg);
..	..	@@ -2713,6 +2731,7 @@
2713	2731	child = new cGroup();
2714	2732	csg.addChild(child);
2715	2733	child.addChild(csg);
	2734	+ }
2716	2735	} else
2717	2736	if (source == computeAOItem)
2718	2737	{
..	..	@@ -3348,22 +3367,34 @@
3348	3367	} else
3349	3368	if (source == ungroupItem \|\| source == ungroupButton)
3350	3369	{
3351		- boolean hasRoot = false;
	3370	+ boolean canUngroup = true;
3352	3371
3353	3372	for (int i=0; i<group.selection.size(); i++)
3354	3373	{
3355		- if (group.selection.get(i) == group)
	3374	+ Object3D selectedItem = group.selection.get(i);
	3375	+
	3376	+ if (selectedItem.Size() == 0)
3356	3377	{
3357		- 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;
3358	3387	break;
3359	3388	}
3360	3389	}
3361	3390
3362		- if (!hasRoot)
	3391	+ if (canUngroup)
3363	3392	{
3364	3393	for (int i=0; i<group.selection.size(); i++)
3365	3394	{
3366		- Ungroup(group.selection.get(i));
	3395	+ Object3D selectedItem = group.selection.get(i);
	3396	+
	3397	+ Ungroup(selectedItem);
3367	3398	}
3368	3399
3369	3400	ClearSelection(false);
..	..	@@ -5325,6 +5356,7 @@
5325	5356
5326	5357	boolean allComposites = true;
5327	5358
	5359	+ if (group.selection != null)
5328	5360	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5329	5361	{
5330	5362	if (!(e.nextElement() instanceof Composite))
..	..	@@ -6232,11 +6264,11 @@
6232	6264	private MenuItem lookAtItem;
6233	6265	private MenuItem lookFromItem;
6234	6266	private MenuItem switchViewItem;
6235		- private MenuItem cutItem;
	6267	+ private JMenuItem cutItem;
6236	6268	private MenuItem undoItem;
6237	6269	private MenuItem redoItem;
6238	6270	private JMenuItem duplicateItem;
6239		- private MenuItem cloneItem;
	6271	+ private JMenuItem cloneItem;
6240	6272	private MenuItem cloneSupportItem;
6241	6273	private MenuItem overwriteGeoItem;
6242	6274	private MenuItem overwriteMatItem;
..	..	@@ -6257,13 +6289,13 @@
6257	6289	private MenuItem cloneGeometriesItem;
6258	6290	private MenuItem shareGeometriesItem;
6259	6291	private MenuItem mergeGeometriesItem;
6260		- private MenuItem copyItem;
	6292	+ private JMenuItem copyItem;
6261	6293	private MenuItem pasteItem;
6262		- private MenuItem pasteIntoItem;
6263		- private MenuItem pasteLinkItem;
6264		- private MenuItem pasteCloneItem;
6265		- private MenuItem pasteExpandItem;
6266		- private MenuItem deleteItem;
	6294	+ private JMenuItem pasteIntoItem;
	6295	+ private JMenuItem pasteLinkItem;
	6296	+ private JMenuItem pasteCloneItem;
	6297	+ private JMenuItem pasteExpandItem;
	6298	+ private JMenuItem deleteItem;
6267	6299	private MenuItem clearAllItem;
6268	6300	private MenuItem genUVItem;
6269	6301	private MenuItem genNormalsMESHItem;
..	..	@@ -6331,7 +6363,7 @@
6331	6363	private MenuItem switchTransfoItem;
6332	6364	private MenuItem morphItem;
6333	6365	private MenuItem linkerItem;
6334		- private MenuItem ungroupItem;
	6366	+ private JMenuItem ungroupItem;
6335	6367	private MenuItem editItem;
6336	6368	private MenuItem openWindowItem;
6337	6369	private MenuItem editLeafItem;