blame | history | patch | commit | commitdiff
Normand Briere
2019-06-29 a69bb4474a3264a9a7a7f8b8d8154ea771f167c8 
 ObjEditor.java
....@@ -449,7 +449,7 @@
449449 // TEXTAREA           infoarea.setLineWrap(true);
450450 // TEXTAREA           infoarea.setWrapStyleWord(true);
451451         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(50, 200));
453453         infoPanel.setName("Info");
454454         //infoPanel.setLayout(new BorderLayout());
455455         //infoPanel.add(createTextPane());
....@@ -721,10 +721,19 @@
721721         void Minimize()
722722         {
723723             frame.setState(Frame.ICONIFIED);
724
+            frame.validate();
724725         }
725726         
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={}
726730         void Maximize()
727731         {
732
+            if (CameraPane.FULLSCREEN)
733
+            {
734
+                ToggleFullScreen();
735
+            }
736
+            
728737             if (maximized)
729738             {
730739                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -739,7 +748,13 @@
739748             }
740749             
741750             maximized ^= true;
751
+            
752
+            frame.validate();
742753         }
754
+        
755
+	cButton minButton;
756
+	cButton maxButton;
757
+	cButton fullButton;
743758         
744759         void ToggleFullScreen()
745760         {
....@@ -748,6 +763,8 @@
748763                 if (!CameraPane.FULLSCREEN)
749764                 {
750765                     device.setFullScreenWindow(null);
766
+            frame.validate();
767
+                    
751768                     //frame.setVisible(false);
752769 //                frame.removeNotify();
753770 //                frame.setUndecorated(false);
....@@ -773,6 +790,7 @@
773790 //                        frame.getToolkit().getScreenSize().height);
774791                     //frame.setVisible(false);
775792                     device.setFullScreenWindow(frame);
793
+            frame.validate();
776794 //                frame.removeNotify();
777795 //                frame.setUndecorated(true);
778796 //                frame.addNotify();
....@@ -785,6 +803,7 @@
785803                     radio.layout.doClick();
786804                     //frame.setVisible(true);
787805                 }
806
+            frame.validate();
788807         }
789808 
790809     private JTextPane createTextPane()
....@@ -1117,7 +1136,7 @@
11171136             namePanel = new cGridBag();
11181137             
11191138         nameField = AddText(namePanel, copy.GetName());
1120
-        namePanel.add(nameField);
1139
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11211140         oe.ctrlPanel.add(namePanel);
11221141         
11231142         oe.ctrlPanel.Return();
....@@ -1142,7 +1161,7 @@
11421161         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
11431162         rewindCB.setToolTipText("Rewind animation");
11441163         
1145
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1164
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11461165         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11471166 
11481167         if (Globals.ADVANCED)
....@@ -1686,24 +1705,6 @@
16861705                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16871706         colorSection.add(texture);
16881707 
1689
-        cGridBag anisoU = new cGridBag();
1690
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1691
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1693
-        colorSection.add(anisoU);
1694
-
1695
-        cGridBag anisoV = new cGridBag();
1696
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1697
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1699
-        colorSection.add(anisoV);
1700
-
1701
-        cGridBag shadowbias = new cGridBag();
1702
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1703
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1705
-        colorSection.add(shadowbias);
1706
-
17071708         panel.add(new JSeparator());
17081709         
17091710         panel.add(colorSection);
....@@ -1753,6 +1754,12 @@
17531754                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17541755                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17551756         diffuseSection.add(fakedepth);
1757
+
1758
+        cGridBag shadowbias = new cGridBag();
1759
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1760
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1761
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1762
+        diffuseSection.add(shadowbias);
17561763 
17571764         panel.add(new JSeparator());
17581765         
....@@ -1804,6 +1811,18 @@
18041811 //		aConstraints.gridy += 1;
18051812 //		aConstraints.gridwidth = 1;
18061813 
1814
+        cGridBag anisoU = new cGridBag();
1815
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1816
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818
+        specularSection.add(anisoU);
1819
+
1820
+        cGridBag anisoV = new cGridBag();
1821
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1822
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1823
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1824
+        specularSection.add(anisoV);
1825
+
18071826 
18081827         panel.add(new JSeparator());
18091828         
....@@ -1811,35 +1830,35 @@
18111830         
18121831         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18131832         
1814
-        cGridBag globalSection = new cGridBag().setVertical(true);
1833
+        //cGridBag globalSection = new cGridBag().setVertical(true);
18151834 
18161835         cGridBag camera = new cGridBag();
18171836                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
18181837                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18191838                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1820
-        globalSection.add(camera);
1839
+        colorSection.add(camera);
18211840 
18221841         cGridBag ambient = new cGridBag();
18231842                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
18241843                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18251844                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1826
-        globalSection.add(ambient);
1845
+        colorSection.add(ambient);
18271846 
18281847         cGridBag backlit = new cGridBag();
18291848                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
18301849                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18311850                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1832
-        globalSection.add(backlit);
1851
+        colorSection.add(backlit);
18331852 
18341853         cGridBag opacity = new cGridBag();
18351854                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
18361855                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18371856                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1838
-        globalSection.add(opacity);
1857
+        colorSection.add(opacity);
18391858 
1840
-        panel.add(new JSeparator());
1859
+        //panel.add(new JSeparator());
18411860         
1842
-        panel.add(globalSection);
1861
+        //panel.add(globalSection);
18431862         
18441863         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18451864         
....@@ -3538,8 +3557,10 @@
35383557         
35393558         copy.ExtractBigData(hashtable);
35403559         
3560
+        byte[] compress = Compress(copy);
3561
+        
35413562         //EditorFrame.m_MainFrame.requestFocusInWindow();
3542
-        tab.graphs[tab.undoindex++] = Compress(copy);
3563
+        tab.graphs[tab.undoindex++] = compress;
35433564 
35443565         copy.RestoreBigData(hashtable);
35453566