maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixes

Browse source
This commit is contained in:
knowledgenude 2020-11-17 17:35:22 -03:00
parent 9e16c53494
commit 46492cc425
28 changed files with 108 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Sources/armory/logicnode/GetCursorStateNode.hx
View file

@ -12,12 +12,12 @@ class GetCursorStateNode extends LogicNode {
var mouse = iron.system.Input.getMouse();
return switch (from) {
case 0:
if (mouse.hidden == true && mouse.locked == true) return true;
return false;
case 1: mouse.hidden;
case 2: mouse.locked;
case 0:
mouse.hidden ? return false : mouse.locked ? return false : return true;
case 1:
mouse.hidden;
case 2:
mouse.locked;
default: null;
}
}

12
Sources/armory/logicnode/MergedGamepadNode.hx
View file

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

12
Sources/armory/logicnode/MergedKeyboardNode.hx
View file

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

16
Sources/armory/logicnode/MergedMouseNode.hx
View file

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

16
Sources/armory/logicnode/MergedSurfaceNode.hx
View file

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

12
Sources/armory/logicnode/MergedVirtualButtonNode.hx
View file

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

8
Sources/armory/logicnode/SetActivationStateNode.hx
View file

@ -25,13 +25,13 @@ class SetActivationStateNode extends LogicNode {
var rigidBody = object.getTrait(RigidBody);
switch (property0) {
case "Inactive":
case "inactive":
state = 0; // Inactive Tag
case "Active":
case "active":
state = 1; // Active Tag
case "Always Active":
case "always active":
state = 4 ; // Disable Deactivation
case "Always Inactive":
case "always inactive":
state = 5; // Disable Simulation
}
rigidBody.setActivationState(state);

6
Sources/armory/logicnode/SetCursorStateNode.hx
View file

@ -13,14 +13,14 @@ class SetCursorStateNode extends LogicNode {
var mouse = iron.system.Input.getMouse();
switch (property0) {
case "Hide Locked":
case "hide locked":
state ? mouse.hide() : mouse.show();
mouse.hidden ? mouse.lock() : mouse.unlock();
case "Hide":
case "hide":
state ? mouse.hide() : mouse.show();
case "Lock":
case "lock":
state ? mouse.lock() : mouse.unlock();
}

8
Sources/armory/logicnode/SetDebugConsoleSettings.hx
View file

@ -19,14 +19,14 @@ class SetDebugConsoleSettings extends LogicNode {
armory.trait.internal.DebugConsole.setScale(scale);
switch (property0) {
case "Left":
case "anchor left":
return armory.trait.internal.DebugConsole.setPosition(PositionStateEnum.LEFT);
case "Center":
case "anchor center":
return armory.trait.internal.DebugConsole.setPosition(PositionStateEnum.CENTER);
case "Right":
case "anchor right":
return armory.trait.internal.DebugConsole.setPosition(PositionStateEnum.RIGHT);
}
#end
runOutput(0);
}
}
}

6
Sources/armory/logicnode/SetVisibleNode.hx
View file

