Resized logo, enabled information

Photonsters · Jul 31, 2018 · d76b7d7 · d76b7d7
1 parent bc8188a
commit d76b7d7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/out/artifacts/PhotonFileValidator.jar b/out/artifacts/PhotonFileValidator.jar
diff --git a/src/photon/application/MainForm.form b/src/photon/application/MainForm.form
@@ -116,7 +116,7 @@
         <border type="none"/>
         <children>
           <grid id="75762" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-            <margin top="10" left="0" bottom="0" right="0"/>
+            <margin top="4" left="0" bottom="0" right="0"/>
             <constraints>
               <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="1" fill="1" indent="0" use-parent-layout="false">
                 <minimum-size width="70" height="70"/>
@@ -387,7 +387,7 @@
           <grid id="bff7f" binding="tab3D" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="0" left="0" bottom="0" right="0"/>
             <constraints>
-              <tabbedpane title="Peel the Onion"/>
+              <tabbedpane title="Preview 3D"/>
             </constraints>
             <properties/>
             <border type="none"/>

diff --git a/src/photon/application/MainForm.java b/src/photon/application/MainForm.java
@@ -338,7 +338,7 @@ private void createUIComponents() {
         panel2.setLayout(new GridLayoutManager(1, 2, new Insets(0, 0, 0, 0), -1, -1));
         mainPanel.add(panel2, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
         final JPanel panel3 = new JPanel();
-        panel3.setLayout(new GridLayoutManager(1, 1, new Insets(10, 0, 0, 0), -1, -1));
+        panel3.setLayout(new GridLayoutManager(1, 1, new Insets(4, 0, 0, 0), -1, -1));
         panel3.setBackground(new Color(-1250068));
         panel3.setEnabled(false);
         panel2.add(panel3, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_NORTH, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, new Dimension(70, 70), new Dimension(70, 70), new Dimension(70, 70), 0, false));
@@ -419,7 +419,7 @@ private void createUIComponents() {
         layerImage.setBorder(BorderFactory.createTitledBorder(BorderFactory.createLineBorder(new Color(-16777216)), null));
         tab3D = new JPanel();
         tab3D.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
-        tabbedPane.addTab("Peel the Onion", tab3D);
+        tabbedPane.addTab("Preview 3D", tab3D);
         layer3D.setLayout(new GridLayoutManager(1, 1, new Insets(0, 0, 0, 0), -1, -1));
         tab3D.add(layer3D, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));
         layer3D.add(render3D, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, null, null, null, 0, false));

diff --git a/src/photon/application/render/OnionPanel.java b/src/photon/application/render/OnionPanel.java
@@ -131,9 +131,9 @@ public void drawLayer(int layerNo, PhotonFileLayer fileLayer, PhotonFile photonF
                     if (i < (showLayers - 20)) {
                         col = 64 + (i * 100 / showLayers);
                     } else {
-                        col = 244 - (showLayers-i)*4;
+                        col = 204 - (showLayers-i)*2;
                     }
-                    baseElement.setColor(0, col, col);
+                    baseElement.setColor(0, col, col / 2);
                     ///baseElement.setColor(0, 64 + (i * 100 / showLayers), 0);
                 }
                 world.add(baseElement);
@@ -169,7 +169,7 @@ public void drawLayer(int layerNo, PhotonFileLayer fileLayer, PhotonFile photonF
         }
 
 
-        world.rotate(new RotationBaseMatrix(-1.7, 0, 0));
+        world.rotate(new RotationBaseMatrix(-1.8, 0, 0));
 
         repaint();
     }

diff --git a/src/photon/application/utilities/PhotonLoadWorker.java b/src/photon/application/utilities/PhotonLoadWorker.java
@@ -73,6 +73,7 @@ protected void done() {
         if (mainForm.photonFile!=null) {
             mainForm.openBtn.setEnabled(true);
             mainForm.saveBtn.setEnabled(true);
+            mainForm.informationBtn.setEnabled(true);
             mainForm.tabPreviewLarge.setEnabled(true);
             mainForm.tabPreviewSmall.setEnabled(true);
             mainForm.showFileInformation();