~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -134,8 +134,14 @@
134	134
135	135	try
136	136	{
137		- BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
138		-
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
139	145	// if (image.getWidth() > 48 && image.getHeight() > 48)
140	146	// {
141	147	// BufferedImage resized = new BufferedImage(48, 48, image.getType());
..	..	@@ -377,14 +383,6 @@
377	383	client = inClient;
378	384	copy = client;
379	385
380		- if (copy.versionlist == null)
381		- {
382		- copy.versionlist = new Object3D[100];
383		- copy.versionindex = -1;
384		-
385		-// Save(true);
386		- }
387		-
388	386	SetupUI2(callee.GetEditor());
389	387	}
390	388
..	..	@@ -1878,9 +1876,9 @@
1878	1876
1879	1877	if (Globals.ADVANCED)
1880	1878	{
1881		- tabbedPane.add(infoPanel);
1882		- tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1883		- tabbedPane.setToolTipTextAt(4, "Information");
	1879	+ objectPanel.add(infoPanel);
	1880	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1881	+ objectPanel.setToolTipTextAt(4, "Information");
1884	1882	}
1885	1883
1886	1884	/*
..	..	@@ -2364,7 +2362,7 @@
2364	2362	{
2365	2363	public void mouseClicked(MouseEvent e)
2366	2364	{
2367		- borderfadeField.setFloat(0.5);
	2365	+ borderfadeField.setFloat(0.4);
2368	2366	opacityField.setFloat(0.75);
2369	2367
2370	2368	materialtouched = true;
..	..	@@ -2430,6 +2428,48 @@
2430	2428	}
2431	2429	});
2432	2430	presetpanel.add(shadowShader);
	2431	+
	2432	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2433	+ para0.setToolTipText("No parallax");
	2434	+ para0.addMouseListener(new MouseAdapter()
	2435	+ {
	2436	+ public void mouseClicked(MouseEvent e)
	2437	+ {
	2438	+ parallaxField.setFloat(0.125);
	2439	+
	2440	+ materialtouched = true;
	2441	+ applySelf();
	2442	+ }
	2443	+ });
	2444	+ presetpanel.add(para0);
	2445	+
	2446	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2447	+ para1.setToolTipText("With parallax");
	2448	+ para1.addMouseListener(new MouseAdapter()
	2449	+ {
	2450	+ public void mouseClicked(MouseEvent e)
	2451	+ {
	2452	+ parallaxField.setFloat(0.13);
	2453	+
	2454	+ materialtouched = true;
	2455	+ applySelf();
	2456	+ }
	2457	+ });
	2458	+ presetpanel.add(para1);
	2459	+
	2460	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2461	+ para2.setToolTipText("Reset parallax");
	2462	+ para2.addMouseListener(new MouseAdapter()
	2463	+ {
	2464	+ public void mouseClicked(MouseEvent e)
	2465	+ {
	2466	+ parallaxField.setFloat(0.14);
	2467	+
	2468	+ materialtouched = true;
	2469	+ applySelf();
	2470	+ }
	2471	+ });
	2472	+ presetpanel.add(para2);
2433	2473
2434	2474	cGridBag panel = new cGridBag().setVertical(true);
2435	2475
..	..	@@ -2676,6 +2716,12 @@
2676	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2677	2717	colorSection.add(backlit);
2678	2718
	2719	+ cGridBag parallax = new cGridBag();
	2720	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2721	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2722	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2723	+ colorSection.add(parallax);
	2724	+
2679	2725	//panel.add(new JSeparator());
2680	2726
2681	2727	//panel.add(globalSection);
..	..	@@ -3727,6 +3773,7 @@
3727	3773	shadowField.setFloat(mat.shadow);
3728	3774	textureField.setFloat(mat.texture);
3729	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
3730	3777	fakedepthField.setFloat(mat.fakedepth);
3731	3778	shadowbiasField.setFloat(mat.shadowbias);
3732	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -4420,7 +4467,11 @@
4420	4467	System.err.println("Save");
4421	4468	Replace();
4422	4469
4423		- //cRadio tab = GetCurrentTab();
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
4424	4475
4425	4476	Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4426	4477
..	..	@@ -4594,7 +4645,7 @@
4594	4645
4595	4646	//cRadio tab = GetCurrentTab();
4596	4647
4597		- if (copy.versionlist == null)
	4648	+ if (copy.versionindex == -2)
4598	4649	{
4599	4650	saveVersionButton.setEnabled(false);
4600	4651	restoreButton.setEnabled(false);
..	..	@@ -4951,6 +5002,7 @@
4951	5002	current.shadow = (float) shadowField.getFloat();
4952	5003	current.texture = (float) textureField.getFloat();
4953	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
4954	5006	current.fakedepth = (float) fakedepthField.getFloat();
4955	5007	current.shadowbias = (float) shadowbiasField.getFloat();
4956	5008
..	..	@@ -5005,6 +5057,8 @@
5005	5057	textureField.SetToolTipValue((mat.texture));
5006	5058	if (!Equal(opacityField.getFloat(), mat.opacity))
5007	5059	opacityField.SetToolTipValue((mat.opacity));
	5060	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5061	+ parallaxField.SetToolTipValue((mat.parallax));
5008	5062	if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
5009	5063	fakedepthField.SetToolTipValue((mat.fakedepth));
5010	5064	if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
..	..	@@ -6261,6 +6315,8 @@
6261	6315	cNumberSlider textureField;
6262	6316	JLabel opacityLabel;
6263	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
6264	6320	JLabel fakedepthLabel;
6265	6321	cNumberSlider fakedepthField;
6266	6322	JLabel shadowbiasLabel;