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

Various smaller node fixes

Browse source
This commit is contained in:
Moritz Brückner 2021-08-19 21:59:52 +02:00
parent 2630c159d8
commit 4e526a6dd3
10 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
blender/arm/logicnode/animation/LN_set_parent_bone.py
View file

@ -10,7 +10,7 @@ class SetParentBoneNode(ArmLogicTreeNode):
def arm_init(self, context):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('ArmNodeSocketObject', 'Parent', default_value='Parent')
self.add_input('ArmNodeSocketObject', 'Parent')
self.add_input('ArmStringSocket', 'Bone', default_value='Bone')
self.add_output('ArmNodeSocketAction', 'Out')

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

@ -61,4 +61,4 @@ class GamepadNode(ArmLogicTreeNode):
if inp_gamepad.is_linked:
return f'{self.bl_label}: {self.property1}'
return f'{self.bl_label} {inp_gamepad.default_value}: {self.property1}'
return f'{self.bl_label} {inp_gamepad.default_value_raw}: {self.property1}'

14
blender/arm/logicnode/input/LN_on_swipe.py
View file

@ -60,14 +60,12 @@ class OnSwipeNode(ArmLogicTreeNode):
array_nodes[str(id(self))] = self
def arm_init(self, context):
self.inputs.new('ArmFloatSocket', 'Time')
self.inputs[-1].default_value = 0.15
self.inputs.new('ArmIntSocket', 'Min Length (px)')
self.inputs[-1].default_value = 100
self.outputs.new('ArmNodeSocketAction', 'Out')
self.outputs.new('ArmVectorSocket', 'Direction')
self.outputs.new('ArmIntSocket', 'Length (px)')
self.outputs.new('ArmIntSocket', 'Angle (0-360)')
self.add_input('ArmFloatSocket', 'Time', default_value=0.15)
self.add_input('ArmIntSocket', 'Min Length (px)', default_value=100)
self.add_output('ArmNodeSocketAction', 'Out')
self.add_output('ArmVectorSocket', 'Direction')
self.add_output('ArmIntSocket', 'Length (px)')
self.add_output('ArmIntSocket', 'Angle (0-360)')
# Draw node buttons
def draw_buttons(self, context, layout):

11
blender/arm/logicnode/input/LN_on_tap_screen.py
View file

@ -1,6 +1,6 @@
from arm.logicnode.arm_nodes import *
# Class OnTapScreen
class OnTapScreen(ArmLogicTreeNode):
"""Activates the output on tap screen event.
@ -19,12 +19,9 @@ class OnTapScreen(ArmLogicTreeNode):
arm_version = 1
def arm_init(self, context):
self.add_input('ArmFloatSocket', 'Duration')
self.inputs[-1].default_value = 0.3
self.add_input('ArmFloatSocket', 'Interval')
self.inputs[-1].default_value = 0.0
self.add_input('ArmIntSocket', 'Repeat')
self.inputs[-1].default_value = 2
self.add_input('ArmFloatSocket', 'Duration', default_value=0.3)
self.add_input('ArmFloatSocket', 'Interval', default_value=0.0)
self.add_input('ArmIntSocket', 'Repeat', default_value=2)
self.add_output('ArmNodeSocketAction', 'Done')
self.add_output('ArmNodeSocketAction', 'Fail')

4
blender/arm/logicnode/logic/LN_loop.py
View file

@ -35,7 +35,7 @@ class LoopNode(ArmLogicTreeNode):
if inp_from.is_linked and inp_to.is_linked:
return self.bl_label
val_from = 'x' if inp_from.is_linked else inp_from.default_value
val_to = 'y' if inp_to.is_linked else inp_to.default_value
val_from = 'x' if inp_from.is_linked else inp_from.default_value_raw
val_to = 'y' if inp_to.is_linked else inp_to.default_value_raw
return f'{self.bl_label}: {val_from}...{val_to}'

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

@ -16,8 +16,7 @@ class SetDebugConsoleSettings(ArmLogicTreeNode):
def arm_init(self, context):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmBoolSocket', 'Visible')
self.add_input('ArmFloatSocket', 'Scale')
self.inputs[-1].default_value = 1.0
self.add_input('ArmFloatSocket', 'Scale', default_value=1.0)
self.add_output('ArmNodeSocketAction', 'Out')

2
blender/arm/logicnode/miscellaneous/LN_timer.py
View file

@ -27,4 +27,4 @@ class TimerNode(ArmLogicTreeNode):
if inp_duration.is_linked or inp_repeat.is_linked:
return self.bl_label
return f'{self.bl_label}: {round(inp_duration.default_value, 3)}s ({inp_repeat.default_value} R.)'
return f'{self.bl_label}: {round(inp_duration.default_value_raw, 3)}s ({inp_repeat.default_value_raw} R.)'

3
blender/arm/logicnode/native/LN_set_vibrate.py
View file

@ -10,8 +10,7 @@ class SetVibrateNode(ArmLogicTreeNode):
def arm_init(self, context):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmIntSocket', 'Milliseconds')
self.inputs[-1].default_value = 100
self.add_input('ArmIntSocket', 'Milliseconds', default_value=100)
self.add_output('ArmNodeSocketAction', 'Out')
# Add permission for target android

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

@ -12,6 +12,6 @@ class SetParentNode(ArmLogicTreeNode):
def arm_init(self, context):
self.add_input('ArmNodeSocketAction', 'In')
self.add_input('ArmNodeSocketObject', 'Object')
self.add_input('ArmNodeSocketObject', 'Parent', default_value='Parent')
self.add_input('ArmNodeSocketObject', 'Parent')
self.add_output('ArmNodeSocketAction', 'Out')

2
blender/arm/logicnode/physics/LN_Add_rigid_body.py
View file

@ -106,7 +106,7 @@ class AddRigidBodyNode(ArmLogicTreeNode):
self.inputs.remove(i)
# Add dynamic input sockets
if self.property1_:
if self.property1:
self.add_input('ArmBoolSocket', 'Collision Margin', False)
self.add_input('ArmFloatSocket', 'Margin', 0.04)
self.add_input('ArmFloatSocket', 'Linear Damping', 0.04)