~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,33 +540,35 @@
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"));
560		- deleteItem.addActionListener(this);
	570	+ //menu.add("-");
	571	+ oe.jTree.popup.addSeparator();
561	572
562	573	if (Globals.ADVANCED)
563	574	{
..	..	@@ -692,9 +703,8 @@
692	703	setMasterItem.addActionListener(this);
693	704	}
694	705
695		- oe.menuBar.add(menu = new Menu("Group"));
696		-// grabItem = menu.add(new MenuItem("Grab"));
697		-// grabItem.addActionListener(this);
	706	+ oe.menuBar.add(menu = new Menu("Order"));
	707	+
698	708	backItem = menu.add(new MenuItem("Back"));
699	709	backItem.addActionListener(this);
700	710	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -702,13 +712,21 @@
702	712	// compositeItem = menu.add(new MenuItem("Composite"));
703	713	// compositeItem.addActionListener(this);
704	714
	715	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	716	+ grabItem.addActionListener(this);
	717	+
705	718	if (Globals.ADVANCED)
706	719	{
707	720	hideItem = menu.add(new MenuItem("Hidden Group"));
708	721	hideItem.addActionListener(this);
709	722	}
710		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	723	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711	724	ungroupItem.addActionListener(this);
	725	+
	726	+ oe.jTree.popup.addSeparator();
	727	+
	728	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	729	+ deleteItem.addActionListener(this);
712	730
713	731	// menu.add("-");
714	732	//
..	..	@@ -914,7 +932,7 @@
914	932
915	933	JTabbedPane resourcecontainer;
916	934	cGridBag currenttab;
917		- boolean added; // patch for jar
	935	+ //boolean added; // patch for jar
918	936
919	937	int tabcount = 0;
920	938	int colcount = 0;
..	..	@@ -931,12 +949,14 @@
931	949	// System.out.println();
932	950
933	951	if (//rowcount == 0 \|\|
934		- path.length == 1)
	952	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
