Added height range to render condition

Author: TathanDev

common/src/main/java/fr/tathan/sky_aesthetics/client/DimensionRenderer.java

@@ -4,6 +4,7 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
 import com.mojang.blaze3d.vertex.VertexBuffer;
+import fr.tathan.SkyAesthetics;
 import fr.tathan.sky_aesthetics.client.skies.settings.*;
 import fr.tathan.sky_aesthetics.client.skies.utils.ShootingStar;
 import fr.tathan.sky_aesthetics.client.skies.utils.SkyHelper;
@@ -82,9 +83,10 @@ public void render(ClientLevel level, PoseStack poseStack, Matrix4f projectionMa
         this.skyColor.setSkyColor(level, camera, partialTick);
 
         SkyHelper.drawSky(poseStack.last().pose(), projectionMatrix);
+        SkyAesthetics.LOG.error("rotation {}", dayAngle);
 
         if(this.skyBoxSetting != null) {
-            this.skyBoxSetting.renderSkyBox(poseStack, projectionMatrix, camera);
+            this.skyBoxSetting.renderSkyBox(poseStack, projectionMatrix, camera,dayAngle);
         }
 
         this.fogSettings.runFogCallback(fogCallback);

common/src/main/java/fr/tathan/sky_aesthetics/client/screens/SkyModificationScreen.java

@@ -281,7 +281,7 @@ public static SkyProperties fromComponent(FlowLayout component) {
                         (int) skyBoxSetting.childById(DiscreteSliderComponent.class, "gradation").discreteValue(),
                         ResourceLocation.parse(skyBoxSetting.childById(TextBoxComponent.class, "texture").getValue()),
                         getVec3fFromComponent(skyBoxSetting.childById(FlowLayout.class, "rotation")).orElseGet(Vector3f::new),
-                        Optional.empty())
+                        Optional.of(Rotation.createDefaultSettings()))
                 );
 
         CollapsibleContainer lightSettings = component.childById(CollapsibleContainer.class, "light_settings");

common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/Rotation.java

@@ -4,6 +4,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.util.StringRepresentable;
+import org.joml.Matrix4f;
 import org.joml.Quaternionf;
 
 import java.util.Objects;
@@ -15,12 +16,15 @@ public record Rotation(Axis axis, String rotationType) {
             Codec.STRING.fieldOf("rotation").forGetter(Rotation::rotationType)
     ).apply(instance, Rotation::new));
 
+    public static Rotation createDefaultSettings() {
+        return new Rotation(Axis.XP, "NIGHT");
+    }
 
