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

Got rid of previous material system, now uses enumerators and item ids. Also imported QuadTree.cs so we can have entity collision.

Browse Source
This commit is contained in:
Solargale
2020-06-21 20:17:59 -06:00
parent e25f4d70eb
commit 69c93ea427
25 changed files with 510 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Collector/src/Dimension/Block.cs
View File

@@ -1,8 +0,0 @@
public class Block {
public string Name { get; }
public Block(string name) {
Name = name;
}
}

32
Collector/src/Dimension/BlockMaterials.cs
View File

@@ -1,32 +0,0 @@
using System.Collections.Generic;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
namespace Collector.Dimension
{
public static class BlockMaterials {
public static readonly Dictionary<string,Block> Materials = new Dictionary<string, Block>();
public static readonly Dictionary<string,Texture2D> Textures = new Dictionary<string, Texture2D>();
//Private so the singleton can't be instantiated
static BlockMaterials() {}
public static void Initialize(ContentManager content){
Materials.Add("grass",new Block("grass"));
Materials.Add("wood",new Block("wood"));
Materials.Add("water",new Block("water"));
Materials.Add("stone",new Block("stone"));
Materials.Add("snow",new Block("snow"));
Materials.Add("sand",new Block("sand"));
Materials.Add("air",new Block("air"));
Materials.Add("roof",new Block("roof"));
Materials.Add("wall",new Block("wall"));
foreach (var name in Materials.Keys)
{
Textures.Add(name,content.Load<Texture2D>(name));
}
}
}
}

15
Collector/src/Dimension/Blocks.cs Normal file
View File

@@ -0,0 +1,15 @@
namespace Collector.Dimension
{
public enum Blocks
{
BlockAir,
BlockGrass,
BlockWood,
BlockStone,
BlockSnow,
BlockSand,
BlockRoof,
BlockWall,
BlockWater
}
}

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

