~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
..	..	@@ -2685,7 +2727,7 @@
2685	2727	cGridBag parallax = new cGridBag();
2686	2728	parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
2687	2729	parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2688		- parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
2689	2731	colorSection.add(parallax);
2690	2732
2691	2733	//panel.add(new JSeparator());
..	..	@@ -3739,7 +3781,7 @@
3739	3781	shadowField.setFloat(mat.shadow);
3740	3782	textureField.setFloat(mat.texture);
3741	3783	opacityField.setFloat(mat.opacity);
3742		- parallaxField.setFloat(mat.parallax + 0.25f);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
3743	3785	fakedepthField.setFloat(mat.fakedepth);
3744	3786	shadowbiasField.setFloat(mat.shadowbias);
3745	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -4033,6 +4075,7 @@
4033	4075	} else if (event.getSource() == link2masterCB)
4034	4076	{
4035	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
4036	4079	return;
4037	4080	}
4038	4081	if (event.getSource() == randomCB)
..	..	@@ -4423,7 +4466,7 @@
4423	4466	copy.versionindex -= 1;
4424	4467
4425	4468	if (copy.versionindex != -1)
4426		- CopyChanged();
	4469	+ CopyChanged(copy);
4427	4470
4428	4471	SetVersionStates();
4429	4472	}
..	..	@@ -4433,7 +4476,11 @@
4433	4476	System.err.println("Save");
4434	4477	Replace();
4435	4478
4436		- //cRadio tab = GetCurrentTab();
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
4437	4484
4438	4485	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4439	4486
..	..	@@ -4501,20 +4548,20 @@
4501	4548	{
4502	4549	Object3D selection = new Object3D();
4503	4550
4504		- for (int i = 0; i < copy.selection.size(); i++)
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
4505	4552	{
4506		- Object3D elem = copy.selection.elementAt(i);
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
4507	4554
4508		- Object3D obj = copy.GetObject(elem.GetUUID());
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
4509	4556
4510	4557	if (obj == null)
4511	4558	{
4512		- copy.selection.remove(i--);
	4559	+ objEditor.copy.selection.remove(i--);
4513	4560	}
4514	4561	else
4515	4562	{
4516	4563	selection.add(obj);
4517		- copy.selection.setElementAt(obj, i);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
4518	4565	}
4519	4566	}
4520	4567
..	..	@@ -4527,44 +4574,43 @@
4527	4574	//refreshContents(false);
4528	4575	}
4529	4576
4530		- void CopyChanged()
	4577	+ void CopyChanged(Object3D changed)
4531	4578	{
4532		- Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4533		-
4534		- SetVersionStates();
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
4535	4580
4536	4581	boolean temp = CameraPane.SWITCH;
4537	4582	CameraPane.SWITCH = false;
4538	4583
4539		- copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4540	4585
4541		- copy.clear();
	4586	+ changed.clear();
4542	4587
4543		- copy.skyboxname = obj.skyboxname;
4544		- copy.skyboxext = obj.skyboxext;
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
4545	4590
4546	4591	for (int i=0; i<obj.Size(); i++)
4547	4592	{
4548		- copy.add(obj.get(i));
	4593	+ changed.add(obj.get(i));
4549	4594	}
4550	4595
4551		- copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4552	4597
4553	4598	CameraPane.SWITCH = temp;
4554	4599
4555		- RefreshSelection();
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
4556	4602	//assert(hashtable.isEmpty());
4557	4603
4558		- copy.Touch();
	4604	+ objEditor.copy.Touch();
4559	4605
4560	4606	ResetModel();
4561		- copy.HardTouch(); // recompile?
	4607	+ objEditor.copy.HardTouch(); // recompile?
4562	4608
4563	4609	cRadio ab;
4564		- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
4565	4611	{
4566	4612	ab = (cRadio)e.nextElement();
4567		- Object3D test = copy.GetObject(ab.object.GetUUID());
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
4568	4614	//ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
4569	4615	if (test != null)
4570	4616	{
..	..	@@ -4573,7 +4619,7 @@
4573	4619	}
4574	4620	}
4575	4621
4576		- refreshContents(true);
	4622	+ objEditor.refreshContents(true);
4577	4623	}
4578	4624
4579	4625	cButton previousVersionButton;
..	..	@@ -4587,15 +4633,7 @@
4587	4633
4588	4634	int VersionCount()
4589	4635	{
4590		- int count = 0;
4591		-
4592		- for (int i = copy.versionlist.length; --i >= 0;)
4593		- {
4594		- if (copy.versionlist[i] != null)
4595		- count++;
4596		- }
4597		-
4598		- return count;
	4636	+ return copy.VersionCount();
4599	4637	}
4600	4638
4601	4639	public cGridBag versionSliderPane;
..	..	@@ -4607,7 +4645,7 @@
4607	4645
4608	4646	//cRadio tab = GetCurrentTab();
4609	4647
4610		- if (copy.versionlist == null)
	4648	+ if (copy.versionindex == -2)