935	953	{
936	954	currenttab = new cGridBag();
937		- added = false;
938	955	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939	956	currenttab.setName(tabname);
	957	+ //added = false;
	958	+ resourcecontainer.add(currenttab);
	959	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
940	960	rowcount = 1;
941	961	colcount = 0;
942	962	texturecount = 0;
..	..	@@ -944,12 +964,11 @@
944	964
945	965	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
946	966	{
947		- if (!added)
	967	+ //if (!added)
948	968	{
949		- added = true;
950		- resourcecontainer.add(currenttab);
	969	+ //added = true;
951	970	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
952		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	971	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
953	972	}
954	973
955	974	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -1034,8 +1053,8 @@
1034	1053	// maxButton.addActionListener(this);
1035	1054	}
1036	1055
1037		-// cButton gcButton;
1038		-//
	1056	+ cButton gcButton;
	1057	+
1039	1058	// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040	1059	// gcButton.setToolTipText("Garbage collect");
1041	1060	// gcButton.addActionListener(new ActionListener()
..	..	@@ -1050,7 +1069,7 @@
1050	1069	collapseButton.setToolTipText("Collapse toolbar");
1051	1070	collapseButton.addActionListener(this);
1052	1071
1053		- oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1072	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054	1073	maximize3DButton.setToolTipText("Maximize 3D view");
1055	1074	maximize3DButton.addActionListener(this);
1056	1075
..	..	@@ -1172,6 +1191,10 @@
1172	1191	boxButton.setToolTipText("Create box");
1173	1192	boxButton.addActionListener(this);
1174	1193
	1194	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1195	+ superButton.setToolTipText("Create superellipsoid");
	1196	+ superButton.addActionListener(this);
	1197	+
1175	1198	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176	1199	sphereButton.setToolTipText("Create sphere");
1177	1200	sphereButton.addActionListener(this);
..	..	@@ -1183,10 +1206,6 @@
1183	1206	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184	1207	torusButton.setToolTipText("Create torus");
1185	1208	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	1209
1191	1210	if (Globals.ADVANCED)
1192	1211	{
..	..	@@ -1459,11 +1478,11 @@
1459	1478	{
1460	1479	assert(obj instanceof Composite);
1461	1480
1462		- if (obj.versionlist == null)
1463		- {
1464		- obj.versionlist = new Object3D[100];
1465		- obj.versionindex = -1;
1466		- }
	1481	+// if (obj.versionlist == null)
	1482	+// {
	1483	+// obj.versionlist = new Object3D[100];
	1484	+// obj.versionindex = -1;
	1485	+// }
1467	1486
1468	1487	cRadio radioButton = new cRadio(obj.name);
1469	1488
..	..	@@ -1489,6 +1508,7 @@
1489	1508
1490	1509	oe.SetupViews();
1491	1510
	1511	+ if (Globals.DEBUG)
1492	1512	System.out.println("SetupViews");
1493	1513	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1494	1514	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -2150,7 +2170,11 @@
2150	2170	shadow.material = new cMaterial(obj.material);
2151	2171	shadow.material.diffuse = 0.0001f;
2152	2172	shadow.material.specular = 0.0001f;
2153		- //shadow.projectedVertices[1].x = 300;
	2173	+ shadow.material.opacity = 0.75f;
	2174	+
	2175	+ AllocProjectedVertices(shadow);
	2176	+
	2177	+ shadow.projectedVertices[1].x = 300;
2154	2178
2155	2179	makeSomething(shadow);
2156	2180	}
..	..	@@ -2671,27 +2695,35 @@
2671	2695	} else
2672	2696	if (source == loopItem \|\| source == loopButton)
2673	2697	{
	2698	+ if (!group.selection.isEmpty())
	2699	+ {
2674	2700	Composite csg = new GroupLeaf();
2675	2701	csg.count = 5;
2676		- group(csg);
2677	2702	Composite child = new cGroup("Branch");
2678	2703	csg.addChild(child);
2679	2704	child.addChild(csg);
	2705	+ group(csg);
	2706	+ }
2680	2707	} else
2681	2708	if (source == doubleItem)
2682	2709	{
	2710	+ if (!group.selection.isEmpty())
	2711	+ {
2683	2712	Composite csg = new GroupLeaf("Fork");
2684	2713	csg.count = 5;
2685		- group(csg);
2686	2714	Composite child = new cGroup("Branch A");
2687	2715	csg.addChild(child);
2688	2716	child.addChild(csg);
2689	2717	child = new cGroup("Branch B");
2690	2718	csg.addChild(child);
2691	2719	child.addChild(csg);
	2720	+ group(csg);
	2721	+ }
2692	2722	} else
2693	2723	if (source == tripleItem)
2694	2724	{
	2725	+ if (!group.selection.isEmpty())
	2726	+ {
2695	2727	Composite csg = new GroupLeaf("Trident");
2696	2728	csg.count = 4;
2697	2729	group(csg);
..	..	@@ -2704,6 +2736,7 @@
2704	2736	child = new cGroup();
2705	2737	csg.addChild(child);
2706	2738	child.addChild(csg);
	2739	+ }
2707	2740	} else
2708	2741	if (source == computeAOItem)
2709	2742	{
..	..	@@ -3339,22 +3372,34 @@
3339	3372	} else
3340	3373	if (source == ungroupItem \|\| source == ungroupButton)
3341	3374	{
3342		- boolean hasRoot = false;
	3375	+ boolean canUngroup = true;
3343	3376
3344	3377	for (int i=0; i<group.selection.size(); i++)
3345	3378	{
3346		- if (group.selection.get(i) == group)
	3379	+ Object3D selectedItem = group.selection.get(i);
	3380	+
	3381	+ if (selectedItem.Size() == 0)
3347	3382	{
3348		- 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;
3349	3392	break;
3350	3393	}
3351	3394	}
3352	3395
3353		- if (!hasRoot)
	3396	+ if (canUngroup)
3354	3397	{
3355	3398	for (int i=0; i<group.selection.size(); i++)
3356	3399	{
3357		- Ungroup(group.selection.get(i));
	3400	+ Object3D selectedItem = group.selection.get(i);
	3401	+
	3402	+ Ungroup(selectedItem);
3358	3403	}
3359	3404
3360	3405	ClearSelection(false);
..	..	@@ -4067,7 +4112,20 @@
4067	4112	*/
4068	4113	radio.layout.doClick();
4069	4114
4070		- SetUndoStates();
	4115	+ assert(copy instanceof Composite);
	4116	+
	4117	+ if (copy.versionlist == null)
	4118	+ {
	4119	+ copy.versionlist = new Object3D[100];
	4120	+ copy.versionindex = -1;
	4121	+
	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);
	4126	+ }
	4127	+
	4128	+ SetVersionStates();
4071	4129
4072	4130	ClearUnpinned();
4073	4131
..	..	@@ -5306,9 +5364,11 @@
5306	5364
5307	5365	boolean allComposites = true;
5308	5366
	5367	+ if (group.selection != null)
5309	5368	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310	5369	{
5311		- if (!(e.nextElement() instanceof Composite))
	5370	+ Object next = e.nextElement();
	5371	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
5312	5372	{
5313	5373	allComposites = false;
5314	5374	break;
..	..	@@ -6213,11 +6273,11 @@
6213	6273	private MenuItem lookAtItem;
6214	6274	private MenuItem lookFromItem;
6215	6275	private MenuItem switchViewItem;
6216		- private MenuItem cutItem;
	6276	+ private JMenuItem cutItem;
6217	6277	private MenuItem undoItem;
6218	6278	private MenuItem redoItem;
6219	6279	private JMenuItem duplicateItem;
6220		- private MenuItem cloneItem;
	6280	+ private JMenuItem cloneItem;
6221	6281	private MenuItem cloneSupportItem;
6222	6282	private MenuItem overwriteGeoItem;
6223	6283	private MenuItem overwriteMatItem;
..	..	@@ -6238,13 +6298,13 @@
6238	6298	private MenuItem cloneGeometriesItem;
6239	6299	private MenuItem shareGeometriesItem;
6240	6300	private MenuItem mergeGeometriesItem;
6241		- private MenuItem copyItem;
	6301	+ private JMenuItem copyItem;
6242	6302	private MenuItem pasteItem;
6243		- private MenuItem pasteIntoItem;
6244		- private MenuItem pasteLinkItem;
6245		- private MenuItem pasteCloneItem;
6246		- private MenuItem pasteExpandItem;
6247		- private MenuItem deleteItem;
	6303	+ private JMenuItem pasteIntoItem;
	6304	+ private JMenuItem pasteLinkItem;
	6305	+ private JMenuItem pasteCloneItem;
	6306	+ private JMenuItem pasteExpandItem;
	6307	+ private JMenuItem deleteItem;
6248	6308	private MenuItem clearAllItem;
6249	6309	private MenuItem genUVItem;
6250	6310	private MenuItem genNormalsMESHItem;
..	..	@@ -6299,7 +6359,7 @@
6299	6359	private MenuItem transformGeometryItem;
6300	6360	private MenuItem transformChildrenItem;
6301	6361	private MenuItem hideItem;
6302		- private MenuItem grabItem;
	6362	+ private JMenuItem grabItem;
6303	6363	private MenuItem backItem;
6304	6364	private MenuItem frontItem;
6305	6365	private MenuItem cameraItem;
..	..	@@ -6312,7 +6372,7 @@
6312	6372	private MenuItem switchTransfoItem;
6313	6373	private MenuItem morphItem;
6314	6374	private MenuItem linkerItem;
6315		- private MenuItem ungroupItem;
	6375	+ private JMenuItem ungroupItem;
6316	6376	private MenuItem editItem;
6317	6377	private MenuItem openWindowItem;
6318	6378	private MenuItem editLeafItem;