Merge pull request #77 from ArtifactForms/working2

update

Author: ArtifactForms

pom.xml

@@ -13,7 +13,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <release>15</release>
+                    <release>17</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -23,6 +23,25 @@
                 <configuration>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.googlecode.mavennatives</groupId>
+                <artifactId>maven-nativedependencies-plugin</artifactId>
+                <version>0.0.7</version>
+                <executions>
+                    <execution>
+                        <id>unpack-natives</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/natives
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <repositories>
@@ -98,7 +117,13 @@
         <dependency>
             <groupId>net.java.jinput</groupId>
             <artifactId>jinput</artifactId>
-            <version>2.0.9</version>
+            <version>2.0.10</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.jinput</groupId>
+            <artifactId>jinput</artifactId>
+            <version>2.0.10</version>
+            <classifier>natives-all</classifier>
         </dependency>
     </dependencies>
 </project>

src/main/java/engine/components/SmoothFlyByCameraControl.java

@@ -45,7 +45,7 @@ public class SmoothFlyByCameraControl extends AbstractComponent {
   private float moveSpeed = DEFAULT_MOVE_SPEED;
   private float acceleration = 10f;
   private float deceleration = 8f;
-  private float speedBoostMultiplier = 3;
+  private float speedBoostMultiplier = 3f;
 
   private Input input;
   private Camera camera;

src/main/java/engine/debug/FpsGraph.java

@@ -53,7 +53,15 @@ private void renderFpsGraph(Graphics g, int width, int height) {
     }
 
     // Draw axis labels
+    g.setColor(Color.BLACK);
+    renderAxisLabels(g, x + 1, y + 1, height);
     g.setColor(Color.WHITE);
+    renderAxisLabels(g, x, y, height);
+  }
+
+  private void renderAxisLabels(Graphics g, int x, int y, int height) {
+    float maxFps = fpsHistory.getMaxFps();
+
     g.text("0 FPS", x, y + height + 15); // Min FPS label
     g.text((int) maxFps + " FPS", x, y - 5); // Max FPS label
   }

src/main/java/engine/demos/landmass/ProceduralLandmassDemo.java

@@ -11,7 +11,6 @@
 import engine.scene.SceneNode;
 import engine.scene.camera.PerspectiveCamera;
 import engine.scene.light.DirectionalLight;
-import engine.ui.LoadingScreen;
 import math.Color;
 import math.Vector3f;
 import mesh.Mesh3D;
