Fix rebase errors.

chunky-dev · Oct 2, 2022 · eef4b36 · eef4b36
1 parent bf8e3c9
commit eef4b36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/chunky/src/java/se/llbit/chunky/model/AABBModel.java b/chunky/src/java/se/llbit/chunky/model/AABBModel.java
@@ -148,13 +148,10 @@ public boolean intersect(Ray ray, Scene scene) {
           }
         }
 
-        if (side != -1) {
-          boolean hit = intersectFace(ray, scene, textures[i][side],
-              mapping != null ? mapping[i][side] : null,
-              tintedFacesBox != null ? tintedFacesBox[side] : Tint.NONE);
-          hitTexture = hit ? textures[i][side] : hitTexture;
-          hitSide = hit ? side : hitSide;
-          ray.t = hit ? ray.tNext: ray.t;
+        if (hit) {
+          ray.t = ray.tNext;
+          hitTexture = textures[i][side];
+          hitSide = side;
         }
       }
     }

diff --git a/chunky/src/java/se/llbit/chunky/model/QuadModel.java b/chunky/src/java/se/llbit/chunky/model/QuadModel.java
@@ -6,6 +6,7 @@
 import se.llbit.chunky.resources.pbr.NormalMap;
 import se.llbit.math.Quad;
 import se.llbit.math.Ray;
+import se.llbit.math.Vector3;
 
 import java.util.Random;
 

diff --git a/chunky/src/java/se/llbit/chunky/resources/Texture.java b/chunky/src/java/se/llbit/chunky/resources/Texture.java
@@ -1293,7 +1293,7 @@ public float[] getColor(double u, double v) {
    * @return color
    */
   public final float[] getColor(int x, int y) {
-    if(usesAverageColor)
+    if(usesAverageColor) {
       return avgColorFlat;
     }
     float[] result = new float[4];