library-mirrors/Graphoon
1
0
Fork 0
mirror of https://github.com/rm-code/Graphoon.git synced 2024-12-10 04:34:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove name attribute in Node class

Browse Source 
Seems kind of redundant to have both an id and a name attribute.
This commit is contained in:
Robert Machmer 2016-01-03 02:31:57 +01:00
parent e6154ba5ea
commit dba6a49587
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fd/Graph.lua
View File

@ -55,9 +55,9 @@ function Graph.new()
for _, node in pairs( table.nodes ) do
local rx, ry = math.random( x, w ), math.random( y, h );
if type( node ) == 'string' then
self:addNode( node, nil, rx, ry );
self:addNode( node, rx, ry );
elseif type( node ) == 'table' then
self:addNode( node.id, node.name, node.x or rx, node.y or ry, node.anchor );
self:addNode( node.id, node.x or rx, node.y or ry, node.anchor );
end
end
@ -72,9 +72,9 @@ function Graph.new()
-- @param x - The x-coordinate at which to place the new node.
-- @param y - The y-coordinate at which to place the new node.
--
function self:addNode( id, name, x, y, anchor )
function self:addNode( id, x, y, anchor )
assert( not nodes[id], "Node IDs must be unique." );
nodes[id] = Node.new( id, name, x, y, anchor );
nodes[id] = Node.new( id, x, y, anchor );
return nodes[id];
end

7
fd/Node.lua
View File

@ -12,10 +12,9 @@ local DEFAULT_MASS = 0.05;
---
-- @param id - A unique id which will be used to reference this node.
--
function Node.new( id, name, x, y, anchor )
function Node.new( id, x, y, anchor )
local self = {};
local name = name or id;
local px, py = x or 0, y or 0;
local ax, ay = 0, 0;
local vx, vy = 0, 0;
@ -80,10 +79,6 @@ function Node.new( id, name, x, y, anchor )
return id;
end
function self:getName()
return name;
end
function self:getX()
return px;
end