~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -60,7 +60,7 @@
60	60	//AddSkyboxButton("default", "cornell", row0);
61	61	AddSkyboxButton("penguins", "dust", row0);
62	62	AddSkyboxButton("penguins", "tropic", row0);
63		- AddSkyboxButton("default", "skycube", row0);
	63	+ AddSkyboxButton("penguins", "yonder", row0);
64	64
65	65	AddSkyboxButton("default", "uffizi", row1);
66	66	AddSkyboxButton("bridge", "Bridge", row1);
..	..	@@ -90,7 +90,7 @@
90	90	AddSkyboxButton("park", "Skansen3", row6);
91	91	AddSkyboxButton("park", "Skansen4", row6);
92	92	AddSkyboxButton("park", "Skansen5", row6);
93		- AddSkyboxButton("park", "Stairs", row6);
	93	+ AddSkyboxButton("persson", "VancouverConventionCentre", row6);
94	94
95	95	tab0.add(row0);
96	96	tab0.add(row1);
..	..	@@ -144,21 +144,18 @@
144	144
145	145	AddSkyboxButton("mountain", "Maskonaive2", row4);
146	146	AddSkyboxButton("mountain", "Maskonaive3", row4);
147		- AddSkyboxButton("mountain", "Ryfjallet", row4);
148	147	AddSkyboxButton("mountain", "Teide", row4);
149	148	AddSkyboxButton("park", "Tantolunden4", row4);
150	149
151		- AddSkyboxButton("penguins", "wrath", row5);
152		- AddSkyboxButton("penguins", "yonder", row5);
	150	+ AddSkyboxButton("park", "Stairs", row5);
	151	+ AddSkyboxButton("default", "skycube", row6);
153	152	AddSkyboxButton("rocky", "Langholmen", row5);
154	153	AddSkyboxButton("rocky", "Skinnarviksberget", row5);
155		- AddSkyboxButton("rocky", "Tantolunden6", row5);
156	154
	155	+ AddSkyboxButton("rocky", "Tantolunden6", row5);
