Skip to content

#134 Use Perlin Noise #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Av3boy merged 3 commits into from
Jun 28, 2026
Merged

#134 Use Perlin Noise #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5229da4
#134 Minecraft terrain logic
Av3boy Jun 28, 2026
234b720
Merge remote-tracking branch 'origin/dev' into 134-av-use-perlin-noise
Av3boy Jun 28, 2026
84fe2c6
#87 Use SharpEngine Numerics
Av3boy Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions Examples/MinecraftClone/Inventory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using Minecraft.Terrain.Block;
using System;
using System.Linq;

namespace Minecraft;
Expand Down Expand Up @@ -31,7 +32,7 @@ public class Inventory
public InventoryItem GetActiveSlotItems(int slotNumber)
=> Toolbar[slotNumber].Items;

/*public void AddItem(BlockType type)
/*public void AddItem(BlockId type)
{
var item = Items.FirstOrDefault(x => x.Type == type);
if (item is not null)
Expand All @@ -43,10 +44,10 @@ public InventoryItem GetActiveSlotItems(int slotNumber)
/// <summary>
/// Adds an item to the toolbar.
/// </summary>
/// <param name="blockType">The type of the block to add to the toolbar.</param>
public void AddToolbarItem(BlockType blockType)
/// <param name="BlockId">The type of the block to add to the toolbar.</param>
public void AddToolbarItem(BlockId BlockId)
{
var slot = Toolbar.FirstOrDefault(i => i.Items.Type == blockType);
var slot = Toolbar.FirstOrDefault(i => i.Items.Type == BlockId);
if (slot is not null)
{
slot.Items.Amount += 1;
Expand All @@ -57,18 +58,18 @@ public void AddToolbarItem(BlockType blockType)
return;
}

if (SelectedSlot.Items.Type == BlockType.None)
if (SelectedSlot.Items.Type == BlockId.Air)
{
SelectedSlot.Items = new InventoryItem { Type = blockType, Amount = 1 };
SelectedSlot.Items = new InventoryItem { Type = BlockId, Amount = 1 };
Toolbar[SelectedSlotIndex] = SelectedSlot;
return;
}

for (int i = 0; i < Toolbar.Length; i++)
{
if (Toolbar[i].Items.Type == BlockType.None)
if (Toolbar[i].Items.Type == BlockId.Air)
{
Toolbar[i].Items = new InventoryItem { Type = blockType, Amount = 1 };
Toolbar[i].Items = new InventoryItem { Type = BlockId, Amount = 1 };
return;
}
}
Expand Down Expand Up @@ -130,7 +131,7 @@ public class InventoryItem
/// <summary>
/// Gets or sets the type of the block in the inventory.
/// </summary>
public BlockType Type { get; set; } = BlockType.None;
public BlockId Type { get; set; } = BlockId.Air;

/// <summary>Gets or sets the amount of the block.</summary>
public int Amount { get; set; }
Expand Down
179 changes: 54 additions & 125 deletions Examples/MinecraftClone/Minecraft.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,17 @@
using ImGuiNET;

using Minecraft.Block;
using Microsoft.Extensions.Logging;

using Minecraft.Terrain.Block;
using Minecraft.Terrain.Layers;
using SharpEngine.Core;
using SharpEngine.Core.Entities;
using SharpEngine.Core.Entities.Lights;
using SharpEngine.Core.Entities.Properties;
using SharpEngine.Core.Entities.UI;
using SharpEngine.Core.Entities.UI.Layouts;
using SharpEngine.Core.Enums;
using SharpEngine.Core.Interfaces;
using SharpEngine.Core.Numerics;
using SharpEngine.Core.Scenes;
using SharpEngine.Core.Windowing;
using SharpEngine.Core.ObjLoader.Loaders.ObjLoader;

using Silk.NET.Input;

using System;
using System.Numerics;

namespace Minecraft;

Expand All @@ -32,14 +25,14 @@
private readonly Scene _scene;
private readonly ILogger<Minecraft> _logger;

private SceneNode _lightsNode;
private SceneNode _blocksNode;

private Input _input;
private readonly Inventory _inventory;

private UIElement _uiElem;

private readonly Terrain.TerrainGenerator_New _terrain;
private readonly SceneNode _blocksNode;

/// <summary>
/// Gets the main window.
/// </summary>
Expand All @@ -60,6 +53,17 @@

_inventory = new Inventory();

_blocksNode = _scene.AddNode("Blocks");
_terrain = new Terrain.TerrainGenerator_New(_scene, _blocksNode,
[
new HeightMapPass(),
new BaseTerrainPass(),
new CavePass(),
// new OrePass(),
// new WaterPass(),
// new SurfaceDecorationPass(),
// new FoliagePass()
]);
}

/// <inheritdoc />
Expand All @@ -72,33 +76,35 @@
_input = new Input(Camera);
_inventory.Initialize();

_lightsNode = _scene.Root.AddChild("lights");
_blocksNode = _scene.Root.AddChild("blocks");

// var gridLayout = new GridLayout<UIElement>();
_terrain.InitializeWorld();

// TODO: #89 Fix UI renderer
_uiElem = new UIElement(Window.GetGL(), "uiElement");
_scene.UIElements.Add(_uiElem);

var uiElem2 = new UIElement(Window.GetGL(), "uiElement");
uiElem2.Transform.Scale = new SharpEngine.Core.Numerics.Vector2(0.2f, 0.2f);
uiElem2.Transform.Position = new SharpEngine.Core.Numerics.Vector2(30, 0);

// gridLayout.AddChild(_uiElem, uiElem2);
_scene.UIElements.Add(_uiElem);
_scene.UIElements.Add(uiElem2);

// _scene.UIElements.Add(gridLayout);

InitializeWorld();
InitializeUI();
}
catch (Exception ex)
{
_logger.LogInformation(ex, "{Message}", ex.Message);
}
}

private void InitializeUI()
{
// var gridLayout = new GridLayout<UIElement>();

Check warning on line 91 in Examples/MinecraftClone/Minecraft.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this commented out code. 


See more on https://sonarcloud.io/project/issues?id=Av3boy_SharpEngine&issues=AZ8PJKRXxRTRgvXs0vl3&open=AZ8PJKRXxRTRgvXs0vl3&pullRequest=137

// TODO: #89 Fix UI renderer
_uiElem = new UIElement(Window.GetGL(), "uiElement");
_scene.UIElements.Add(_uiElem);

var uiElem2 = new UIElement(Window.GetGL(), "uiElement");
uiElem2.Transform.Scale = new Vector2(0.2f, 0.2f);
uiElem2.Transform.Position = new Vector2(30, 0);

// gridLayout.AddChild(_uiElem, uiElem2);

Check warning on line 101 in Examples/MinecraftClone/Minecraft.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this commented out code. 


See more on https://sonarcloud.io/project/issues?id=Av3boy_SharpEngine&issues=AZ8PJKRXxRTRgvXs0vl4&open=AZ8PJKRXxRTRgvXs0vl4&pullRequest=137
_scene.UIElements.Add(_uiElem);
_scene.UIElements.Add(uiElem2);

// _scene.UIElements.Add(gridLayout);

Check warning on line 105 in Examples/MinecraftClone/Minecraft.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this commented out code. 


See more on https://sonarcloud.io/project/issues?id=Av3boy_SharpEngine&issues=AZ8PJKRXxRTRgvXs0vl5&open=AZ8PJKRXxRTRgvXs0vl5&pullRequest=137
}

/// <summary>
/// Handles rendering after the frame is drawn.
/// </summary>
Expand Down Expand Up @@ -133,97 +139,20 @@
ImGui.SliderFloat("rotation", ref rotation, 0, 360);

ImGui.Text($"UI Element width: {_uiElem.Width}");
ImGui.SliderFloat("width", ref width, 0, 100);
ImGui.SliderFloat("width", ref width, 0, Window.Width);

ImGui.Text($"UI Element height: {_uiElem.Height}");
ImGui.SliderFloat("height", ref height, 0, 100);
ImGui.SliderFloat("height", ref height, 0, Window.Height);

ImGui.End();

_uiElem.Transform.Position = new SharpEngine.Core.Numerics.Vector2(x, y);
_uiElem.Transform.Scale = new SharpEngine.Core.Numerics.Vector2(sx, sy);
_uiElem.Transform.Position = new Vector2(x, y);
_uiElem.Transform.Scale = new Vector2(sx, sy);
_uiElem.Transform.Rotation.Angle = rotation;

_uiElem.Height = height;
_uiElem.Width = width;
}

private void InitializeWorld()
{
InitializeLights();
InitializeChunks();

// TODO: #2 Does not work yet.
// var torus = MeshService.Instance.LoadMesh("torus", @"C:\Users\antti\Documents\Untitled2.obj");

var model = ObjLoaderFactory.Load(Window.GetGL(), @"C:\Users\antti\Documents\Untitled2.obj");
var go = new GameObject(model);
var go2 = new GameObject(model)
{
Transform = new Transform(new SharpEngine.Core.Numerics.Vector3(0, 0, 30))
};

_scene.Root.AddChild(go);
_scene.Root.AddChild(go2);
}

private void InitializeLights()
{
_lightsNode.AddChild(new DirectionalLight());

_lightsNode.AddChild(
new PointLight(new SharpEngine.Core.Numerics.Vector3(0.7f, 0.2f, 2.0f), 0),
new PointLight(new SharpEngine.Core.Numerics.Vector3(2.3f, -3.3f, -4.0f), 1),
new PointLight(new SharpEngine.Core.Numerics.Vector3(-4.0f, 2.0f, -12.0f), 2),
new PointLight(new SharpEngine.Core.Numerics.Vector3(0.0f, 0.0f, -3.0f), 3)
);

_lightsNode.AddChild(new SpotLight()
{
Ambient = new SharpEngine.Core.Numerics.Vector3(0.0f, 0.0f, 0.0f),
Diffuse = new SharpEngine.Core.Numerics.Vector3(1.0f, 1.0f, 1.0f),
Specular = new SharpEngine.Core.Numerics.Vector3(1.0f, 1.0f, 1.0f),
});
}

private void InitializeChunks()
{
// TODO: #88 Generate chunks when player moves

// TODO: #87 Generate chunks using 3d Perlin noise

const int chunkSize = 16;
const int numChunks = 1;
// const int numChunks = 3;

for (int i = 0; i < numChunks; i++)
{
var chunkPos = new Vector3(i * chunkSize, 0, 0);
GenerateChunk(chunkSize, chunkPos);
}
}

private void GenerateChunk(int chunkSize, Vector3 chunkPos)
{
for (int x = 0; x < chunkSize; x++)
{
for (int z = 0; z < chunkSize; z++)
{
var blockPos = chunkPos + new Vector3(x, 0, z);

var dirt = new Dirt(blockPos, $"Dirt ({x}{z})");
_blocksNode.AddChild(dirt);

for (int y = 1; y < chunkSize; y++)
{
blockPos.Y = -y;
var stone = new Stone(blockPos, $"Dirt ({x}{z}.{y})");
_blocksNode.AddChild(stone);
}
}
}
}

/// <inheritdoc />
public override void Update(double deltaTime, IInputContext input)
=> _input.HandleKeyboard(input.Keyboards[0], (float)deltaTime);
Expand All @@ -232,7 +161,7 @@
/// <inheritdoc />
public override void HandleKeyboard(IKeyboard input, double deltaTime)
{
for (int i = 0; i <= 9; i++)
for (int i = 1; i <= 9; i++)
{
if (input.IsKeyPressed(Key.Number0 + i))
{
Expand Down Expand Up @@ -262,13 +191,13 @@
{
if (button == MouseButton.Right)
{
if (_inventory.SelectedSlot.Items.Type != BlockType.None && _inventory.SelectedSlot.Items.Amount > 0)
if (_inventory.SelectedSlot.Items.Type != BlockId.Air && _inventory.SelectedSlot.Items.Amount > 0)
{
PlaceBlock();
_inventory.SelectedSlot.Items.Amount -= 1;

if (_inventory.SelectedSlot.Items.Amount < 0)
_inventory.SelectedSlot.Items.Type = BlockType.None;
_inventory.SelectedSlot.Items.Type = BlockId.Air;
}
else
{
Expand All @@ -278,26 +207,26 @@

if (button == MouseButton.Left)
{
var destroyedBlockType = DestroyBlock();
if (destroyedBlockType != BlockType.None)
var destroyedBlockId = DestroyBlock();
if (destroyedBlockId != BlockId.Air)
{
// TODO: #86 The block should be added to the slot so that 0 is the last slot instead of 9.
// TODO: #86 The first block destroyed doesn't seem to be added to the inventory.
_logger.LogInformation("Block destroyed: {DestroyedBlockType}.", destroyedBlockType);
_inventory.AddToolbarItem(destroyedBlockType);
_logger.LogInformation("Block destroyed: {DestroyedBlockId}.", destroyedBlockId);
_inventory.AddToolbarItem(destroyedBlockId);
}
}
}

private BlockType DestroyBlock()
private BlockId DestroyBlock()
{
if (!Camera.IsInView(_scene, out GameObject? intersectingObject, out Vector3 _, allowedTypes: typeof(BlockBase)))
return BlockType.None;
if (!Camera.IsInView(_scene, out GameObject? intersectingObject, out _, allowedTypes: typeof(BlockBase)))
return BlockId.Air;

var block = (BlockBase)intersectingObject!;
_blocksNode.RemoveChild(intersectingObject!);

return block.BlockType;
return block.BlockId;
}

private void PlaceBlock()
Expand All @@ -318,7 +247,7 @@
private static Vector3 GetNewBlockPosition(Vector3 hitPosition, GameObject intersectingObject)
{
Vector3 normal = Ray.GetClosestFaceNormal(hitPosition, intersectingObject);
return (System.Numerics.Vector3)intersectingObject.Transform.Position + (normal * (System.Numerics.Vector3)intersectingObject.Transform.Scale);
return intersectingObject.Transform.Position + (normal * intersectingObject.Transform.Scale);
}

/// <inheritdoc />
Expand Down
9 changes: 4 additions & 5 deletions Examples/MinecraftClone/Block/BlockBase.cs → ...MinecraftClone/Terrain/Block/BlockBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using SharpEngine.Core.Entities;
using SharpEngine.Core.Numerics;
using SharpEngine.Core.Primitives;

using System.Numerics;

namespace Minecraft.Block;
namespace Minecraft.Terrain.Block;

/// <summary>
/// Represents a block in the game.
Expand All @@ -13,10 +12,10 @@
/// <summary>
/// Gets the block type.
/// </summary>
public virtual BlockType BlockType { get; }
public virtual BlockId BlockId { get; }

/// <summary>Gets a value indicating whether the block is solid.</summary>
public virtual bool IsSolid { get; }
public virtual bool IsSolid { get; } = true;

/// <summary>Gets or sets the size of the block in the inventory.</summary>
public int SizeInInventory { get; set; } = 1;
Expand All @@ -42,7 +41,7 @@

private void Initialize(Vector3 position, string name, string diffuseMapFile, string specularMapFile, string vertShaderFile, string fragShaderFile)
{
var cube = PrimitiveFactory.Create(PrimitiveType.Cube, (SharpEngine.Core.Numerics.Vector3)position, diffuseMapFile, specularMapFile, vertShaderFile, fragShaderFile);

Check warning on line 44 in Examples/MinecraftClone/Terrain/Block/BlockBase.cs

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this unnecessary cast to 'Vector3'. 


See more on https://sonarcloud.io/project/issues?id=Av3boy_SharpEngine&issues=AZ8PJKN_xRTRgvXs0vlo&open=AZ8PJKN_xRTRgvXs0vlo&pullRequest=137
AssignProperties(cube, name);
}

Expand Down
Loading