~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, String c, final String t, int count, cGridBag row)
	46	+ {
	47	+ cButton textureButton;
	48	+ final String path = "textures/" + f + "/" + c + "/"; // + t;
	49	+ row.add(textureButton = GetButton(path + "icons/" + t, !Grafreed.NIMBUSLAF));
	50	+ textureButton.setToolTipText(c + count);
	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,37 @@
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	+ for (int i=0; i<group.selection.size(); i++)
	354	+ {
	355	+ Object3D obj = group.selection.get(i);
	356	+ obj.SetPigmentTexture("@" + texture);
	357	+ }
	358	+
	359	+ refreshContents();
	360	+ }
	361	+
322	362	//ObjEditor objEditor;
323	363	public void closeUI2()
324	364	{
..	..	@@ -356,9 +396,9 @@
356	396	this.copy = this.group = group;
357	397	//selectees = this.group.selectees;
358	398
359		- if (copy.versions == null)
	399	+ if (copy.versionlist == null)
360	400	{
361		- copy.versions = new byte[100][];
	401	+ copy.versionlist = new Object3D[100];
362	402	copy.versionindex = -1;
363	403	}
364	404
..	..	@@ -383,9 +423,9 @@
383	423
384	424	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
385	425
386		- if (copy.versions == null)
	426	+ if (copy.versionlist == null)
387	427	{
388		- copy.versions = new byte[100][];
	428	+ copy.versionlist = new Object3D[100];
389	429	copy.versionindex = -1;
390	430
391	431	Save(true);
..	..	@@ -859,6 +899,73 @@
859	899	buildToolsMenu(menu);
860	900	}
861	901
	902	+ JTabbedPane resourcecontainer;
	903	+ cGridBag currenttab;
	904	+ boolean added; // patch for jar
	905	+
	906	+ int tabcount = 0;
	907	+ int colcount = 0;
	908	+ int rowcount = 0;
	909	+ int texturecount = 0;
	910	+
	911	+ int columns = 5;
	912	+ int rows = 7;
	913	+
	914	+ public void ResourceCallBack(String[] path)
	915	+ {
	916	+// for (int i = 0; i < path.length; i++)
	917	+// System.out.print(path[i] + "/");
	918	+// System.out.println();
	919	+
	920	+ if (//rowcount == 0 \|\|
	921	+ path.length == 1)
	922	+ {
	923	+ currenttab = new cGridBag();
	924	+ added = false;
	925	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	926	+ currenttab.setName(tabname);
	927	+ rowcount = 1;
	928	+ colcount = 0;
	929	+ texturecount = 0;
	930	+ }
	931	+
	932	+ if (path.length > 2 && path[2].toLowerCase().endsWith(".jpg"))
	933	+ {
	934	+ if (!added)
	935	+ {
	936	+ added = true;
	937	+ resourcecontainer.add(currenttab);
	938	+ String tabname = path[0]; // String.valueOf((char)('A'+tabcount));
	939	+ resourcecontainer.setToolTipTextAt(tabcount++, "Texture Group " + tabname);
	940	+ }
	941	+
	942	+ AddTextureButton(path[0], path[1], path[2], texturecount++, currenttab);
	943	+
	944	+ if (++colcount >= columns)
	945	+ {
	946	+ colcount = 0;
	947	+ currenttab.Return();
	948	+
	949	+ if (rowcount++ >= rows)
	950	+ {
	951	+ rowcount = 0;
	952	+ }
	953	+ }
	954	+ }
	955	+ else
	956	+ {
	957	+// if (!path[path.length-1].equals("icons"))
	958	+// resourcecontainer.Return();
	959	+ }
	960	+ }
	961	+
	962	+ void CreateTexturePanel(cGridBag container)
	963	+ {
	964	+ resourcecontainer = new JTabbedPane(JTabbedPane.LEFT);
	965	+ container.add(resourcecontainer);
	966	+
	967	+ Grafreed.ParseResources("textures", this);
	968	+ }
862	969
863	970	void SetupUI2(ObjEditor oe)
864	971	{
..	..	@@ -931,32 +1038,36 @@
931	1038	restoreCameraButton.setToolTipText("Restore viewpoint");
932	1039	restoreCameraButton.addActionListener(this);
933	1040
934		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
935		- saveButton.setToolTipText("New version");
936		- saveButton.addActionListener(this);
	1041	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1042	+ saveVersionButton.setToolTipText("Duplicate current version");
	1043	+ saveVersionButton.addActionListener(this);
937	1044
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);
	1045	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1046	+ deleteVersionButton.setToolTipText("Delete current version");
	1047	+ deleteVersionButton.addActionListener(this);
	1048	+
	1049	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1050	+ previousVersionButton.setToolTipText("Previous version");
	1051	+ previousVersionButton.addActionListener(this);
	1052	+ previousVersionButton.setEnabled(false);
942	1053
943	1054	cGridBag updown = new cGridBag().setVertical(true);
944	1055	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
945		- restoreButton.setToolTipText("Restore current");
	1056	+ restoreButton.setToolTipText("Undo (restore current version)");
946	1057	restoreButton.addActionListener(this);
947		- restoreButton.setEnabled(false);
	1058	+ //restoreButton.setEnabled(false);
948	1059
949	1060	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
950		- replaceButton.setToolTipText("Replace current");
	1061	+ replaceButton.setToolTipText("Save (replace current version)");
951	1062	replaceButton.addActionListener(this);
952		- replaceButton.setEnabled(false);
	1063	+ //replaceButton.setEnabled(false);
953	1064
954	1065	copyOptionsPanel.add(updown);
955	1066
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);
	1067	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1068	+ nextVersionButton.setToolTipText("Next version");
	1069	+ nextVersionButton.addActionListener(this);
	1070	+ nextVersionButton.setEnabled(false);
