From ee47213dbbf2e9071e13d4a56bb3b5de5dfb4ce6 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sat, 8 Jun 2024 21:42:44 +0300 Subject: [PATCH] add temporary test block --- res/content/base/blocks/door.json | 15 ++++++++++++++ res/content/base/content.json | 9 +++++---- res/content/base/textures/blocks/door.png | Bin 0 -> 8418 bytes .../base/textures/blocks/door_side.png | Bin 0 -> 6856 bytes res/content/base/textures/blocks/door_top.png | Bin 0 -> 6556 bytes src/frontend/debug_panel.cpp | 19 ++++++++++++++++++ src/logic/PlayerController.cpp | 5 +++++ src/objects/Player.hpp | 1 + 8 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 res/content/base/blocks/door.json create mode 100644 res/content/base/textures/blocks/door.png create mode 100644 res/content/base/textures/blocks/door_side.png create mode 100644 res/content/base/textures/blocks/door_top.png diff --git a/res/content/base/blocks/door.json b/res/content/base/blocks/door.json new file mode 100644 index 00000000..db12e660 --- /dev/null +++ b/res/content/base/blocks/door.json @@ -0,0 +1,15 @@ +{ + "material": "base:wood", + "texture-faces": [ + "door_side", + "door_side", + "door_top", + "door_top", + "door", + "door" + ], + "light-passing": true, + "sky-light-passing": true, + "size": [1, 2, 1], + "rotation": "pipe" +} diff --git a/res/content/base/content.json b/res/content/base/content.json index ef2f084b..09fc42f1 100644 --- a/res/content/base/content.json +++ b/res/content/base/content.json @@ -1,7 +1,4 @@ { - "items": [ - "bazalt_breaker" - ], "blocks": [ "dirt", "grass_block", @@ -25,6 +22,10 @@ "pane", "pipe", "lightbulb", - "torch" + "torch", + "door" + ], + "items": [ + "bazalt_breaker" ] } \ No newline at end of file diff --git a/res/content/base/textures/blocks/door.png b/res/content/base/textures/blocks/door.png new file mode 100644 index 0000000000000000000000000000000000000000..ad651ac66efe6de06134de64963dc0442048785f GIT binary patch literal 8418 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 literal 0 HcmV?d00001 diff --git a/res/content/base/textures/blocks/door_top.png b/res/content/base/textures/blocks/door_top.png new file mode 100644 index 0000000000000000000000000000000000000000..96e2a73d550e68b7ba4e3ec5147e776c5b28435c GIT binary patch literal 6556 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 ZW~O>i#H=uUo4uK(Z0vaN;xRF4{{^IkJFWl# literal 0 HcmV?d00001 diff --git a/src/frontend/debug_panel.cpp b/src/frontend/debug_panel.cpp index 958b2f02..91067211 100644 --- a/src/frontend/debug_panel.cpp +++ b/src/frontend/debug_panel.cpp @@ -31,6 +31,13 @@ static std::shared_ptr