157	156	AddSkyboxButton("default", "CloudyHills", row6);
158	157	AddSkyboxButton("daz", "Autumn", row6);
159		- AddSkyboxButton("daz", "Greenlands", row6);
160	158	AddSkyboxButton("daz", "MountainTrail", row6);
161		- AddSkyboxButton("daz", "Oasis", row6);
162	159	/*
163	160	Autumn
164	161	Greenlands
..	..	@@ -210,8 +207,8 @@
210	207	AddSkyboxButton("penguins", "sleepyhollow", row1);
211	208
212	209	AddSkyboxButton("penguins", "kenon_star", row2);
213		- AddSkyboxButton("indoors", "DallasW", row2);
214		- AddSkyboxButton("indoors", "MarriottMadisonWest", row2);
	210	+ AddSkyboxButton("persson", "corona", row2);
	211	+ AddSkyboxButton("persson", "spaceskybox", row2);
215	212	AddSkyboxButton("indoors", "Vasa", row2);
216	213
217	214	AddSkyboxButton("winter", "Backyard", row3);
..	..	@@ -232,7 +229,7 @@
232	229	AddSkyboxButton("daz", "TheRock", row6);
233	230	AddSkyboxButton("daz", "TopOfTheWorld", row6);
234	231	AddSkyboxButton("daz", "Winter", row6);
235		- AddSkyboxButton("penguins", "desertdawn", row6);
	232	+ AddSkyboxButton("mountain", "Ryfjallet", row6);
236	233
237	234	tab0.add(row0);
238	235	tab0.add(row1);
..	..	@@ -248,7 +245,72 @@
248	245	//tab0.add(new cGridBag());
249	246	}
250	247	}
251		-
	248	+
	249	+ public void AddSkyboxTab3(JTabbedPane skyboxpanel)
	250	+ {
	251	+ cGridBag tab0 = new cGridBag().setVertical(true);
	252	+
	253	+ tab0.setName("Others");
	254	+ skyboxpanel.add(tab0);
	255	+
	256	+ cGridBag row0 = new cGridBag();
	257	+ cGridBag row1 = new cGridBag();
	258	+ cGridBag row2 = new cGridBag();
	259	+ cGridBag row3 = new cGridBag();
	260	+ cGridBag row4 = new cGridBag();
	261	+ cGridBag row5 = new cGridBag();
	262	+ cGridBag row6 = new cGridBag();
	263	+
	264	+ AddSkyboxButton("mayhem", "afterrain", row0);
	265	+ AddSkyboxButton("mayhem", "aqua4", row0);
	266	+ AddSkyboxButton("mayhem", "aqua9", row0);
	267	+ AddSkyboxButton("mayhem", "flame", row0);
	268	+
	269	+ AddSkyboxButton("mayhem", "h2s", row1);
	270	+ AddSkyboxButton("mayhem", "prehistoric", row1);
	271	+ AddSkyboxButton("mayhem", "scorched", row1);
	272	+ AddSkyboxButton("penguins", "desertdawn", row1);
	273	+
	274	+ AddSkyboxButton("persson", "Citadella", row2);
	275	+ AddSkyboxButton("persson", "Citadella2", row2);
	276	+ AddSkyboxButton("persson", "clouds1", row2);
	277	+ AddSkyboxButton("penguins", "wrath", row2);
	278	+
	279	+ AddSkyboxButton("persson", "FishermansBastion", row3);
	280	+ AddSkyboxButton("persson", "HeroesSquare", row3);
	281	+ AddSkyboxButton("indoors", "DallasW", row3);
	282	+ AddSkyboxButton("indoors", "MarriottMadisonWest", row3);
	283	+
	284	+ AddSkyboxButton("persson", "LancellottiChapel", row4);
	285	+ AddSkyboxButton("persson", "PereaBeach1", row4);
	286	+ AddSkyboxButton("persson", "PereaBeach2", row4);
	287	+ AddSkyboxButton("persson", "redeclipse", row4);
	288	+
	289	+ AddSkyboxButton("daz", "Greenlands", row5);
	290	+ AddSkyboxButton("daz", "Oasis", row5);
	291	+ AddSkyboxButton("elyvisions", "arch3", row5);
	292	+ AddSkyboxButton("elyvisions", "calm_sea", row5);
	293	+
	294	+ AddSkyboxButton("elyvisions", "rainbow", row6);
	295	+ AddSkyboxButton("elyvisions", "distant_sunset", row6);
	296	+ AddSkyboxButton("elyvisions", "heaven", row6);
	297	+ AddSkyboxButton("elyvisions", "hot", row6);
	298	+
	299	+ tab0.add(row0);
	300	+ tab0.add(row1);
	301	+ tab0.add(row2);
	302	+ tab0.add(row3);
	303	+ tab0.add(row4);
	304	+ tab0.add(row5);
	305	+ tab0.add(row6);
	306	+
	307	+ for (int i=5; --i>=0;)
	308	+ {
	309	+ //oe.toolboxPanel.Return();
	310	+ //tab0.add(new cGridBag());
	311	+ }
	312	+ }
	313	+
252	314	public void ChangeSkybox(String name)
253	315	{
254	316	//cameraView.envyoff = false;
..	..	@@ -294,9 +356,9 @@
294	356	this.copy = this.group = group;
295	357	//selectees = this.group.selectees;
296	358
297		- if (copy.versions == null)
	359	+ if (copy.versionlist == null)
298	360	{
299		- copy.versions = new byte[100][];
	361	+ copy.versionlist = new Object3D[100];
300	362	copy.versionindex = -1;
301	363	}
302	364
..	..	@@ -321,9 +383,9 @@
321	383
322	384	((cRadio)radioPanel.getComponent(0)).SetCamera(cameraView.renderCamera, true);
323	385
324		- if (copy.versions == null)
	386	+ if (copy.versionlist == null)
325	387	{
326		- copy.versions = new byte[100][];
	388	+ copy.versionlist = new Object3D[100];
327	389	copy.versionindex = -1;
328	390
329	391	Save(true);
..	..	@@ -869,32 +931,36 @@
869	931	restoreCameraButton.setToolTipText("Restore viewpoint");
870	932	restoreCameraButton.addActionListener(this);
871	933
872		- copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
873		- saveButton.setToolTipText("New version");
874		- saveButton.addActionListener(this);
	934	+ copyOptionsPanel.add(saveVersionButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	935	+ saveVersionButton.setToolTipText("Duplicate current version");
	936	+ saveVersionButton.addActionListener(this);
875	937
876		- copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
877		- undoButton.setToolTipText("Previous version");
878		- undoButton.addActionListener(this);
879		- undoButton.setEnabled(false);
	938	+ copyOptionsPanel.add(deleteVersionButton = GetButton("icons/trash.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	939	+ deleteVersionButton.setToolTipText("Delete current version");
	940	+ deleteVersionButton.addActionListener(this);
	941	+
	942	+ copyOptionsPanel.add(previousVersionButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	943	+ previousVersionButton.setToolTipText("Previous version");
	944	+ previousVersionButton.addActionListener(this);
	945	+ previousVersionButton.setEnabled(false);
880	946
881	947	cGridBag updown = new cGridBag().setVertical(true);
882	948	updown.add(restoreButton = GetButton("icons/restore.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
883		- restoreButton.setToolTipText("Restore current");
	949	+ restoreButton.setToolTipText("Undo (restore current version)");
884	950	restoreButton.addActionListener(this);
885		- restoreButton.setEnabled(false);
	951	+ //restoreButton.setEnabled(false);
886	952
887	953	updown.add(replaceButton = GetButton("icons/replace.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
888		- replaceButton.setToolTipText("Replace current");
	954	+ replaceButton.setToolTipText("Save (replace current version)");
889	955	replaceButton.addActionListener(this);
890		- replaceButton.setEnabled(false);
	956	+ //replaceButton.setEnabled(false);
891	957
892	958	copyOptionsPanel.add(updown);
893	959
894		- copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
895		- redoButton.setToolTipText("Next version");
896		- redoButton.addActionListener(this);
897		- redoButton.setEnabled(false);
	960	+ copyOptionsPanel.add(nextVersionButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	961	+ nextVersionButton.setToolTipText("Next version");
	962	+ nextVersionButton.addActionListener(this);
	963	+ nextVersionButton.setEnabled(false);
898	964
899	965	oe.toolbarPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
900	966	liveCB.setToolTipText("Enable animation");
..	..	@@ -1040,6 +1106,7 @@
1040	1106	AddSkyboxTab0(skyboxpanel);
1041	1107	AddSkyboxTab1(skyboxpanel);
1042	1108	AddSkyboxTab2(skyboxpanel);
	1109	+ AddSkyboxTab3(skyboxpanel);
1043	1110
1044	1111	// EDIT panel
1045	1112	editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
..	..	@@ -1047,14 +1114,14 @@
1047	1114	editButton.addActionListener(this);
1048	1115
1049	1116	editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1050		- uneditButton.setToolTipText("Remove selection controls");
	1117	+ uneditButton.setToolTipText("Unpin and remove selection controls");
1051	1118	uneditButton.addActionListener(this);
1052	1119
1053	1120	editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
1054	1121	allParamsButton.setToolTipText("Show all controle");
1055	1122	allParamsButton.addActionListener(this);
1056	1123
1057		- editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	1124	+ editCommandsPanel.add(clearPanelButton = GetButton("icons/clear.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
1058	1125	clearPanelButton.setToolTipText("Clear edit panel");
1059	1126	clearPanelButton.addActionListener(this);
1060	1127
..	..	@@ -1120,7 +1187,7 @@
1120	1187	dgr.addDragGestureListener(this);
1121	1188	}catch(Exception e) {}
1122	1189	*/
1123		- radio.layout = sixButton; // sevenButton;
	1190	+ radio.layout = threeButton; // sixButton;
