Skip to content

Commit 3b78a22

Browse files
numberZeronumberZero
authoredMar 29, 2021
Degrotate support for mesh nodes (#7840)
·
5.11.05.5.0
1 parent fde2785 commit 3b78a22

File tree

11 files changed

+113
-13
lines changed

11 files changed

+113
-13
lines changed
 

‎builtin/game/item.lua

+5-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ end
157157

158158
function core.is_colored_paramtype(ptype)
159159
return (ptype == "color") or (ptype == "colorfacedir") or
160-
(ptype == "colorwallmounted")
160+
(ptype == "colorwallmounted") or (ptype == "colordegrotate")
161161
end
162162

163163
function core.strip_param2_color(param2, paramtype2)
@@ -168,6 +168,8 @@ function core.strip_param2_color(param2, paramtype2)
168168
param2 = math.floor(param2 / 32) * 32
169169
elseif paramtype2 == "colorwallmounted" then
170170
param2 = math.floor(param2 / 8) * 8
171+
elseif paramtype2 == "colordegrotate" then
172+
param2 = math.floor(param2 / 32) * 32
171173
end
172174
-- paramtype2 == "color" requires no modification.
173175
return param2
@@ -345,6 +347,8 @@ function core.item_place_node(itemstack, placer, pointed_thing, param2,
345347
color_divisor = 8
346348
elseif def.paramtype2 == "colorfacedir" then
347349
color_divisor = 32
350+
elseif def.paramtype2 == "colordegrotate" then
351+
color_divisor = 32
348352
end
349353
if color_divisor then
350354
local color = math.floor(metatable.palette_index / color_divisor)

‎doc/lua_api.txt

+8-3
Original file line numberDiff line numberDiff line change
@@ -1048,9 +1048,9 @@ The function of `param2` is determined by `paramtype2` in node definition.
10481048
* The height of the 'plantlike' section is stored in `param2`.
10491049
* The height is (`param2` / 16) nodes.
10501050
* `paramtype2 = "degrotate"`
1051-
* Only valid for "plantlike" drawtype. The rotation of the node is stored in
1052-
`param2`.
1053-
* Values range 0 - 179. The value stored in `param2` is multiplied by two to
1051+
* Valid for `plantlike` and `mesh` drawtypes. The rotation of the node is
1052+
stored in `param2`.
1053+
* Values range 0–239. The value stored in `param2` is multiplied by 1.5 to
10541054
get the actual rotation in degrees of the node.
10551055
* `paramtype2 = "meshoptions"`
10561056
* Only valid for "plantlike" drawtype. `param2` encodes the shape and
@@ -1088,6 +1088,11 @@ The function of `param2` is determined by `paramtype2` in node definition.
10881088
* `param2` values 0-63 define 64 levels of internal liquid, 0 being empty
10891089
and 63 being full.
10901090
* Liquid texture is defined using `special_tiles = {"modname_tilename.png"}`
1091+
* `paramtype2 = "colordegrotate"`
1092+
* Same as `degrotate`, but with colors.
1093+
* The first (most-significant) three bits of `param2` tells which color
1094+
is picked from the palette. The palette should have 8 pixels.
1095+
* Remaining 5 bits store rotation in range 0–23 (i.e. in 15° steps)
10911096
* `paramtype2 = "none"`
10921097
* `param2` will not be used by the engine and can be used to store
10931098
an arbitrary value

‎games/devtest/mods/testnodes/drawtypes.lua

+55-1
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,73 @@ minetest.register_node("testnodes:plantlike_waving", {
223223

224224

225225
-- param2 will rotate
226+
local function rotate_on_rightclick(pos, node, clicker)
227+
local def = minetest.registered_nodes[node.name]
228+
local aux1 = clicker:get_player_control().aux1
229+
230+
local deg, deg_max
231+
local color, color_mult = 0, 0
232+
if def.paramtype2 == "degrotate" then
233+
deg = node.param2
234+
deg_max = 240
235+
elseif def.paramtype2 == "colordegrotate" then
236+
-- MSB [3x color, 5x rotation] LSB
237+
deg = node.param2 % 2^5
238+
deg_max = 24
239+
color_mult = 2^5
240+
color = math.floor(node.param2 / color_mult)
241+
end
242+
243+
deg = (deg + (aux1 and 10 or 1)) % deg_max
244+
node.param2 = color * color_mult + deg
245+
minetest.swap_node(pos, node)
246+
minetest.chat_send_player(clicker:get_player_name(),
247+
"Rotation is now " .. deg .. " / " .. deg_max)
248+
end
249+
226250
minetest.register_node("testnodes:plantlike_degrotate", {
227251
description = S("Degrotate Plantlike Drawtype Test Node"),
228252
drawtype = "plantlike",
229253
paramtype = "light",
230254
paramtype2 = "degrotate",
231255
tiles = { "testnodes_plantlike_degrotate.png" },
232256

233-
257+
on_rightclick = rotate_on_rightclick,
258+
place_param2 = 7,
234259
walkable = false,
235260
sunlight_propagates = true,
236261
groups = { dig_immediate = 3 },
237262
})
238263

264+
minetest.register_node("testnodes:mesh_degrotate", {
265+
description = S("Degrotate Mesh Drawtype Test Node"),
266+
drawtype = "mesh",
267+
paramtype = "light",
268+
paramtype2 = "degrotate",
269+
mesh = "testnodes_pyramid.obj",
270+
tiles = { "testnodes_mesh_stripes2.png" },
271+
272+
on_rightclick = rotate_on_rightclick,
273+
place_param2 = 7,
274+
sunlight_propagates = true,
275+
groups = { dig_immediate = 3 },
276+
})
277+
278+
minetest.register_node("testnodes:mesh_colordegrotate", {
279+
description = S("Color Degrotate Mesh Drawtype Test Node"),
280+
drawtype = "mesh",
281+
paramtype2 = "colordegrotate",
282+
palette = "testnodes_palette_facedir.png",
283+
mesh = "testnodes_pyramid.obj",
284+
tiles = { "testnodes_mesh_stripes2.png" },
285+
286+
on_rightclick = rotate_on_rightclick,
287+
-- color index 1, 7 steps rotated
288+
place_param2 = 1 * 2^5 + 7,
289+
sunlight_propagates = true,
290+
groups = { dig_immediate = 3 },
291+
})
292+
239293
-- param2 will change height
240294
minetest.register_node("testnodes:plantlike_leveled", {
241295
description = S("Leveled Plantlike Drawtype Test Node"),

‎src/client/content_mapblock.cpp

+12-4
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ void MapblockMeshGenerator::drawPlantlike()
968968
draw_style = PLANT_STYLE_CROSS;
969969
scale = BS / 2 * f->visual_scale;
970970
offset = v3f(0, 0, 0);
971-
rotate_degree = 0;
971+
rotate_degree = 0.0f;
972972
random_offset_Y = false;
973973
face_num = 0;
974974
plant_height = 1.0;
@@ -988,7 +988,8 @@ void MapblockMeshGenerator::drawPlantlike()
988988
break;
989989

990990
case CPT2_DEGROTATE:
991-
rotate_degree = n.param2 * 2;
991+
case CPT2_COLORED_DEGROTATE:
992+
rotate_degree = 1.5f * n.getDegRotate(nodedef);
992993
break;
993994

994995
case CPT2_LEVELED:
@@ -1343,6 +1344,7 @@ void MapblockMeshGenerator::drawMeshNode()
13431344
u8 facedir = 0;
13441345
scene::IMesh* mesh;
13451346
bool private_mesh; // as a grab/drop pair is not thread-safe
1347+
int degrotate = 0;
13461348

13471349
if (f->param_type_2 == CPT2_FACEDIR ||
13481350
f->param_type_2 == CPT2_COLORED_FACEDIR) {
@@ -1354,17 +1356,23 @@ void MapblockMeshGenerator::drawMeshNode()
13541356
facedir = n.getWallMounted(nodedef);
13551357
if (!enable_mesh_cache)
13561358
facedir = wallmounted_to_facedir[facedir];
1359+
} else if (f->param_type_2 == CPT2_DEGROTATE ||
1360+
f->param_type_2 == CPT2_COLORED_DEGROTATE) {
1361+
degrotate = n.getDegRotate(nodedef);
13571362
}
13581363

1359-
if (!data->m_smooth_lighting && f->mesh_ptr[facedir]) {
1364+
if (!data->m_smooth_lighting && f->mesh_ptr[facedir] && !degrotate) {
13601365
// use cached meshes
13611366
private_mesh = false;
13621367
mesh = f->mesh_ptr[facedir];
13631368
} else if (f->mesh_ptr[0]) {
13641369
// no cache, clone and rotate mesh
13651370
private_mesh = true;
13661371
mesh = cloneMesh(f->mesh_ptr[0]);
1367-
rotateMeshBy6dFacedir(mesh, facedir);
1372+
if (facedir)
1373+
rotateMeshBy6dFacedir(mesh, facedir);
1374+
else if (degrotate)
1375+
rotateMeshXZby(mesh, 1.5f * degrotate);
13681376
recalculateBoundingBox(mesh);
13691377
meshmanip->recalculateNormals(mesh, true, false);
13701378
} else

‎src/client/content_mapblock.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class MapblockMeshGenerator
139139
// plantlike-specific
140140
PlantlikeStyle draw_style;
141141
v3f offset;
142-
int rotate_degree;
142+
float rotate_degree;
143143
bool random_offset_Y;
144144
int face_num;
145145
float plant_height;

‎src/mapnode.cpp

+21
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,16 @@ v3s16 MapNode::getWallMountedDir(const NodeDefManager *nodemgr) const
177177
}
178178
}
179179

180+
u8 MapNode::getDegRotate(const NodeDefManager *nodemgr) const
181+
{
182+
const ContentFeatures &f = nodemgr->get(*this);
183+
if (f.param_type_2 == CPT2_DEGROTATE)
184+
return getParam2() % 240;
185+
if (f.param_type_2 == CPT2_COLORED_DEGROTATE)
186+
return 10 * ((getParam2() & 0x1F) % 24);
187+
return 0;
188+
}
189+
180190
void MapNode::rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot)
181191
{
182192
ContentParamType2 cpt2 = nodemgr->get(*this).param_type_2;
@@ -230,6 +240,17 @@ void MapNode::rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot)
230240
Rotation oldrot = wallmounted_to_rot[wmountface - 2];
231241
param2 &= ~7;
232242
param2 |= rot_to_wallmounted[(oldrot - rot) & 3];
243+
} else if (cpt2 == CPT2_DEGROTATE) {
244+
int angle = param2; // in 1.5°
245+
angle += 60 * rot; // don’t do that on u8
246+
angle %= 240;
247+
param2 = angle;
248+
} else if (cpt2 == CPT2_COLORED_DEGROTATE) {
249+
int angle = param2 & 0x1F; // in 15°
250+
int color = param2 & 0xE0;
251+
angle += 6 * rot;
252+
angle %= 24;
253+
param2 = color | angle;
233254
}
234255
}
235256

‎src/mapnode.h

+3
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@ struct MapNode
240240
u8 getWallMounted(const NodeDefManager *nodemgr) const;
241241
v3s16 getWallMountedDir(const NodeDefManager *nodemgr) const;
242242

243+
/// @returns Rotation in range 0–239 (in 1.5° steps)
244+
u8 getDegRotate(const NodeDefManager *nodemgr) const;
245+
243246
void rotateAlongYAxis(const NodeDefManager *nodemgr, Rotation rot);
244247

245248
/*!

‎src/nodedef.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,8 @@ void ContentFeatures::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
944944

945945
if (param_type_2 == CPT2_COLOR ||
946946
param_type_2 == CPT2_COLORED_FACEDIR ||
947-
param_type_2 == CPT2_COLORED_WALLMOUNTED)
947+
param_type_2 == CPT2_COLORED_WALLMOUNTED ||
948+
param_type_2 == CPT2_COLORED_DEGROTATE)
948949
palette = tsrc->getPalette(palette_name);
949950

950951
if (drawtype == NDT_MESH && !mesh.empty()) {

‎src/nodedef.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ enum ContentParamType2
6767
CPT2_WALLMOUNTED,
6868
// Block level like FLOWINGLIQUID
6969
CPT2_LEVELED,
70-
// 2D rotation for things like plants
70+
// 2D rotation
7171
CPT2_DEGROTATE,
7272
// Mesh options for plants
7373
CPT2_MESHOPTIONS,
@@ -79,6 +79,8 @@ enum ContentParamType2
7979
CPT2_COLORED_WALLMOUNTED,
8080
// Glasslike framed drawtype internal liquid level, param2 values 0 to 63
8181
CPT2_GLASSLIKE_LIQUID_LEVEL,
82+
// 3 bits of palette index, then degrotate
83+
CPT2_COLORED_DEGROTATE,
8284
};
8385

8486
enum LiquidType

‎src/script/common/c_content.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,8 @@ void read_content_features(lua_State *L, ContentFeatures &f, int index)
685685
if (!f.palette_name.empty() &&
686686
!(f.param_type_2 == CPT2_COLOR ||
687687
f.param_type_2 == CPT2_COLORED_FACEDIR ||
688-
f.param_type_2 == CPT2_COLORED_WALLMOUNTED))
688+
f.param_type_2 == CPT2_COLORED_WALLMOUNTED ||
689+
f.param_type_2 == CPT2_COLORED_DEGROTATE))
689690
warningstream << "Node " << f.name.c_str()
690691
<< " has a palette, but not a suitable paramtype2." << std::endl;
691692

‎src/script/cpp_api/s_node.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ struct EnumString ScriptApiNode::es_ContentParamType2[] =
6565
{CPT2_COLORED_FACEDIR, "colorfacedir"},
6666
{CPT2_COLORED_WALLMOUNTED, "colorwallmounted"},
6767
{CPT2_GLASSLIKE_LIQUID_LEVEL, "glasslikeliquidlevel"},
68+
{CPT2_COLORED_DEGROTATE, "colordegrotate"},
6869
{0, NULL},
6970
};
7071

0 commit comments

Comments
 (0)
Please sign in to comment.