-    public void rotatePoseStack(PoseStack stack, float dayAngle){
+    public void rotatePoseStack(Matrix4f modelMatrix, float dayAngle){
         if(Objects.equals(rotationType, "NIGHT")){
             dayAngle = -dayAngle;
         }
-       stack.mulPose(axis.toQuaternion(dayAngle));
+        modelMatrix.rotate(axis.toQuaternion(dayAngle));
     }
 
     public enum Axis implements StringRepresentable {
@@ -29,7 +33,6 @@ public enum Axis implements StringRepresentable {
         ZP("ZP");
 
 
-
         public final String name;
 
         Axis(String name) {

common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/SkyBoxSetting.java

@@ -100,7 +100,7 @@ public VertexBuffer createSphere() {
     }
 
 
-    public void renderSkyBox(PoseStack poseStack, Matrix4f projectionMatrix, Camera camera) {
+    public void renderSkyBox(PoseStack poseStack, Matrix4f projectionMatrix, Camera camera, float dayAngle) {
         poseStack.pushPose();
 
         FogRenderer.setupNoFog();
@@ -121,6 +121,11 @@ public void renderSkyBox(PoseStack poseStack, Matrix4f projectionMatrix, Camera
                 .rotate(Axis.YP.rotationDegrees(this.rotation.y))
                 .rotate(Axis.ZP.rotationDegrees(this.rotation.z));
 
+        this.dynamicRotation.ifPresent((dynRota -> {
+            SkyAesthetics.LOG.error("rotation {}", dayAngle);
+            dynRota.rotatePoseStack(modelMatrix, dayAngle);
+        }));
+
         // Combine view and model matrices
         Matrix4f mvMatrix = new Matrix4f(viewMatrix).mul(modelMatrix);
 
@@ -133,7 +138,7 @@ public void renderSkyBox(PoseStack poseStack, Matrix4f projectionMatrix, Camera
     }
 
     public static SkyBoxSetting createDefaultSettings() {
-        return new SkyBoxSetting(100, ResourceLocation.parse("sky_aesthetics:textures/skyboxes/venus.png"), new Vector3f(0, 0, 0), Optional.empty());
+        return new SkyBoxSetting(100, ResourceLocation.parse("sky_aesthetics:textures/skyboxes/venus.png"), new Vector3f(0, 0, 0), Optional.of(Rotation.createDefaultSettings()));
     }
 
     static {

common/src/main/java/fr/tathan/sky_aesthetics/client/skies/settings/SkyProperties.java

@@ -5,6 +5,7 @@
 import fr.tathan.SkyAesthetics;
 import fr.tathan.sky_aesthetics.client.DimensionRenderer;
 import fr.tathan.sky_aesthetics.client.skies.DimensionSky;
+import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.registries.Registries;
@@ -14,6 +15,9 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.phys.Vec2;
+import net.minecraft.world.phys.Vec3;
+import org.joml.Vector4f;
 
 import java.util.List;
 import java.util.Optional;
@@ -94,10 +98,14 @@ public static SkyProperties createDefault() {
         );
     }
 
-    public record RenderCondition(Optional<TagKey<Biome>> biomes, Optional<ResourceKey<Biome>> biome) {
+    public static Codec<Vec2> VEC2 = Codec.FLOAT.listOf().comapFlatMap((list) -> Util.fixedSize(list, 2).map((listx) -> new Vec2(listx.getFirst(), listx.getLast())), (vector4f) -> List.of(vector4f.x, vector4f.y));
+
+
+    public record RenderCondition(Optional<TagKey<Biome>> biomes, Optional<ResourceKey<Biome>> biome, Optional<Vec2> heightRange) {
         public static final Codec<RenderCondition> CODEC = RecordCodecBuilder.create(instance -> instance.group(
                 TagKey.codec(Registries.BIOME).optionalFieldOf("biomes").forGetter(RenderCondition::biomes),
-                ResourceKey.codec(Registries.BIOME).optionalFieldOf("biome").forGetter(RenderCondition::biome)
+                ResourceKey.codec(Registries.BIOME).optionalFieldOf("biome").forGetter(RenderCondition::biome),
+                VEC2.optionalFieldOf("height_range").forGetter(RenderCondition::heightRange)
         ).apply(instance, RenderCondition::new));
 
         public boolean isSkyRendered(ServerLevel level) {
@@ -106,9 +114,19 @@ public boolean isSkyRendered(ServerLevel level) {
             if (player == null || level == null) return false;
 
             if(this.biomes().isPresent()) {
-                return level.getBiome(player.getOnPos()).is(this.biomes().get());
+                return level.getBiome(player.getOnPos()).is(this.biomes().get()) && isPlayerAtHeight(player);
             } else if (this.biome().isPresent()) {
-                return level.getBiome(player.getOnPos()).is(this.biome().get());
+                return level.getBiome(player.getOnPos()).is(this.biome().get()) && isPlayerAtHeight(player);
+            }
+
+            return true;
+        }
+
+        public boolean isPlayerAtHeight(LocalPlayer player) {
+            double playerHeight = player.position().y;
+            if(this.heightRange.isPresent()) {
+                Vec2 heightRange = this.heightRange.get();
+                return playerHeight >= heightRange.y && playerHeight <= heightRange.y;
             }
 
             return true;