1124	1191	oe.toolbarPanel.add(radioPanel); //, oe.aConstraints);
1125	1192	}
1126	1193
..	..	@@ -1171,9 +1238,12 @@
1171	1238	smoothCB.setToolTipText("Snapping delay");
1172	1239	smoothCB.addItemListener(this);
1173	1240
1174		- panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
1175		- slowCB.setToolTipText("Smooth interpolation");
1176		- slowCB.addItemListener(this);
	1241	+// panel.add(slowCB = new cCheckBox("Slow", CameraPane.SLOWPOSE)); //, constraints);
	1242	+// slowCB.setToolTipText("Smooth interpolation");
	1243	+// slowCB.addItemListener(this);
	1244	+ panel.add(minshaderCB = new cCheckBox("Min shader", Globals.MINSHADER)); //, constraints);
	1245	+ minshaderCB.setToolTipText("Minimal fast shader");
	1246	+ minshaderCB.addItemListener(this);
1177	1247
1178	1248	// constraints.gridy += 1;
1179	1249	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
..	..	@@ -1262,7 +1332,7 @@
1262	1332	}
1263	1333
1264	1334	radioButton.SetObject(obj);
1265		- radioButton.layout = sixButton; // sevenButton;
	1335	+ radioButton.layout = threeButton; // sixButton;
