Add rover. Use lua voxelmanip data buffer memory optimisation

master
paramat 2017-03-07 16:32:42 +00:00
parent c0851059a8
commit f9b2fe4db0
10 changed files with 255 additions and 7 deletions

View File

@ -1,4 +1,4 @@
moonrealm 0.10.0 by paramat
moonrealm 0.10.1 by paramat
For Minetest 0.4.14 or later
Depends default
Licenses: Code LGPL 2.1. Media CC BY-SA 3.0

View File

@ -105,6 +105,7 @@ local np_terblen = {
dofile(minetest.get_modpath("moonrealm") .. "/nodes.lua")
dofile(minetest.get_modpath("moonrealm") .. "/crafting.lua")
dofile(minetest.get_modpath("moonrealm") .. "/functions.lua")
dofile(minetest.get_modpath("moonrealm") .. "/rover.lua")
-- Set mapgen parameters
@ -252,6 +253,11 @@ local nbuf_terblen
local nbuf_gradcen
-- Localise data buffer
local dbuf
-- On generated function
minetest.register_on_generated(function(minp, maxp, seed)
@ -261,7 +267,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
return
end
local t1 = os.clock()
--local t1 = os.clock()
local x1 = maxp.x
local y1 = maxp.y
local z1 = maxp.z
@ -271,7 +277,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
local area = VoxelArea:new{MinEdge = emin, MaxEdge = emax}
local data = vm:get_data()
local data = vm:get_data(dbuf)
local c_air = minetest.get_content_id("air")
local c_ignore = minetest.get_content_id("ignore")
@ -328,7 +334,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
end
for y = y0, y1 do
local vi = area:index(x0, y, z) -- LVM index for first node in x row
local vi = area:index(x0, y, z)
local icecha = ICECHA * (1 + (GRADCEN - y) / ICEGRAD)
for x = x0, x1 do
@ -412,12 +418,12 @@ minetest.register_on_generated(function(minp, maxp, seed)
end
vm:set_data(data)
--vm:set_lighting({day=0, night=0})
vm:set_lighting({day=0, night=0})
vm:calc_lighting()
vm:write_to_map(data)
local chugent = math.ceil((os.clock() - t1) * 1000)
print ("[moonrealm] chunk generation " .. chugent .. " ms")
--local chugent = math.ceil((os.clock() - t1) * 1000)
--print ("[moonrealm] chunk generation " .. chugent .. " ms")
end)
@ -541,6 +547,7 @@ minetest.register_on_newplayer(function(player)
inv:add_item("main", "moonrealm:hlsource 4")
inv:add_item("main", "moonrealm:sapling 4")
inv:add_item("main", "moonrealm:spacesuit 4")
inv:add_item("main", "moonrealm:rover")
end)

241
rover.lua Normal file
View File

@ -0,0 +1,241 @@
local ACDC = 0.2 -- Acceleration / decelleration
local MAXSP = 8 -- Maximum speed
local TURNSP = 0.03 -- Maximum yaw speed
local STEPH = 1.1 -- Stepheight, 0.6 = climb slabs, 1.1 = climb nodes
-- Functions
local function is_ground(pos)
return minetest.registered_nodes[minetest.get_node(pos).name].walkable
end
local function get_sign(i)
if i == 0 then
return 0
else
return i / math.abs(i)
end
end
local function get_velocity(v, yaw, y)
local x = -math.sin(yaw) * v
local z = math.cos(yaw) * v
return {x = x, y = y, z = z}
end
local function get_v(v)
return math.sqrt(v.x ^ 2 + v.z ^ 2)
end
-- Rover
local rover = {
physical = true,
collide_with_objects = true,
collisionbox = {-0.53, -1.0, -0.53, 0.53, 1.0, 0.53},
visual = "cube",
visual_size = {x = 2.0, y = 2.0},
textures = { -- top base rightside leftside front back
"moonrealm_rover_top.png",
"moonrealm_rover_base.png",
"moonrealm_rover_right.png",
"moonrealm_rover_left.png",
"moonrealm_rover_front.png",
"moonrealm_rover_back.png",
},
stepheight = STEPH,
driver = nil,
v = 0,
last_v = 0,
removed = false,
}
function rover:on_rightclick(clicker)
if not clicker or not clicker:is_player() then
return
end
local name = clicker:get_player_name()
if self.driver and clicker == self.driver then
self.driver = nil
clicker:set_detach()
default.player_attached[name] = false
default.player_set_animation(clicker, "stand" , 30)
elseif not self.driver then
self.driver = clicker
clicker:set_attach(self.object, "",
{x = 0, y = 3, z = -2}, {x = 0, y = 0, z = 0})
default.player_attached[name] = true
minetest.after(0.2, function()
default.player_set_animation(clicker, "sit" , 30)
end)
self.object:setyaw(clicker:get_look_yaw() - math.pi / 2)
end
end
function rover.on_activate(self, staticdata, dtime_s)
self.object:set_armor_groups({immortal = 1})
if staticdata then
self.v = tonumber(staticdata)
end
self.last_v = self.v
end
function rover.get_staticdata(self)
return tostring(self.v)
end
function rover.on_punch(self, puncher, time_from_last_punch,
tool_capabilities, direction)
if self.driver then
self.driver:set_detach()
local name = self.driver:get_player_name()
default.player_attached[name] = false
default.player_set_animation(self.driver, "stand" , 30)
self.driver = nil
end
-- delay remove to ensure player is detached
minetest.after(0.1, function()
self.object:remove()
end)
if puncher and puncher:is_player() and
not minetest.setting_getbool("creative_mode") then
puncher:get_inventory():add_item("main", "moonrealm:rover")
end
end
function rover:on_step(dtime)
self.v = get_v(self.object:getvelocity()) * get_sign(self.v)
if self.driver then
local ctrl = self.driver:get_player_control()
if ctrl.up then
self.v = self.v + ACDC
elseif ctrl.down then
self.v = self.v - ACDC
end
end
if self.v == 0 and self.object:getvelocity().y == 0 then
return
end
local absv = math.abs(self.v)
if self.driver then
local ctrl = self.driver:get_player_control()
local turn
local maxturn = (1 + dtime * 2) * TURNSP
if absv < 4 then
turn = maxturn * absv / 4
else
turn = maxturn * (1 - (absv - 4) / 16)
end
if ctrl.left then
self.object:setyaw(self.object:getyaw() + turn)
elseif ctrl.right then
self.object:setyaw(self.object:getyaw() - turn)
end
end
local s = get_sign(self.v)
self.v = self.v - 0.03 * s
if s ~= get_sign(self.v) then
self.object:setvelocity({x = 0, y = 0, z = 0})
self.v = 0
return
end
if absv > MAXSP then
self.v = MAXSP * get_sign(self.v)
end
self.object:setacceleration({x = 0, y = -1.962, z = 0})
self.object:setvelocity(get_velocity(self.v, self.object:getyaw(),
self.object:getvelocity().y))
self.object:setpos(self.object:getpos())
end
-- Register entity
minetest.register_entity("moonrealm:rover", rover)
-- Item
minetest.register_craftitem("moonrealm:rover", {
description = "Rover",
inventory_image = "moonrealm_rover_front.png",
wield_scale = {x = 2, y = 2, z = 2},
liquids_pointable = true,
on_place = function(itemstack, placer, pointed_thing)
if pointed_thing.type ~= "node" then
return
end
if not is_ground(pointed_thing.under) then
return
end
pointed_thing.under.y = pointed_thing.under.y + 1.5
minetest.add_entity(pointed_thing.under, "moonrealm:rover")
if not minetest.setting_getbool("creative_mode") then
itemstack:take_item()
end
return itemstack
end,
})
--[[
minetest.register_craftitem("mesecar:motor", {
description = "Mesecar Motor",
inventory_image = "mesecar_motor.png",
groups = {not_in_creative_inventory=1},
})
minetest.register_craftitem("mesecar:battery", {
description = "Mesecar Battery",
inventory_image = "mesecar_battery.png",
groups = {not_in_creative_inventory=1},
})
-- Crafting
minetest.register_craft({
output = "mesecar:motor",
recipe = {
{"default:steel_ingot", "default:copper_ingot", "default:steel_ingot"},
{"default:copper_ingot", "default:steel_ingot", "default:copper_ingot"},
{"default:steel_ingot", "default:copper_ingot", "default:steel_ingot"},
},
})
minetest.register_craft({
output = "mesecar:battery",
recipe = {
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
{"default:steel_ingot", "default:mese_block", "default:steel_ingot"},
{"default:copper_ingot", "default:copper_ingot", "default:steel_ingot"},
},
})
minetest.register_craft({
output = "mesecar:mesecar4", -- Mesecar
recipe = {
{"default:steel_ingot", "dye:yellow", "default:steel_ingot"},
{"default:steel_ingot", "group:wool", "default:glass"},
{"mesecar:motor", "mesecar:battery", "mesecar:motor"},
},
})
--]]

Binary file not shown.

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 207 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 701 B