~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)
..	..	@@ -406,12 +415,14 @@
406	415	this.copy = this.group = group;
407	416	//selectees = this.group.selectees;
408	417
	418	+ assert(false);
	419	+
409	420	if (copy.versionlist == null)
410	421	{
411	422	copy.versionlist = new Object3D[100];
412	423	copy.versionindex = -1;
413	424
414		- Save(true);
	425	+ //Save(true);
415	426	}
416	427
417	428	if(ui)
..	..	@@ -440,7 +451,7 @@
440	451	copy.versionlist = new Object3D[100];
441	452	copy.versionindex = -1;
442	453
443		- Save(true);
	454	+ //Save(true);
444	455	}
445	456	}
446	457
..	..	@@ -531,33 +542,35 @@
531	542	// menu.add("-");
532	543	duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
533	544	duplicateItem.addActionListener(this);
534		- cloneItem = menu.add(new MenuItem("Clone"));
	545	+
	546	+ cloneItem = oe.jTree.popup.add(new JMenuItem("Clone"));
535	547	cloneItem.addActionListener(this);
536		- if (Globals.ADVANCED)
	548	+ //if (Globals.ADVANCED)
537	549	{
538	550	cloneSupportItem = menu.add(new MenuItem("Clone (+supports)"));
539	551	cloneSupportItem.addActionListener(this);
540	552	}
	553	+ oe.jTree.popup.addSeparator();
541	554	menu.add("-");
542		- cutItem = menu.add(new MenuItem("Cut"));
	555	+ cutItem = oe.jTree.popup.add(new JMenuItem("Cut"));
543	556	cutItem.addActionListener(this);
544		- copyItem = menu.add(new MenuItem("Copy"));
	557	+ copyItem = oe.jTree.popup.add(new JMenuItem("Copy"));
545	558	copyItem.addActionListener(this);
546	559	pasteItem = menu.add(new MenuItem("Paste"));
547	560	pasteItem.addActionListener(this);
548	561
549		- menu.add("-");
550		- pasteIntoItem = menu.add(new MenuItem("Paste into"));
	562	+ oe.jTree.popup.addSeparator();
	563	+ //menu.add("-");
	564	+ pasteIntoItem = oe.jTree.popup.add(new JMenuItem("Paste into"));
551	565	pasteIntoItem.addActionListener(this);
552		- pasteLinkItem = menu.add(new MenuItem("Paste link"));
	566	+ pasteLinkItem = oe.jTree.popup.add(new JMenuItem("Paste link"));
553	567	pasteLinkItem.addActionListener(this);
554		- pasteCloneItem = menu.add(new MenuItem("Paste clone"));
	568	+ pasteCloneItem = oe.jTree.popup.add(new JMenuItem("Paste clone"));
555	569	pasteCloneItem.addActionListener(this);
556		-// pasteExpandItem = menu.add(new MenuItem("Paste expand"));
	570	+// CRASH pasteExpandItem = oe.jTree.popup.add(new JMenuItem("Paste expand"));
557	571	// pasteExpandItem.addActionListener(this);
558		- menu.add("-");
559		- deleteItem = menu.add(new MenuItem("Delete"));
560		- deleteItem.addActionListener(this);
	572	+ //menu.add("-");
	573	+ oe.jTree.popup.addSeparator();
561	574
562	575	if (Globals.ADVANCED)
563	576	{
..	..	@@ -692,9 +705,8 @@
692	705	setMasterItem.addActionListener(this);
693	706	}
694	707
695		- oe.menuBar.add(menu = new Menu("Group"));
696		-// grabItem = menu.add(new MenuItem("Grab"));
697		-// grabItem.addActionListener(this);
	708	+ oe.menuBar.add(menu = new Menu("Order"));
	709	+
698	710	backItem = menu.add(new MenuItem("Back"));
699	711	backItem.addActionListener(this);
700	712	frontItem = menu.add(new MenuItem("Front"));
..	..	@@ -702,13 +714,21 @@
702	714	// compositeItem = menu.add(new MenuItem("Composite"));
703	715	// compositeItem.addActionListener(this);
704	716
	717	+ grabItem = oe.jTree.popup.add(new JMenuItem("Group"));
	718	+ grabItem.addActionListener(this);
	719	+
705	720	if (Globals.ADVANCED)
706	721	{
707	722	hideItem = menu.add(new MenuItem("Hidden Group"));
708	723	hideItem.addActionListener(this);
709	724	}
710		- ungroupItem = menu.add(new MenuItem("Ungroup"));
	725	+ ungroupItem = oe.jTree.popup.add(new JMenuItem("Ungroup"));
