cleanups-and-renames

This commit is contained in:
knowledgenude 2020-11-17 12:01:15 -03:00
parent 09ec8f23f8
commit a7863075e2
239 changed files with 345 additions and 111 deletions

View file

@ -7,8 +7,8 @@ class DefaultIfNullNode extends LogicNode {
}
override function get(from: Int): Dynamic {
var v1: Dynamic = inputs[0].get();
var v2: Dynamic = inputs[1].get();
var v1 = inputs[0].get();
var v2 = inputs[1].get();
v1 != null ? return v1 : return v2;
}

View file

@ -6,12 +6,12 @@ class MapRangeNode extends LogicNode {
super(tree);
}
override function get(from: Int): Dynamic {
var value: kha.FastFloat = inputs[0].get();
var fromMin: kha.FastFloat = inputs[1].get();
var fromMax: kha.FastFloat = inputs[2].get();
var toMin: kha.FastFloat = inputs[3].get();
var toMax: kha.FastFloat = inputs[4].get();
override function get(from: Int): kha.FastFloat {
var value = inputs[0].get();
var fromMin = inputs[1].get();
var fromMax = inputs[2].get();
var toMin = inputs[3].get();
var toMax = inputs[4].get();
if (value == null || fromMin == null || fromMax == null || toMin == null || toMax == null) return null;

View file

@ -17,10 +17,10 @@ class MergedGamepadNode extends LogicNode {
if (gamepad == null) return;
var b = false;
switch (property0) {
case "Down":
b = gamepad.down(property1) > 0.0;
case "Started":
b = gamepad.started(property1);
case "Down":
b = gamepad.down(property1) > 0.0;
case "Released":
b = gamepad.released(property1);
// case "Moved Left":
@ -35,10 +35,10 @@ class MergedGamepadNode extends LogicNode {
var num: Int = inputs[0].get();
var gamepad = iron.system.Input.getGamepad(num);
switch (property0) {
case "Down":
return gamepad.down(property1) > 0.0;
case "Started":
return gamepad.started(property1);
case "Down":
return gamepad.down(property1) > 0.0;
case "Released":
return gamepad.released(property1);
// case "Moved Left":

View file

@ -15,10 +15,10 @@ class MergedKeyboardNode extends LogicNode {
var keyboard = iron.system.Input.getKeyboard();
var b = false;
switch (property0) {
case "Down":
b = keyboard.down(property1);
case "Started":
b = keyboard.started(property1);
case "Down":
b = keyboard.down(property1);
case "Released":
b = keyboard.released(property1);
}
@ -28,10 +28,10 @@ class MergedKeyboardNode extends LogicNode {
override function get(from: Int): Dynamic {
var keyboard = iron.system.Input.getKeyboard();
switch (property0) {
case "Down":
return keyboard.down(property1);
case "Started":
return keyboard.started(property1);
case "Down":
return keyboard.down(property1);
case "Released":
return keyboard.released(property1);
}

View file

@ -15,10 +15,10 @@ class MergedMouseNode extends LogicNode {
var mouse = iron.system.Input.getMouse();
var b = false;
switch (property0) {
case "Down":
b = mouse.down(property1);
case "Started":
b = mouse.started(property1);
case "Down":
b = mouse.down(property1);
case "Released":
b = mouse.released(property1);
case "Moved":
@ -30,10 +30,10 @@ class MergedMouseNode extends LogicNode {
override function get(from: Int): Dynamic {
var mouse = iron.system.Input.getMouse();
switch (property0) {
case "Down":
return mouse.down(property1);
case "Started":
return mouse.started(property1);
case "Down":
return mouse.down(property1);
case "Released":
return mouse.released(property1);
case "Moved":

View file

@ -14,10 +14,10 @@ class MergedSurfaceNode extends LogicNode {
var surface = iron.system.Input.getSurface();
var b = false;
switch (property0) {
case "Touched":
b = surface.down();
case "Started":
b = surface.started();
case "Down":
b = surface.down();
case "Released":
b = surface.released();
case "Moved":
@ -29,10 +29,10 @@ class MergedSurfaceNode extends LogicNode {
override function get(from: Int): Dynamic {
var surface = iron.system.Input.getSurface();
switch (property0) {
case "Touched":
return surface.down();
case "Started":
return surface.started();
case "Down":
return surface.down();
case "Released":
return surface.released();
case "Moved":

View file

@ -16,10 +16,10 @@ class MergedVirtualButtonNode extends LogicNode {
if (vb == null) return;
var b = false;
switch (property0) {
case "Down":
b = vb.down;
case "Started":
b = vb.started;
case "Down":
b = vb.down;
case "Released":
b = vb.released;
}
@ -30,10 +30,10 @@ class MergedVirtualButtonNode extends LogicNode {
var vb = iron.system.Input.getVirtualButton(property1);
if (vb == null) return false;
switch (property0) {
case "Down":
return vb.down;
case "Started":
return vb.started;
case "Down":
return vb.down;
case "Released":
return vb.released;
}

View file

@ -50,10 +50,10 @@ class OnCanvasElementNode extends LogicNode {
if (property0 == "click") {
switch (property1) {
case "down":
isEvent = mouse.down(property2);
case "started":
isEvent = mouse.started(property2);
case "down":
isEvent = mouse.down(property2);
case "released":
isEvent = mouse.released(property2);
}

View file

@ -8,14 +8,14 @@ class VectorFromBooleanNode extends LogicNode {
super(tree);
}
override function get(from: Int): Dynamic {
override function get(from: Int): Bool {
var boolX: Bool = inputs[0].get();
var boolNegX: Bool = inputs[1].get();
var boolY: Bool = inputs[2].get();
var boolNegY: Bool = inputs[3].get();
var boolZ: Bool = inputs[4].get();
var boolNegZ: Bool = inputs[5].get();
var boolX = inputs[0].get();
var boolNegX = inputs[1].get();
var boolY = inputs[2].get();
var boolNegY = inputs[3].get();
var boolZ = inputs[4].get();
var boolNegZ = inputs[5].get();
var vector = new Vec4();

View file

@ -9,4 +9,5 @@ class AnimActionNode(ArmLogicTreeNode):
def init(self, context):
super(AnimActionNode, self).init(context)
self.add_input('ArmNodeSocketAnimAction', 'Action')
self.add_output('ArmNodeSocketAnimAction', 'Action', is_var=True)

View file

@ -13,4 +13,5 @@ class BlendActionNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAnimAction', 'Action 1')
self.add_input('ArmNodeSocketAnimAction', 'Action 2')
self.add_input('NodeSocketFloat', 'Factor', default_value = 0.5)
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -13,4 +13,5 @@ class BoneFKNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketString', 'Bone')
self.add_input('NodeSocketShader', 'Transform')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -13,4 +13,5 @@ class BoneIKNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketString', 'Bone')
self.add_input('NodeSocketVector', 'Goal')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -9,6 +9,7 @@ class AnimationStateNode(ArmLogicTreeNode):
def init(self, context):
super(AnimationStateNode, self).init(context)
self.add_input('ArmNodeSocketObject', 'Object')
self.add_output('NodeSocketString', 'Action')
self.add_output('NodeSocketInt', 'Frame')
self.add_output('NodeSocketBool', 'Is Paused')

View file

@ -10,6 +10,7 @@ class GetTilesheetStateNode(ArmLogicTreeNode):
def init(self, context):
super(GetTilesheetStateNode, self).init(context)
self.add_input('ArmNodeSocketObject', 'Object')
self.add_output('NodeSocketString', 'Name')
self.add_output('NodeSocketInt', 'Frame')
self.add_output('NodeSocketBool', 'Is Paused')

View file

@ -10,4 +10,5 @@ class OnActionMarkerNode(ArmLogicTreeNode):
super(OnActionMarkerNode, self).init(context)
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketString', 'Marker')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -12,6 +12,7 @@ class PlayActionFromNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('ArmNodeSocketAnimAction', 'Action')
self.add_input('NodeSocketInt', 'Start Frame')
self.add_input('NodeSocketFloat', 'Blend', default_value=0.2)
self.add_input('NodeSocketFloat', 'Blend', default_value=0.25)
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('ArmNodeSocketAction', 'Done')

View file

@ -12,5 +12,6 @@ class PlayTilesheetNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketString', 'Name')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('ArmNodeSocketAction', 'Done')

View file

@ -11,4 +11,5 @@ class SetActionPausedNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketBool', 'Paused')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class SetActionSpeedNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketFloat', 'Speed', default_value=1.0)
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -13,4 +13,5 @@ class SetParentBoneNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('ArmNodeSocketObject', 'Parent', default_value='Parent')
self.add_input('NodeSocketString', 'Bone', default_value='Bone')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class SetParticleSpeedNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketFloat', 'Speed', default_value=1.0)
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -12,4 +12,5 @@ class SetTilesheetPausedNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketBool', 'Paused')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -22,6 +22,7 @@ class ArrayAddNode(ArmLogicTreeNode):
self.add_input('NodeSocketBool', 'Modify Original', default_value=True)
self.add_input('NodeSocketBool', 'Unique Values')
self.add_input('NodeSocketShader', 'Value')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('ArmNodeSocketArray', 'Array')

View file

@ -10,4 +10,5 @@ class ArrayContainsNode(ArmLogicTreeNode):
super(ArrayContainsNode, self).init(context)
self.add_input('ArmNodeSocketArray', 'Array')
self.add_input('NodeSocketShader', 'Value')
self.add_output('NodeSocketBool', 'Contains')

View file

@ -10,4 +10,5 @@ class ArrayGetNode(ArmLogicTreeNode):
super(ArrayGetNode, self).init(context)
self.add_input('ArmNodeSocketArray', 'Array')
self.add_input('NodeSocketInt', 'Index')
self.add_output('NodeSocketShader', 'Value')

View file

@ -9,4 +9,5 @@ class ArrayLengthNode(ArmLogicTreeNode):
def init(self, context):
super(ArrayLengthNode, self).init(context)
self.add_input('ArmNodeSocketArray', 'Array')
self.add_output('NodeSocketInt', 'Length')

View file

@ -11,6 +11,7 @@ class ArrayLoopNode(ArmLogicTreeNode):
super(ArrayLoopNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketArray', 'Array')
self.add_output('ArmNodeSocketAction', 'Loop')
self.add_output('NodeSocketShader', 'Value')
self.add_output('NodeSocketInt', 'Index')

View file

@ -11,4 +11,5 @@ class ArrayPopNode(ArmLogicTreeNode):
def init(self, context):
super(ArrayPopNode, self).init(context)
self.add_input('ArmNodeSocketArray', 'Array')
self.add_output('NodeSocketShader', 'Value')

View file

@ -13,5 +13,6 @@ class ArrayRemoveIndexNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketArray', 'Array')
self.add_input('NodeSocketInt', 'Index')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('NodeSocketShader', 'Value')

View file

@ -16,6 +16,7 @@ class ArrayRemoveValueNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketArray', 'Array')
self.add_input('NodeSocketShader', 'Value')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('NodeSocketShader', 'Value')

View file

@ -12,4 +12,5 @@ class ArraySetNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketArray', 'Array')
self.add_input('NodeSocketInt', 'Index')
self.add_input('NodeSocketShader', 'Value')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class ArrayShiftNode(ArmLogicTreeNode):
def init(self, context):
super(ArrayShiftNode, self).init(context)
self.add_input('ArmNodeSocketArray', 'Array')
self.add_output('NodeSocketShader', 'Value')

View file

@ -13,4 +13,5 @@ class ArraySliceNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketArray', 'Array')
self.add_input('NodeSocketInt', 'Index')
self.add_input('NodeSocketInt', 'End')
self.add_output('ArmNodeSocketArray', 'Array')

View file

@ -14,4 +14,5 @@ class ArraySpliceNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketArray', 'Array')
self.add_input('NodeSocketInt', 'Index')
self.add_input('NodeSocketInt', 'Length')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class GetCameraFovNode(ArmLogicTreeNode):
def init(self, context):
super(GetCameraFovNode, self).init(context)
self.add_input('ArmNodeSocketObject', 'Object')
self.add_output('NodeSocketFloat', 'FOV')

View file

@ -12,4 +12,5 @@ class SetCameraNode(ArmLogicTreeNode):
super(SetCameraNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Camera')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -12,5 +12,6 @@ class SetCameraFovNode(ArmLogicTreeNode):
super(SetCameraFovNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Camera')
self.add_input('NodeSocketFloat', 'FOV', default_value=0.85)
self.add_input('NodeSocketFloat', 'FOV', default_value=0.9)
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -9,4 +9,5 @@ class CanvasGetCheckboxNode(ArmLogicTreeNode):
def init(self, context):
super(CanvasGetCheckboxNode, self).init(context)
self.add_input('NodeSocketString', 'Element')
self.add_output('NodeSocketBool', 'Is Checked')

View file

@ -9,4 +9,5 @@ class CanvasGetInputTextNode(ArmLogicTreeNode):
def init(self, context):
super(CanvasGetInputTextNode, self).init(context)
self.add_input('NodeSocketString', 'Element')
self.add_output('NodeSocketString', 'Text')

View file

@ -10,6 +10,7 @@ class CanvasGetLocationNode(ArmLogicTreeNode):
super(CanvasGetLocationNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('NodeSocketInt', 'X')
self.add_output('NodeSocketInt', 'Y')

View file

@ -9,4 +9,5 @@ class CanvasGetPositionNode(ArmLogicTreeNode):
def init(self, context):
super(CanvasGetPositionNode, self).init(context)
self.add_input('NodeSocketString', 'Element')
self.add_output('NodeSocketInt', 'Position')

View file

@ -10,6 +10,7 @@ class CanvasGetPBNode(ArmLogicTreeNode):
super(CanvasGetPBNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('NodeSocketInt', 'At')
self.add_output('NodeSocketInt', 'Max')

View file

@ -10,5 +10,6 @@ class CanvasGetRotationNode(ArmLogicTreeNode):
super(CanvasGetRotationNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('NodeSocketFloat', 'Rad')

View file

@ -10,6 +10,7 @@ class CanvasGetScaleNode(ArmLogicTreeNode):
super(CanvasGetScaleNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('NodeSocketInt', 'Height')
self.add_output('NodeSocketInt', 'Width')

View file

@ -9,4 +9,5 @@ class CanvasGetSliderNode(ArmLogicTreeNode):
def init(self, context):
super(CanvasGetSliderNode, self).init(context)
self.add_input('NodeSocketString', 'Element')
self.add_output('NodeSocketFloat', 'Float')

View file

@ -12,4 +12,5 @@ class CanvasGetVisibleNode(ArmLogicTreeNode):
def init(self, context):
super(CanvasGetVisibleNode, self).init(context)
self.inputs.new('NodeSocketString', 'Element')
self.outputs.new('NodeSocketBool', 'Is Visible')

View file

@ -11,19 +11,20 @@ class OnCanvasElementNode(ArmLogicTreeNode):
('hover', 'Hover', 'Listen to mouse hover')],
name='Listen to', default='click')
property1: EnumProperty(
items=[('down', 'Down', 'Down'),
('started', 'Started', 'Started'),
items=[('started', 'Started', 'Started'),
('down', 'Down', 'Down'),
('released', 'Released', 'Released')],
name='Status', default='down')
property2: EnumProperty(
items=[('left', 'Left', 'Left Button'),
('right', 'Right', 'Right Button'),
('middle', 'Middle', 'Middle Button')],
('middle', 'Middle', 'Midde Button'),
('right', 'Right', 'Right Button')],
name='Mouse Button', default='left')
def init(self, context):
super(OnCanvasElementNode, self).init(context)
self.add_input('NodeSocketString', 'Element')
self.add_output('ArmNodeSocketAction', 'Out')
def draw_buttons(self, context, layout):

View file

@ -11,4 +11,5 @@ class CanvasSetAssetNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketString', 'Asset')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class CanvasSetCheckBoxNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketBool', 'Check')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -12,4 +12,5 @@ class CanvasSetLocationNode(ArmLogicTreeNode):
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketFloat', 'X')
self.add_input('NodeSocketFloat', 'Y')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -12,4 +12,5 @@ class CanvasSetPBNode(ArmLogicTreeNode):
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketInt', 'At')
self.add_input('NodeSocketInt', 'Max')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class CanvasSetRotationNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketFloat', 'Rad')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -12,4 +12,5 @@ class CanvasSetScaleNode(ArmLogicTreeNode):
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketInt', 'Height')
self.add_input('NodeSocketInt', 'Width')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class CanvasSetSliderNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketFloat', 'Float')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class CanvasSetTextNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketString', 'Text')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -14,4 +14,5 @@ class CanvasSetTextColorNode(ArmLogicTreeNode):
self.add_input('NodeSocketFloat', 'G')
self.add_input('NodeSocketFloat', 'B')
self.add_input('NodeSocketFloat', 'A')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class CanvasSetVisibleNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Element')
self.add_input('NodeSocketBool', 'Visible')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -1,6 +1,5 @@
from arm.logicnode.arm_nodes import *
class OnApplicationStateNode(ArmLogicTreeNode):
"""Listens to different application state changes."""
bl_idname = 'LNOnApplicationStateNode'

View file

@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
class OnEventNode(ArmLogicTreeNode):
"""Activates the output when the given event is received.
@seeNode Send Event To Object
@seeNode Send Event to Object
@seeNode Send Event"""
bl_idname = 'LNOnEventNode'
bl_label = 'On Event'

View file

@ -13,4 +13,5 @@ class OnTimerNode(ArmLogicTreeNode):
super(OnTimerNode, self).init(context)
self.add_input('NodeSocketFloat', 'Duration')
self.add_input('NodeSocketBool', 'Repeat')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -1,7 +1,7 @@
from arm.logicnode.arm_nodes import *
class SendEventNode(ArmLogicTreeNode):
"""Sends the given event to the given object.
"""Sends a event to the given object.
@seeNode Send Event
@seeNode On Event
@ -9,7 +9,7 @@ class SendEventNode(ArmLogicTreeNode):
@input Event: the identifier of the event
@input Object: the receiving object"""
bl_idname = 'LNSendEventNode'
bl_label = 'Send Event To Object'
bl_label = 'Send Event to Object'
arm_section = 'custom'
arm_version = 1
@ -18,4 +18,5 @@ class SendEventNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Event')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
class SendGlobalEventNode(ArmLogicTreeNode):
"""Sends the given event to all objects in the scene.
@seeNode Send Event To Object
@seeNode Send Event to Object
@seeNode On Event
@input Event: the identifier of the event"""
@ -16,4 +16,5 @@ class SendGlobalEventNode(ArmLogicTreeNode):
super(SendGlobalEventNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketString', 'Event')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -1,7 +1,7 @@
from arm.logicnode.arm_nodes import *
class GamepadNode(ArmLogicTreeNode):
"""Activates the output when there is a gamepad event.
"""Activates the output on the given gamepad event.
@seeNode Gamepad Coords
@ -16,12 +16,12 @@ class GamepadNode(ArmLogicTreeNode):
arm_section = 'gamepad'
property0: EnumProperty(
items = [('Down', 'Down', 'Down'),
('Started', 'Started', 'Started'),
items = [('Started', 'Started', 'Started'),
('Down', 'Down', 'Down'),
('Released', 'Released', 'Released')],
# ('Moved Left', 'Moved Left', 'Moved Left'),
# ('Moved Right', 'Moved Right', 'Moved Right'),],
name='', default='Started')
name='', default='Down')
property1: EnumProperty(
items = [('cross', 'cross / a', 'cross / a'),
@ -48,6 +48,7 @@ class GamepadNode(ArmLogicTreeNode):
super(GamepadNode, self).init(context)
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('NodeSocketBool', 'State')
self.add_input('NodeSocketInt', 'Gamepad')
def draw_buttons(self, context, layout):

View file

@ -19,4 +19,5 @@ class GamepadCoordsNode(ArmLogicTreeNode):
self.add_output('NodeSocketVector', 'Right Movement')
self.add_output('NodeSocketFloat', 'Left Trigger')
self.add_output('NodeSocketFloat', 'Right Trigger')
self.add_input('NodeSocketInt', 'Gamepad')

View file

@ -12,6 +12,7 @@ class GetMouseMovementNode(ArmLogicTreeNode):
self.add_input('NodeSocketFloat', 'X Multiplier' , default_value=-1.0)
self.add_input('NodeSocketFloat', 'Y Multiplier', default_value=-1.0)
self.add_input('NodeSocketFloat', 'Delta Multiplier', default_value=-1.0)
self.add_output('NodeSocketFloat', 'X')
self.add_output('NodeSocketFloat', 'Y')
self.add_output('NodeSocketInt', 'Delta')

View file

@ -11,6 +11,7 @@ class GetTouchMovementNode(ArmLogicTreeNode):
super(GetTouchMovementNode, self).init(context)
self.add_input('NodeSocketFloat', 'X Multiplier', default_value=-1.0)
self.add_input('NodeSocketFloat', 'Y Multiplier', default_value=-1.0)
self.add_output('NodeSocketFloat', 'X')
self.add_output('NodeSocketFloat', 'Y')
self.add_output('NodeSocketFloat', 'Multiplied X')

View file

@ -1,17 +1,17 @@
from arm.logicnode.arm_nodes import *
class KeyboardNode(ArmLogicTreeNode):
"""Activates the output when the given keyboard action is done."""
"""Activates the output on the given key event."""
bl_idname = 'LNMergedKeyboardNode'
bl_label = 'Keyboard'
arm_section = 'keyboard'
arm_version = 1
property0: EnumProperty(
items = [('Down', 'Down', 'Down'),
('Started', 'Started', 'Started'),
items = [('Started', 'Started', 'Started'),
('Down', 'Down', 'Down'),
('Released', 'Released', 'Released')],
name='', default='Started')
name='', default='Down')
property1: EnumProperty(
items = [('a', 'a', 'a'),

View file

@ -1,23 +1,23 @@
from arm.logicnode.arm_nodes import *
class MouseNode(ArmLogicTreeNode):
"""Activates the output when the given mouse action is done."""
"""Activates the output on the given mouse event."""
bl_idname = 'LNMergedMouseNode'
bl_label = 'Mouse'
arm_section = 'mouse'
arm_version = 1
property0: EnumProperty(
items = [('Down', 'Down', 'Down'),
('Started', 'Started', 'Started'),
items = [('Started', 'Started', 'Started'),
('Down', 'Down', 'Down'),
('Released', 'Released', 'Released'),
('Moved', 'Moved', 'Moved')],
name='', default='Down')
property1: EnumProperty(
items = [('left', 'left', 'left'),
('right', 'right', 'right'),
('middle', 'middle', 'middle')],
name='', default='left')
items = [('Left', 'Left', 'Left'),
('Middle', 'Middle', 'Middle'),
('Right', 'Right', 'Right')],
name='', default='Left')
def init(self, context):
super(MouseNode, self).init(context)

View file

@ -45,7 +45,7 @@ class NodeRemoveOutputButton(bpy.types.Operator):
# Class SwipeNode
class OnSwipeNode(ArmLogicTreeNode):
"""Activates the output when the given swipe action is done."""
"""Activates the output on the given swipe event."""
bl_idname = 'LNOnSwipeNode'
bl_label = 'On Swipe'
arm_version = 1

View file

@ -2,7 +2,17 @@ from arm.logicnode.arm_nodes import *
# Class OnTapScreen
class OnTapScreen(ArmLogicTreeNode):
"""Activates the output when the given tap action is done."""
"""Activates the output on tap screen event.
@input Duration: touching time
@input Interval: interval between taps
@input Repeat: repetitions required
@output Done: the sequence success
@output Fail: the the sequence failure
@output Tap Number: number of the last tap
@output Coords: the coordinates of the last tap
"""
bl_idname = 'LNOnTapScreen'
bl_label = 'On Tap Screen'
arm_section = 'Input'
@ -16,6 +26,7 @@ class OnTapScreen(ArmLogicTreeNode):
self.inputs[-1].default_value = 0.0
self.add_input('NodeSocketInt', 'Repeat')
self.inputs[-1].default_value = 2
self.add_output('ArmNodeSocketAction', 'Done')
self.add_output('ArmNodeSocketAction', 'Fail')
self.add_output('ArmNodeSocketAction', 'Tap')

View file

@ -24,6 +24,7 @@ class SetCursorStateNode(ArmLogicTreeNode):
super(SetCursorStateNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketBool', 'State')
self.add_output('ArmNodeSocketAction', 'Out')
def draw_buttons(self, context, layout):

View file

@ -1,18 +1,18 @@
from arm.logicnode.arm_nodes import *
class SurfaceNode(ArmLogicTreeNode):
"""Activates the output when the given action over the screen is done."""
"""Activates the output on the given touch event."""
bl_idname = 'LNMergedSurfaceNode'
bl_label = 'Surface'
bl_label = 'Touch'
arm_section = 'surface'
arm_version = 1
property0: EnumProperty(
items = [('Touched', 'Touched', 'Touched'),
('Started', 'Started', 'Started'),
items = [('Started', 'Started', 'Started'),
('Down', 'Down', 'Down'),
('Released', 'Released', 'Released'),
('Moved', 'Moved', 'Moved')],
name='', default='Touched')
name='', default='Down')
def init(self, context):
super(SurfaceNode, self).init(context)

View file

@ -1,17 +1,17 @@
from arm.logicnode.arm_nodes import *
class VirtualButtonNode(ArmLogicTreeNode):
"""Activates the output when the given action over the virtual button is done."""
"""Activates the output on the given virtual button event."""
bl_idname = 'LNMergedVirtualButtonNode'
bl_label = 'Virtual Button'
arm_section = 'virtual'
arm_version = 1
property0: EnumProperty(
items = [('Down', 'Down', 'Down'),
('Started', 'Started', 'Started'),
items = [('Started', 'Started', 'Started'),
('Down', 'Down', 'Down'),
('Released', 'Released', 'Released')],
name='', default='Started')
name='', default='Down')
property1: StringProperty(name='', default='button')
def init(self, context):

View file

@ -11,4 +11,5 @@ class SetLightColorNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Light')
self.add_input('NodeSocketColor', 'Color', default_value=[1.0, 1.0, 1.0, 1.0])
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -11,4 +11,5 @@ class SetLightStrengthNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Light')
self.add_input('NodeSocketFloat', 'Strength', default_value=250)
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -2,7 +2,7 @@ from arm.logicnode.arm_nodes import *
class AlternateNode(ArmLogicTreeNode):
"""Activates the outputs "0" and "1" alternating every time it is active."""
"""Activates the outputs `0` and `1` alternating every time it is active."""
bl_idname = 'LNAlternateNode'
bl_label = 'Alternate Output'
arm_section = 'flow'
@ -11,5 +11,6 @@ class AlternateNode(ArmLogicTreeNode):
def init(self, context):
super(AlternateNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_output('ArmNodeSocketAction', '0')
self.add_output('ArmNodeSocketAction', '1')

View file

@ -12,5 +12,6 @@ class BranchNode(ArmLogicTreeNode):
super(BranchNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketBool', 'Bool')
self.add_output('ArmNodeSocketAction', 'True')
self.add_output('ArmNodeSocketAction', 'False')

View file

@ -18,6 +18,7 @@ class CallFunctionNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketShader', 'Trait/Any')
self.add_input('NodeSocketString', 'Function')
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('NodeSocketShader', 'Result')

View file

@ -42,6 +42,7 @@ class GateNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketShader', 'Input 1')
self.add_input('NodeSocketShader', 'Input 2')
self.add_output('ArmNodeSocketAction', 'True')
self.add_output('ArmNodeSocketAction', 'False')

View file

@ -9,4 +9,5 @@ class NotNode(ArmLogicTreeNode):
def init(self, context):
super(NotNode, self).init(context)
self.add_input('NodeSocketBool', 'Bool In')
self.add_output('NodeSocketBool', 'Bool Out')

View file

@ -11,4 +11,5 @@ class InverseNode(ArmLogicTreeNode):
def init(self, context):
super(InverseNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -14,4 +14,5 @@ class IsFalseNode(ArmLogicTreeNode):
super(IsFalseNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketBool', 'Bool')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -13,4 +13,5 @@ class IsNotNoneNode(ArmLogicTreeNode):
super(IsNotNoneNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketShader', 'Value')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -14,4 +14,5 @@ class IsNoneNode(ArmLogicTreeNode):
super(IsNoneNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketShader', 'Value')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -13,4 +13,5 @@ class IsTrueNode(ArmLogicTreeNode):
super(IsTrueNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketBool', 'Bool')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -25,6 +25,7 @@ class LoopNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketInt', 'From')
self.add_input('NodeSocketInt', 'To')
self.add_output('ArmNodeSocketAction', 'Loop')
self.add_output('NodeSocketInt', 'Index')
self.add_output('ArmNodeSocketAction', 'Done')

View file

@ -3,7 +3,7 @@ from arm.logicnode.arm_nodes import *
class SequenceNode(ArmLogicTreeNode):
"""Activates the outputs one by one sequentially and repeatedly."""
bl_idname = 'LNSequenceNode'
bl_label = 'Sequence'
bl_label = 'Output Sequence'
arm_section = 'flow'
arm_version = 1

View file

@ -4,10 +4,11 @@ class ToBoolNode(ArmLogicTreeNode):
"""Converts a signal to a boolean value. If the input signal is
active, the boolean is `true`; if not, the boolean is `false`."""
bl_idname = 'LNToBoolNode'
bl_label = 'To Boolean'
bl_label = 'Output to Boolean'
arm_version = 1
def init(self, context):
super(ToBoolNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_output('NodeSocketBool', 'Bool')

View file

@ -19,6 +19,7 @@ class SwitchNode(ArmLogicTreeNode):
super(SwitchNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketShader', 'Value')
self.add_output('ArmNodeSocketAction', 'Default')
def draw_buttons(self, context, layout):

View file

@ -10,5 +10,6 @@ class ValueChangedNode(ArmLogicTreeNode):
super(ValueChangedNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketShader', 'Value')
self.add_output('ArmNodeSocketAction', 'Changed')
self.add_output('ArmNodeSocketAction', 'Unchanged')

View file

@ -11,7 +11,7 @@ class WhileNode(ArmLogicTreeNode):
@output Loop: Activated on every iteration step
@output Done: Activated when the loop is done executing"""
bl_idname = 'LNWhileNode'
bl_label = 'While'
bl_label = 'While True'
arm_section = 'flow'
arm_version = 1
@ -19,5 +19,6 @@ class WhileNode(ArmLogicTreeNode):
super(WhileNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketBool', 'Condition')
self.add_output('ArmNodeSocketAction', 'Loop')
self.add_output('ArmNodeSocketAction', 'Done')

View file

@ -10,4 +10,5 @@ class GetMaterialNode(ArmLogicTreeNode):
super(GetMaterialNode, self).init(context)
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketInt', 'Slot')
self.add_output('NodeSocketShader', 'Material')

View file

@ -13,4 +13,5 @@ class SetMaterialImageParamNode(ArmLogicTreeNode):
self.add_input('NodeSocketShader', 'Material')
self.add_input('NodeSocketString', 'Node')
self.add_input('NodeSocketString', 'Image')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -13,4 +13,5 @@ class SetMaterialRgbParamNode(ArmLogicTreeNode):
self.add_input('NodeSocketShader', 'Material')
self.add_input('NodeSocketString', 'Node')
self.add_input('NodeSocketColor', 'Color')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -13,4 +13,5 @@ class SetMaterialValueParamNode(ArmLogicTreeNode):
self.add_input('NodeSocketShader', 'Material')
self.add_input('NodeSocketString', 'Node')
self.add_input('NodeSocketFloat', 'Float')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -12,4 +12,5 @@ class SetMaterialSlotNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketShader', 'Material')
self.add_input('NodeSocketInt', 'Slot')
self.add_output('ArmNodeSocketAction', 'Out')

View file

@ -1,7 +1,10 @@
from arm.logicnode.arm_nodes import *
class ClampNode(ArmLogicTreeNode):
"""Keeps the value inside the given bound."""
"""Keeps the value inside the given bound.
@seeNode Map Range
"""
bl_idname = 'LNClampNode'
bl_label = 'Clamp'
arm_version = 1
@ -11,4 +14,5 @@ class ClampNode(ArmLogicTreeNode):
self.add_input('NodeSocketFloat', 'Value')
self.add_input('NodeSocketFloat', 'Min')
self.add_input('NodeSocketFloat', 'Max')
self.add_output('NodeSocketFloat', 'Result')

View file

@ -32,6 +32,7 @@ class CompareNode(ArmLogicTreeNode):
super(CompareNode, self).init(context)
self.add_input('NodeSocketShader', 'Value')
self.add_input('NodeSocketShader', 'Value')
self.add_output('NodeSocketBool', 'Bool')
def draw_buttons(self, context, layout):

View file

@ -10,4 +10,5 @@ class DegToRadNode(ArmLogicTreeNode):
def init(self, context):
super(DegToRadNode, self).init(context)
self.add_input('NodeSocketFloat', 'Degrees')
self.add_output('NodeSocketFloat', 'Radians')

Some files were not shown because too many files have changed in this diff Show more