Commit b112d968 authored by Radek Ošlejšek's avatar Radek Ošlejšek
Browse files

Rendering toolbar

parent 45b31d13

GUI/src/main/java/cz/fidentis/analyst/gui/canvas/Canvas.form

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
          <Color blue="28" green="28" red="28" type="rgb"/>

        </Property>

        <Property name="toolTipText" type="java.lang.String" value=""/>

        <Property name="opaque" type="boolean" value="true"/>

      </Properties>

      <Events>

        <EventHandler event="componentResized" listener="java.awt.event.ComponentListener" parameters="java.awt.event.ComponentEvent" handler="jLayeredPane1ComponentResized"/>
@@ -191,6 +190,9 @@ 
        </Component>

        <Component class="javax.swing.JLabel" name="jLabel1">

          <Properties>

            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">

              <Color blue="28" green="28" red="28" type="rgb"/>

            </Property>

            <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">

              <Image iconType="3" name="/navigBackground.png"/>

            </Property>

GUI/src/main/java/cz/fidentis/analyst/gui/canvas/Canvas.java

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ public class Canvas extends javax.swing.JPanel { 


        jLayeredPane1.setBackground(new java.awt.Color(40, 40, 40));

        jLayeredPane1.setToolTipText("");

        jLayeredPane1.setOpaque(true);

        jLayeredPane1.addComponentListener(new java.awt.event.ComponentAdapter() {

            public void componentResized(java.awt.event.ComponentEvent evt) {

                jLayeredPane1ComponentResized(evt);
@@ -290,6 +289,7 @@ public class Canvas extends javax.swing.JPanel { 
        jLayeredPane1.add(plusNavigationButton);

        plusNavigationButton.setBounds(30, 90, 30, 30);



        jLabel1.setBackground(new java.awt.Color(40, 40, 40));

        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/navigBackground.png"))); // NOI18N

        jLayeredPane1.add(jLabel1);

        jLabel1.setBounds(30, 10, 90, 90);

GUI/src/main/java/cz/fidentis/analyst/gui/core/RenderingToolBar.java

+28 −10
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package cz.fidentis.analyst.gui.core; 
import com.jogamp.opengl.GL2;

import cz.fidentis.analyst.gui.canvas.Canvas;

import cz.fidentis.analyst.gui.scene.DrawableMesh;

import java.awt.Color;

import java.awt.event.MouseAdapter;

import java.awt.event.MouseEvent;

import java.net.URL;
@@ -21,21 +22,19 @@ import org.openide.awt.Mnemonics; 
 */

public class RenderingToolBar extends JToolBar {

    

    public static final int WIDTH = 40;

    public static final int WIDTH = 48;

    public static final Color REFLECTIONS_COLOR = Color.DARK_GRAY;

    

    public enum Button {

        WIREFRAME,

        BACKGROUND;

        WIREFRAME,  // wire-frame vs. filled triangles

        BACKGROUND, // light vs. dark background

        REFLECTIONS; // ligths producing reflections on surface

        

        @Override

        public String toString() {

            switch (this) {

                case WIREFRAME:

                    return "wireframe";

                case BACKGROUND:

                    return "background";

                default:

                    return toString();

                    return super.toString().toLowerCase();

            }

        }

    }
@@ -60,12 +59,14 @@ public class RenderingToolBar extends JToolBar { 
    private void initButtons() {

        for (Button butEnum: Button.values()) {

            JButton button = new JButton();

            URL icon = getClass().getResource("/" + butEnum + "32x32.png");

            URL icon = getClass().getResource("/" + butEnum + "28x28.png");

            if (icon != null) {

                button.setIcon(new ImageIcon(getClass().getResource("/" + butEnum + "32x32.png")));

                button.setIcon(new ImageIcon(icon));

            }

            Mnemonics.setLocalizedText(button, org.openide.util.NbBundle.getMessage(RenderingToolBar.class, "RenderingToolBar." + butEnum +".text"));

            button.setFocusable(false);

            button.setText(null);

            button.setToolTipText(butEnum.toString());

            button.setHorizontalTextPosition(SwingConstants.CENTER);

            button.setVerticalTextPosition(SwingConstants.BOTTOM);

            buttons.put(butEnum, button);
@@ -87,6 +88,9 @@ public class RenderingToolBar extends JToolBar { 
                        case BACKGROUND:

                            backgroundButtonClicked(evt);

                            break;

                        case REFLECTIONS:

                            reflectionsButtonClicked(evt);

                            break;

                    }

                }

            });
@@ -118,4 +122,18 @@ public class RenderingToolBar extends JToolBar { 
        }

        canvas.renderScene();

    }

    

    private void reflectionsButtonClicked(MouseEvent evt) {

        boolean on = buttons.get(Button.REFLECTIONS).isSelected();

        for (DrawableMesh dm: canvas.getScene().getDrawables()) {

            if (on) {

                dm.setHighlights(Color.BLACK);

                buttons.get(Button.REFLECTIONS).setSelected(false);

            } else {

                dm.setHighlights(REFLECTIONS_COLOR);

                buttons.get(Button.REFLECTIONS).setSelected(true);

            }

        }

        canvas.renderScene();

    }

}

GUI/src/main/java/cz/fidentis/analyst/gui/scene/DrawableMesh.java

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ public class DrawableMesh { 
    /**

     * {@link Color} of mesh

     */

    private Color color = new Color(255, 255, 255);

    private Color color = new Color(224, 172, 105);

    /**

     * {@link Color} of highlights

     */

GUI/src/main/resources/background28x28.png

0 → 100644
+8.82 KiB
Loading image diff...