~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -16,6 +16,7 @@
16	16	//import buoy.widget.BFileChooser;
17	17
18	18	class GroupEditor extends ObjEditor implements //iParse, //iCallBack,
	19	+ Grafreed.iResourceCallBack,
19	20	ObjectUI,
20	21	Runnable,
21	22	ActionListener,
..	..	@@ -41,6 +42,22 @@
41	42	});
42	43	}
43	44
	45	+ public void AddTextureButton(String f, final String t, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(f + "s");
	51	+ textureButton.addActionListener(new ActionListener()
	52	+ {
	53	+ @Override
	54	+ public void actionPerformed(ActionEvent e)
	55	+ {
	56	+ ChangeTexture(path + t);
	57	+ }
	58	+ });
	59	+ }
	60	+
44	61	public void AddSkyboxTab0(JTabbedPane skyboxpanel)
45	62	{
46	63	cGridBag tab0 = new cGridBag().setVertical(true);
..	..	@@ -311,14 +328,31 @@
311	328	}
312	329	}
313	330
314		- public void ChangeSkybox(String name)
	331	+ public void ChangeSkybox(String skybox)
315	332	{
316	333	//cameraView.envyoff = false;
317		- group.skyboxname = name;
	334	+ group.skyboxname = skybox;
318	335	group.skyboxext = "jpg";
319	336	cameraView.repaint();
320	337	}
	338	+
	339	+ public void CreateSkyboxPanel(cGridBag skyboxPanel)
	340	+ {
	341	+ JTabbedPane skyboxpane = new JTabbedPane();
	342	+
	343	+ AddSkyboxTab0(skyboxpane);
	344	+ AddSkyboxTab1(skyboxpane);
	345	+ AddSkyboxTab2(skyboxpane);
	346	+ AddSkyboxTab3(skyboxpane);
	347	+
	348	+ skyboxPanel.add(skyboxpane);
	349	+ }
321	350
	351	+ public void ChangeTexture(String texture)
	352	+ {
	353	+ cameraView.repaint();
	354	+ }
	355	+
