~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -540,33 +540,35 @@
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"));
569		- deleteItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
570	572
571	573	if (Globals.ADVANCED)
572	574	{
..	..	@@ -701,9 +703,8 @@
701	703	setMasterItem.addActionListener(this);
702	704	}
703	705
704		- oe.menuBar.add(menu = new Menu("Group"));
705		-// grabItem = menu.add(new MenuItem("Grab"));
706		-// grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
707	708	backItem = menu.add(new MenuItem("Back"));
708	709	backItem.addActionListener(this);
709	710	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -711,13 +712,21 @@
711	712	// compositeItem = menu.add(new MenuItem("Composite"));
712	713	// compositeItem.addActionListener(this);
713	714
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
714	718	if (Globals.ADVANCED)
715	719	{
716	720	hideItem = menu.add(new MenuItem("Hidden Group"));
717	721	hideItem.addActionListener(this);
718	722	}
719		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
720	724	ungroupItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
721	730
722	731	// menu.add("-");
723	732	//
..	..	@@ -923,7 +932,7 @@
923	932
924	933	JTabbedPane resourcecontainer;
925	934	cGridBag currenttab;
926		- boolean added; // patch for jar
	935	+ //boolean added; // patch for jar
927	936
928	937	int tabcount = 0;
929	938	int colcount = 0;
..	..	@@ -940,12 +949,14 @@
940	949	// System.out.println();
941	950
942	951	if (//rowcount == 0 \|\|
943		- path.length == 1)
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
944	953	{
945	954	currenttab = new cGridBag();
946		- added = false;
947	955	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
948	956	currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
949	960	rowcount = 1;
950	961	colcount = 0;
951	962	texturecount = 0;
..	..	@@ -953,12 +964,11 @@
953	964
954	965	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
955	966	{
956		- if (!added)
	967	+ //if (!added)
957	968	{
958		- added = true;
959		- resourcecontainer.add(currenttab);
	969	+ //added = true;
960	970	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
961		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
962	972	}
963	973
964	974	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -1059,7 +1069,7 @@
1059	1069	collapseButton.setToolTipText("Collapse toolbar");
1060	1070	collapseButton.addActionListener(this);
1061	1071
1062		- oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1063	1073	maximize3DButton.setToolTipText("Maximize 3D view");
1064	1074	maximize3DButton.addActionListener(this);
1065	1075
..	..	@@ -1181,6 +1191,10 @@
1181	1191	boxButton.setToolTipText("Create box");
1182	1192	boxButton.addActionListener(this);
1183	1193
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
1184	1198	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1185	1199	sphereButton.setToolTipText("Create sphere");
1186	1200	sphereButton.addActionListener(this);
..	..	@@ -1192,10 +1206,6 @@
1192	1206	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1193	1207	torusButton.setToolTipText("Create torus");
1194	1208	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	1209
1200	1210	if (Globals.ADVANCED)
1201	1211	{
..	..	@@ -1498,6 +1508,7 @@
1498	1508
1499	1509	oe.SetupViews();
1500	1510
	1511	+ if (Globals.DEBUG)
1501	1512	System.out.println("SetupViews");
1502	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1503	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -2159,7 +2170,11 @@
2159	2170	shadow.material = new cMaterial(obj.material);
2160	2171	shadow.material.diffuse = 0.0001f;
2161	2172	shadow.material.specular = 0.0001f;
2162		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
2163	2178
2164	2179	makeSomething(shadow);
2165	2180	}
..	..	@@ -2680,27 +2695,35 @@
2680	2695	} else
2681	2696	if (source == loopItem \|\| source == loopButton)
2682	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
2683	2700	Composite csg = new GroupLeaf();
2684	2701	csg.count = 5;
2685		- group(csg);
2686	2702	Composite child = new cGroup("Branch");
2687	2703	csg.addChild(child);
2688	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
2689	2707	} else
2690	2708	if (source == doubleItem)
2691	2709	{
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
2692	2712	Composite csg = new GroupLeaf("Fork");
2693	2713	csg.count = 5;
2694		- group(csg);
2695	2714	Composite child = new cGroup("Branch A");
2696	2715	csg.addChild(child);
2697	2716	child.addChild(csg);
2698	2717	child = new cGroup("Branch B");
2699	2718	csg.addChild(child);
2700	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2701	2722	} else
2702	2723	if (source == tripleItem)
2703	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2704	2727	Composite csg = new GroupLeaf("Trident");
2705	2728	csg.count = 4;
2706	2729	group(csg);
..	..	@@ -2713,6 +2736,7 @@
2713	2736	child = new cGroup();
2714	2737	csg.addChild(child);
2715	2738	child.addChild(csg);
	2739	+ }
