]> git.lizzy.rs Git - Crafter.git/commitdiff
EXTREME redstone speed up
authoroilboi <47129783+oilboi@users.noreply.github.com>
Fri, 26 Jun 2020 14:07:16 +0000 (10:07 -0400)
committeroilboi <47129783+oilboi@users.noreply.github.com>
Fri, 26 Jun 2020 14:07:16 +0000 (10:07 -0400)
mods/redstone/init.lua

index 09eb70ac8eefb27ae34c0a1e18ec19e1f1582aa9..3d2cd435f21e99a7a2ba78f43253ef74d39ff68f 100644 (file)
@@ -27,6 +27,12 @@ local add_vec         = vector.add
 local sub_vec         = vector.subtract
 local vector_distance = vector.distance
 
+local order = {
+       {x=1, y=0, z=0}, {x=-1, y=0, z= 0},
+       {x=0, y=1, z=0}, {x= 0, y=-1, z=0},
+       {x=0, y=0, z=1}, {x= 0, y=0, z=-1},
+}
+
 -- redstone class
 redstone = {}
 
@@ -34,6 +40,7 @@ local speed_test
 
 local r_index = {}
 local a_index = {}
+local check_table = {}
 
 local path = minetest.get_modpath("redstone")
 dofile(path.."/functions.lua")
@@ -58,21 +65,14 @@ local get_local_power = function(pos)
        if not pos then
                return
        end
-       for x = -1,1 do
-       for y = -1,1 do
-       for z = -1,1 do
-               --index only direct neighbors
-               if abs(x)+abs(z)+abs(y) == 1 then
-                       --print(get_node(add_vec(new_vec(x,y,z),pos)).name)
-                       if get_item_group(get_node(add_vec(new_vec(x,y,z),pos)).name, "redstone_power") > 0 then
-                               return(1)
-                       end
-                       if get_meta(add_vec(new_vec(x,y,z),pos)):get_int("redstone_power") > 0 then
-                               return(1)
-                       end
+       for _,order in pairs(order) do
+               --print(get_node(add_vec(new_vec(x,y,z),pos)).name)
+               if get_item_group(get_node(add_vec(new_vec(order.x,order.y,order.z),pos)).name, "redstone_power") > 0 then
+                       return(1)
+               end
+               if get_meta(add_vec(new_vec(order.x,order.y,order.z),pos)):get_int("redstone_power") > 0 then
+                       return(1)
                end
-       end
-       end
        end     
        return(0)
 end
@@ -117,7 +117,7 @@ end
 
 local localredstone = {}
 
-localredstone.injector = function(i)
+localredstone.injector = function(i,origin)
        if get_node(i).name == "air" then
                return
        end
@@ -128,16 +128,31 @@ localredstone.injector = function(i)
                end
        end
 
+       if vector_distance(i,origin) > 9 then
+               return
+       end
+
        --index dust
        if get_group(i,"redstone_dust") > 0 then
-               --add data to both maps
-               if not r_index[i.x] then r_index[i.x] = {} end
-               if not r_index[i.x][i.y] then r_index[i.x][i.y] = {} end
-               r_index[i.x][i.y][i.z] = {dust = true,level = 0}
-               --the data to the 3d array must be written to memory before this is executed
-               --or a stack overflow occurs!!!
-               localredstone.collector(i)
-               return
+               if vector_distance(i,origin) <= 8 then
+                       --add data to both maps
+                       if not r_index[i.x] then r_index[i.x] = {} end
+                       if not r_index[i.x][i.y] then r_index[i.x][i.y] = {} end
+                       r_index[i.x][i.y][i.z] = {dust = true,level = 0}
+
+                       if not check_table[i.x] then check_table[i.x] = {} end
+                       if not check_table[i.x][i.y] then check_table[i.x][i.y] = {} end
+                       check_table[i.x][i.y][i.z] = get_group(i,"redstone_power")
+                       
+                       --the data to the 3d array must be written to memory before this is executed
+                       --or a stack overflow occurs!!!
+                       localredstone.collector(i,origin)
+                       return
+               else
+                       if not r_index[i.x] then r_index[i.x] = {} end
+                       if not r_index[i.x][i.y] then r_index[i.x][i.y] = {} end
+                       r_index[i.x][i.y][i.z] = {torch = true,power=get_group(i,"redstone_power")}
+               end
        end
        --index power sources
        if get_group(i,"redstone_torch") > 0 then