960	1071
961	1072	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
962	1073	liveCB.setToolTipText("Enable animation");
..	..	@@ -1090,19 +1201,15 @@
1090	1201
1091	1202	oe.toolboxPanel.add(row2);
1092	1203
1093		- // ENVYMAPS
1094		- cGridBag skyboxpane = new cGridBag();
1095		- skyboxpane.preferredHeight = 100;
	1204	+ cGridBag textures = new cGridBag();
1096	1205
1097		- oe.toolboxPanel.add(skyboxpane);
	1206	+ CreateTexturePanel(textures);
1098	1207
1099		- JTabbedPane skyboxpanel = new JTabbedPane();
1100		- skyboxpane.add(skyboxpanel);
	1208	+ oe.toolboxPanel.add(textures);
1101	1209
1102		- AddSkyboxTab0(skyboxpanel);
1103		- AddSkyboxTab1(skyboxpanel);
1104		- AddSkyboxTab2(skyboxpanel);
1105		- AddSkyboxTab3(skyboxpanel);
	1210	+ textures.preferredHeight = 100;
	1211	+
	1212	+ CreateSkyboxPanel(oe.skyboxPanel);
1106	1213
1107	1214	// EDIT panel
1108	1215	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1110,20 +1217,20 @@
1110	1217	editButton.addActionListener(this);
1111	1218
1112	1219	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1113		- uneditButton.setToolTipText("Remove selection controls");
	1220	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1114	1221	uneditButton.addActionListener(this);
1115	1222
1116	1223	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1117		- allParamsButton.setToolTipText("Show all controle");
	1224	+ allParamsButton.setToolTipText("Show all controls");
1118	1225	allParamsButton.addActionListener(this);
1119	1226
1120		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1121		- clearPanelButton.setToolTipText("Clear edit panel");
	1227	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1228	+ clearPanelButton.setToolTipText("Clear all controls");
1122	1229	clearPanelButton.addActionListener(this);
1123	1230
1124		- editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1125		- unselectButton.setToolTipText("Unselect");
1126		- unselectButton.addActionListener(this);
	1231	+ //editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1232	+ //unselectButton.setToolTipText("Unselect");
	1233	+ //unselectButton.addActionListener(this);
