Min shader.

Normand Briere

2019-08-23 60cec91731a350fe67e9b5ffe7a00d70e9026314

 ObjEditor.java
..
..
@@ -383,14 +383,6 @@
383
383
         client = inClient;
384
384
         copy = client;
385
385
 
386
-        if (copy.versionlist == null)
387
-        {
388
-            copy.versionlist = new Object3D[100];
389
-            copy.versionindex = -1;
390
-            
391
-//            Save(true);
392
-        }
393
-        
394
386
         SetupUI2(callee.GetEditor());
395
387
     }
396
388
 
..
..
@@ -1775,7 +1767,7 @@
1775
1767
         scrollpane.addMouseWheelListener(this); // Default not fast enough
1776
1768
 
1777
1769
         /*JTabbedPane*/ scenePanel = new cGridBag();
1778
-        scenePanel.preferredWidth = 6;
1770
+        scenePanel.preferredWidth = 5;
1779
1771
         
1780
1772
         JTabbedPane tabbedPane = new JTabbedPane();
1781
1773
         tabbedPane.add(scrollpane);
..
..
@@ -1884,9 +1876,9 @@
1884
1876
         
1885
1877
         if (Globals.ADVANCED)
1886
1878
         {
1887
-            tabbedPane.add(infoPanel);
1888
-            tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
1889
-            tabbedPane.setToolTipTextAt(4, "Information");
1879
+            objectPanel.add(infoPanel);
1880
+            objectPanel.setIconAt(5, GetIcon("icons/info.png"));
1881
+            objectPanel.setToolTipTextAt(4, "Information");
1890
1882
         }
1891
1883
 
1892
1884
         /*
..
..
@@ -2370,7 +2362,7 @@
2370
2362
         {
2371
2363
             public void mouseClicked(MouseEvent e)
2372
2364
             {
2373
-                borderfadeField.setFloat(0.5);
2365
+                borderfadeField.setFloat(0.4);
2374
2366
                 opacityField.setFloat(0.75);
2375
2367
 
2376
2368
                 materialtouched = true;
..
..
@@ -2443,7 +2435,7 @@
2443
2435
         {
2444
2436
             public void mouseClicked(MouseEvent e)
2445
2437
             {
2446
-                parallaxField.setFloat(0.25);
2438
+                parallaxField.setFloat(0.125);
2447
2439
 
2448
2440
                 materialtouched = true;
2449
2441
                 applySelf();
..
..
@@ -2457,7 +2449,7 @@
2457
2449
         {
2458
2450
             public void mouseClicked(MouseEvent e)
2459
2451
             {
2460
-                parallaxField.setFloat(0.255);
2452
+                parallaxField.setFloat(0.13);
2461
2453
 
2462
2454
                 materialtouched = true;
2463
2455
                 applySelf();
..
..
@@ -2471,7 +2463,7 @@
2471
2463
         {
2472
2464
             public void mouseClicked(MouseEvent e)
2473
2465
             {
2474
-                parallaxField.setFloat(0.265);
2466
+                parallaxField.setFloat(0.14);
2475
2467
 
2476
2468
                 materialtouched = true;
2477
2469
                 applySelf();
..
..
@@ -2727,7 +2719,7 @@
2727
2719
         cGridBag parallax = new cGridBag();
2728
2720
                 parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
2729
2721
                 parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2730
-                parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
2722
+                parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
2731
2723
         colorSection.add(parallax);
2732
2724
         
2733
2725
         //panel.add(new JSeparator());
..
..
@@ -3781,7 +3773,7 @@
3781
3773
         shadowField.setFloat(mat.shadow);
3782
3774
         textureField.setFloat(mat.texture);
3783
3775
         opacityField.setFloat(mat.opacity);
3784
-        parallaxField.setFloat(mat.parallax + 0.25f);
3776
+        parallaxField.setFloat(mat.parallax + 0.125f);
3785
3777
         fakedepthField.setFloat(mat.fakedepth);
3786
3778
         shadowbiasField.setFloat(mat.shadowbias);
3787
3779
         bumpField.setInteger(1); // dec 2013
..
..
@@ -4475,7 +4467,11 @@
4475
4467
         System.err.println("Save");
4476
4468
         Replace();
4477
4469
         
4478
-        //cRadio tab = GetCurrentTab();
4470
+        if (copy.versionlist == null)
4471
+        {
4472
+            copy.versionlist = new Object3D[100];
4473
+            copy.versionindex = -1;
4474
+        }
4479
4475
         
4480
4476
         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4481
4477
         
..
..
@@ -4649,7 +4645,7 @@
4649
4645
                     
4650
4646
         //cRadio tab = GetCurrentTab();
4651
4647
         
4652
-        if (copy.versionlist == null)
4648
+        if (copy.versionindex == -2)
4653
4649
         {
4654
4650
             saveVersionButton.setEnabled(false);
4655
4651
             restoreButton.setEnabled(false);
..
..
@@ -5006,7 +5002,7 @@
5006
5002
             current.shadow = (float) shadowField.getFloat();
5007
5003
             current.texture = (float) textureField.getFloat();
5008
5004
             current.opacity = (float) opacityField.getFloat();
5009
-            current.parallax = (float) parallaxField.getFloat() - 0.25f;
5005
+            current.parallax = (float) parallaxField.getFloat() - 0.125f;
5010
5006
             current.fakedepth = (float) fakedepthField.getFloat();
5011
5007
             current.shadowbias = (float) shadowbiasField.getFloat();
5012
5008