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

Merge pull request #1836 from MoritzBrueckner/set-camera-nodes

Browse source 
Rename camera nodes (no longer duplicate names)
This commit is contained in:
Lubos Lenco 2020-09-04 09:38:37 +02:00 committed by GitHub
parent e00a625b6f a344209a79
commit 728706e7f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
blender/arm/logicnode/action_set_camera.py
View file

@ -4,14 +4,15 @@ from bpy.types import Node, NodeSocket
from arm.logicnode.arm_nodes import *
class SetCameraNode(Node, ArmLogicTreeNode):
'''Set camera node'''
"""Set the active camera of the active scene."""
bl_idname = 'LNSetCameraNode'
bl_label = 'Set Camera'
bl_label = 'Set Active Camera'
bl_icon = 'NONE'
def init(self, context):
self.inputs.new('ArmNodeSocketAction', 'In')
self.inputs.new('ArmNodeSocketObject', 'Object')
self.outputs.new('ArmNodeSocketAction', 'Out')
add_node(SetCameraNode, category='Action')

4
blender/arm/logicnode/postprocess_get_camera.py
View file

@ -4,9 +4,9 @@ from bpy.types import Node, NodeSocket
from arm.logicnode.arm_nodes import *
class CameraGetNode(Node, ArmLogicTreeNode):
'''Get Camera Effect'''
"""Get postprocessing effects of the camera."""
bl_idname = 'LNCameraGetNode'
bl_label = 'Get Camera'
bl_label = 'Get Camera Postprocessing'
bl_icon = 'NONE'
def init(self, context):

37
blender/arm/logicnode/postprocess_set_camera.py
View file

@ -4,35 +4,24 @@ from bpy.types import Node, NodeSocket
from arm.logicnode.arm_nodes import *
class CameraSetNode(Node, ArmLogicTreeNode):
'''Set Camera Effect'''
"""Set postprocessing effects of the camera."""
bl_idname = 'LNCameraSetNode'
bl_label = 'Set Camera'
bl_label = 'Set Camera Postprocessing'
bl_icon = 'NONE'
def init(self, context):
self.inputs.new('ArmNodeSocketAction', 'In')
self.inputs.new('NodeSocketFloat', 'F-stop')
self.inputs[-1].default_value = 2.0
self.inputs.new('NodeSocketFloat', 'Shutter Time')
self.inputs[-1].default_value = 1.0
self.inputs.new('NodeSocketFloat', 'ISO')
self.inputs[-1].default_value = 100.0
self.inputs.new('NodeSocketFloat', 'Exposure Compensation')
self.inputs[-1].default_value = 0.0
self.inputs.new('NodeSocketFloat', 'Fisheye Distortion')
self.inputs[-1].default_value = 0.01
self.inputs.new('NodeSocketBool', 'Auto Focus')
self.inputs[-1].default_value = True
self.inputs.new('NodeSocketFloat', 'DoF Distance')
self.inputs[-1].default_value = 10.0
self.inputs.new('NodeSocketFloat', 'DoF Length')
self.inputs[-1].default_value = 160.0
self.inputs.new('NodeSocketFloat', 'DoF F-Stop')
self.inputs[-1].default_value = 128.0
self.inputs.new('NodeSocketInt', 'Tonemapper')
self.inputs[-1].default_value = 0.0
self.inputs.new('NodeSocketFloat', 'Film Grain')
self.inputs[-1].default_value = 2.0
self.inputs.new('NodeSocketFloat', 'F-stop').default_value = 2.0
self.inputs.new('NodeSocketFloat', 'Shutter Time').default_value = 1.0
self.inputs.new('NodeSocketFloat', 'ISO').default_value = 100.0
self.inputs.new('NodeSocketFloat', 'Exposure Compensation').default_value = 0.0
self.inputs.new('NodeSocketFloat', 'Fisheye Distortion').default_value = 0.01
self.inputs.new('NodeSocketBool', 'Auto Focus').default_value = True
self.inputs.new('NodeSocketFloat', 'DoF Distance').default_value = 10.0
self.inputs.new('NodeSocketFloat', 'DoF Length').default_value = 160.0
self.inputs.new('NodeSocketFloat', 'DoF F-Stop').default_value = 128.0
self.inputs.new('NodeSocketInt', 'Tonemapper').default_value = 0.0
self.inputs.new('NodeSocketFloat', 'Film Grain').default_value = 2.0
self.outputs.new('ArmNodeSocketAction', 'Out')
add_node(CameraSetNode, category='Postprocess')

6
blender/arm/logicnode/value_active_camera.py
View file

@ -4,11 +4,11 @@ from bpy.types import Node, NodeSocket
from arm.logicnode.arm_nodes import *
class ActiveCameraNode(Node, ArmLogicTreeNode):
'''Active camera node'''
"""Get the active camera of the active scene."""
bl_idname = 'LNActiveCameraNode'
bl_label = 'Active Camera'
bl_label = 'Get Active Camera'
bl_icon = 'NONE'
def init(self, context):
self.outputs.new('ArmNodeSocketObject', 'Object')