RecentRunner/CollectorMono
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Added back block placement

Browse Source
This commit is contained in:
Solargale
2020-04-23 13:40:33 -06:00
parent 0c01a22761
commit e25f4d70eb
6 changed files with 130 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Collector/src/Dimension/Chunks.cs
View File

@@ -7,12 +7,11 @@ using Collector.ThirdPartyCode;
namespace Collector.Dimension
{
public class Chunks: IRestrictions {
public static Dictionary<Tuple<int, int, int>, Block> LoadedChunks { get; } =
new Dictionary<Tuple<int, int, int>, Block>();
public static Dictionary<Tuple<int, int, int>, Block> LoadedChunks { get; } = new Dictionary<Tuple<int, int, int>, Block>();
private static readonly Dictionary<Tuple<int, int, int>, Block> SavedChunks = new Dictionary<Tuple<int, int, int>, Block>();
private static readonly OpenSimplexNoise _gen1 = new OpenSimplexNoise(IRestrictions.Seed+ 1);
private static readonly OpenSimplexNoise _gen2 = new OpenSimplexNoise(IRestrictions.Seed);
private static readonly OpenSimplexNoise Gen1 = new OpenSimplexNoise(IRestrictions.Seed+ 1);
private static readonly OpenSimplexNoise Gen2 = new OpenSimplexNoise(IRestrictions.Seed);
public static void CreateStructures() {
const int i = 10;
@@ -21,22 +20,30 @@ namespace Collector.Dimension
SetBlock(3 + i, 3,1, "roof");
SetBlock(4 + i, 3,1,"roof");
}
public static void SetBlock(int x, int y,int z, string name) {
LoadedChunks.Add(new Tuple<int,int,int>(x, y, z), BlockMaterials.Materials[name]);
SavedChunks.Add(new Tuple<int,int,int>(x, y, z), BlockMaterials.Materials[name]);
private static void SetBlock(int x, int y, int z, string name) {
LoadedChunks[new Tuple<int,int,int>(x, y, z)] = BlockMaterials.Materials[name];
SavedChunks[new Tuple<int,int,int>(x, y, z)] = BlockMaterials.Materials[name];
}
public static void PlaceBlock(int x, int y, string name){
public static void PlaceBlock(int x, int y, string name)
{
var triple = new Tuple<int, int, int>(x, y, 1);
if (!LoadedChunks[triple].Name.Equals("air")) return;
LoadedChunks[triple] = BlockMaterials.Materials[name];
SavedChunks[triple] = BlockMaterials.Materials[name];
if (LoadedChunks.ContainsKey(triple))
{
if (LoadedChunks[triple].Name.Equals("air"))
{
SetBlock(x, y, 1, name);
}
}
}
public static void RemoveBlock(int x, int y){
var triple = new Tuple<int, int, int>(x, y, 1);
if (!LoadedChunks.ContainsKey(triple)) return;
if (LoadedChunks[triple].Name.Equals("air")) return;
LoadedChunks[triple] = BlockMaterials.Materials["air"];
SavedChunks[triple] = BlockMaterials.Materials["air"];
}
@@ -97,11 +104,11 @@ namespace Collector.Dimension
}
private static double Noise1(double nx, double ny) {
return _gen1.Evaluate(nx, ny) / 2 + 0.5;
return Gen1.Evaluate(nx, ny) / 2 + 0.5;
}
private static double Noise2(double nx, double ny) {
return _gen2.Evaluate(nx, ny) / 2 + 0.5;
return Gen2.Evaluate(nx, ny) / 2 + 0.5;
}
private static Block GetTerrain(int x, int y) {

33
Collector/src/Dimension/WorldRenderer.cs
View File

@@ -3,30 +3,22 @@ using Collector.Character;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
using MonoGame.Extended;
namespace Collector.Dimension
{
public class WorldRenderer : IRestrictions
{
private Mouse _mouse;
private InputController _inputController;
private Player _player;
private SpriteBatch _spriteBatch;
private Main _main;
private OrthographicCamera _orthographicCamera;
private double _elapsedTime;
private readonly PlayerMouse _playerMouse;
private readonly InputController _inputController;
private readonly SpriteBatch _spriteBatch;
private readonly Main _main;
public WorldRenderer(Mouse mouse, InputController inputController, Player player, SpriteBatch spriteBatch,
Main main, OrthographicCamera orthographicCamera)
public WorldRenderer(PlayerMouse playerMouse, InputController inputController, SpriteBatch spriteBatch, Main main)
{
_mouse = mouse;
_playerMouse = playerMouse;
_inputController = inputController;
_player = player;
_spriteBatch = spriteBatch;
_main = main;
_orthographicCamera = orthographicCamera;
_elapsedTime = 0;
}
private static void DrawWorld(SpriteBatch batch, int layer)
@@ -45,23 +37,12 @@ namespace Collector.Dimension
}
}
/*
private void mouseCrosshair(SpriteBatch batch)
{
Vector3 mousePos = new Vector3(Gdx.input.getX(), Gdx.input.getY(), 0);
Main.cam.unproject(mousePos);
int x = mouse.getSelectedX(mousePos);
int y = mouse.getSelectedY(mousePos);
batch.draw(mouse.getCrosshair(), x, y);
}
*/
public void Draw(GameTime gameTime)
{
//Higher means draws in a lower layer
DrawWorld(_spriteBatch, 0);
_inputController.Draw();
_inputController.PlayerInput(_main,_mouse,gameTime);
_inputController.PlayerInput(_main,_playerMouse,gameTime);
DrawWorld(_spriteBatch, 1);
}
}