2716	2740	} else
2717	2741	if (source == computeAOItem)
2718	2742	{
..	..	@@ -3348,22 +3372,34 @@
3348	3372	} else
3349	3373	if (source == ungroupItem \|\| source == ungroupButton)
3350	3374	{
3351		- boolean hasRoot = false;
	3375	+ boolean canUngroup = true;
3352	3376
3353	3377	for (int i=0; i<group.selection.size(); i++)
3354	3378	{
3355		- if (group.selection.get(i) == group)
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
3356	3382	{
3357		- hasRoot = true;
	3383	+ // Cannot ungroup leaves
	3384	+ canUngroup = false;
	3385	+ break;
	3386	+ }
	3387	+
	3388	+ if (selectedItem == group)
	3389	+ {
	3390	+ // Cannot ungroup root
	3391	+ canUngroup = false;
3358	3392	break;
3359	3393	}
3360	3394	}
3361	3395
3362		- if (!hasRoot)
	3396	+ if (canUngroup)
3363	3397	{
3364	3398	for (int i=0; i<group.selection.size(); i++)
3365	3399	{
3366		- Ungroup(group.selection.get(i));
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
3367	3403	}
3368	3404
3369	3405	ClearSelection(false);
..	..	@@ -4083,7 +4119,10 @@
4083	4119	copy.versionlist = new Object3D[100];
4084	4120	copy.versionindex = -1;
4085	4121
4086		- Save(true);
	4122	+ // Cannot work with loops
	4123	+ // To fix this issue, first mark all nodes above the root,
	4124	+ // and check if any of these nodes are reachable below the root.
	4125	+ //Save(true);
4087	4126	}
4088	4127
4089	4128	SetVersionStates();
..	..	@@ -5328,7 +5367,8 @@
5328	5367	if (group.selection != null)
5329	5368	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5330	5369	{
5331		- if (!(e.nextElement() instanceof Composite))
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
5332	5372	{
5333	5373	allComposites = false;
5334	5374	break;
..	..	@@ -6233,11 +6273,11 @@
6233	6273	private MenuItem lookAtItem;
6234	6274	private MenuItem lookFromItem;
6235	6275	private MenuItem switchViewItem;
6236		- private MenuItem cutItem;
	6276	+ private JMenuItem cutItem;
6237	6277	private MenuItem undoItem;
6238	6278	private MenuItem redoItem;
6239	6279	private JMenuItem duplicateItem;
6240		- private MenuItem cloneItem;
	6280	+ private JMenuItem cloneItem;
6241	6281	private MenuItem cloneSupportItem;
6242	6282	private MenuItem overwriteGeoItem;
6243	6283	private MenuItem overwriteMatItem;
..	..	@@ -6258,13 +6298,13 @@
6258	6298	private MenuItem cloneGeometriesItem;
6259	6299	private MenuItem shareGeometriesItem;
6260	6300	private MenuItem mergeGeometriesItem;
6261		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
6262	6302	private MenuItem pasteItem;
6263		- private MenuItem pasteIntoItem;
6264		- private MenuItem pasteLinkItem;
6265		- private MenuItem pasteCloneItem;
6266		- private MenuItem pasteExpandItem;
6267		- private MenuItem deleteItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
6268	6308	private MenuItem clearAllItem;
6269	6309	private MenuItem genUVItem;
6270	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -6319,7 +6359,7 @@
6319	6359	private MenuItem transformGeometryItem;
6320	6360	private MenuItem transformChildrenItem;
6321	6361	private MenuItem hideItem;
6322		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
6323	6363	private MenuItem backItem;
6324	6364	private MenuItem frontItem;
6325	6365	private MenuItem cameraItem;
..	..	@@ -6332,7 +6372,7 @@
6332	6372	private MenuItem switchTransfoItem;
6333	6373	private MenuItem morphItem;
6334	6374	private MenuItem linkerItem;
6335		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
6336	6376	private MenuItem editItem;
6337	6377	private MenuItem openWindowItem;
6338	6378	private MenuItem editLeafItem;