feat: add doors during level generation #41

LukaBerkers · 2024-04-20T14:07:24Z

Description

This PR adds automatic placement of doors during level generation. The doors are placed when a room is placed, based on the available directions of that room. Each door gets a unique ID which we will use in the future to match doors with keys.

Testability

There is no level generation yet, but there is a hard-coded level in the TempFillFunction in GridPlacer.cs.

You can play this level in the GridSystem scene. The rooms should have the correct doors placed according to the hard-coded values in TempFillFunction. The doors should open when approached by the player.

Checklist

Set the proper pull request name
Merged main into your branch
Added a scene to the game for your changes

aplib.net-demo/Assets/Scripts/Tiles/Tile.cs

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

wingbladedota

LGTM :)

SilasPeters

There is no test scene :(

aplib.net-demo/.editorconfig

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

aplib.net-demo/Packages/manifest.json

LukaBerkers · 2024-04-24T13:30:33Z

There is no test scene :(

The test scene is GridSystem. At the time I did not yet know that I should create my own new scene.

SilasPeters · 2024-04-24T16:32:55Z

I don't thinkg perf: is a valid prefix for a commit, but I get where you are coming from.

SilasPeters

Currently, doors are placed at every room for every direction they allow the player to go, period. This is not very flexible. How do you envision that your code will be used later? I expect that not every room needs to have doors from the beginning.

aplib.net-demo/Assets/Prefabs/Environment/Interactables/Door.prefab

JensSteenmetz · 2024-04-25T21:53:27Z

Old (closed) PR: #39
Reason for new PR: branch name was changed.

LukaBerkers · 2024-04-26T15:08:39Z

I don't thinkg perf: is a valid prefix for a commit, but I get where you are coming from.

It is actually, see https://www.conventionalcommits.org/en/v1.0.0/#summary.

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

SilasPeters · 2024-04-27T11:24:57Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

@@ -193,6 +193,7 @@ private void PlaceDoors(int x, int z, Room room)
            {
                // # Calculate where the door should be placed

+                // North is in the negative x direction


I see that that is how you coded the door placement, but why? I oriented all the prefabs and tile to have North be positive X.

Yes, but the grid is generated with north in the negative x direction.

JensSteenmetz

Looks great! Some small nitpicks.

JensSteenmetz · 2024-04-28T15:04:25Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

-                {
-                    PlaceTile(x, z, _grid[x, z].Tile);
-                }
+                for (int x = 0; x < _grid.Width; x++) PlaceTile(x, z, _grid[x, z].Tile);


Nit: could also remove the brackets of the other for loop.

JensSteenmetz · 2024-04-28T15:06:09Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

+        private void PlaceDoors(int x, int z, Room room)
+        {
+            Vector3 roomPosition = new(x * _tileSizeX, 0, z * _tileSizeZ);
+            // Get (half of) the depth of the door model


Nit

Suggested change

// Get (half of) the depth of the door model

// Get (half of) the depth of the door model.

JensSteenmetz · 2024-04-28T15:06:21Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

+            Vector3 roomPosition = new(x * _tileSizeX, 0, z * _tileSizeZ);
+            // Get (half of) the depth of the door model
+            float doorDepthExtend = _doorRenderer.bounds.extents.z;
+            // Calculate the distance from the room center to where a door should be placed


Nit

Suggested change

// Calculate the distance from the room center to where a door should be placed

// Calculate the distance from the room center to where a door should be placed.

JensSteenmetz · 2024-04-28T15:06:38Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

+                // # Calculate where the door should be placed
+
+                // North is in the negative x direction


Nit

Suggested change

// # Calculate where the door should be placed

// North is in the negative x direction

// # Calculate where the door should be placed.

// North is in the negative x direction.

JensSteenmetz · 2024-04-28T15:07:14Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

+            float doorDepthExtend = _doorRenderer.bounds.extents.z;
+            // Calculate the distance from the room center to where a door should be placed


Nit

Suggested change

float doorDepthExtend = _doorRenderer.bounds.extents.z;

// Calculate the distance from the room center to where a door should be placed

float doorDepthExtend = _doorRenderer.bounds.extents.z;

// Calculate the distance from the room center to where a door should be placed

JensSteenmetz · 2024-04-28T15:07:36Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

+            Vector3 roomPosition = new(x * _tileSizeX, 0, z * _tileSizeZ);
+            // Get (half of) the depth of the door model


Nit

Suggested change

Vector3 roomPosition = new(x * _tileSizeX, 0, z * _tileSizeZ);

// Get (half of) the depth of the door model

Vector3 roomPosition = new(x * _tileSizeX, 0, z * _tileSizeZ);

// Get (half of) the depth of the door model

JensSteenmetz · 2024-04-28T15:08:20Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

+                // # Calculate the rotation the door should have
+
+                // The `RotateLeft` here is because the rotation of the grid and the rotation of the door model do not
+                // line up


Nit

Suggested change

// # Calculate the rotation the door should have

// The `RotateLeft` here is because the rotation of the grid and the rotation of the door model do not

// line up

// # Calculate the rotation the door should have.

// The `RotateLeft` here is because the rotation of the grid and the rotation of the door model do not

// line up.

JensSteenmetz · 2024-04-28T15:08:36Z

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs

+                Quaternion relativeDoorRotation = Quaternion.Euler(0, direction.RotateLeft().RotationDegrees(), 0);
+                Quaternion doorRotation = roomRotation * relativeDoorRotation;
+
+                // # Spawn the door


Nit

Suggested change

// # Spawn the door

// # Spawn the door.

What is the reason for the markdown header syntax? In other comments as well?

JensSteenmetz

There might be a problem with the door placement, see Discord thread "fix: change boundary conditions for wave function collapse"

JensSteenmetz

The problem I mentioned earlier is not with the door placement.

github-actions · 2024-04-29T08:43:51Z

🎉 This PR is included in version 3.5.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

LukaBerkers added 3 commits April 18, 2024 14:15

feat: add doors during level generation

81e42d8

fix: naming and formatting

0c34a99

fix: do not serialize the door ID in DoorCollision

daf2c70

LukaBerkers changed the title ~~Feat/68 spawn doors~~ feat: add doors during level generation Apr 20, 2024

fix: place door in the center of the door opening

fca7461

LukaBerkers force-pushed the feat/68-spawn-doors branch from 7233dd6 to 3a057e7 Compare April 22, 2024 16:50

Merge branch 'main' into feat/68-spawn-doors

0fda83c

LukaBerkers force-pushed the feat/68-spawn-doors branch from 3a057e7 to 0fda83c Compare April 24, 2024 10:40

LukaBerkers added 2 commits April 24, 2024 13:31

Merge branch 'main' into feat/68-spawn-doors

472bd77

style: improve the readability of PlaceDoors

f93c45a

LukaBerkers marked this pull request as ready for review April 24, 2024 11:55

LukaBerkers requested review from JensSteenmetz, Tboefijn, SilasPeters and wingbladedota and removed request for Tboefijn April 24, 2024 11:56

wingbladedota reviewed Apr 24, 2024

View reviewed changes

aplib.net-demo/Assets/Scripts/Tiles/Tile.cs Outdated Show resolved Hide resolved

wingbladedota reviewed Apr 24, 2024

View reviewed changes

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs Show resolved Hide resolved

wingbladedota previously approved these changes Apr 24, 2024

View reviewed changes

SilasPeters requested changes Apr 24, 2024

View reviewed changes

aplib.net-demo/.editorconfig Show resolved Hide resolved

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs Show resolved Hide resolved

aplib.net-demo/Assets/Scripts/WFC/GridPlacer.cs Outdated Show resolved Hide resolved

aplib.net-demo/Packages/manifest.json Show resolved Hide resolved

LukaBerkers added 2 commits April 24, 2024 15:18

Merge branch 'main' into feat/68-spawn-doors

27041c3

perf: move code out of a loop

2aac621

LukaBerkers dismissed wingbladedota’s stale review via 2aac621 April 24, 2024 13:28

LukaBerkers requested review from wingbladedota and SilasPeters April 24, 2024 13:28

SilasPeters requested changes Apr 24, 2024

View reviewed changes

aplib.net-demo/Assets/Prefabs/Environment/Interactables/Door.prefab Outdated Show resolved Hide resolved

Merge branch 'main' into feat/68-spawn-doors

9a93b58

chore: clarify the north direction in PlaceDoors

f7b3b58

LukaBerkers requested a review from SilasPeters April 26, 2024 15:11

LukaBerkers added 2 commits April 26, 2024 17:37

perf: only call _doorPrefab.GetComponent<Renderer> once

7edbd38

Merge branch 'main' into feat/68-spawn-doors

a8e2760

LukaBerkers requested review from JensSteenmetz and wingbladedota and removed request for JensSteenmetz and wingbladedota April 26, 2024 15:46

LukaBerkers enabled auto-merge (squash) April 26, 2024 15:48

SilasPeters requested changes Apr 27, 2024

View reviewed changes

LukaBerkers requested a review from SilasPeters April 28, 2024 09:18

JensSteenmetz approved these changes Apr 28, 2024

View reviewed changes

JensSteenmetz requested changes Apr 28, 2024

View reviewed changes

JensSteenmetz approved these changes Apr 28, 2024

View reviewed changes

SilasPeters approved these changes Apr 29, 2024

View reviewed changes

LukaBerkers merged commit c0fb998 into main Apr 29, 2024
2 checks passed

LukaBerkers deleted the feat/68-spawn-doors branch April 29, 2024 08:30

github-actions bot added the released label Apr 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add doors during level generation #41

feat: add doors during level generation #41

LukaBerkers commented Apr 20, 2024

wingbladedota left a comment

SilasPeters left a comment

LukaBerkers commented Apr 24, 2024 •

edited

Loading

SilasPeters commented Apr 24, 2024

SilasPeters left a comment

JensSteenmetz commented Apr 25, 2024 •

edited

Loading

LukaBerkers commented Apr 26, 2024

SilasPeters Apr 27, 2024

LukaBerkers Apr 27, 2024

JensSteenmetz left a comment

JensSteenmetz Apr 28, 2024

JensSteenmetz Apr 28, 2024

JensSteenmetz Apr 28, 2024

JensSteenmetz Apr 28, 2024

JensSteenmetz Apr 28, 2024

JensSteenmetz Apr 28, 2024

JensSteenmetz Apr 28, 2024

JensSteenmetz Apr 28, 2024

JensSteenmetz Apr 28, 2024

JensSteenmetz left a comment

JensSteenmetz left a comment •

edited

Loading

github-actions bot commented Apr 29, 2024

	// Get (half of) the depth of the door model
	// Get (half of) the depth of the door model.

	// Calculate the distance from the room center to where a door should be placed
	// Calculate the distance from the room center to where a door should be placed.

		// # Calculate where the door should be placed

		// North is in the negative x direction

		float doorDepthExtend = _doorRenderer.bounds.extents.z;
		// Calculate the distance from the room center to where a door should be placed

		Vector3 roomPosition = new(x * _tileSizeX, 0, z * _tileSizeZ);
		// Get (half of) the depth of the door model

feat: add doors during level generation #41

feat: add doors during level generation #41

Conversation

LukaBerkers commented Apr 20, 2024

Description

Testability

Checklist

wingbladedota left a comment

Choose a reason for hiding this comment

SilasPeters left a comment

Choose a reason for hiding this comment

LukaBerkers commented Apr 24, 2024 • edited Loading

SilasPeters commented Apr 24, 2024

SilasPeters left a comment

Choose a reason for hiding this comment

JensSteenmetz commented Apr 25, 2024 • edited Loading

LukaBerkers commented Apr 26, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JensSteenmetz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JensSteenmetz left a comment

Choose a reason for hiding this comment

JensSteenmetz left a comment • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Apr 29, 2024

LukaBerkers commented Apr 24, 2024 •

edited

Loading

JensSteenmetz commented Apr 25, 2024 •

edited

Loading

JensSteenmetz left a comment •

edited

Loading