Added lightbulb block

MihailRis · Dec 9, 2023 · 9e04a72 · 9e04a72
1 parent 545057e
commit 9e04a72
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 3 deletions.
diff --git a/res/content/base/blocks/lightbulb.json 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
@@ -23,6 +23,7 @@
         "green_lamp",
         "blue_lamp",
         "pane",
-        "pipe"
+        "pipe",
+        "lightbulb"
     ]
-}
+}
diff --git a/res/textures/blocks/dbg_bottom.png b/res/textures/blocks/dbg_bottom.png
diff --git a/res/textures/blocks/dbg_east.png b/res/textures/blocks/dbg_east.png
diff --git a/res/textures/blocks/dbg_north.png b/res/textures/blocks/dbg_north.png
diff --git a/res/textures/blocks/dbg_south.png b/res/textures/blocks/dbg_south.png
diff --git a/res/textures/blocks/dbg_top.png b/res/textures/blocks/dbg_top.png
diff --git a/res/textures/blocks/dbg_west.png b/res/textures/blocks/dbg_west.png
diff --git a/res/textures/blocks/lightbulb.png b/res/textures/blocks/lightbulb.png
diff --git 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;