~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -316,6 +316,8 @@
316	316	objEditor.ctrlPanel.remove(setupPanel2);
317	317	objEditor.ctrlPanel.remove(objectCommandsPanel);
318	318	objEditor.ctrlPanel.remove(pushPanel);
	319	+ if (versionPanel != null)
	320	+ objEditor.ctrlPanel.remove(versionPanel);
319	321	//objEditor.ctrlPanel.remove(fillPanel);
320	322
321	323	//Remove(normalpushField);
..	..	@@ -383,14 +385,6 @@
383	385	client = inClient;
384	386	copy = client;
385	387
386		- if (copy.versionlist == null)
387		- {
388		- copy.versionlist = new Object3D[100];
389		- copy.versionindex = -1;
390		-
391		-// Save(true);
392		- }
393		-
394	388	SetupUI2(callee.GetEditor());
395	389	}
396	390
..	..	@@ -1171,6 +1165,7 @@
1171	1165	cGridBag setupPanel2;
1172	1166	cGridBag objectCommandsPanel;
1173	1167	cGridBag pushPanel;
	1168	+ cGridBag versionPanel;
1174	1169	cGridBag fillPanel;
1175	1170
1176	1171	JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
..	..	@@ -1417,9 +1412,14 @@
1417	1412	oe.ctrlPanel.add(objectCommandsPanel);
1418	1413	oe.ctrlPanel.Return();
1419	1414
1420		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1415	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
1421	1416	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1422		- //Return();
	1417	+ if (false && copy.versionlist != null && copy.versionindex != -1)
	1418	+ {
	1419	+ oe.ctrlPanel.Return();
	1420	+ versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
	1421	+ versionField = (cNumberSlider)versionPanel.getComponent(1);
	1422	+ }
1423	1423
1424	1424	oe.ctrlPanel.Return();
1425	1425
..	..	@@ -1775,7 +1775,7 @@
1775	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1776	1776
1777	1777	/JTabbedPane/ scenePanel = new cGridBag();
1778		- scenePanel.preferredWidth = 6;
	1778	+ scenePanel.preferredWidth = 5;
