Clear versions.

Normand Briere

2019-08-22 0c7b833be7d86598a6813cd1c6db0ca9e1b17966

 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
 
..
..
@@ -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;
..
..
@@ -2436,6 +2428,48 @@
2436
2428
             }
2437
2429
         });
2438
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);
2439
2473
         
2440
2474
         cGridBag panel = new cGridBag().setVertical(true);
2441
2475
         
..
..
@@ -2685,7 +2719,7 @@
2685
2719
         cGridBag parallax = new cGridBag();
2686
2720
                 parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
2687
2721
                 parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2688
-                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);
2689
2723
         colorSection.add(parallax);
2690
2724
         
2691
2725
         //panel.add(new JSeparator());
..
..
@@ -3739,7 +3773,7 @@
3739
3773
         shadowField.setFloat(mat.shadow);
3740
3774
         textureField.setFloat(mat.texture);
3741
3775
         opacityField.setFloat(mat.opacity);
3742
-        parallaxField.setFloat(mat.parallax + 0.25f);
3776
+        parallaxField.setFloat(mat.parallax + 0.125f);
3743
3777
         fakedepthField.setFloat(mat.fakedepth);
3744
3778
         shadowbiasField.setFloat(mat.shadowbias);
3745
3779
         bumpField.setInteger(1); // dec 2013
..
..
@@ -4433,7 +4467,11 @@
4433
4467
         System.err.println("Save");
4434
4468
         Replace();
4435
4469
         
4436
-        //cRadio tab = GetCurrentTab();
4470
+        if (copy.versionlist == null)
4471
+        {
4472
+            copy.versionlist = new Object3D[100];
4473
+            copy.versionindex = -1;
4474
+        }
4437
4475
         
4438
4476
         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
4439
4477
         
..
..
@@ -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);
..
..
@@ -4964,7 +5002,7 @@
4964
5002
             current.shadow = (float) shadowField.getFloat();
4965
5003
             current.texture = (float) textureField.getFloat();
4966
5004
             current.opacity = (float) opacityField.getFloat();
4967
-            current.parallax = (float) parallaxField.getFloat() - 0.25f;
5005
+            current.parallax = (float) parallaxField.getFloat() - 0.125f;
4968
5006
             current.fakedepth = (float) fakedepthField.getFloat();
4969
5007
             current.shadowbias = (float) shadowbiasField.getFloat();
4970
5008