Get icons 256x256

Normand Briere

2019-07-01 6600d22461ccc1cb602f238a9ffa83cf07dd830e

 ObjEditor.java
..
..
@@ -309,7 +309,7 @@
309
309
         //localCopy.parent = null;
310
310
 
311
311
         frame = new JFrame();
312
-                frame.setUndecorated(true);
312
+                frame.setUndecorated(false);
313
313
         objEditor = this;
314
314
         this.callee = callee;
315
315
 
..
..
@@ -350,7 +350,7 @@
350
350
         frame.setMenuBar(menuBar = new MenuBar());
351
351
         menuBar.add(fileMenu = new Menu("File"));
352
352
         fileMenu.add(newItem = new MenuItem("New"));
353
-        fileMenu.add(loadItem = new MenuItem("Open..."));
353
+        fileMenu.add(openItem = new MenuItem("Open..."));
354
354
         
355
355
                 //oe.menuBar.add(menu = new Menu("Include"));
356
356
         Menu menu = new Menu("Import");
..
..
@@ -382,7 +382,7 @@
382
382
         }
383
383
 
384
384
         newItem.addActionListener(this);
385
-        loadItem.addActionListener(this);
385
+        openItem.addActionListener(this);
386
386
         saveItem.addActionListener(this);
387
387
         saveAsItem.addActionListener(this);
388
388
         exportAsItem.addActionListener(this);
..
..
@@ -449,7 +449,7 @@
449
449
 // TEXTAREA           infoarea.setLineWrap(true);
450
450
 // TEXTAREA           infoarea.setWrapStyleWord(true);
451
451
         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
-        infoPanel.setPreferredSize(new Dimension(50, 200));
452
+        infoPanel.setPreferredSize(new Dimension(1, 1));
453
453
         infoPanel.setName("Info");
454
454
         //infoPanel.setLayout(new BorderLayout());
455
455
         //infoPanel.add(createTextPane());
..
..
@@ -463,10 +463,11 @@
463
463
         mainPanel.setResizeWeight(0.5);
464
464
         
465
465
 //mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
-//    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
-//    divider.setDividerSize(15);
468
-//    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
466
+    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
+    divider.setDividerSize(15);
468
+    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
469
469
     
470
+    mainPanel.setUI(new BasicSplitPaneUI());
470
471
     
471
472
         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
472
473
         //mainPanel.setLayout(new GridBagLayout());
..
..
@@ -698,8 +699,8 @@
698
699
         }
699
700
     }
700
701
 
701
-static GraphicsDevice device = GraphicsEnvironment
702
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
702
+//static GraphicsDevice device = GraphicsEnvironment
703
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
703
704
 
704
705
     Rectangle keeprect;
705
706
         cRadio radio;
..
..
@@ -720,10 +721,19 @@
720
721
         void Minimize()
721
722
         {
722
723
             frame.setState(Frame.ICONIFIED);
724
+            frame.validate();
723
725
         }
724
726
         
727
+//        artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
728
+//        artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
729
+//        artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
725
730
         void Maximize()
