Added lightbulb block
9
res/content/base/blocks/lightbulb.json
Normal file
@ -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
|
||||||
|
}
|
||||||
@ -23,6 +23,7 @@
|
|||||||
"green_lamp",
|
"green_lamp",
|
||||||
"blue_lamp",
|
"blue_lamp",
|
||||||
"pane",
|
"pane",
|
||||||
"pipe"
|
"pipe",
|
||||||
|
"lightbulb"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
BIN
res/textures/blocks/dbg_bottom.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
res/textures/blocks/dbg_east.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
res/textures/blocks/dbg_north.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
res/textures/blocks/dbg_south.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
res/textures/blocks/dbg_top.png
Normal file
|
After Width: | Height: | Size: 156 B |
BIN
res/textures/blocks/dbg_west.png
Normal file
|
After Width: | Height: | Size: 6.6 KiB |
BIN
res/textures/blocks/lightbulb.png
Normal file
|
After Width: | Height: | Size: 6.1 KiB |
@ -223,7 +223,6 @@ voxel* Chunks::rayCast(vec3 start,
|
|||||||
|
|
||||||
const Block* def = contentIds->getBlockDef(voxel->id);
|
const Block* def = contentIds->getBlockDef(voxel->id);
|
||||||
if (def->selectable){
|
if (def->selectable){
|
||||||
timeutil::ScopeLogTimer lg((long long)def);
|
|
||||||
end.x = px + t * dx;
|
end.x = px + t * dx;
|
||||||
end.y = py + t * dy;
|
end.y = py + t * dy;
|
||||||
end.z = pz + t * dz;
|
end.z = pz + t * dz;
|
||||||
|
|||||||