1266	1336	radioButton.SetCamera(cameraView.renderCamera, false);
1267	1337	radioButton.addActionListener(this);
1268	1338	radioPanel.add(radioButton);
..	..	@@ -1287,6 +1357,8 @@
1287	1357	cCheckBox localCB;
1288	1358	cCheckBox crowdCB;
1289	1359	cCheckBox smoothCB;
	1360	+ cCheckBox minshaderCB;
	1361	+
1290	1362	cToggleButton fastCB;
1291	1363	cCheckBox slowCB;
1292	1364	cCheckBox boxCB;
..	..	@@ -1357,6 +1429,12 @@
1357	1429	{
1358	1430	cameraView.ToggleInertia();
1359	1431	cameraView.repaint();
	1432	+ }
	1433	+ else if(e.getSource() == minshaderCB)
	1434	+ {
	1435	+ Globals.MINSHADER ^= true;
	1436	+ cameraView.programInitialized = false;
	1437	+ cameraView.repaint();
1360	1438	}
1361	1439	else if(e.getSource() == localCB)
1362	1440	{
..	..	@@ -2497,7 +2575,7 @@
2497	2575	if (source == invariantsItem)
2498	2576	{
2499	2577	System.out.println("Invariants:");
2500		- Grafreed.grafreeD.universe.invariants();
	2578	+ Grafreed.grafreed.universe.invariants();
2501	2579	} else
2502	2580	if (source == memoryItem)
2503	2581	{
..	..	@@ -2528,33 +2606,40 @@
2528	2606	{
2529	2607	ToggleFullScreen();
2530	2608	} else
2531		- if (source == undoButton)
	2609	+ if (source == previousVersionButton)
2532	2610	{
2533	2611	// Go to previous version
2534	2612	//if (!Undo())
2535	2613	//java.awt.Toolkit.getDefaultToolkit().beep();
2536		- Undo();
	2614	+ PreviousVersion();
2537	2615	} else
2538	2616	if (source == restoreButton)
2539	2617	{
2540	2618	// Restore current version
2541	2619	Restore();
	2620	+ //restoreButton.setEnabled(false);
2542	2621	} else
2543	2622	if (source == replaceButton)
2544	2623	{
2545	2624	// Overwrite current version
2546	2625	Replace();
	2626	+ //replaceButton.setEnabled(false);
2547	2627	} else
2548		- if (source == redoButton)
	2628	+ if (source == nextVersionButton)
2549	2629	{
2550	2630	// Go to next version
2551		- Redo();
	2631	+ NextVersion();
2552	2632	} else
2553		- if (source == saveButton)
	2633	+ if (source == saveVersionButton)
2554	2634	{
2555	2635	// Save a new version
2556	2636	if (!Save(true))
2557	2637	java.awt.Toolkit.getDefaultToolkit().beep();
	2638	+ } else
	2639	+ if (source == deleteVersionButton)
	2640	+ {
	2641	+ // Delete a new version
	2642	+ DeleteVersion();
2558	2643	} else
2559	2644	if (source == oneStepButton)
2560	2645	{
..	..	@@ -2609,11 +2694,11 @@
2609	2694	} else
2610	2695	if (source == undoItem)
2611	2696	{
2612		- Undo();
	2697	+ PreviousVersion();
2613	2698	} else
2614	2699	if (source == redoItem)
2615	2700	{
2616		- Redo();
	2701	+ NextVersion();
2617	2702	} else
2618	2703	if (source == duplicateItem)
2619	2704	{
..	..	@@ -3746,10 +3831,10 @@
3746	3831	{
3747	3832	Object3D child = (Object3D)e.nextElement();
3748	3833	if(child.editWindow != null)
3749		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3750	3834	child.pinned = false;
3751	3835	child.CloseUI();
3752	3836	listUI.remove(child);
	3837	+// objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3753	3838
3754	3839	//child.editWindow = null; // ???????????
3755	3840	}
..	..	@@ -3768,6 +3853,7 @@
3768	3853	obj.CloseUI();
3769	3854	}
3770	3855	listUI.clear();
	3856	+ SetPinStates(group.selection.size() > 0);
3771	3857	refreshContents(true);
3772	3858	} else
3773	3859	if (source == allParamsButton)
..	..	@@ -3854,6 +3940,7 @@
3854	3940	radio.layout.doClick();
3855	3941
3856	3942	ClearUnpinned();
	3943	+
3857	3944	//Grafreed.Assert(group != null);
3858	3945	//Grafreed.Assert(group.selection != null);
3859	3946	SetPinStates(group.selection == null \|\| group.selection.size() > 0);
..	..	@@ -3870,11 +3957,13 @@
3870	3957	} else if (event.getSource() == editCameraItem)
3871	3958	{
3872	3959	cameraView.ProtectCamera();
	3960	+ cameraView.requestFocusInWindow();
3873	3961	cameraView.repaint();
3874	3962	return;
3875	3963	} else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3876	3964	{
3877	3965	cameraView.RevertCamera();
	3966	+ cameraView.requestFocusInWindow();
3878	3967	cameraView.repaint();
3879	3968	return;
3880	3969	// } else if (event.getSource() == textureButton)
..	..	@@ -5007,9 +5096,7 @@
5007	5096
5008	5097	freezemodel = false;
5009	5098	}
5010		-
5011		- boolean flashIt = true;
5012		-
	5099	+
5013	5100	public void valueChanged(TreeSelectionEvent e)
5014	5101	//public boolean handleEvent(Event event)
5015	5102	{
..	..	@@ -5084,6 +5171,8 @@
5084	5171	uneditButton.setEnabled(enabled);
5085	5172	unselectButton.setEnabled(enabled);
5086	5173	flashSelectionButton.setEnabled(enabled);
	5174	+
	5175	+ clearPanelButton.setEnabled(!listUI.isEmpty());
5087	5176	}
5088	5177
5089	5178	void refreshContents(boolean cp)
..	..	@@ -5924,7 +6013,6 @@
5924	6013
5925	6014	cButton restoreCameraButton;
5926	6015
5927		- cButton saveButton;
5928	6016	cButton oneStepButton;
5929	6017
5930	6018	cButton groupButton;