PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp

Browse Source
This commit is contained in:
@clasher113
2023-11-29 17:11:56 +02:00
parent 984ffcbfe6 693ad6d9a7
commit a8af2653f4
9 changed files with 144 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/definitions.cpp
+6 -1
View File
@@ -1,11 +1,15 @@
#include "definitions.h"
#include <glm/glm.hpp>
#include "content/Content.h"
#include "window/Window.h"
#include "window/Events.h"
#include "window/input.h"
#include "voxels/Block.h"
using glm::vec3;
// All in-game definitions (blocks, items, etc..)
void setup_definitions(ContentBuilder* builder) {
Block* block = new Block("core:air", "air");
@@ -70,7 +74,7 @@ void setup_definitions(ContentBuilder* builder) {
block->lightPassing = true;
block->obstacle = false;
block->model = BlockModel::xsprite;
block->hitboxScale = 0.5f;
block->hitbox.scale(vec3(0.7f), vec3(0.5f, 0.0f, 0.5f));
builder->add(block);
block = new Block("base:flower", "flower");
@@ -78,6 +82,7 @@ void setup_definitions(ContentBuilder* builder) {
block->lightPassing = true;
block->obstacle = false;
block->model = BlockModel::xsprite;
block->hitbox.scale(vec3(0.7f));
builder->add(block);
block = new Block("base:brick", "brick");