@@ -51,7 +50,7 @@ public enum DrawMode {
   private Scene scene;
   //  private EndlessTerrain endlessTerrain;
 
-  private LoadingScreen loadingScreen;
+//  private LoadingScreen loadingScreen;
   private RoundReticle roundReticle;
 
   public static void main(String[] args) {
@@ -101,8 +100,8 @@ private void setupUI() {
     rootUI.addChild(reticleNode);
 
     SceneNode loadingScreenNode = new SceneNode();
-    loadingScreen = new LoadingScreen();
-    loadingScreenNode.addComponent(loadingScreen);
+//    loadingScreen = new LoadingScreen();
+//    loadingScreenNode.addComponent(loadingScreen);
     rootUI.addChild(loadingScreenNode);
   }
 
@@ -143,7 +142,7 @@ private void createTerrain() {
     scene.addNode(chunkDisplayNode);
 
     roundReticle.setActive(true);
-    loadingScreen.hide();
+//    loadingScreen.hide();
   }
 
   /** Sets up the camera with smooth fly-by controls. */

src/main/java/engine/demos/voxels/ChunkMesher.java

@@ -29,11 +29,11 @@ public class ChunkMesher {
 
   private static ArrayList<Vector2f> uvs;
   public static Material sharedMaterial;
-  private static TextureAtlas textureAtlas;
+  private static TextureAtlas2 textureAtlas;
 
   static {
     sharedMaterial = new Material();
-    textureAtlas = new TextureAtlas();
+    textureAtlas = new TextureAtlas2();
     Texture texture = textureAtlas.getTexture();
     texture.setFilterMode(FilterMode.POINT);
     sharedMaterial.setDiffuseTexture(texture);

src/main/java/engine/demos/voxels/GameSettings.java

@@ -4,7 +4,7 @@ public class GameSettings {
 
   public static boolean textureNoise = false;
 
-  public static boolean textureDebugText = true;
+  public static boolean textureDebugText = false;
 
   public static boolean textureBackground = false;
 

src/main/java/engine/demos/voxels/Hotbar.java

@@ -22,7 +22,7 @@ public class Hotbar extends AbstractComponent implements RenderableComponent {
 
   // Hotbar configuration
   private static final int SCALE = 4;
-  private static final int SIZE = 19;
+  private static final int SIZE = 16;
   private static final int BORDER = 1;
   private static final int MARGIN = 20;
   private static final int SLOTS = 9;
@@ -97,10 +97,15 @@ private void drawHotbarSlots(Graphics2D g2d) {
       g2d.setColor(java.awt.Color.LIGHT_GRAY);
       g2d.drawRoundRect(x, 0, SIZE - 1, SIZE - 1, 2, 2);
 
-      // Slot decorations
+      // Slot highlights
       g2d.setColor(java.awt.Color.GRAY);
-      g2d.drawLine(x + 2, 1, x + SIZE - 2, 1); // Horizontal
-      g2d.drawLine(x + 1, 1, x + 1, SIZE - 2); // Vertical
+      g2d.drawLine(x + 2, 1, x + SIZE - 2, 1); // Horizontal top
+      g2d.drawLine(x + 1, 1, x + 1, SIZE - 2); // Vertical top
+
+      //      // Slot shadows
+      g2d.setColor(java.awt.Color.DARK_GRAY);
+      g2d.drawLine(x + 2, SIZE - 2, x + SIZE - 2, SIZE - 2); // Horizontal bottom
+      g2d.drawLine(x + SIZE - 2, 2, x + SIZE - 2, SIZE - 2); // Vertical bottom
     }
   }
 
@@ -136,5 +141,4 @@ public void onDetach() {
   public void onUpdate(float tpf) {
     // Optional: Add update logic (e.g., animations or interactions)
   }
-  
 }

src/main/java/engine/demos/voxels/Player.java

@@ -5,9 +5,15 @@
 public class Player {
 
   private Vector3f position;
+  private Vector3f velocity;
+  private float width = 0.6f;
+  private float height = 1.8f;
+  private boolean grounded;
 
   public Player() {
     position = new Vector3f();
+    velocity = new Vector3f();
+    grounded = false;
   }
 
   public Vector3f getPosition() {
@@ -17,4 +23,28 @@ public Vector3f getPosition() {
   public void setPosition(Vector3f position) {
     this.position = position;
   }
+
+  public Vector3f getVelocity() {
+    return velocity;
+  }
+
+  public void setVelocity(Vector3f velocity) {
+    this.velocity = velocity;
+  }
+
+  public float getWidth() {
+    return width;
+  }
+
+  public float getHeight() {
+    return height;
+  }
+
+  public boolean isGrounded() {
+    return grounded;
+  }
+
+  public void setGrounded(boolean grounded) {
+    this.grounded = grounded;
+  }
 }

src/main/java/engine/demos/voxels/PlayerVisual.java

@@ -12,36 +12,35 @@
 public class PlayerVisual extends AbstractComponent implements RenderableComponent {
 
   private Mesh3D mesh;
-  
+
   public PlayerVisual() {
-      mesh = new BoxCreator(0.9f, 1.8f, 0.9f).create();
-      mesh.apply(new SnapToGroundModifier());
-      mesh.apply(new TranslateModifier(0, -0.5f, 0));
+    mesh = new BoxCreator(0.9f, 1.8f, 0.9f).create();
+    mesh.apply(new SnapToGroundModifier());
+    mesh.apply(new TranslateModifier(0, -0.5f, 0));
   }
-    
+
   @Override
-  public void onAttach() {
-    // TODO Auto-generated method stub
-    
+  public void render(Graphics g) {
+    g.setColor(Color.YELLOW);
+    g.drawFaces(mesh);
+    g.drawLine(0, 0, 0, 0, -200, 0);
   }
 
   @Override
-  public void onDetach() {
+  public void onUpdate(float tpf) {
     // TODO Auto-generated method stub
-    
+
   }
 
   @Override
-  public void render(Graphics g) {
-      g.setColor(Color.YELLOW);
-      g.drawFaces(mesh);
-      g.drawLine(0, 0, 0, 0, -200, 0);
+  public void onAttach() {
+    // TODO Auto-generated method stub
+
   }
 
   @Override
-  public void onUpdate(float tpf) {
+  public void onDetach() {
     // TODO Auto-generated method stub
-    
+
   }
-  
 }

src/main/java/engine/demos/voxels/TextureAtlas.java

@@ -17,7 +17,7 @@ public class TextureAtlas {
   private boolean useNoise = GameSettings.textureNoise;
   private boolean drawDebugText = GameSettings.textureDebugText;
   private boolean fillTextureBackground = GameSettings.textureBackground;
-  private float epsilon = 0.001f; // Small margin to prevent texture bleeding
+  private float epsilon = 0.002f; // Small margin to prevent texture bleeding
   private int tileSize = 128;
   private int columns = 6; // 6 faces per block
   private int rows = BlockType.values().length;