4611	4649	{
4612	4650	saveVersionButton.setEnabled(false);
4613	4651	restoreButton.setEnabled(false);
..	..	@@ -4669,7 +4707,9 @@
4669	4707
4670	4708	copy.versionindex -= 1;
4671	4709
4672		- CopyChanged();
	4710	+ CopyChanged(copy);
	4711	+
	4712	+ SetVersionStates();
4673	4713
4674	4714	return true;
4675	4715	}
..	..	@@ -4687,7 +4727,9 @@
4687	4727	}
4688	4728
4689	4729	//CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4690		- CopyChanged();
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
4691	4733
4692	4734	return true;
4693	4735	}
..	..	@@ -4724,10 +4766,12 @@
4724	4766
4725	4767	copy.versionindex += 1;
4726	4768
4727		- CopyChanged();
	4769	+ CopyChanged(copy);
4728	4770
4729	4771	//if (!tab.user[tab.versionindex])
4730	4772	// tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
4731	4775	}
4732	4776
4733	4777	void ImportGFD()
..	..	@@ -4964,7 +5008,7 @@
4964	5008	current.shadow = (float) shadowField.getFloat();
4965	5009	current.texture = (float) textureField.getFloat();
4966	5010	current.opacity = (float) opacityField.getFloat();
4967		- current.parallax = (float) parallaxField.getFloat() - 0.25f;
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4968	5012	current.fakedepth = (float) fakedepthField.getFloat();
4969	5013	current.shadowbias = (float) shadowbiasField.getFloat();
4970	5014
..	..	@@ -5056,6 +5100,7 @@
5056	5100	}
5057	5101
5058	5102	cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
5059	5104
5060	5105	public void stateChanged(ChangeEvent e)
5061	5106	{
..	..	@@ -5072,12 +5117,26 @@
5072	5117	if (version != -1 && copy.versionlist[version] != null)
5073	5118	{
5074	5119	copy.versionindex = version;
5075		- CopyChanged();
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
5076	5122	}
5077	5123
5078	5124	return;
5079	5125	}
5080	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	+
5081	5140	if (freezematerial)
5082	5141	{
5083	5142	return;
..	..	@@ -5167,7 +5226,7 @@
5167	5226	}
5168	5227
5169	5228	if (normalpushField != null)
5170		- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
5171	5230	}
5172	5231
5173	5232	void SnapObject()
..	..	@@ -5541,7 +5600,7 @@
5541	5600	void ResetModel()
5542	5601	{
5543	5602	//assert(copy instanceof Composite);
5544		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
5545	5604
5546	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
5547	5606
..	..	@@ -5552,14 +5611,14 @@
5552	5611	//group.refreshEditWindow();
5553	5612	//refreshContents();
5554	5613
5555		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
5556	5615	{
5557		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
5558	5617	}
5559	5618
5560		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
5561	5620	{
5562		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
5563	5622
5564	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
5565	5624	{
..	..	@@ -5568,15 +5627,15 @@
5568	5627
5569	5628	if (item.count <= 1) // ??? == 0)
5570	5629	{
5571		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
5572	5631	}
5573	5632	}
5574	5633
5575	5634	boolean first = true;
5576	5635
5577		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
5578	5637	{
5579		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
5580	5639
5581	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
5582	5641	{