@@ -181,41 +196,37 @@ localredstone.injector = function(i)
        end
 end
 
-localredstone.collector = function(pos)
-       for x = -1,1 do
-       for y = -1,1 do
-       for z = -1,1 do
-               if abs(x)+abs(z) == 1 then
-                       localredstone.injector(add_vec(pos,new_vec(x,y,z)))
-               end
-       end
-       end
+localredstone.collector = function(pos,origin)
+       for _,order in pairs(order) do
+               localredstone.injector(add_vec(pos,new_vec(order.x,order.y,order.z)),origin)
        end
 end
 
 
+--check if index table contains items
+--then execute an update
+local function redstone_algorithm()
+       --if indexes exist then calculate redstone
+       --create the old version to help with deactivation calculation
+       redstone.calculate()
+       --clear the index to avoid cpu looping wasting processing power
+       r_index = {}
+       a_index = {}
+       check_table = {}
+end
+
+
 function redstone.collect_info(pos)
        if r_index[pos.x] and r_index[pos.x][pos.y] and r_index[pos.x][pos.y][pos.z] then
                return
        end
-       localredstone.injector(pos)
-       localredstone.collector(pos)
+       localredstone.injector(pos,pos)
+       localredstone.collector(pos,pos)
+       
+       redstone_algorithm()
 end
 
 
---check if index table contains items
---then execute an update
-minetest.register_globalstep(function(dtime)
-       --if indexes exist then calculate redstone
-       if (r_index and next(r_index)) or (a_index and next(a_index)) then
-               --create the old version to help with deactivation calculation
-               redstone.calculate()
-               --clear the index to avoid cpu looping wasting processing power
-               r_index = {}
-               a_index = {}
-       end
-end)
-
 --make all power sources push power out
 local x_min
 local x_max
@@ -254,16 +265,20 @@ function redstone.calculate()
 
        --reassemble the table into a position list minetest can understand
        --run through and set dust
+       local count = 0
+
        for x,datax in pairs(r_index) do
                for y,datay in pairs(datax) do
                        for z,index in pairs(datay) do
                                --print(get_node(new_vec(x,y,z)).name)
-                               if index and index.dust then
+                               if index and index.dust and index.level ~= check_table[x][y][z] then
+                                       count = count + 1
                                        minetest.set_node(new_vec(x,y,z),{name="redstone:dust_"..index.level})
                                end
                        end
                end
        end
+       print("set "..count.." nodes")
 
        for x,datax in pairs(a_index) do
                for y,datay in pairs(datax) do
@@ -311,31 +326,26 @@ local function redstone_pathfinder(source,source_level,direction)
                                passed_on_level = source_level - 1
                                if passed_on_level > 0 then
                                        r_index[i.x][i.y][i.z].level = passed_on_level
-                                       redstone_pathfinder(i,passed_on_level,nil,origin)
+                                       redstone_pathfinder(i,passed_on_level,nil)
                                end
                        end
                end
        else
                --redstone and torch
-               for x = -1,1 do
-               for y = -1,1 do
-               for z = -1,1 do
-                       if abs(x)+abs(z) == 1 then
-                               i = add_vec(source,new_vec(x,y,z))
-                               if r_index and r_index[i.x] and r_index[i.x][i.y] and r_index[i.x][i.y][i.z] then
-                                       index = r_index[i.x][i.y][i.z]                                  
-                                       if index.dust  then
-                                               passed_on_level = source_level - 1
-                                               if passed_on_level > 0 and index.level < source_level then
-                                                       r_index[i.x][i.y][i.z].level = passed_on_level
-                                                       redstone_pathfinder(i,passed_on_level,nil)
-                                               end
+               for _,order in pairs(order) do
+                       i = add_vec(source,new_vec(order.x,order.y,order.z))
+                       if r_index and r_index[i.x] and r_index[i.x][i.y] and r_index[i.x][i.y][i.z] then
+                               --print(minetest.get_node(i).name)
+                               index = r_index[i.x][i.y][i.z]                                  
+                               if index.dust  then
+                                       passed_on_level = source_level - 1
+                                       if passed_on_level > 0 and index.level < source_level then
+                                               r_index[i.x][i.y][i.z].level = passed_on_level
+                                               redstone_pathfinder(i,passed_on_level,nil)
                                        end
                                end
                        end
                end
-               end
-               end
        end
 end
 function redstone.pathfind(source,source_level,direction)