Commit: ccc7ebe0a26a665dd93e6e5c5e7670f7be672f96 - HotshotIOS (hg)

Commit MetaInfo

• Revisão: ccc7ebe0a26a665dd93e6e5c5e7670f7be672f96 (tree)
• Hora: 2021-06-20 22:10:10
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Mensagem de Log

Added button for adding asteroids directly.

Mudança Sumário

• modified: HotshotEditor/src/com/javafx/experiments/jfx3dviewer/MainController.java
• modified: HotshotEditor/src/com/javafx/experiments/jfx3dviewer/SettingsController.java
• modified: HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings.fxml
• modified: HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings_old.fxml
• delete: HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings__.fxml

Diff

diff -r f58d32108187 -r ccc7ebe0a26a HotshotEditor/src/com/javafx/experiments/jfx3dviewer/MainController.java
--- a/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/MainController.java	Thu Jun 17 13:01:22 2021 +0300
+++ b/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/MainController.java	Sun Jun 20 16:10:10 2021 +0300
@@ -87,6 +87,8 @@
  * Controller class for main fxml file.
  */
 public class MainController implements Initializable {
+
+    private static MainController singleton;
     public Button              endBtn;
     public Button              ffBtn;
     public CheckMenuItem       loadAsPolygonsCheckBox;
@@ -194,6 +196,7 @@
     @SuppressWarnings("deprecation")
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        singleton = this;
         try {
             // CREATE NAVIGATOR CONTROLS
             navigationPanel = FXMLLoader.load(MainController.class.getResource("/resources/com/javafx/experiments/jfx3dviewer/navigation.fxml"));
@@ -364,7 +367,7 @@
         updateStatus();
     }
 
-    private void load(File file) {
+    public void load(File file) {
         loadedPath = file;
         try {
             doLoad(file.toURI()
@@ -433,4 +436,8 @@
     private void requestSceneFocus() {
         contentModel.getSubScene().requestFocus();
     }
+
+    public static MainController getSingleton() {
+        return singleton;
+    }
 }

diff -r f58d32108187 -r ccc7ebe0a26a HotshotEditor/src/com/javafx/experiments/jfx3dviewer/SettingsController.java
--- a/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/SettingsController.java	Thu Jun 17 13:01:22 2021 +0300
+++ b/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/SettingsController.java	Sun Jun 20 16:10:10 2021 +0300
@@ -31,6 +31,7 @@
  */
 package com.javafx.experiments.jfx3dviewer;
 
+import java.io.File;
 import java.net.URL;
 import java.util.ResourceBundle;
 
@@ -41,6 +42,7 @@
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.DoubleProperty;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.Node;
@@ -531,4 +533,10 @@
                             "ambientEnable");
         sessionManager.bind(settings, "settingsPane");
     }
+
+    public void loadAsteroid(ActionEvent event) {
+        System.out.println("loading asteroid");
+
+        MainController.getSingleton().load(new File("/Users/sebastian/Downloads/BlackholeDarksunOnline6/HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/box.obj"));
+    }
 }

diff -r f58d32108187 -r ccc7ebe0a26a HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings.fxml
--- a/HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings.fxml	Thu Jun 17 13:01:22 2021 +0300
+++ b/HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings.fxml	Sun Jun 20 16:10:10 2021 +0300
@@ -34,6 +34,7 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Accordion?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ColorPicker?>
 <?import javafx.scene.control.Label?>
@@ -241,7 +242,7 @@
         <GridPane hgap="5.0" padding="$x3" styleClass="settings" vgap="5.0">
           <children>
             <Label text="Field of view:" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-            <Slider fx:id="fovSlider" majorTickUnit="40.0" max="180.0" min="0.0" minorTickCount="4" showTickLabels="true" showTickMarks="true" GridPane.columnIndex="1" GridPane.rowIndex="0" value="90" />
+            <Slider fx:id="fovSlider" majorTickUnit="40.0" max="180.0" min="0.0" minorTickCount="4" showTickLabels="true" showTickMarks="true" value="90" GridPane.columnIndex="1" GridPane.rowIndex="0" />
             <Label fx:id="nearClipLabel" text="Near clipping pane: &#10;   %.5f" GridPane.columnIndex="0" GridPane.rowIndex="1" />
             <Slider fx:id="nearClipSlider" majorTickUnit="1" max="5" min="-5" minorTickCount="4" showTickLabels="true" showTickMarks="true" GridPane.columnIndex="1" GridPane.rowIndex="1" />
             <Label fx:id="farClipLabel" text="Far clipping pane: &#10;   %.5f" GridPane.columnIndex="0" GridPane.rowIndex="2" />
@@ -311,6 +312,7 @@
                         <ToggleButton fx:id="asteroid5Toggle" layoutX="106.0" layoutY="10.0" mnemonicParsing="false" text="5" toggleGroup="$asteroidGroup" />
                      </children>
                   </HBox>
+                  <Button fx:id="loadAsteroidBtn" mnemonicParsing="false" onAction="#loadAsteroid" text="Add" GridPane.rowIndex="1" />
                </children>
             </GridPane>
          </content>

diff -r f58d32108187 -r ccc7ebe0a26a HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings__.fxml
--- a/HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings__.fxml	Thu Jun 17 13:01:22 2021 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Copyright (c) 2010, 2014, Oracle and/or its affiliates.
-All rights reserved. Use is subject to license terms.
-
-This file is available and licensed under the following license:
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
- - Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
- - Neither the name of Oracle Corporation nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<?import java.lang.*?>
-<?import java.net.*?>
-<?import java.util.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.ToolBar?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-<?import com.javafx.experiments.shape3d.*?>
-<?scenebuilder-stylesheet viewer.css?>
-
-<!--suppress JavaFxUnresolvedStyleClassReference -->
-
-<Accordion fx:id="settings" minWidth="0.0" prefHeight="798.0" prefWidth="279.0" xmlns:fx="http://javafx.com/fxml" fx:controller="com.javafx.experiments.jfx3dviewer.SettingsController">
-  <expandedPane>
-    <TitledPane fx:id="x5" animated="false" expanded="true" text="Hierarchy">
-      <content>
-        <TreeTableView fx:id="hierarachyTreeTable" editable="true" prefHeight="200.0" prefWidth="200.0">
-          <columns>
-            <TreeTableColumn fx:id="nodeColumn" editable="false" prefWidth="75.0" sortable="false" text="Node" />
-            <TreeTableColumn fx:id="idColumn" editable="false" prefWidth="75.0" text="Id" />
-            <TreeTableColumn fx:id="visibilityColumn" editable="true" text="Visibility" />
-            <TreeTableColumn fx:id="widthColumn" editable="false" text="W" />
-            <TreeTableColumn fx:id="heightColumn" editable="false" text="H" />
-            <TreeTableColumn fx:id="depthColumn" editable="false" text="D" />
-          </columns>
-        </TreeTableView>
-      </content>
-    </TitledPane>
-  </expandedPane>
-  <panes>
-    <TitledPane fx:id="x4" animated="false" expanded="false" text="Options">
-      <content>
-        <GridPane hgap="5.0" styleClass="settings" vgap="5.0">
-          <children>
-            <Label text="Show Axis:" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-            <Label text="Y Up:" GridPane.columnIndex="0" GridPane.rowIndex="1" />
-            <CheckBox fx:id="showAxisCheckBox" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-            <CheckBox fx:id="yUpCheckBox" mnemonicParsing="false" selected="true" text="" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-            <Label text="MSAA Antialiasing" GridPane.columnIndex="0" GridPane.rowIndex="2" />
-            <CheckBox id="msaaCheckBox" fx:id="msaaCheckBox" mnemonicParsing="false" selected="true" text="" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-            <Label text="Background Color" GridPane.columnIndex="0" GridPane.rowIndex="3" />
-            <ColorPicker fx:id="backgroundColorPicker" GridPane.columnIndex="1" GridPane.rowIndex="3" />
-            <Label text="Wireframe" GridPane.columnIndex="0" GridPane.rowIndex="4" />
-            <CheckBox fx:id="wireFrameCheckbox" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-            <Label text="Subdivision level" GridPane.columnIndex="0" GridPane.rowIndex="5" />
-            <HBox prefHeight="-1.0" prefWidth="-1.0" GridPane.columnIndex="1" GridPane.rowIndex="5">
-              <children>
-                <ToggleButton mnemonicParsing="false" selected="true" styleClass="left-pill" text="None" userData="0">
-                  <toggleGroup>
-                    <ToggleGroup fx:id="subdivisionLevelGroup" />
-                  </toggleGroup>
-                </ToggleButton>
-                <ToggleButton mnemonicParsing="false" styleClass="center-pill" text="1" toggleGroup="$subdivisionLevelGroup" userData="1" />
-                <ToggleButton mnemonicParsing="false" styleClass="center-pill" text="2" toggleGroup="$subdivisionLevelGroup" userData="2" />
-                <ToggleButton mnemonicParsing="false" styleClass="right-pill" text="3" toggleGroup="$subdivisionLevelGroup" userData="3" />
-              </children>
-            </HBox>
-            <Label text="Creases (Boundary Rules)" GridPane.columnIndex="0" GridPane.rowIndex="6" />
-            <HBox prefHeight="-1.0" prefWidth="-1.0" GridPane.columnIndex="1" GridPane.rowIndex="6">
-              <children>
-                <ToggleButton mnemonicParsing="false" selected="true" styleClass="left-pill" text="Edges">
-                  <toggleGroup>
-                    <ToggleGroup fx:id="subdivisionBoundaryGroup" />
-                  </toggleGroup>
-                  <userData>
-                    <SubdivisionMesh.BoundaryMode fx:value="CREASE_EDGES"/>
-                  </userData>
-                  <tooltip>
-                    <Tooltip text="Only edges at the boundary are treated as creases" />
-                  </tooltip>
-                </ToggleButton>
-                <ToggleButton mnemonicParsing="false" styleClass="right-pill" text="All" toggleGroup="$subdivisionBoundaryGroup">
-                  <userData>
-                    <SubdivisionMesh.BoundaryMode fx:value="CREASE_ALL"/>
-                  </userData>
-                  <tooltip>
-                    <Tooltip text="Edges and points at the boundary are treated as creases" />
-                  </tooltip>
-                </ToggleButton>
-              </children>
-            </HBox>
-            <Label text="Smooth Texture Map" GridPane.columnIndex="0" GridPane.rowIndex="7" />
-            <HBox prefHeight="-1.0" prefWidth="-1.0" GridPane.columnIndex="1" GridPane.rowIndex="7">
-              <children>
-                <ToggleButton mnemonicParsing="false" selected="true" styleClass="left-pill" text="None">
-                  <toggleGroup>
-                    <ToggleGroup fx:id="subdivisionSmoothGroup" />
-                  </toggleGroup>
-                  <userData>
-                    <SubdivisionMesh.MapBorderMode fx:value="NOT_SMOOTH"/>
-                  </userData>
-                  <tooltip>
-                    <Tooltip text="Keeps the same uvs for all control points" />
-                  </tooltip>
-                </ToggleButton>
-                <ToggleButton mnemonicParsing="false" styleClass="center-pill" text="Internal" toggleGroup="$subdivisionSmoothGroup">
-                  <userData>
-                    <SubdivisionMesh.MapBorderMode fx:value="SMOOTH_INTERNAL"/>
-                  </userData>
-                  <tooltip>
-                    <Tooltip text="Smooths uvs of points at corners" />
-                  </tooltip>
-                </ToggleButton>
-                <ToggleButton mnemonicParsing="false" styleClass="right-pill" text="All" toggleGroup="$subdivisionSmoothGroup">
-                  <userData>
-                    <SubdivisionMesh.MapBorderMode fx:value="SMOOTH_ALL"/>
-                  </userData>
-                  <tooltip>
-                    <Tooltip text="Smooths uvs of points at boundaries" />
-                  </tooltip>
-                </ToggleButton>
-              </children>
-            </HBox>
-            <Region maxHeight="1.7976931348623157E308" prefHeight="-1.0" prefWidth="-1.0" GridPane.columnIndex="0" GridPane.rowIndex="8" />
-          </children>
-          <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-          </columnConstraints>
-          <padding>
-            <Insets bottom="8.0" left="8.0" right="8.0" top="8.0" fx:id="x3" />
-          </padding>
-          <rowConstraints>
-            <RowConstraints minHeight="10.0" prefHeight="-1.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="-1.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" prefHeight="-1.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-            <RowConstraints minHeight="10.0" vgrow="ALWAYS" />
-          </rowConstraints>
-        </GridPane>
-      </content>
-    </TitledPane>
-    <TitledPane fx:id="x2" animated="false" text="Lights">
-      <content>
-        <ScrollPane fitToWidth="true" prefHeight="200.0" prefWidth="200.0">
-          <content>
-            <GridPane hgap="5.0" padding="$x3" styleClass="settings" vgap="5.0">
-              <children>
-                <Label text="Color:" GridPane.columnIndex="0" GridPane.rowIndex="2" />
-                <Label maxWidth="1.7976931348623157E308" styleClass="settings-header" text="Ambient" GridPane.columnIndex="0" GridPane.columnSpan="2147483647" GridPane.hgrow="ALWAYS" GridPane.rowIndex="0" />
-                <ColorPicker fx:id="ambientColorPicker" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-                <Label text="Enabled" GridPane.columnIndex="0" GridPane.rowIndex="1" />
-                <CheckBox fx:id="ambientEnableCheckbox" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-                <Label text="Color:" GridPane.columnIndex="0" GridPane.rowIndex="5" />
-                <ColorPicker id="ambientColorPicker" fx:id="light1ColorPicker" GridPane.columnIndex="1" GridPane.rowIndex="5" />
-                <Label maxWidth="1.7976931348623157E308" styleClass="settings-header" text="Light 1 (Camera)" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" />
-                <Label text="Enabled" GridPane.columnIndex="0" GridPane.rowIndex="4" />
-                <CheckBox fx:id="light1EnabledCheckBox" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="4" />
-                <Label text="Lock to Camera" GridPane.columnIndex="0" GridPane.rowIndex="6" />
-                <CheckBox fx:id="light1followCameraCheckBox" mnemonicParsing="false" selected="true" text="" GridPane.columnIndex="1" GridPane.rowIndex="6" />
-                <Label text="X" GridPane.columnIndex="0" GridPane.rowIndex="7" />
-                <Slider fx:id="light1x" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="7" />
-                <Label text="Y" GridPane.columnIndex="0" GridPane.rowIndex="8" />
-                <Slider fx:id="light1y" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="8" />
-                <Label text="Z" GridPane.columnIndex="0" GridPane.rowIndex="9" />
-                <Slider fx:id="light1z" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="9" />
-                <Label maxWidth="1.7976931348623157E308" styleClass="settings-header" text="Light 2" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.rowIndex="10" />
-                <Label text="Enabled" GridPane.columnIndex="0" GridPane.rowIndex="11" />
-                <CheckBox fx:id="light2EnabledCheckBox" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="11" />
-                <Label text="X" GridPane.columnIndex="0" GridPane.rowIndex="13" />
-                <Slider fx:id="light2x" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="13" />
-                <Label text="Y" GridPane.columnIndex="0" GridPane.rowIndex="14" />
-                <Slider fx:id="light2y" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="14" />
-                <Label text="Z" GridPane.columnIndex="0" GridPane.rowIndex="15" />
-                <Slider fx:id="light2z" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="15" />
-                <Label maxWidth="1.7976931348623157E308" styleClass="settings-header" text="Light 3" GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.hgrow="ALWAYS" GridPane.rowIndex="16" />
-                <Label text="Enabled" GridPane.columnIndex="0" GridPane.rowIndex="17" />
-                <CheckBox fx:id="light3EnabledCheckBox" mnemonicParsing="false" text="" GridPane.columnIndex="1" GridPane.rowIndex="17" />
-                <Label text="Lock to Camera" GridPane.columnIndex="0" GridPane.rowIndex="19" />
-                <Slider fx:id="light3x" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="19" />
-                <Label text="Y" GridPane.columnIndex="0" GridPane.rowIndex="20" />
-                <Slider fx:id="light3y" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="20" />
-                <Label text="Z" GridPane.columnIndex="0" GridPane.rowIndex="21" />
-                <Slider fx:id="light3z" majorTickUnit="20.0" max="100.0" min="-100.0" minorTickCount="5" showTickLabels="true" showTickMarks="false" value="0.0" GridPane.columnIndex="1" GridPane.rowIndex="21" />
-                <Label text="Color:" GridPane.columnIndex="0" GridPane.rowIndex="12" />
-                <ColorPicker fx:id="light2ColorPicker" GridPane.columnIndex="1" GridPane.rowIndex="12" />
-                <Label text="Color" GridPane.columnIndex="0" GridPane.rowIndex="18" />
-                <ColorPicker fx:id="light3ColorPicker" GridPane.columnIndex="1" GridPane.rowIndex="18" />
-              </children>
-              <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-              </columnConstraints>
-              <rowConstraints>
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-              </rowConstraints>
-            </GridPane>
-          </content>
-        </ScrollPane>
-      </content>
-    </TitledPane>
-    <TitledPane fx:id="x1" animated="false" text="Camera">
-      <content>
-        <GridPane hgap="5.0" padding="$x3" styleClass="settings" vgap="5.0">
-          <children>
-            <Label text="Field of view:" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-            <Slider fx:id="fovSlider" majorTickUnit="40.0" max="180.0" min="0.0" minorTickCount="4" showTickLabels="true" showTickMarks="true" GridPane.columnIndex="1" GridPane.rowIndex="0" />
-            <Label fx:id="nearClipLabel" text="Near clipping pane: &#10;   %.5f" GridPane.columnIndex="0" GridPane.rowIndex="1" />
-            <Slider fx:id="nearClipSlider" majorTickUnit="1" max="5" min="-5" minorTickCount="4" showTickLabels="true" showTickMarks="true" GridPane.columnIndex="1" GridPane.rowIndex="1" />
-            <Label fx:id="farClipLabel" text="Far clipping pane: &#10;   %.5f" GridPane.columnIndex="0" GridPane.rowIndex="2" />
-            <Slider fx:id="farClipSlider" majorTickUnit="1" max="5" min="-5" minorTickCount="4" showTickLabels="true" showTickMarks="true" GridPane.columnIndex="1" GridPane.rowIndex="2" />
-          </children>
-          <columnConstraints>
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-          </columnConstraints>
-          <rowConstraints>
-            <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-
-          </rowConstraints>
-        </GridPane>
-      </content>
-    </TitledPane>
-    <TitledPane animated="false" expanded="true" text="Hierarchy" fx:id="x5">
-      <content>
-        <TreeTableView fx:id="hierarachyTreeTable" editable="true" prefHeight="200.0" prefWidth="200.0">
-          <columns>
-            <TreeTableColumn fx:id="nodeColumn" editable="false" prefWidth="75.0" sortable="false" text="Node" />
-            <TreeTableColumn fx:id="idColumn" editable="false" prefWidth="75.0" text="Id" />
-            <TreeTableColumn fx:id="visibilityColumn" editable="true" text="Visibility" />
-            <TreeTableColumn fx:id="widthColumn" editable="false" text="W" />
-            <TreeTableColumn fx:id="heightColumn" editable="false" text="H" />
-            <TreeTableColumn fx:id="depthColumn" editable="false" text="D" />
-          </columns>
-        </TreeTableView>
-      </content>
-    </TitledPane>
-    <TitledPane animated="false" expanded="false" text="Transforms" fx:id="x6">
-      <content>
-        <VBox>
-          <children>
-            <Label fx:id="selectedNodeLabel"/>
-            <ListView fx:id="transformsList" prefHeight="200.0" prefWidth="200.0">
-                <VBox.vgrow>ALWAYS</VBox.vgrow>
-            </ListView>
-          </children>
-        </VBox>
-      </content>
-    </TitledPane>
-      <TitledPane animated="false" text="Asteroid">
-         <content>
-            <GridPane>
-              <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-              </columnConstraints>
-              <rowConstraints>
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-              </rowConstraints>
-               <children>
-                  <Label text="Asteroid" />
-                  <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1">
-                     <children>
-                        <ToggleButton mnemonicParsing="false" text="ToggleButton" />
-                        <ToggleButton layoutX="10.0" layoutY="10.0" mnemonicParsing="false" text="ToggleButton" />
-                        <ToggleButton layoutX="74.0" layoutY="10.0" mnemonicParsing="false" text="ToggleButton" />
-                        <ToggleButton layoutX="96.0" layoutY="10.0" mnemonicParsing="false" text="ToggleButton" />
-                        <ToggleButton layoutX="106.0" layoutY="10.0" mnemonicParsing="false" text="ToggleButton" />
-                     </children>
-                  </HBox>
-               </children>
-            </GridPane>
-         </content>
-      </TitledPane>
-  </panes>
-</Accordion>

diff -r f58d32108187 -r ccc7ebe0a26a HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings_old.fxml
--- a/HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings_old.fxml	Thu Jun 17 13:01:22 2021 +0300
+++ b/HotshotEditor/src/resources/com/javafx/experiments/jfx3dviewer/settings_old.fxml	Sun Jun 20 16:10:10 2021 +0300
@@ -31,22 +31,36 @@
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
-<?import java.lang.*?>
-<?import java.net.*?>
-<?import java.util.*?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.control.MenuBar?>
-<?import javafx.scene.control.ToolBar?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-<?import com.javafx.experiments.shape3d.*?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Accordion?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ColorPicker?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.Slider?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.TitledPane?>
+<?import javafx.scene.control.ToggleButton?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.scene.control.TreeTableColumn?>
+<?import javafx.scene.control.TreeTableView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
 <?scenebuilder-stylesheet viewer.css?>
+
 <!--suppress JavaFxUnresolvedStyleClassReference -->
 
 <Accordion fx:id="settings" minWidth="0.0" prefHeight="798.0" prefWidth="279.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.javafx.experiments.jfx3dviewer.SettingsController">
   <panes>
-    <TitledPane fx:id="x4" animated="false" expanded="false" text="Options">
+    <TitledPane animated="false" expanded="false" text="Options" fx:id="x4">
       <content>
         <GridPane hgap="5.0" styleClass="settings" vgap="5.0">
           <children>
@@ -73,6 +87,52 @@
                 <ToggleButton mnemonicParsing="false" styleClass="right-pill" text="3" toggleGroup="$subdivisionLevelGroup" userData="3" />
               </children>
             </HBox>
+            <Label text="Creases (Boundary Rules)" GridPane.columnIndex="0" GridPane.rowIndex="6" />
+            <HBox prefHeight="-1.0" prefWidth="-1.0" GridPane.columnIndex="1" GridPane.rowIndex="6">
+              <children>
+                <ToggleButton mnemonicParsing="false" selected="true" styleClass="left-pill" text="Edges">
+                  <toggleGroup>
+                    <ToggleGroup fx:id="subdivisionBoundaryGroup" />
+                  </toggleGroup>
+
+                  <tooltip>
+                    <Tooltip text="Only edges at the boundary are treated as creases" />
+                  </tooltip>
+                </ToggleButton>
+                <ToggleButton mnemonicParsing="false" styleClass="right-pill" text="All" toggleGroup="$subdivisionBoundaryGroup">
+
+                  <tooltip>
+                    <Tooltip text="Edges and points at the boundary are treated as creases" />
+                  </tooltip>
+                </ToggleButton>
+              </children>
+            </HBox>
+            <Label text="Smooth Texture Map" GridPane.columnIndex="0" GridPane.rowIndex="7" />
+            <HBox prefHeight="-1.0" prefWidth="-1.0" GridPane.columnIndex="1" GridPane.rowIndex="7">
+              <children>
+                <ToggleButton mnemonicParsing="false" selected="true" styleClass="left-pill" text="None">
+                  <toggleGroup>
+                    <ToggleGroup fx:id="subdivisionSmoothGroup" />
+                  </toggleGroup>
+
+                  <tooltip>
+                    <Tooltip text="Keeps the same uvs for all control points" />
+                  </tooltip>
+                </ToggleButton>
+                <ToggleButton mnemonicParsing="false" styleClass="center-pill" text="Internal" toggleGroup="$subdivisionSmoothGroup">
+
+                  <tooltip>
+                    <Tooltip text="Smooths uvs of points at corners" />
+                  </tooltip>
+                </ToggleButton>
+                <ToggleButton mnemonicParsing="false" styleClass="right-pill" text="All" toggleGroup="$subdivisionSmoothGroup">
+
+                  <tooltip>
+                    <Tooltip text="Smooths uvs of points at boundaries" />
+                  </tooltip>
+                </ToggleButton>
+              </children>
+            </HBox>
             <Region maxHeight="1.7976931348623157E308" prefHeight="-1.0" prefWidth="-1.0" GridPane.columnIndex="0" GridPane.rowIndex="8" />
           </children>
           <columnConstraints>
@@ -96,7 +156,7 @@
         </GridPane>
       </content>
     </TitledPane>
-    <TitledPane fx:id="x2" animated="false" text="Lights">
+    <TitledPane animated="false" text="Lights" fx:id="x2">
       <content>
         <ScrollPane fitToWidth="true" prefHeight="200.0" prefWidth="200.0">
           <content>
@@ -176,12 +236,12 @@
         </ScrollPane>
       </content>
     </TitledPane>
-    <TitledPane fx:id="x1" animated="false" text="Camera">
+    <TitledPane animated="false" text="Camera" fx:id="x1">
       <content>
         <GridPane hgap="5.0" padding="$x3" styleClass="settings" vgap="5.0">
           <children>
             <Label text="Field of view:" GridPane.columnIndex="0" GridPane.rowIndex="0" />
-            <Slider fx:id="fovSlider" majorTickUnit="40.0" max="180.0" min="0.0" minorTickCount="4" showTickLabels="true" showTickMarks="true" GridPane.columnIndex="1" GridPane.rowIndex="0" />
+            <Slider fx:id="fovSlider" majorTickUnit="40.0" max="180.0" min="0.0" minorTickCount="4" showTickLabels="true" showTickMarks="true" GridPane.columnIndex="1" GridPane.rowIndex="0" value="90" />
             <Label fx:id="nearClipLabel" text="Near clipping pane: &#10;   %.5f" GridPane.columnIndex="0" GridPane.rowIndex="1" />
             <Slider fx:id="nearClipSlider" majorTickUnit="1" max="5" min="-5" minorTickCount="4" showTickLabels="true" showTickMarks="true" GridPane.columnIndex="1" GridPane.rowIndex="1" />
             <Label fx:id="farClipLabel" text="Far clipping pane: &#10;   %.5f" GridPane.columnIndex="0" GridPane.rowIndex="2" />
@@ -241,19 +301,78 @@
                   <Label text="Asteroid" />
                   <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1">
                      <children>
-                        <ToggleButton mnemonicParsing="false" selected="true" text="1">
+                        <ToggleButton fx:id="asteroid1Toggle" mnemonicParsing="false" selected="true" text="1">
                            <toggleGroup>
                               <ToggleGroup fx:id="asteroidGroup" />
                            </toggleGroup></ToggleButton>
-                        <ToggleButton layoutX="10.0" layoutY="10.0" mnemonicParsing="false" text="2" />
-                        <ToggleButton layoutX="74.0" layoutY="10.0" mnemonicParsing="false" text="3" toggleGroup="$asteroidGroup" />
-                        <ToggleButton layoutX="96.0" layoutY="10.0" mnemonicParsing="false" text="4" toggleGroup="$asteroidGroup" />
-                        <ToggleButton layoutX="106.0" layoutY="10.0" mnemonicParsing="false" text="5" toggleGroup="$asteroidGroup" />
+                        <ToggleButton fx:id="asteroid2Toggle" layoutX="10.0" layoutY="10.0" mnemonicParsing="false" text="2" />
+                        <ToggleButton fx:id="ateroid3Toggle" layoutX="74.0" layoutY="10.0" mnemonicParsing="false" text="3" toggleGroup="$asteroidGroup" />
+                        <ToggleButton fx:id="asteroid4Toggle" layoutX="96.0" layoutY="10.0" mnemonicParsing="false" text="4" toggleGroup="$asteroidGroup" />
+                        <ToggleButton fx:id="asteroid5Toggle" layoutX="106.0" layoutY="10.0" mnemonicParsing="false" text="5" toggleGroup="$asteroidGroup" />
                      </children>
                   </HBox>
                </children>
             </GridPane>
          </content>
       </TitledPane>
+      <TitledPane animated="false" text="Modifiers">
+        <content>
+          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+               <children>
+                  <GridPane layoutX="24.0" layoutY="17.0" prefHeight="73.0" prefWidth="220.0">
+                    <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                     <children>
+                        <HBox prefHeight="100.0" prefWidth="200.0">
+                           <children>
+                              <ToggleButton fx:id="translationButton" mnemonicParsing="false" selected="true" text="Translation">
+                                 <toggleGroup>
+                                    <ToggleGroup fx:id="modifiersGroup" />
+                                 </toggleGroup>
+                              </ToggleButton>
+                              <ToggleButton fx:id="rotationButton" mnemonicParsing="false" text="Rotation" toggleGroup="$modifiersGroup" />
+                              <ToggleButton fx:id="scalingButton" mnemonicParsing="false" text="Scaling" toggleGroup="$modifiersGroup" />
+                           </children>
+                        </HBox>
+                     </children>
+                  </GridPane>
+                  <VBox layoutX="24.0" layoutY="43.0" prefHeight="200.0" prefWidth="234.0">
+                     <children>
+                        <HBox prefHeight="100.0" prefWidth="200.0">
+                           <children>
+                              <Label text="Pos" />
+                              <TextField prefHeight="26.0" prefWidth="58.0" fx:id="xPosTextField" />
+                              <TextField fx:id="yPosTextField" layoutX="31.0" layoutY="10.0" prefHeight="26.0" prefWidth="58.0" />
+                              <TextField fx:id="zPosTextField" layoutX="89.0" layoutY="10.0" prefHeight="26.0" prefWidth="58.0" />
+                           </children>
+                        </HBox>
+                        <HBox prefHeight="100.0" prefWidth="200.0">
+                           <children>
+                              <Label text="Rot" />
+                              <TextField prefHeight="26.0" prefWidth="60.0" fx:id="xRotTextField" />
+                              <TextField fx:id="yRotTextField" layoutX="29.0" layoutY="10.0" prefHeight="26.0" prefWidth="60.0" />
+                              <TextField fx:id="zRotTextField" layoutX="89.0" layoutY="10.0" prefHeight="26.0" prefWidth="60.0" />
+                           </children>
+                        </HBox>
+                        <HBox prefHeight="100.0" prefWidth="200.0">
+                           <children>
+                              <Label text="Scl" />
+                              <TextField prefHeight="26.0" prefWidth="62.0" fx:id="xSclTextField" />
+                              <TextField fx:id="ySclTextField" layoutX="27.0" layoutY="10.0" prefHeight="26.0" prefWidth="62.0" />
+                              <TextField fx:id="zSclTextField" layoutX="89.0" layoutY="10.0" prefHeight="26.0" prefWidth="62.0" />
+                           </children>
+                        </HBox>
+                     </children>
+                  </VBox>
+               </children>
+            </AnchorPane>
+        </content>
+      </TitledPane>
   </panes>
 </Accordion>