726
731
         {
732
+            if (CameraPane.FULLSCREEN)
733
+            {
734
+                ToggleFullScreen();
735
+            }
736
+            
727
737
             if (maximized)
728
738
             {
729
739
                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..
..
@@ -731,22 +741,36 @@
731
741
             else
732
742
             {
733
743
                 keeprect = frame.getBounds();
734
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
735
-                Dimension rect2 = frame.getToolkit().getScreenSize();
736
-                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
744
+//                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
+//                Dimension rect2 = frame.getToolkit().getScreenSize();
746
+//                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
737
747
 //                frame.setState(Frame.MAXIMIZED_BOTH);
748
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
738
749
             }
739
750
             
740
751
             maximized ^= true;
752
+            
753
+            frame.validate();
741
754
         }
755
+        
756
+	cButton minButton;
757
+	cButton maxButton;
758
+	cButton fullButton;
742
759
         
743
760
         void ToggleFullScreen()
744
761
         {
762
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763
+
745
764
                 cameraView.ToggleFullScreen();
746
765
                 
747
766
                 if (!CameraPane.FULLSCREEN)
748
767
                 {
749
768
                     device.setFullScreenWindow(null);
769
+                    frame.dispose();
770
+                frame.setUndecorated(false);
771
+            frame.validate();
772
+                    frame.setVisible(true);
773
+                    
750
774
                     //frame.setVisible(false);
751
775
 //                frame.removeNotify();
752
776
 //                frame.setUndecorated(false);
..
..
@@ -756,7 +780,7 @@
756
780
 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
757
781
 // X                   framePanel.add(bigThree);
758
782
 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
759
-                    framePanel.setDividerLocation(1);
783
+                    framePanel.setDividerLocation(46);
760
784
                     
761
785
                     //frame.setVisible(true);
762
786
                     radio.layout = keepButton;
..
..
@@ -771,7 +795,12 @@
771
795
 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
772
796
 //                        frame.getToolkit().getScreenSize().height);
773
797
                     //frame.setVisible(false);
798
+                    
799
+            frame.dispose();
800
+                frame.setUndecorated(true);
774
801
                     device.setFullScreenWindow(frame);
802
+            frame.validate();
803
+                    frame.setVisible(true);
775
804
 //                frame.removeNotify();
776
805
 //                frame.setUndecorated(true);
777
806
 //                frame.addNotify();
..
..
@@ -784,6 +813,7 @@
784
813
                     radio.layout.doClick();
785
814
                     //frame.setVisible(true);
786
815
                 }
816
+            frame.validate();
787
817
         }
788
818
 
789
819
     private JTextPane createTextPane()
..
..
@@ -1116,7 +1146,7 @@
1116
1146
             namePanel = new cGridBag();
1117
1147
             
1118
1148
         nameField = AddText(namePanel, copy.GetName());
1119
-        namePanel.add(nameField);
1149
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1120
1150
         oe.ctrlPanel.add(namePanel);
1121
1151
         
1122
1152
         oe.ctrlPanel.Return();
..
..
@@ -1141,7 +1171,7 @@
1141
1171
         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1142
1172
         rewindCB.setToolTipText("Rewind animation");
1143
1173
         
1144
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1174
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1145
1175
         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1146
1176
 
1147
1177
         if (Globals.ADVANCED)
..
..
@@ -1463,7 +1493,10 @@
1463
1493
 //        north.add(ctrlPanel, BorderLayout.NORTH);
1464
1494
 //        objectPanel.add(north);
1465
1495
         objectPanel.add(editPanel);
1466
-        objectPanel.add(infoPanel);
1496
+        
1497
+        //if (Globals.ADVANCED)
1498
+            objectPanel.add(infoPanel);
1499
+        
1467
1500
         objectPanel.add(toolboxPanel);
1468
1501
 
1469
1502
         /*
..
..
@@ -1572,9 +1605,9 @@
1572
1605
 //		aConstraints.gridheight = 1;
1573
1606
 
1574
1607
         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1575
-        framePanel.setContinuousLayout(true);
1576
-        framePanel.setOneTouchExpandable(true);
1577
-        framePanel.setDividerLocation(0.8);
1608
+        framePanel.setContinuousLayout(false);
1609
+        framePanel.setOneTouchExpandable(false);
1610
+        //.setDividerLocation(0.8);
1578
1611
         //framePanel.setDividerSize(15);
1579
1612
         //framePanel.setResizeWeight(0.15);
1580
1613
         framePanel.setName("Frame");
..
..
@@ -1593,12 +1626,13 @@
1593
1626
 
1594
1627
         frame.setSize(1280, 860);
1595
1628
         
1596
-        frame.validate();
1597
-        frame.setVisible(true);
1598
-
1599
1629
                     cameraView.requestFocusInWindow();
1600
1630
                     
1601
1631
         gridPanel.setDividerLocation(1.0);
1632
+        
1633
+        frame.validate();
1634
+
1635
+        frame.setVisible(true);
1602
1636
 
1603
1637
         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1604
1638
         frame.addWindowListener(new WindowAdapter()
..
..
@@ -1685,24 +1719,6 @@
1685
1719
                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1686
1720
         colorSection.add(texture);
1687
1721
 
1688
-        cGridBag anisoU = new cGridBag();
1689
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1690
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1691
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1692
-        colorSection.add(anisoU);
1693
-
1694
-        cGridBag anisoV = new cGridBag();
1695
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1696
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1697
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1698
-        colorSection.add(anisoV);
1699
-
1700
-        cGridBag shadowbias = new cGridBag();
1701
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1702
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1704
-        colorSection.add(shadowbias);
1705
-
1706
1722
         panel.add(new JSeparator());
1707
1723
         
1708
1724
         panel.add(colorSection);
..
..
@@ -1752,6 +1768,12 @@
1752
1768
                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
1769
                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1754
1770
         diffuseSection.add(fakedepth);
1771
+
1772
+        cGridBag shadowbias = new cGridBag();
1773
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1774
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1776
+        diffuseSection.add(shadowbias);
1755
1777
 
1756
1778
         panel.add(new JSeparator());
1757
1779
         
..
..
@@ -1803,6 +1825,18 @@
1803
1825
 //		aConstraints.gridy += 1;
1804
1826
 //		aConstraints.gridwidth = 1;
1805
1827
 
1828
+        cGridBag anisoU = new cGridBag();
1829
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1830
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1831
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1832
+        specularSection.add(anisoU);
1833
+
1834
+        cGridBag anisoV = new cGridBag();
1835
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1836
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1837
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1838
+        specularSection.add(anisoV);
1839
+
1806
1840
 
1807
1841
         panel.add(new JSeparator());
1808
1842
         
..
..
@@ -1810,35 +1844,35 @@
1810
1844
         
1811
1845
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812
1846
         
1813
-        cGridBag globalSection = new cGridBag().setVertical(true);
1847
+        //cGridBag globalSection = new cGridBag().setVertical(true);
1814
1848
 
1815
1849
         cGridBag camera = new cGridBag();
1816
1850
                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1817
1851
                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1818
1852
                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1819
-        globalSection.add(camera);
1853
+        colorSection.add(camera);
1820
1854
 
1821
1855
         cGridBag ambient = new cGridBag();
1822
1856
                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1823
1857
                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1824
1858
                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1825
-        globalSection.add(ambient);
1859
+        colorSection.add(ambient);
1826
1860
 
1827
1861
         cGridBag backlit = new cGridBag();
1828
1862
                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1829
1863
                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1830
1864
                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1831
-        globalSection.add(backlit);
1865
+        colorSection.add(backlit);
1832
1866
 
1833
1867
         cGridBag opacity = new cGridBag();
1834
1868
                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1835
1869
                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1836
1870
                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1837
-        globalSection.add(opacity);
1871
+        colorSection.add(opacity);
1838
1872
 
1839
-        panel.add(new JSeparator());
1873
+        //panel.add(new JSeparator());
1840
1874
         
1841
-        panel.add(globalSection);
1875
+        //panel.add(globalSection);
1842
1876
         
1843
1877
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1844
1878
         
..
..
@@ -3360,9 +3394,9 @@
3360
3394
         {
3361
3395
             Close();
3362
3396
             //return true;
3363
-        } else if (source == loadItem)
3397
+        } else if (source == openItem)
3364
3398
         {
3365
-            load();
3399
+            Open();
3366
3400
             //return true;
3367
3401
         } else if (source == newItem)
3368
3402
         {
..
..
@@ -3387,6 +3421,10 @@
3387
3421
         {
3388
3422
             generatePOV();
3389
3423
             //return true;
3424
+        } else if (event.getSource() == archiveItem)
3425
+        {
3426
+            cTools.Archive(frame);
3427
+            return;
3390
3428
         } else if (source == zBufferItem)
3391
3429
         {
3392
3430
             try
..
..
@@ -3537,8 +3575,10 @@
3537
3575
         
3538
3576
         copy.ExtractBigData(hashtable);
3539
3577
         
3578
+        byte[] compress = Compress(copy);
3579
+        
3540
3580
         //EditorFrame.m_MainFrame.requestFocusInWindow();
3541
-        tab.graphs[tab.undoindex++] = Compress(copy);
3581
+        tab.graphs[tab.undoindex++] = compress;
3542
3582
 
3543
3583
         copy.RestoreBigData(hashtable);
3544
3584
 
..
..
@@ -4687,7 +4727,7 @@
4687
4727
         }
4688
4728
     }
4689
4729
 
4690
-    void load() // throws ClassNotFoundException
4730
+    void Open() // throws ClassNotFoundException
4691
4731
     {
4692
4732
         if (Grafreed.standAlone)
4693
4733
         {
..
..
@@ -4972,7 +5012,7 @@
4972
5012
     MenuBar menuBar;
4973
5013
     Menu fileMenu;
4974
5014
     MenuItem newItem;
4975
-    MenuItem loadItem;
5015
+    MenuItem openItem;
4976
5016
     MenuItem saveItem;
4977
5017
     MenuItem saveAsItem;
4978
5018
     MenuItem exportAsItem;
..
..
@@ -4995,6 +5035,7 @@
4995
5035
     CheckboxMenuItem toggleSwitchItem;
4996
5036
     CheckboxMenuItem toggleRootItem;
4997
5037
     CheckboxMenuItem animationItem;
5038
+    MenuItem archiveItem;
4998
5039
     CheckboxMenuItem toggleHandleItem;
4999
5040
     CheckboxMenuItem togglePaintItem;
5000
5041
     JSplitPane mainPanel;