322	356	//ObjEditor objEditor;
323	357	public void closeUI2()
324	358	{
..	..	@@ -356,9 +390,9 @@
356	390	this.copy = this.group = group;
357	391	//selectees = this.group.selectees;
358	392
359		- if (copy.versions == null)
	393	+ if (copy.versionlist == null)
360	394	{
361		- copy.versions = new byte[100][];
	395	+ copy.versionlist = new Object3D[100];
362	396	copy.versionindex = -1;
363	397	}
364	398
..	..	@@ -383,9 +417,9 @@
383	417
384	418	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385	419
386		- if (copy.versions == null)
	420	+ if (copy.versionlist == null)
387	421	{
388		- copy.versions = new byte[100][];
	422	+ copy.versionlist = new Object3D[100];
389	423	copy.versionindex = -1;
390	424
391	425	Save(true);
..	..	@@ -859,6 +893,67 @@
859	893	buildToolsMenu(menu);
860	894	}
861	895
	896	+ JTabbedPane resourcecontainer;
	897	+ cGridBag currenttab;
	898	+ boolean added; // patch for jar
	899	+
	900	+ int tabcount = 0;
	901	+ int colcount = 0;
	902	+ int rowcount = 0;
	903	+
	904	+ int columns = 5;
	905	+ int rows = 7;
	906	+
	907	+ public void ResourceCallBack(String[] path)
	908	+ {
	909	+ for (int i = 0; i < path.length; i++)
	910	+ System.out.print(path[i] + "/");
	911	+ System.out.println();
	912	+ if (rowcount == 0)
	913	+ {
	914	+ currenttab = new cGridBag();
	915	+ added = false;
	916	+ String tabname = String.valueOf((char)('A'+tabcount));
	917	+ currenttab.setName(tabname);
	918	+ rowcount = 1;
	919	+ }
	920	+
	921	+ if (path.length > 1 && path[1].toLowerCase().endsWith(".jpg"))
	922	+ {
	923	+ if (!added)
	924	+ {
	925	+ added = true;
	926	+ resourcecontainer.add(currenttab);
	927	+ String tabname = String.valueOf((char)('A'+tabcount));
	928	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	929	+ }
	930	+
	931	+ AddTextureButton(path[0], path[1], currenttab);
	932	+ if (++colcount >= columns)
	933	+ {
	934	+ colcount = 0;
	935	+ currenttab.Return();
	936	+
	937	+ if (rowcount++ >= rows)
	938	+ {
	939	+ rowcount = 0;
	940	+ }
	941	+ }
	942	+ }
	943	+ else
	944	+ {
	945	+// if (!path[path.length-1].equals("icons"))
	946	+// resourcecontainer.Return();
	947	+ }
	948	+ }
	949	+
	950	+ void CreateTexturePanel(cGridBag container)
	951	+ {
	952	+ resourcecontainer = new JTabbedPane();
	953	+ container.add(resourcecontainer);
	954	+
	955	+ Grafreed.ParseResources("textures", this);
	956	+ }
862	957
863	958	void SetupUI2(ObjEditor oe)
864	959	{
..	..	@@ -931,32 +1026,36 @@
931	1026	restoreCameraButton.setToolTipText("Restore viewpoint");
932	1027	restoreCameraButton.addActionListener(this);
933	1028
934		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935		- saveButton.setToolTipText("New version");
936		- saveButton.addActionListener(this);
	1029	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1030	+ saveVersionButton.setToolTipText("Duplicate current version");
	1031	+ saveVersionButton.addActionListener(this);
937	1032
938		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
939		- undoButton.setToolTipText("Previous version");
940		- undoButton.addActionListener(this);
941		- undoButton.setEnabled(false);
	1033	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1034	+ deleteVersionButton.setToolTipText("Delete current version");
	1035	+ deleteVersionButton.addActionListener(this);
	1036	+
	1037	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1038	+ previousVersionButton.setToolTipText("Previous version");
	1039	+ previousVersionButton.addActionListener(this);
	1040	+ previousVersionButton.setEnabled(false);
942	1041
943	1042	cGridBag updown = new cGridBag().setVertical(true);
944	1043	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945		- restoreButton.setToolTipText("Restore current");
	1044	+ restoreButton.setToolTipText("Undo (restore current version)");
946	1045	restoreButton.addActionListener(this);
947		- restoreButton.setEnabled(false);
	1046	+ //restoreButton.setEnabled(false);
948	1047
949	1048	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950		- replaceButton.setToolTipText("Replace current");
	1049	+ replaceButton.setToolTipText("Save (replace current version)");
951	1050	replaceButton.addActionListener(this);
952		- replaceButton.setEnabled(false);
	1051	+ //replaceButton.setEnabled(false);
953	1052
954	1053	copyOptionsPanel.add(updown);
955	1054
956		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
957		- redoButton.setToolTipText("Next version");
958		- redoButton.addActionListener(this);
959		- redoButton.setEnabled(false);
	1055	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1056	+ nextVersionButton.setToolTipText("Next version");
	1057	+ nextVersionButton.addActionListener(this);
	1058	+ nextVersionButton.setEnabled(false);
960	1059
961	1060	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
962	1061	liveCB.setToolTipText("Enable animation");
..	..	@@ -1090,19 +1189,15 @@
1090	1189
1091	1190	oe.toolboxPanel.add(row2);
1092	1191
1093		- // ENVYMAPS
1094		- cGridBag skyboxpane = new cGridBag();
1095		- skyboxpane.preferredHeight = 100;
	1192	+ cGridBag textures = new cGridBag();
1096	1193
1097		- oe.toolboxPanel.add(skyboxpane);
	1194	+ CreateTexturePanel(textures);
1098	1195
1099		- JTabbedPane skyboxpanel = new JTabbedPane();
1100		- skyboxpane.add(skyboxpanel);
	1196	+ oe.toolboxPanel.add(textures);
1101	1197
1102		- AddSkyboxTab0(skyboxpanel);
1103		- AddSkyboxTab1(skyboxpanel);
1104		- AddSkyboxTab2(skyboxpanel);
1105		- AddSkyboxTab3(skyboxpanel);
	1198	+ textures.preferredHeight = 100;
	1199	+
	1200	+ CreateSkyboxPanel(oe.skyboxPanel);
1106	1201
1107	1202	// EDIT panel
1108	1203	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1110,20 +1205,20 @@
1110	1205	editButton.addActionListener(this);
1111	1206
1112	1207	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113		- uneditButton.setToolTipText("Remove selection controls");
	1208	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1114	1209	uneditButton.addActionListener(this);
1115	1210
1116	1211	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117		- allParamsButton.setToolTipText("Show all controle");
	1212	+ allParamsButton.setToolTipText("Show all controls");
1118	1213	allParamsButton.addActionListener(this);
1119	1214
1120		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121		- clearPanelButton.setToolTipText("Clear edit panel");
	1215	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1216	+ clearPanelButton.setToolTipText("Clear all controls");
1122	1217	clearPanelButton.addActionListener(this);
1123	1218
1124		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125		- unselectButton.setToolTipText("Unselect");
1126		- unselectButton.addActionListener(this);
	1219	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1220	+ //unselectButton.setToolTipText("Unselect");
	1221	+ //unselectButton.addActionListener(this);
1127	1222
1128	1223	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129	1224	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1183,7 +1278,7 @@
1183	1278	dgr.addDragGestureListener(this);
1184	1279	}catch(Exception e) {}
1185	1280	*/
1186		- radio.layout = sixButton; // sevenButton;
	1281	+ radio.layout = threeButton; // sixButton;
1187	1282	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1188	1283	}
1189	1284
..	..	@@ -1234,9 +1329,12 @@
1234	1329	smoothCB.setToolTipText("Snapping delay");
1235	1330	smoothCB.addItemListener(this);
1236	1331
1237		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1238		- slowCB.setToolTipText("Smooth interpolation");
1239		- slowCB.addItemListener(this);
	1332	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1333	+// slowCB.setToolTipText("Smooth interpolation");
	1334	+// slowCB.addItemListener(this);
	1335	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1336	+ minshaderCB.setToolTipText("Minimal fast shader");
	1337	+ minshaderCB.addItemListener(this);