1779	1779
1780	1780	JTabbedPane tabbedPane = new JTabbedPane();
1781	1781	tabbedPane.add(scrollpane);
..	..	@@ -1884,9 +1884,9 @@
1884	1884
1885	1885	if (Globals.ADVANCED)
1886	1886	{
1887		- tabbedPane.add(infoPanel);
1888		- tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1889		- tabbedPane.setToolTipTextAt(4, "Information");
	1887	+ objectPanel.add(infoPanel);
	1888	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1889	+ objectPanel.setToolTipTextAt(4, "Information");
1890	1890	}
1891	1891
1892	1892	/*
..	..	@@ -2370,7 +2370,7 @@
2370	2370	{
2371	2371	public void mouseClicked(MouseEvent e)
2372	2372	{
2373		- borderfadeField.setFloat(0.5);
	2373	+ borderfadeField.setFloat(0.4);
2374	2374	opacityField.setFloat(0.75);
2375	2375
2376	2376	materialtouched = true;
..	..	@@ -2429,13 +2429,55 @@
2429	2429	cameraField.setFloat(0.001);
2430	2430	specularField.setFloat(0.001);
2431	2431	fakedepthField.setFloat(0.001);
2432		- opacityField.setFloat(0.6);
	2432	+ opacityField.setFloat(0.4);
2433	2433
2434	2434	materialtouched = true;
2435	2435	applySelf();
2436	2436	}
2437	2437	});
2438	2438	presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.125);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.13);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.14);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
2439	2481
2440	2482	cGridBag panel = new cGridBag().setVertical(true);
2441	2483
..	..	@@ -2682,6 +2724,12 @@
2682	2724	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2683	2725	colorSection.add(backlit);
2684	2726
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2731	+ colorSection.add(parallax);
	2732	+
2685	2733	//panel.add(new JSeparator());
2686	2734
2687	2735	//panel.add(globalSection);
..	..	@@ -3733,6 +3781,7 @@
3733	3781	shadowField.setFloat(mat.shadow);
3734	3782	textureField.setFloat(mat.texture);
3735	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
3736	3785	fakedepthField.setFloat(mat.fakedepth);
3737	3786	shadowbiasField.setFloat(mat.shadowbias);
3738	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -4026,6 +4075,7 @@
4026	4075	} else if (event.getSource() == link2masterCB)
4027	4076	{
4028	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
4029	4079	return;
4030	4080	}
4031	4081	if (event.getSource() == randomCB)
..	..	@@ -4416,7 +4466,7 @@
4416	4466	copy.versionindex -= 1;
4417	4467
4418	4468	if (copy.versionindex != -1)
4419		- CopyChanged();
	4469	+ CopyChanged(copy);
4420	4470
4421	4471	SetVersionStates();
4422	4472	}
..	..	@@ -4426,7 +4476,11 @@
4426	4476	System.err.println("Save");
4427	4477	Replace();
4428	4478
4429		- //cRadio tab = GetCurrentTab();
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
4430	4484
4431	4485	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4432	4486
..	..	@@ -4494,20 +4548,20 @@
4494	4548	{
4495	4549	Object3D selection = new Object3D();
4496	4550
4497		- for (int i = 0; i < copy.selection.size(); i++)
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
4498	4552	{
4499		- Object3D elem = copy.selection.elementAt(i);
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
4500	4554
4501		- Object3D obj = copy.GetObject(elem.GetUUID());
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
4502	4556
4503	4557	if (obj == null)
4504	4558	{
4505		- copy.selection.remove(i--);
	4559	+ objEditor.copy.selection.remove(i--);
4506	4560	}
4507	4561	else
4508	4562	{
4509	4563	selection.add(obj);
4510		- copy.selection.setElementAt(obj, i);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
4511	4565	}
4512	4566	}
4513	4567
..	..	@@ -4520,44 +4574,43 @@
4520	4574	//refreshContents(false);
4521	4575	}
4522	4576
4523		- void CopyChanged()
	4577	+ void CopyChanged(Object3D changed)
4524	4578	{
4525		- Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4526		-
4527		- SetVersionStates();
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
4528	4580
4529	4581	boolean temp = CameraPane.SWITCH;
4530	4582	CameraPane.SWITCH = false;
4531	4583
4532		- copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4533	4585
4534		- copy.clear();
	4586	+ changed.clear();
4535	4587
4536		- copy.skyboxname = obj.skyboxname;
4537		- copy.skyboxext = obj.skyboxext;
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
4538	4590
4539	4591	for (int i=0; i<obj.Size(); i++)
4540	4592	{
4541		- copy.add(obj.get(i));
	4593	+ changed.add(obj.get(i));
4542	4594	}
4543	4595
4544		- copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4545	4597
4546	4598	CameraPane.SWITCH = temp;
4547	4599
4548		- RefreshSelection();
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
4549	4602	//assert(hashtable.isEmpty());
4550	4603
4551		- copy.Touch();
	4604	+ objEditor.copy.Touch();
4552	4605
4553	4606	ResetModel();
4554		- copy.HardTouch(); // recompile?
	4607	+ objEditor.copy.HardTouch(); // recompile?
4555	4608
4556	4609	cRadio ab;
4557		- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
4558	4611	{
4559	4612	ab = (cRadio)e.nextElement();
4560		- Object3D test = copy.GetObject(ab.object.GetUUID());
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
4561	4614	//ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
4562	4615	if (test != null)
4563	4616	{
..	..	@@ -4566,7 +4619,7 @@
4566	4619	}
4567	4620	}
4568	4621
4569		- refreshContents(true);
	4622	+ objEditor.refreshContents(true);
4570	4623	}
4571	4624
4572	4625	cButton previousVersionButton;
..	..	@@ -4580,15 +4633,7 @@
4580	4633
4581	4634	int VersionCount()
4582	4635	{
4583		- int count = 0;
4584		-
4585		- for (int i = copy.versionlist.length; --i >= 0;)
4586		- {
4587		- if (copy.versionlist[i] != null)
4588		- count++;
4589		- }
4590		-
4591		- return count;
	4636	+ return copy.VersionCount();
4592	4637	}
4593	4638
4594	4639	public cGridBag versionSliderPane;
..	..	@@ -4600,7 +4645,7 @@
4600	4645
4601	4646	//cRadio tab = GetCurrentTab();
4602	4647
4603		- if (copy.versionlist == null)
	4648	+ if (copy.versionindex == -2)
4604	4649	{
4605	4650	saveVersionButton.setEnabled(false);
4606	4651	restoreButton.setEnabled(false);
..	..	@@ -4662,7 +4707,9 @@
4662	4707
4663	4708	copy.versionindex -= 1;
4664	4709
4665		- CopyChanged();
	4710	+ CopyChanged(copy);
	4711	+
	4712	+ SetVersionStates();
4666	4713
4667	4714	return true;
4668	4715	}
..	..	@@ -4680,7 +4727,9 @@
4680	4727	}
4681	4728
4682	4729	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4683		- CopyChanged();
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
4684	4733
4685	4734	return true;
4686	4735	}
..	..	@@ -4717,10 +4766,12 @@
4717	4766
4718	4767	copy.versionindex += 1;
4719	4768
4720		- CopyChanged();
	4769	+ CopyChanged(copy);
4721	4770
4722	4771	//if (!tab.user[tab.versionindex])
4723	4772	// tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
4724	4775	}
4725	4776
4726	4777	void ImportGFD()
..	..	@@ -4957,6 +5008,7 @@
4957	5008	current.shadow = (float) shadowField.getFloat();
4958	5009	current.texture = (float) textureField.getFloat();
4959	5010	current.opacity = (float) opacityField.getFloat();
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4960	5012	current.fakedepth = (float) fakedepthField.getFloat();
4961	5013	current.shadowbias = (float) shadowbiasField.getFloat();
4962	5014
..	..	@@ -5011,6 +5063,8 @@
5011	5063	textureField.SetToolTipValue((mat.texture));
5012	5064	if (!Equal(opacityField.getFloat(), mat.opacity))
5013	5065	opacityField.SetToolTipValue((mat.opacity));
	5066	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5067	+ parallaxField.SetToolTipValue((mat.parallax));
5014	5068	if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
5015	5069	fakedepthField.SetToolTipValue((mat.fakedepth));
5016	5070	if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
..	..	@@ -5046,6 +5100,7 @@
5046	5100	}
5047	5101
5048	5102	cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
5049	5104
5050	5105	public void stateChanged(ChangeEvent e)
5051	5106	{
..	..	@@ -5062,12 +5117,26 @@
5062	5117	if (version != -1 && copy.versionlist[version] != null)
5063	5118	{
5064	5119	copy.versionindex = version;
5065		- CopyChanged();
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
5066	5122	}
5067	5123
5068	5124	return;
5069	5125	}
5070	5126
	5127	+ if (e.getSource() == versionField)
	5128	+ {
	5129	+ int version = versionField.getInteger();
	5130	+
	5131	+ if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
	5132	+ {
	5133	+ copy.versionindex = version;
	5134	+ CopyChanged(copy);
	5135	+ }
	5136	+
	5137	+ return;
	5138	+ }
	5139	+
5071	5140	if (freezematerial)
5072	5141	{
5073	5142	return;
..	..	@@ -5157,7 +5226,7 @@
5157	5226	}
5158	5227
5159	5228	if (normalpushField != null)
5160		- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
5161	5230	}
5162	5231
5163	5232	void SnapObject()
..	..	@@ -5531,7 +5600,7 @@
5531	5600	void ResetModel()
5532	5601	{
5533	5602	//assert(copy instanceof Composite);
5534		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
5535	5604
5536	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
5537	5606
..	..	@@ -5542,14 +5611,14 @@
5542	5611	//group.refreshEditWindow();
5543	5612	//refreshContents();
5544	5613
5545		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
5546	5615	{
5547		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
5548	5617	}
5549	5618
5550		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
5551	5620	{
5552		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
5553	5622
5554	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
5555	5624	{
..	..	@@ -5558,15 +5627,15 @@
5558	5627
5559	5628	if (item.count <= 1) // ??? == 0)
5560	5629	{
5561		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
5562	5631	}
5563	5632	}
5564	5633
5565	5634	boolean first = true;
5566	5635
5567		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
5568	5637	{
5569		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
5570	5639
5571	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
5572	5641	{
..	..	@@ -6267,6 +6336,8 @@
6267	6336	cNumberSlider textureField;
6268	6337	JLabel opacityLabel;
6269	6338	cNumberSlider opacityField;
	6339	+ JLabel parallaxLabel;
	6340	+ cNumberSlider parallaxField;
6270	6341	JLabel fakedepthLabel;
6271	6342	cNumberSlider fakedepthField;
6272	6343	JLabel shadowbiasLabel;