Commit cb63000c authored by Timothy Borunov's avatar Timothy Borunov
Browse files

Minor merged changes

parent d2baeec1

.idea/misc.xml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    </option>

    <option name="workspaceImportForciblyTurnedOn" value="true" />

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_X" default="true" project-jdk-name="22" project-jdk-type="JavaSDK">

  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="22" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/out" />

  </component>

</project>
 
 No newline at end of file

src/main/java/org/example/newmat/GraphicsAndWindowsTest.java

+9 −7
Original line number Diff line number Diff line
@@ -51,11 +51,13 @@ public class GraphicsAndWindowsTest extends Application { 
        VisibleWindow sceneWindow = new VisibleWindow(500, -250, -250);

        Box ourWindow = sceneWindow.makeWindow();



//        ObstacleField obs = new ObstacleField(sceneWindow.getWindowSize(),sceneWindow.getXOffset(),

//                sceneWindow.getYOffset(),350,100, 20, 50, "Box",

//                Color.ORANGERED);



        ObstacleField obs = new ObstacleField(sceneWindow.getWindowSize(),sceneWindow.getXOffset(),

                sceneWindow.getYOffset(),350,100, 20, 50, "Box",

                Color.ORANGERED);



        String[] ob2 = {"--image", "src/teapot.txt", "--speed", "20", "--dir", "4,", "10,", "6"};

        String[] ob3 = {"--image", "src/armadillo.txt", "--speed", "5", "--dir", "1,", "1,", "1"};

        String[] ob3 = {"--image", "src/teapot.txt", "--speed", "5", "--dir", "1,", "1,", "1"};

        String[] ob4 = {"--image", "src/teapot.txt", "--speed", "100", "--dir", "3,", "5,", "7"};

        MovingObject newObject1 = new MovingObject(getParameters().getRaw().toArray(new String[0]));

        MovingObject newObject2 = new MovingObject(ob2);
@@ -79,7 +81,7 @@ public class GraphicsAndWindowsTest extends Application { 
        group3D.setTranslateZ(250);

        group3D.getChildren().add(ourWindow);

        group3D.getChildren().add(new AmbientLight(Color.WHITE));

        //obs.addToGroup(group3D);

        obs.addToGroup(group3D);



        // NOTE: Due to the perspectiveCamera it looks like it is rotating even though it isn't

        // If you comment out this line and the scene.setCamera(camera) line
@@ -249,7 +251,7 @@ public class GraphicsAndWindowsTest extends Application { 
                            //mesh.getPoints().setAll(points);



                        }

                    /*



                    if(obs.checkCollision(meshBounds[i])){

                        switch (lastChanged){

                            case 1: direction[i][0] *= -1;
@@ -262,7 +264,7 @@ public class GraphicsAndWindowsTest extends Application { 
                        }

                    }



                     */







                        objects[i].updateTranslate(objects[i].getTranslate().getX() + direction[i][0], objects[i].getTranslate().getY() + direction[i][1], objects[i].getTranslate().getZ() + direction[i][2]);