Normand Briere
2019-08-22 6a145f6c81dfcbe0653eda27d042efb48daa7512
ObjEditor.java
....@@ -2370,7 +2370,7 @@
23702370 {
23712371 public void mouseClicked(MouseEvent e)
23722372 {
2373
- borderfadeField.setFloat(0.5);
2373
+ borderfadeField.setFloat(0.4);
23742374 opacityField.setFloat(0.75);
23752375
23762376 materialtouched = true;
....@@ -2436,6 +2436,48 @@
24362436 }
24372437 });
24382438 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);
24392481
24402482 cGridBag panel = new cGridBag().setVertical(true);
24412483
....@@ -2685,7 +2727,7 @@
26852727 cGridBag parallax = new cGridBag();
26862728 parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
26872729 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);
26892731 colorSection.add(parallax);
26902732
26912733 //panel.add(new JSeparator());
....@@ -3739,7 +3781,7 @@
37393781 shadowField.setFloat(mat.shadow);
37403782 textureField.setFloat(mat.texture);
37413783 opacityField.setFloat(mat.opacity);
3742
- parallaxField.setFloat(mat.parallax + 0.25f);
3784
+ parallaxField.setFloat(mat.parallax + 0.125f);
37433785 fakedepthField.setFloat(mat.fakedepth);
37443786 shadowbiasField.setFloat(mat.shadowbias);
37453787 bumpField.setInteger(1); // dec 2013
....@@ -4964,7 +5006,7 @@
49645006 current.shadow = (float) shadowField.getFloat();
49655007 current.texture = (float) textureField.getFloat();
49665008 current.opacity = (float) opacityField.getFloat();
4967
- current.parallax = (float) parallaxField.getFloat() - 0.25f;
5009
+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
49685010 current.fakedepth = (float) fakedepthField.getFloat();
49695011 current.shadowbias = (float) shadowbiasField.getFloat();
49705012