@ -20,19 +20,19 @@ class SetVisibleNode extends LogicNode {
var objectChildren: Array<Object> = object.children;
switch (property0) {
case "Object":
case "object":
object.visible = visible;
if (children == true) for (child in objectChildren) {
child.visible = visible;
}
case "Mesh":
case "mesh":
object.visibleMesh = visible;
if (children == true) for (child in objectChildren) {
child.visibleMesh = visible;
}
case "Shadow":
case "shadow":
object.visibleShadow = visible;
if (children == true) for (child in objectChildren) {
child.visibleShadow = visible;

8
blender/arm/logicnode/input/LN_gamepad.py
View file

@ -16,12 +16,12 @@ class GamepadNode(ArmLogicTreeNode):
arm_section = 'gamepad'
property0: EnumProperty(
items = [('Started', 'Started', 'Started'),
('Down', 'Down', 'Down'),
('Released', 'Released', 'Released')],
items = [('started', 'Started', 'The gamepad button starts to be pressed'),
('down', 'Down', 'The gamepad button is pressed'),
('released', 'Released', 'The gamepad button stops being pressed')],
# ('Moved Left', 'Moved Left', 'Moved Left'),
# ('Moved Right', 'Moved Right', 'Moved Right'),],
name='', default='Down')
name='', default='down')
property1: EnumProperty(
items = [('cross', 'cross / a', 'cross / a'),

8
blender/arm/logicnode/input/LN_keyboard.py
View file

@ -8,10 +8,10 @@ class KeyboardNode(ArmLogicTreeNode):
arm_version = 1
property0: EnumProperty(
items = [('Started', 'Started', 'The keyboard button starts to be pressed'),
('Down', 'Down', 'The keyboard button is pressed'),
('Released', 'Released', 'The keyboard button stops being pressed')],
name='', default='Down')
items = [('started', 'Started', 'The keyboard button starts to be pressed'),
('down', 'Down', 'The keyboard button is pressed'),
('released', 'Released', 'The keyboard button stops being pressed')],
name='', default='down')
property1: EnumProperty(
items = [('a', 'a', 'a'),

18
blender/arm/logicnode/input/LN_mouse.py
View file

@ -8,16 +8,16 @@ class MouseNode(ArmLogicTreeNode):
arm_version = 1
property0: EnumProperty(
items = [('Started', 'Started', 'The mouse button startes to be pressed'),
('Down', 'Down', 'The mouse button is pressed'),
('Released', 'Released', 'The mouse button stops being pressed'),
('Moved', 'Moved', 'Moved')],
name='', default='Down')
items = [('started', 'Started', 'The mouse button startes to be pressed'),
('down', 'Down', 'The mouse button is pressed'),
('released', 'Released', 'The mouse button stops being pressed'),
('moved', 'Moved', 'Moved')],
name='', default='down')
property1: EnumProperty(
items = [('Left', 'Left', 'Left'),
('Middle', 'Middle', 'Middle'),
('Right', 'Right', 'Right')],
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)

8
blender/arm/logicnode/input/LN_set_cursor_state.py
View file

@ -15,11 +15,11 @@ class SetCursorStateNode(ArmLogicTreeNode):
arm_version = 1
property0: EnumProperty(
items = [('Hide Locked', 'Hide Locked', 'The mouse cursor is hidden and locked'),
('Hide', 'Hide', 'The mouse cursor is hidden'),
('Lock', 'Lock', 'The mouse cursor is locked'),
items = [('hide locked', 'Hide Locked', 'The mouse cursor is hidden and locked'),
('hide', 'Hide', 'The mouse cursor is hidden'),
('lock', 'Lock', 'The mouse cursor is locked'),
],
name='', default='Hide Locked')
name='', default='hide locked')
def init(self, context):
super(SetCursorStateNode, self).init(context)

10
blender/arm/logicnode/input/LN_touch.py
View file

@ -8,11 +8,11 @@ class SurfaceNode(ArmLogicTreeNode):
arm_version = 1
property0: EnumProperty(
items = [('Started', 'Started', 'The screen surface starts to be touched'),
('Down', 'Down', 'The screen surface is touched'),
('Released', 'Released', 'The screen surface stops being touched'),
('Moved', 'Moved', 'Moved')],
name='', default='Down')
items = [('started', 'Started', 'The screen surface starts to be touched'),
('down', 'Down', 'The screen surface is touched'),
('released', 'Released', 'The screen surface stops being touched'),
('moved', 'Moved', 'Moved')],
name='', default='down')
def init(self, context):
super(SurfaceNode, self).init(context)

8
blender/arm/logicnode/input/LN_virtual_button.py
View file

@ -8,10 +8,10 @@ class VirtualButtonNode(ArmLogicTreeNode):
arm_version = 1
property0: EnumProperty(
items = [('Started', 'Started', 'The virtual button starts to be pressed'),
('Down', 'Down', 'The virtual button is pressed'),
('Released', 'Released', 'The virtual button stops being pressed')],
name='', default='Down')
items = [('started', 'Started', 'The virtual button starts to be pressed'),
('down', 'Down', 'The virtual button is pressed'),
('released', 'Released', 'The virtual button stops being pressed')],
name='', default='down')
property1: StringProperty(name='', default='button')
def init(self, context):

8
blender/arm/logicnode/miscellaneous/LN_set_debug_console_settings.py
View file

@ -7,10 +7,10 @@ class SetDebugConsoleSettings(ArmLogicTreeNode):
arm_version = 1
property0: EnumProperty(
items = [('Left', 'Left', 'Left'),
('Center', 'Center', 'Center'),
('Right', 'Right', 'Right')],
name='', default='Right')
items = [('anchor left', 'Anchor Left', 'Anchor debug console in the top left'),
('anchor center', 'Anchor Center', 'Anchor debug console in the top center'),
('anchor right', 'Anchor Right', 'Anchor the debug console in the top right')],
name='', default='anchor right')
def init(self, context):
super(SetDebugConsoleSettings, self).init(context)

10
blender/arm/logicnode/object/LN_set_object_visible.py
View file

@ -10,18 +10,18 @@ class SetVisibleNode(ArmLogicTreeNode):
arm_version = 1
property0: EnumProperty(
items = [('Object', 'Object', 'Object'),
('Mesh', 'Mesh', 'Mesh'),
('Shadow', 'Shadow', 'Shadow'),
items = [('object', 'Object', 'All object componenets visibility'),
('mesh', 'Mesh', 'Mesh visibility only'),
('shadow', 'Shadow', 'Shadow visibility only'),
],
name='', default='Object')
name='', default='object')
def init(self, context):
super(SetVisibleNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketBool', 'Visible')
self.add_input('NodeSocketBool', 'Children')
self.add_input('NodeSocketBool', 'Children', default_value=True)
self.add_output('ArmNodeSocketAction', 'Out')

2
blender/arm/logicnode/object/LN_spawn_object.py
View file

@ -11,7 +11,7 @@ class SpawnObjectNode(ArmLogicTreeNode):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('NodeSocketShader', 'Transform')
self.add_input('NodeSocketBool', 'Children', default_value=1)
self.add_input('NodeSocketBool', 'Children', default_value=True)
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('ArmNodeSocketObject', 'Object')

10
blender/arm/logicnode/physics/LN_set_rb_activation_state.py
View file

@ -8,12 +8,12 @@ class SetActivationStateNode(ArmLogicTreeNode):
arm_version = 1
property0: EnumProperty(
items = [('Inactive', 'Inactive', 'The rigid body simulation is deactivated'),
('Active', 'Active', 'The rigid body simulation is activated'),
('Always Active', 'Always Active', 'The rigid body simulation is never deactivated'),
('Always Inactive', 'Always Inactive', 'The rigid body simulation is never activated'),
items = [('inactive', 'Inactive', 'The rigid body simulation is deactivated'),
('active', 'Active', 'The rigid body simulation is activated'),
('always active', 'Always Active', 'The rigid body simulation is never deactivated'),
('always inactive', 'Always Inactive', 'The rigid body simulation is never activated'),
],
name='', default='Inactive')
name='', default='inactive')
def init(self, context):
super(SetActivationStateNode, self).init(context)

4
blender/arm/logicnode/variable/LN_boolean.py
View file

@ -2,7 +2,7 @@ from arm.logicnode.arm_nodes import *
class BooleanNode(ArmLogicTreeNode):
"""Stores the given boolean as a variable. A boolean value has just two
states: `True` and `False`."""
states: `true` and `false`."""
bl_idname = 'LNBooleanNode'
bl_label = 'Boolean'
arm_version = 1
@ -11,4 +11,4 @@ class BooleanNode(ArmLogicTreeNode):
super(BooleanNode, self).init(context)
self.add_input('NodeSocketBool', 'Bool In')
self.add_output('NodeSocketBool', 'Bool Out', is_var=1)
self.add_output('NodeSocketBool', 'Bool Out', is_var=True)

2
blender/arm/logicnode/variable/LN_color.py
View file

@ -10,4 +10,4 @@ class ColorNode(ArmLogicTreeNode):
super(ColorNode, self).init(context)
self.add_input('NodeSocketColor', 'Color In', default_value=[1.0, 1.0, 1.0, 1.0])
self.add_output('NodeSocketColor', 'Color Out', is_var=1)
self.add_output('NodeSocketColor', 'Color Out', is_var=True)

2
blender/arm/logicnode/variable/LN_dynamic.py
View file

@ -8,4 +8,4 @@ class DynamicNode(ArmLogicTreeNode):
def init(self, context):
super(DynamicNode, self).init(context)
self.add_output('NodeSocketShader', 'Dynamic', is_var=1)
self.add_output('NodeSocketShader', 'Dynamic', is_var=True)

2
blender/arm/logicnode/variable/LN_float.py
View file

@ -12,4 +12,4 @@ class FloatNode(ArmLogicTreeNode):
def init(self, context):
super(FloatNode, self).init(context)
self.add_input('NodeSocketFloat', 'Float In')
self.add_output('NodeSocketFloat', 'Float Out', is_var=1)
self.add_output('NodeSocketFloat', 'Float Out', is_var=True)

2
blender/arm/logicnode/variable/LN_integer.py
View file

@ -9,4 +9,4 @@ class IntegerNode(ArmLogicTreeNode):
def init(self, context):
super(IntegerNode, self).init(context)
self.add_input('NodeSocketInt', 'Int In')
self.add_output('NodeSocketInt', 'Int Out', is_var=1)
self.add_output('NodeSocketInt', 'Int Out', is_var=True)

2
blender/arm/logicnode/variable/LN_mask.py
View file

@ -12,4 +12,4 @@ class MaskNode(ArmLogicTreeNode):
label = 'Group {:02d}'.format(i)
self.inputs.new('NodeSocketBool', label)
self.add_output('NodeSocketInt', 'Mask', is_var=1)
self.add_output('NodeSocketInt', 'Mask', is_var=True)

2
blender/arm/logicnode/variable/LN_set_variable.py
View file

@ -16,7 +16,7 @@ class SetVariableNode(ArmLogicTreeNode):
def init(self, context):
super(SetVariableNode, self).init(context)
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('NodeSocketShader', 'Variable', is_var=1)
self.add_input('NodeSocketShader', 'Variable', is_var=True)
self.add_input('NodeSocketShader', 'Value')
self.add_output('ArmNodeSocketAction', 'Out')

2
blender/arm/logicnode/variable/LN_vector.py
View file

@ -12,4 +12,4 @@ class VectorNode(ArmLogicTreeNode):
self.add_input('NodeSocketFloat', 'Y')
self.add_input('NodeSocketFloat', 'Z')
self.add_output('NodeSocketVector', 'Vector', is_var=1)
self.add_output('NodeSocketVector', 'Vector', is_var=True)