1240	1338
1241	1339	// constraints.gridy += 1;
1242	1340	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1325,7 +1423,7 @@
1325	1423	}
1326	1424
1327	1425	radioButton.SetObject(obj);
1328		- radioButton.layout = sixButton; // sevenButton;
	1426	+ radioButton.layout = threeButton; // sixButton;
1329	1427	radioButton.SetCamera(cameraView.renderCamera, false);
1330	1428	radioButton.addActionListener(this);
1331	1429	radioPanel.add(radioButton);
..	..	@@ -1350,6 +1448,8 @@
1350	1448	cCheckBox localCB;
1351	1449	cCheckBox crowdCB;
1352	1450	cCheckBox smoothCB;
	1451	+ cCheckBox minshaderCB;
	1452	+
1353	1453	cToggleButton fastCB;
1354	1454	cCheckBox slowCB;
1355	1455	cCheckBox boxCB;
..	..	@@ -1420,6 +1520,12 @@
1420	1520	{
1421	1521	cameraView.ToggleInertia();
1422	1522	cameraView.repaint();
	1523	+ }
	1524	+ else if(e.getSource() == minshaderCB)
	1525	+ {
	1526	+ Globals.MINSHADER ^= true;
	1527	+ cameraView.programInitialized = false;
	1528	+ cameraView.repaint();
1423	1529	}
1424	1530	else if(e.getSource() == localCB)
1425	1531	{
..	..	@@ -2560,7 +2666,7 @@
2560	2666	if (source == invariantsItem)
2561	2667	{
2562	2668	System.out.println("Invariants:");
2563		- Grafreed.grafreeD.universe.invariants();
	2669	+ Grafreed.grafreed.universe.invariants();
2564	2670	} else
2565	2671	if (source == memoryItem)
2566	2672	{
..	..	@@ -2591,33 +2697,40 @@
2591	2697	{
2592	2698	ToggleFullScreen();
2593	2699	} else
2594		- if (source == undoButton)
	2700	+ if (source == previousVersionButton)
2595	2701	{
2596	2702	// Go to previous version
2597	2703	//if (!Undo())
2598	2704	//java.awt.Toolkit.getDefaultToolkit().beep();
2599		- Undo();
	2705	+ PreviousVersion();
2600	2706	} else
2601	2707	if (source == restoreButton)
2602	2708	{
2603	2709	// Restore current version
2604	2710	Restore();
	2711	+ //restoreButton.setEnabled(false);
2605	2712	} else
2606	2713	if (source == replaceButton)
2607	2714	{
2608	2715	// Overwrite current version
2609	2716	Replace();
	2717	+ //replaceButton.setEnabled(false);
2610	2718	} else
2611		- if (source == redoButton)
	2719	+ if (source == nextVersionButton)
2612	2720	{
2613	2721	// Go to next version
2614		- Redo();
	2722	+ NextVersion();
2615	2723	} else
2616		- if (source == saveButton)
	2724	+ if (source == saveVersionButton)
2617	2725	{
2618	2726	// Save a new version
2619	2727	if (!Save(true))
2620	2728	java.awt.Toolkit.getDefaultToolkit().beep();
	2729	+ } else
	2730	+ if (source == deleteVersionButton)
	2731	+ {
	2732	+ // Delete a new version
	2733	+ DeleteVersion();
2621	2734	} else
2622	2735	if (source == oneStepButton)
2623	2736	{
..	..	@@ -2672,11 +2785,11 @@
2672	2785	} else
2673	2786	if (source == undoItem)
2674	2787	{
2675		- Undo();
	2788	+ PreviousVersion();
2676	2789	} else
2677	2790	if (source == redoItem)
2678	2791	{
2679		- Redo();
	2792	+ NextVersion();
2680	2793	} else
2681	2794	if (source == duplicateItem)
2682	2795	{
..	..	@@ -3809,10 +3922,10 @@
3809	3922	{
3810	3923	Object3D child = (Object3D)e.nextElement();
3811	3924	if(child.editWindow != null)
3812		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3813	3925	child.pinned = false;
3814	3926	child.CloseUI();
3815	3927	listUI.remove(child);
	3928	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3816	3929
3817	3930	//child.editWindow = null; // ???????????
3818	3931	}
..	..	@@ -3831,6 +3944,7 @@
3831	3944	obj.CloseUI();
3832	3945	}
3833	3946	listUI.clear();
	3947	+ SetPinStates(group.selection.size() > 0);
3834	3948	refreshContents(true);
3835	3949	} else
3836	3950	if (source == allParamsButton)
..	..	@@ -3917,6 +4031,7 @@
3917	4031	radio.layout.doClick();
3918	4032
3919	4033	ClearUnpinned();
	4034	+
3920	4035	//Grafreed.Assert(group != null);
3921	4036	//Grafreed.Assert(group.selection != null);
3922	4037	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3933,11 +4048,13 @@
3933	4048	} else if (event.getSource() == editCameraItem)
3934	4049	{
3935	4050	cameraView.ProtectCamera();
	4051	+ cameraView.requestFocusInWindow();
3936	4052	cameraView.repaint();
3937	4053	return;
3938	4054	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3939	4055	{
3940	4056	cameraView.RevertCamera();
	4057	+ cameraView.requestFocusInWindow();
3941	4058	cameraView.repaint();
3942	4059	return;
3943	4060	// } else if (event.getSource() == textureButton)
..	..	@@ -5070,9 +5187,7 @@
5070	5187
5071	5188	freezemodel = false;
5072	5189	}
5073		-
5074		- boolean flashIt = true;
5075		-
	5190	+
5076	5191	public void valueChanged(TreeSelectionEvent e)
5077	5192	//public boolean handleEvent(Event event)
5078	5193	{
..	..	@@ -5145,13 +5260,15 @@
5145	5260	{
5146	5261	editButton.setEnabled(enabled);
5147	5262	uneditButton.setEnabled(enabled);
5148		- unselectButton.setEnabled(enabled);
	5263	+ //unselectButton.setEnabled(enabled);
5149	5264	flashSelectionButton.setEnabled(enabled);
	5265	+
	5266	+ clearPanelButton.setEnabled(!listUI.isEmpty());
5150	5267	}
5151	5268
5152	5269	void refreshContents(boolean cp)
5153	5270	{
5154		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5271	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5155	5272	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5156	5273	{
5157	5274	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5987,7 +6104,6 @@
5987	6104
5988	6105	cButton restoreCameraButton;
5989	6106
5990		- cButton saveButton;
5991	6107	cButton oneStepButton;
5992	6108
5993	6109	cButton groupButton;