From 51ece50ac0576301965a4cb11927f546a0472448 Mon Sep 17 00:00:00 2001 From: josua Date: Tue, 17 Sep 2019 11:42:43 +1000 Subject: [PATCH] Added day/night cycle --- src/shootergame/Main.java | 3 --- src/shootergame/entity/player/EntityPlayer.java | 1 - src/shootergame/init/Layers.java | 5 +++-- src/shootergame/tiles/TileLava.java | 2 -- src/shootergame/world/layer/layergen/LayerGenEarth.java | 7 +++++-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/shootergame/Main.java b/src/shootergame/Main.java index 817c54f..b1e14f6 100644 --- a/src/shootergame/Main.java +++ b/src/shootergame/Main.java @@ -22,9 +22,6 @@ import shootergame.tiles.LightLevelNoise; import shootergame.time.GameTimer; import shootergame.world.World; import shootergame.world.chunk.ChunkEventHandler; -import shootergame.world.layer.layergen.LayerGenCaves; -import shootergame.world.layer.layergen.LayerGenEarth; -import shootergame.world.layer.layergen.LayerGenLavaCaves; public class Main { diff --git a/src/shootergame/entity/player/EntityPlayer.java b/src/shootergame/entity/player/EntityPlayer.java index f07b2d4..b3ec9ab 100644 --- a/src/shootergame/entity/player/EntityPlayer.java +++ b/src/shootergame/entity/player/EntityPlayer.java @@ -9,7 +9,6 @@ import shootergame.entity.EntityBullet; import shootergame.entity.EntityInventory; import shootergame.entity.EntityItem; import shootergame.entity.EntityVertical; -import shootergame.init.Items; import shootergame.init.Textures; import shootergame.inventory.Inventory; import shootergame.util.gl.GlHelpers; diff --git a/src/shootergame/init/Layers.java b/src/shootergame/init/Layers.java index ffedf92..97fc396 100644 --- a/src/shootergame/init/Layers.java +++ b/src/shootergame/init/Layers.java @@ -6,8 +6,9 @@ import java.util.Random; import shootergame.Main; import shootergame.world.World; import shootergame.world.layer.Layer; - -import shootergame.world.layer.layergen.*; +import shootergame.world.layer.layergen.LayerGenCaves; +import shootergame.world.layer.layergen.LayerGenEarth; +import shootergame.world.layer.layergen.LayerGenLavaCaves; public class Layers { diff --git a/src/shootergame/tiles/TileLava.java b/src/shootergame/tiles/TileLava.java index 76d7465..bc5d089 100644 --- a/src/shootergame/tiles/TileLava.java +++ b/src/shootergame/tiles/TileLava.java @@ -5,11 +5,9 @@ import java.util.Random; import shootergame.display.Camera; import shootergame.entity.Entity; import shootergame.entity.particle.ParticleLava; -import shootergame.entity.particle.ParticleSmoke; import shootergame.init.Textures; import shootergame.util.gl.GlHelpers; import shootergame.util.math.TileState; -import shootergame.util.math.random.RandomHelpers; import shootergame.util.math.vec.Vec2d; import shootergame.util.math.vec.Vec2i; import shootergame.world.chunk.Chunk; diff --git a/src/shootergame/world/layer/layergen/LayerGenEarth.java b/src/shootergame/world/layer/layergen/LayerGenEarth.java index 94054f7..2aa0cc1 100644 --- a/src/shootergame/world/layer/layergen/LayerGenEarth.java +++ b/src/shootergame/world/layer/layergen/LayerGenEarth.java @@ -4,9 +4,10 @@ import java.util.Random; import shootergame.Main; import shootergame.entity.Entity; -import shootergame.entity.EntityDummy; import shootergame.entity.EntityZombie; import shootergame.init.Tiles; +import shootergame.time.GameTimer; +import shootergame.util.math.MathHelpers; import shootergame.util.math.TileState; import shootergame.util.math.random.OpenSimplexNoise; import shootergame.util.math.random.RandomHelpers; @@ -89,6 +90,8 @@ public class LayerGenEarth extends LayerGen @Override public double getLightLevel() { - return 0.3; + return MathHelpers.map( + Math.sin(GameTimer.getTime() / 100000.0) + , -1, 1, 0, 0.8); } }