diff --git a/res/content/base/blocks/lightbulb.json b/res/content/base/blocks/lightbulb.json new file mode 100644 index 00000000..cf603c2b --- /dev/null +++ b/res/content/base/blocks/lightbulb.json @@ -0,0 +1,9 @@ +{ + "texture": "lightbulb", + "emission": [15, 14, 13], + "model": "aabb", + "hitbox": [0.25, 0.0, 0.25, 0.5, 0.5, 0.5], + "rotation": "pipe", + "light-passing": true, + "sky-light-passing": true +} diff --git a/res/content/base/package.json b/res/content/base/package.json index 5ba70b1f..f131099f 100644 --- a/res/content/base/package.json +++ b/res/content/base/package.json @@ -23,6 +23,7 @@ "green_lamp", "blue_lamp", "pane", - "pipe" + "pipe", + "lightbulb" ] -} \ No newline at end of file +} diff --git a/res/textures/blocks/dbg_bottom.png b/res/textures/blocks/dbg_bottom.png new file mode 100644 index 00000000..01edf51d Binary files /dev/null and b/res/textures/blocks/dbg_bottom.png differ diff --git a/res/textures/blocks/dbg_east.png b/res/textures/blocks/dbg_east.png new file mode 100644 index 00000000..6139b25f Binary files /dev/null and b/res/textures/blocks/dbg_east.png differ diff --git a/res/textures/blocks/dbg_north.png b/res/textures/blocks/dbg_north.png new file mode 100644 index 00000000..d5564609 Binary files /dev/null and b/res/textures/blocks/dbg_north.png differ diff --git a/res/textures/blocks/dbg_south.png b/res/textures/blocks/dbg_south.png new file mode 100644 index 00000000..d105acd4 Binary files /dev/null and b/res/textures/blocks/dbg_south.png differ diff --git a/res/textures/blocks/dbg_top.png b/res/textures/blocks/dbg_top.png new file mode 100644 index 00000000..d5395aca Binary files /dev/null and b/res/textures/blocks/dbg_top.png differ diff --git a/res/textures/blocks/dbg_west.png b/res/textures/blocks/dbg_west.png new file mode 100644 index 00000000..3eb4026b Binary files /dev/null and b/res/textures/blocks/dbg_west.png differ diff --git a/res/textures/blocks/lightbulb.png b/res/textures/blocks/lightbulb.png new file mode 100644 index 00000000..d4b9eabe Binary files /dev/null and b/res/textures/blocks/lightbulb.png differ diff --git a/src/voxels/Chunks.cpp b/src/voxels/Chunks.cpp index 497bb082..ad4a6f09 100644 --- a/src/voxels/Chunks.cpp +++ b/src/voxels/Chunks.cpp @@ -223,7 +223,6 @@ voxel* Chunks::rayCast(vec3 start, const Block* def = contentIds->getBlockDef(voxel->id); if (def->selectable){ - timeutil::ScopeLogTimer lg((long long)def); end.x = px + t * dx; end.y = py + t * dy; end.z = pz + t * dz;