711	726	ungroupItem.addActionListener(this);
	727	+
	728	+ oe.jTree.popup.addSeparator();
	729	+
	730	+ deleteItem = oe.jTree.popup.add(new JMenuItem("Delete"));
	731	+ deleteItem.addActionListener(this);
712	732
713	733	// menu.add("-");
714	734	//
..	..	@@ -914,7 +934,7 @@
914	934
915	935	JTabbedPane resourcecontainer;
916	936	cGridBag currenttab;
917		- boolean added; // patch for jar
	937	+ //boolean added; // patch for jar
918	938
919	939	int tabcount = 0;
920	940	int colcount = 0;
..	..	@@ -931,12 +951,14 @@
931	951	// System.out.println();
932	952
933	953	if (//rowcount == 0 \|\|
934		- path.length == 1)
	954	+ path.length == 1 && !path[0].equals("") && !path[0].equals(".DS_Store"))
935	955	{
936	956	currenttab = new cGridBag();
937		- added = false;
938	957	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
939	958	currenttab.setName(tabname);
	959	+ //added = false;
	960	+ resourcecontainer.add(currenttab);
	961	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
940	962	rowcount = 1;
941	963	colcount = 0;
942	964	texturecount = 0;
..	..	@@ -944,12 +966,11 @@
944	966
945	967	if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
946	968	{
947		- if (!added)
	969	+ //if (!added)
948	970	{
949		- added = true;
950		- resourcecontainer.add(currenttab);
	971	+ //added = true;
951	972	String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
952		- resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	973	+ currenttab = (cGridBag)resourcecontainer.getComponentAt(resourcecontainer.indexOfTab(tabname));
953	974	}
954	975
955	976	AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
..	..	@@ -1034,8 +1055,8 @@
1034	1055	// maxButton.addActionListener(this);
1035	1056	}
1036	1057
1037		-// cButton gcButton;
1038		-//
	1058	+ cButton gcButton;
	1059	+
1039	1060	// oe.toolbarPanel.add(gcButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1040	1061	// gcButton.setToolTipText("Garbage collect");
1041	1062	// gcButton.addActionListener(new ActionListener()
..	..	@@ -1050,7 +1071,7 @@
1050	1071	collapseButton.setToolTipText("Collapse toolbar");
1051	1072	collapseButton.addActionListener(this);
1052	1073
1053		- oe.toolbarPanel.add(maximize3DButton = GetButton("", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1074	+ oe.toolbarPanel.add(maximize3DButton = GetButton("icons/empty.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1054	1075	maximize3DButton.setToolTipText("Maximize 3D view");
1055	1076	maximize3DButton.addActionListener(this);
1056	1077
..	..	@@ -1092,6 +1113,7 @@
1092	1113	copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1093	1114	deleteVersionButton.setToolTipText("Delete current version");
1094	1115	deleteVersionButton.addActionListener(this);
	1116	+ deleteVersionButton.setEnabled(false);
1095	1117
1096	1118	copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1097	1119	previousVersionButton.setToolTipText("Previous version");
..	..	@@ -1102,12 +1124,12 @@
1102	1124	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1103	1125	restoreButton.setToolTipText("Undo (restore current version)");
1104	1126	restoreButton.addActionListener(this);
1105		- //restoreButton.setEnabled(false);
	1127	+ restoreButton.setEnabled(false);
1106	1128
1107	1129	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1108	1130	replaceButton.setToolTipText("Save (replace current version)");
1109	1131	replaceButton.addActionListener(this);
1110		- //replaceButton.setEnabled(false);
	1132	+ replaceButton.setEnabled(false);
1111	1133
1112	1134	copyOptionsPanel.add(updown);
1113	1135
..	..	@@ -1172,6 +1194,10 @@
1172	1194	boxButton.setToolTipText("Create box");
1173	1195	boxButton.addActionListener(this);
1174	1196
	1197	+ row1.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1198	+ superButton.setToolTipText("Create superellipsoid");
	1199	+ superButton.addActionListener(this);
	1200	+
1175	1201	row1.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1176	1202	sphereButton.setToolTipText("Create sphere");
1177	1203	sphereButton.addActionListener(this);
..	..	@@ -1183,10 +1209,6 @@
1183	1209	row1.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1184	1210	torusButton.setToolTipText("Create torus");
1185	1211	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	1212
1191	1213	if (Globals.ADVANCED)
1192	1214	{
..	..	@@ -1236,6 +1258,8 @@
1236	1258	cGridBag textures = new cGridBag();
1237	1259
1238	1260	CreateTexturePanel(textures);
	1261	+
	1262	+ resourcecontainer.setSelectedIndex((int)(Math.random() * resourcecontainer.getTabCount()));
1239	1263
1240	1264	oe.toolboxPanel.add(textures);
1241	1265
..	..	@@ -1459,11 +1483,11 @@
1459	1483	{
1460	1484	assert(obj instanceof Composite);
1461	1485
1462		- if (obj.versionlist == null)
1463		- {
1464		- obj.versionlist = new Object3D[100];
1465		- obj.versionindex = -1;
1466		- }
	1486	+// if (obj.versionlist == null)
	1487	+// {
	1488	+// obj.versionlist = new Object3D[100];
	1489	+// obj.versionindex = -1;
	1490	+// }
1467	1491
1468	1492	cRadio radioButton = new cRadio(obj.name);
1469	1493
..	..	@@ -1489,6 +1513,7 @@
1489	1513
1490	1514	oe.SetupViews();
1491	1515
	1516	+ if (Globals.DEBUG)
1492	1517	System.out.println("SetupViews");
1493	1518	DragSource.getDefaultDragSource().createDefaultDragGestureRecognizer(
1494	1519	oe.cameraView, DnDConstants.ACTION_COPY_OR_MOVE, this); // ACTION_LINK ??
..	..	@@ -2150,7 +2175,11 @@
2150	2175	shadow.material = new cMaterial(obj.material);
2151	2176	shadow.material.diffuse = 0.0001f;
2152	2177	shadow.material.specular = 0.0001f;
2153		- //shadow.projectedVertices[1].x = 300;
	2178	+ shadow.material.opacity = 0.75f;
	2179	+
	2180	+ AllocProjectedVertices(shadow);
	2181	+
	2182	+ shadow.projectedVertices[1].x = 300;
2154	2183
2155	2184	makeSomething(shadow);
2156	2185	}
..	..	@@ -2671,27 +2700,35 @@
2671	2700	} else
2672	2701	if (source == loopItem \|\| source == loopButton)
2673	2702	{
	2703	+ if (!group.selection.isEmpty())
	2704	+ {
2674	2705	Composite csg = new GroupLeaf();
2675	2706	csg.count = 5;
2676		- group(csg);
2677	2707	Composite child = new cGroup("Branch");
2678	2708	csg.addChild(child);
2679	2709	child.addChild(csg);
	2710	+ group(csg);
	2711	+ }
2680	2712	} else
2681	2713	if (source == doubleItem)
2682	2714	{
	2715	+ if (!group.selection.isEmpty())
	2716	+ {
2683	2717	Composite csg = new GroupLeaf("Fork");
2684	2718	csg.count = 5;
2685		- group(csg);
2686	2719	Composite child = new cGroup("Branch A");
2687	2720	csg.addChild(child);
2688	2721	child.addChild(csg);
2689	2722	child = new cGroup("Branch B");
2690	2723	csg.addChild(child);
2691	2724	child.addChild(csg);
	2725	+ group(csg);
	2726	+ }
2692	2727	} else
2693	2728	if (source == tripleItem)
2694	2729	{
	2730	+ if (!group.selection.isEmpty())
	2731	+ {
2695	2732	Composite csg = new GroupLeaf("Trident");
2696	2733	csg.count = 4;
2697	2734	group(csg);
..	..	@@ -2704,6 +2741,7 @@
2704	2741	child = new cGroup();
2705	2742	csg.addChild(child);
2706	2743	child.addChild(csg);
	2744	+ }
2707	2745	} else
2708	2746	if (source == computeAOItem)
2709	2747	{
..	..	@@ -3339,22 +3377,34 @@
3339	3377	} else
3340	3378	if (source == ungroupItem \|\| source == ungroupButton)
3341	3379	{
3342		- boolean hasRoot = false;
	3380	+ boolean canUngroup = true;
3343	3381
3344	3382	for (int i=0; i<group.selection.size(); i++)
3345	3383	{
3346		- if (group.selection.get(i) == group)
	3384	+ Object3D selectedItem = group.selection.get(i);
	3385	+
	3386	+ if (selectedItem.Size() == 0)
3347	3387	{
3348		- hasRoot = true;
	3388	+ // Cannot ungroup leaves
	3389	+ canUngroup = false;
	3390	+ break;
	3391	+ }
	3392	+
	3393	+ if (selectedItem == group)
	3394	+ {
	3395	+ // Cannot ungroup root
	3396	+ canUngroup = false;
3349	3397	break;
3350	3398	}
3351	3399	}
3352	3400
3353		- if (!hasRoot)
	3401	+ if (canUngroup)
3354	3402	{
3355	3403	for (int i=0; i<group.selection.size(); i++)
3356	3404	{
3357		- Ungroup(group.selection.get(i));
	3405	+ Object3D selectedItem = group.selection.get(i);
	3406	+
	3407	+ Ungroup(selectedItem);
3358	3408	}
3359	3409
3360	3410	ClearSelection(false);
..	..	@@ -4067,7 +4117,20 @@
4067	4117	*/
4068	4118	radio.layout.doClick();
4069	4119
4070		- SetUndoStates();
	4120	+ assert(copy instanceof Composite);
	4121	+
	4122	+ if (copy.versionlist == null)
	4123	+ {
	4124	+ copy.versionlist = new Object3D[100];
	4125	+ copy.versionindex = -1;
	4126	+
	4127	+ // Cannot work with loops
	4128	+ // To fix this issue, first mark all nodes above the root,
	4129	+ // and check if any of these nodes are reachable below the root.
	4130	+ //Save(true);
	4131	+ }
	4132	+
	4133	+ SetVersionStates();
4071	4134
4072	4135	ClearUnpinned();
4073	4136
..	..	@@ -5306,9 +5369,11 @@
5306	5369
5307	5370	boolean allComposites = true;
5308	5371
	5372	+ if (group.selection != null)
5309	5373	for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
5310	5374	{
5311		- if (!(e.nextElement() instanceof Composite))
	5375	+ Object next = e.nextElement();
	5376	+ if (!(next instanceof Composite)) // \|\| (next instanceof GroupLeaf))
5312	5377	{
5313	5378	allComposites = false;
5314	5379	break;
..	..	@@ -6213,11 +6278,11 @@
6213	6278	private MenuItem lookAtItem;
6214	6279	private MenuItem lookFromItem;
6215	6280	private MenuItem switchViewItem;
6216		- private MenuItem cutItem;
	6281	+ private JMenuItem cutItem;
6217	6282	private MenuItem undoItem;
6218	6283	private MenuItem redoItem;
6219	6284	private JMenuItem duplicateItem;
6220		- private MenuItem cloneItem;
	6285	+ private JMenuItem cloneItem;
6221	6286	private MenuItem cloneSupportItem;
6222	6287	private MenuItem overwriteGeoItem;
6223	6288	private MenuItem overwriteMatItem;
..	..	@@ -6238,13 +6303,13 @@
6238	6303	private MenuItem cloneGeometriesItem;
6239	6304	private MenuItem shareGeometriesItem;
6240	6305	private MenuItem mergeGeometriesItem;
6241		- private MenuItem copyItem;
	6306	+ private JMenuItem copyItem;
6242	6307	private MenuItem pasteItem;
6243		- private MenuItem pasteIntoItem;
6244		- private MenuItem pasteLinkItem;
6245		- private MenuItem pasteCloneItem;
6246		- private MenuItem pasteExpandItem;
6247		- private MenuItem deleteItem;
	6308	+ private JMenuItem pasteIntoItem;
	6309	+ private JMenuItem pasteLinkItem;
	6310	+ private JMenuItem pasteCloneItem;
	6311	+ private JMenuItem pasteExpandItem;
	6312	+ private JMenuItem deleteItem;
6248	6313	private MenuItem clearAllItem;
6249	6314	private MenuItem genUVItem;
6250	6315	private MenuItem genNormalsMESHItem;
..	..	@@ -6299,7 +6364,7 @@
6299	6364	private MenuItem transformGeometryItem;
6300	6365	private MenuItem transformChildrenItem;
6301	6366	private MenuItem hideItem;
6302		- private MenuItem grabItem;
	6367	+ private JMenuItem grabItem;
6303	6368	private MenuItem backItem;
6304	6369	private MenuItem frontItem;
6305	6370	private MenuItem cameraItem;
..	..	@@ -6312,7 +6377,7 @@
6312	6377	private MenuItem switchTransfoItem;
6313	6378	private MenuItem morphItem;
6314	6379	private MenuItem linkerItem;
6315		- private MenuItem ungroupItem;
	6380	+ private JMenuItem ungroupItem;
6316	6381	private MenuItem editItem;
6317	6382	private MenuItem openWindowItem;
6318	6383	private MenuItem editLeafItem;