@@ -3,38 +3,39 @@
using System;
using System.Collections.Generic;
using Collector.ThirdPartyCode;
using Microsoft.Xna.Framework.Graphics;
namespace Collector.Dimension
{
public class Chunks: IRestrictions {
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>();
public static class Chunks
{
public static Dictionary<Tuple<int, int, int>, Blocks> LoadedChunks { get; } = new Dictionary<Tuple<int, int, int>, Blocks>();
private static readonly Dictionary<Tuple<int, int, int>, Blocks> SavedChunks = new Dictionary<Tuple<int, int, int>, Blocks>();
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;
SetBlock(3 + i, 2,1,"wall");
SetBlock(4 + i, 2,1,"wall");
SetBlock(3 + i, 3,1, "roof");
SetBlock(4 + i, 3,1,"roof");
SetBlock(3 + i, 2,1,Blocks.BlockWall);
SetBlock(4 + i, 2,1,Blocks.BlockWall);
SetBlock(3 + i, 3,1, Blocks.BlockRoof);
SetBlock(4 + i, 3,1,Blocks.BlockRoof);
}
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];
private static void SetBlock(int x, int y, int z, Blocks name)
{
LoadedChunks[new Tuple<int, int, int>(x, y, z)] = name;
SavedChunks[new Tuple<int,int,int>(x, y, z)] = name;
}
public static void PlaceBlock(int x, int y, string name)
public static void PlaceBlock(int x, int y, Blocks name)
{
var triple = new Tuple<int, int, int>(x, y, 1);
if (LoadedChunks.ContainsKey(triple))
if (!LoadedChunks.ContainsKey(triple)) return;
if (LoadedChunks[triple].Equals(Blocks.BlockAir))
{
if (LoadedChunks[triple].Name.Equals("air"))
{
SetBlock(x, y, 1, name);
}
SetBlock(x, y, 1, name);
}
}
@@ -42,10 +43,10 @@ namespace Collector.Dimension
var triple = new Tuple<int, int, int>(x, y, 1);
if (!LoadedChunks.ContainsKey(triple)) return;
if (LoadedChunks[triple].Name.Equals("air")) return;
if (LoadedChunks[triple].Equals(Blocks.BlockAir)) return;
LoadedChunks[triple] = BlockMaterials.Materials["air"];
SavedChunks[triple] = BlockMaterials.Materials["air"];
LoadedChunks[triple] = Blocks.BlockAir;
SavedChunks[triple] = Blocks.BlockAir;
}
public static void UngenerateChunk(int x, int y) {
@@ -99,8 +100,8 @@ namespace Collector.Dimension
}
}
private static Block GetBlocks(int x, int y, int z) {
return SavedChunks.GetValueOrDefault(new Tuple<int, int, int>(x, y, z), new Block("air"));
private static Blocks GetBlocks(int x, int y, int z) {
return SavedChunks.GetValueOrDefault(new Tuple<int, int, int>(x, y, z), Blocks.BlockAir);
}
private static double Noise1(double nx, double ny) {
@@ -111,7 +112,7 @@ namespace Collector.Dimension
return Gen2.Evaluate(nx, ny) / 2 + 0.5;
}
private static Block GetTerrain(int x, int y) {
private static Blocks GetTerrain(int x, int y) {
const double scale = 0.01;
var nx = x * scale;
var ny = y * scale;
@@ -134,26 +135,26 @@ namespace Collector.Dimension
return GetBiomeBlock(moisture, elevation);
}
private static Block GetBiomeBlock(double moisture, double elevation) {
private static Blocks GetBiomeBlock(double moisture, double elevation) {
var biome = GetBiome(moisture, elevation);
if (biome.Equals("Tundra")) return BlockMaterials.Materials["snow"];
if (biome.Equals("Taiga")) return BlockMaterials.Materials["snow"];
if (biome.Equals("Snow")) return BlockMaterials.Materials["snow"];
if (biome.Equals("Tundra")) return Blocks.BlockSnow;
if (biome.Equals("Taiga")) return Blocks.BlockSnow;
if (biome.Equals("Snow")) return Blocks.BlockSnow;
if (biome.Equals("Grassland")) return BlockMaterials.Materials["grass"];
if (biome.Equals("Shrubland")) return BlockMaterials.Materials["grass"];
if (biome.Equals("TemperateDeciduousForest")) return BlockMaterials.Materials["grass"];
if (biome.Equals("Grassland")) return Blocks.BlockGrass;
if (biome.Equals("Shrubland")) return Blocks.BlockGrass;
if (biome.Equals("TemperateDeciduousForest")) return Blocks.BlockGrass;
if (biome.Equals("TemperateRainForest")) return BlockMaterials.Materials["grass"];
if (biome.Equals("TropicalSeasonalForest")) return BlockMaterials.Materials["grass"];
if (biome.Equals("TropicalForest")) return BlockMaterials.Materials["grass"];
if (biome.Equals("TropicalRainForest")) return BlockMaterials.Materials["grass"];
if (biome.Equals("TemperateRainForest")) return Blocks.BlockGrass;
if (biome.Equals("TropicalSeasonalForest")) return Blocks.BlockGrass;
if (biome.Equals("TropicalForest")) return Blocks.BlockGrass;
if (biome.Equals("TropicalRainForest")) return Blocks.BlockGrass;
if (biome.Equals("Beach")) return BlockMaterials.Materials["sand"];
if (biome.Equals("Bare")) return BlockMaterials.Materials["sand"];
if (biome.Equals("Scorched")) return BlockMaterials.Materials["sand"];
if (biome.Equals("TemperateDesert")) return BlockMaterials.Materials["sand"];
return biome.Equals("SubtropicalDesert") ? BlockMaterials.Materials["sand"] : BlockMaterials.Materials["water"];
if (biome.Equals("Beach")) return Blocks.BlockSand;
if (biome.Equals("Bare")) return Blocks.BlockSand;
if (biome.Equals("Scorched")) return Blocks.BlockSand;
if (biome.Equals("TemperateDesert")) return Blocks.BlockSand;
return biome.Equals("SubtropicalDesert") ? Blocks.BlockSand : Blocks.BlockWater;
}
private static string GetBiome(double moisture, double elevation) {

6
Collector/src/Dimension/Inventory.cs
View File

@@ -11,11 +11,7 @@ public class Inventory {
public void SetInventory(LinkedList<ItemStack> inventory) {
this.inventory = inventory;
}
public void AddItem(Block block){
inventory.AddFirst((ItemStack) block);
}
public void RemoveItem(ItemStack itemStack){
inventory.Remove(itemStack);
}

4
Collector/src/Dimension/ItemStack.cs
View File

@@ -1,11 +1,11 @@
namespace Collector.Dimension
{
public class ItemStack: Block {
public class ItemStack {
int value;
int quantity;
public ItemStack(string name, int value, int quantity) : base(name)
public ItemStack(Blocks id, int value, int quantity)
{
this.value = value;
this.quantity = quantity;

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

@@ -1,7 +1,6 @@
using System.Linq;
using Collector.Character;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
namespace Collector.Dimension
@@ -23,10 +22,10 @@ namespace Collector.Dimension
private static void DrawWorld(SpriteBatch batch, int layer)
{
foreach (var chunkpair in Chunks.LoadedChunks.Keys.Where(chunkpair => chunkpair.Item3 == layer))
foreach (var chunkpair in Chunks.LoadedChunks.Keys.Where(chunkpair => layer==chunkpair.Item3))
{
batch.Draw(
BlockMaterials.Textures[Chunks.LoadedChunks[chunkpair].Name],
Main.Materials[Chunks.LoadedChunks[chunkpair]],
new Rectangle(
chunkpair.Item1 << IRestrictions.TileShift,
chunkpair.Item2 << IRestrictions.TileShift,
@@ -40,10 +39,11 @@ namespace Collector.Dimension
public void Draw(GameTime gameTime)
{
//Higher means draws in a lower layer
DrawWorld(_spriteBatch, 0);
DrawWorld(_spriteBatch,0);
DrawWorld(_spriteBatch,1);
_inputController.Draw();
_inputController.PlayerInput(_main,_playerMouse,gameTime);
DrawWorld(_spriteBatch, 1);
DrawWorld(_spriteBatch,2);
}
}
}