1127	1234
1128	1235	editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1129	1236	flashSelectionButton.setToolTipText("Highlight selection");
..	..	@@ -1183,7 +1290,7 @@
1183	1290	dgr.addDragGestureListener(this);
1184	1291	}catch(Exception e) {}
1185	1292	*/
1186		- radio.layout = sixButton; // sevenButton;
	1293	+ radio.layout = threeButton; // sixButton;
1187	1294	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1188	1295	}
1189	1296
..	..	@@ -1234,9 +1341,12 @@
1234	1341	smoothCB.setToolTipText("Snapping delay");
1235	1342	smoothCB.addItemListener(this);
1236	1343
1237		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1238		- slowCB.setToolTipText("Smooth interpolation");
1239		- slowCB.addItemListener(this);
	1344	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1345	+// slowCB.setToolTipText("Smooth interpolation");
	1346	+// slowCB.addItemListener(this);
	1347	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1348	+ minshaderCB.setToolTipText("Minimal fast shader");
	1349	+ minshaderCB.addItemListener(this);
1240	1350
1241	1351	// constraints.gridy += 1;
1242	1352	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1325,7 +1435,7 @@
1325	1435	}
1326	1436
1327	1437	radioButton.SetObject(obj);
1328		- radioButton.layout = sixButton; // sevenButton;
	1438	+ radioButton.layout = threeButton; // sixButton;
1329	1439	radioButton.SetCamera(cameraView.renderCamera, false);
1330	1440	radioButton.addActionListener(this);
1331	1441	radioPanel.add(radioButton);
..	..	@@ -1350,6 +1460,8 @@
1350	1460	cCheckBox localCB;
1351	1461	cCheckBox crowdCB;
1352	1462	cCheckBox smoothCB;
	1463	+ cCheckBox minshaderCB;
	1464	+
1353	1465	cToggleButton fastCB;
1354	1466	cCheckBox slowCB;
1355	1467	cCheckBox boxCB;
..	..	@@ -1420,6 +1532,12 @@
1420	1532	{
1421	1533	cameraView.ToggleInertia();
1422	1534	cameraView.repaint();
	1535	+ }
	1536	+ else if(e.getSource() == minshaderCB)
	1537	+ {
	1538	+ Globals.MINSHADER ^= true;
	1539	+ cameraView.programInitialized = false;
	1540	+ cameraView.repaint();
1423	1541	}
1424	1542	else if(e.getSource() == localCB)
1425	1543	{
..	..	@@ -2560,7 +2678,7 @@
2560	2678	if (source == invariantsItem)
2561	2679	{
2562	2680	System.out.println("Invariants:");
2563		- Grafreed.grafreeD.universe.invariants();
	2681	+ Grafreed.grafreed.universe.invariants();
2564	2682	} else
2565	2683	if (source == memoryItem)
2566	2684	{
..	..	@@ -2591,33 +2709,40 @@
2591	2709	{
2592	2710	ToggleFullScreen();
2593	2711	} else
2594		- if (source == undoButton)
	2712	+ if (source == previousVersionButton)
2595	2713	{
2596	2714	// Go to previous version
2597	2715	//if (!Undo())
2598	2716	//java.awt.Toolkit.getDefaultToolkit().beep();
2599		- Undo();
	2717	+ PreviousVersion();
2600	2718	} else
2601	2719	if (source == restoreButton)
2602	2720	{
2603	2721	// Restore current version
2604	2722	Restore();
	2723	+ //restoreButton.setEnabled(false);
2605	2724	} else
2606	2725	if (source == replaceButton)
2607	2726	{
2608	2727	// Overwrite current version
2609	2728	Replace();
	2729	+ //replaceButton.setEnabled(false);
2610	2730	} else
2611		- if (source == redoButton)
	2731	+ if (source == nextVersionButton)
2612	2732	{
2613	2733	// Go to next version
2614		- Redo();
	2734	+ NextVersion();
2615	2735	} else
2616		- if (source == saveButton)
	2736	+ if (source == saveVersionButton)
2617	2737	{
2618	2738	// Save a new version
2619	2739	if (!Save(true))
2620	2740	java.awt.Toolkit.getDefaultToolkit().beep();
	2741	+ } else
	2742	+ if (source == deleteVersionButton)
	2743	+ {
	2744	+ // Delete a new version
	2745	+ DeleteVersion();
2621	2746	} else
2622	2747	if (source == oneStepButton)
2623	2748	{
..	..	@@ -2672,11 +2797,11 @@
2672	2797	} else
2673	2798	if (source == undoItem)
2674	2799	{
2675		- Undo();
	2800	+ PreviousVersion();
2676	2801	} else
2677	2802	if (source == redoItem)
2678	2803	{
2679		- Redo();
	2804	+ NextVersion();
2680	2805	} else
2681	2806	if (source == duplicateItem)
2682	2807	{
..	..	@@ -3809,10 +3934,10 @@
3809	3934	{
3810	3935	Object3D child = (Object3D)e.nextElement();
3811	3936	if(child.editWindow != null)
3812		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3813	3937	child.pinned = false;
3814	3938	child.CloseUI();
3815	3939	listUI.remove(child);
	3940	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3816	3941
3817	3942	//child.editWindow = null; // ???????????
3818	3943	}
..	..	@@ -3831,6 +3956,7 @@
3831	3956	obj.CloseUI();
3832	3957	}
3833	3958	listUI.clear();
	3959	+ SetPinStates(group.selection.size() > 0);
3834	3960	refreshContents(true);
3835	3961	} else
3836	3962	if (source == allParamsButton)
..	..	@@ -3917,6 +4043,7 @@
3917	4043	radio.layout.doClick();
3918	4044
3919	4045	ClearUnpinned();
	4046	+
3920	4047	//Grafreed.Assert(group != null);
3921	4048	//Grafreed.Assert(group.selection != null);
3922	4049	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3933,11 +4060,13 @@
3933	4060	} else if (event.getSource() == editCameraItem)
3934	4061	{
3935	4062	cameraView.ProtectCamera();
	4063	+ cameraView.requestFocusInWindow();
3936	4064	cameraView.repaint();
3937	4065	return;
3938	4066	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3939	4067	{
3940	4068	cameraView.RevertCamera();
	4069	+ cameraView.requestFocusInWindow();
3941	4070	cameraView.repaint();
3942	4071	return;
3943	4072	// } else if (event.getSource() == textureButton)
..	..	@@ -5070,9 +5199,7 @@
5070	5199
5071	5200	freezemodel = false;
5072	5201	}
5073		-
5074		- boolean flashIt = true;
5075		-
	5202	+
5076	5203	public void valueChanged(TreeSelectionEvent e)
5077	5204	//public boolean handleEvent(Event event)
5078	5205	{
..	..	@@ -5145,13 +5272,15 @@
5145	5272	{
5146	5273	editButton.setEnabled(enabled);
5147	5274	uneditButton.setEnabled(enabled);
5148		- unselectButton.setEnabled(enabled);
	5275	+ //unselectButton.setEnabled(enabled);
5149	5276	flashSelectionButton.setEnabled(enabled);
	5277	+
	5278	+ clearPanelButton.setEnabled(!listUI.isEmpty());
5150	5279	}
5151	5280
5152	5281	void refreshContents(boolean cp)
5153	5282	{
5154		- if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
	5283	+ //if (objectPanel.getSelectedIndex() == 2) // objectPanel.indexOfTab("Info"))
5155	5284	if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
5156	5285	{
5157	5286	objEditor.ClearInfo(); // .GetMaterial());
..	..	@@ -5987,7 +6116,6 @@
5987	6116
5988	6117	cButton restoreCameraButton;
5989	6118
5990		- cButton saveButton;
5991	6119	cButton oneStepButton;
5992	6120
5993	6121	cButton groupButton;