Browse Source

More Fixes through trial and error

* Found a few mistakes that caused the export to stop
* Changed the region_object to tele_object as the former is already elsewhere in the code.
pull/354/head
Patrick Dulebohn 2 years ago committed by Adam Johnson
parent
commit
bf40de581f
Signed by: Hoikas
GPG Key ID: 0B6515D6FF6F271E
  1. 48
      korman/properties/modifiers/logic.py
  2. 2
      korman/ui/modifiers/logic.py

48
korman/properties/modifiers/logic.py

@ -142,7 +142,7 @@ class PlasmaTelescope(PlasmaModifierProperties, PlasmaModifierLogicWiz):
description="Clickable object for telescope.", description="Clickable object for telescope.",
type=bpy.types.Object, type=bpy.types.Object,
poll=idprops.poll_mesh_objects) poll=idprops.poll_mesh_objects)
region_object = PointerProperty(name="Click Region", tele_region = PointerProperty(name="Click Region",
description="Area where clickable becomes active.", description="Area where clickable becomes active.",
type=bpy.types.Object, type=bpy.types.Object,
poll=idprops.poll_mesh_objects) poll=idprops.poll_mesh_objects)
@ -169,7 +169,7 @@ class PlasmaTelescope(PlasmaModifierProperties, PlasmaModifierLogicWiz):
# Region # Region
telescoperegion = nodes.new("PlasmaClickableRegionNode") telescoperegion = nodes.new("PlasmaClickableRegionNode")
telescoperegion.value = self.region_object telescoperegion.region_object = self.tele_region
telescoperegion.link_output(telescopeclick, "satisfies", "region") telescoperegion.link_output(telescopeclick, "satisfies", "region")
# Telescope Camera # Telescope Camera
@ -184,52 +184,52 @@ class PlasmaTelescope(PlasmaModifierProperties, PlasmaModifierLogicWiz):
# OneShot # OneShot
telescopeoneshot = nodes.new("PlasmaSeekTargetNode") telescopeoneshot = nodes.new("PlasmaSeekTargetNode")
telescopeoneshot.target = self.oneshot_object telescopeoneshot.target = self.oneshot_object
telescopeoneshot.link_output(telescopemsb, "seeker", "seek_target") telescopeoneshot.link_output(telescopemsb, "seekers", "seek_target")
# Anim Stage 1 (Grab) # Anim Stage 1 (Grab)
telescopestageone = nodes.new("PlasmaAnimStageNode") telescopestageone = nodes.new("PlasmaAnimStageNode")
telescopestageone.anim_name("GlobalScopeGrab") telescopestageone.anim_name == "GlobalScopeGrab"
telescopestageone.loop_option("kLoop") telescopestageone.loop_option == "kLoop"
telescopestageone.num_loops = 0 telescopestageone.num_loops = 0
telescopestageone.link_output(telescopemsb, "behavior", "stage_refs") telescopestageone.link_output(telescopemsb, "stage", "stage_refs")
# Settings # Settings
telescopestageoneops = nodes.new("PlasmaAnimStageSettingsNode") telescopestageoneops = nodes.new("PlasmaAnimStageSettingsNode")
telescopestageoneops.forward("kPlayAuto") telescopestageoneops.forward == "kPlayAuto"
telescopestageoneops.stage_advance("kPlayAuto") telescopestageoneops.stage_advance == "kPlayAuto"
telescopesceneoneops.notify_on("kNotifyAdvance") telescopestageoneops.notify_on == "kNotifyAdvance"
telescopesceneoneops.auto_advance = True telescopestageoneops.auto_advance = True
telescopesceneoneops.auto_regress = True telescopestageoneops.auto_regress = True
telescopesceneoneops.link_output(telescopestageone, "stage", "stage_settings") telescopestageoneops.link_output(telescopestageone, "stage", "stage_settings")
# Anim Stage 2 (Hold) # Anim Stage 2 (Hold)
telescopestagetwo = nodes.new("PlasmaAnimStageNode") telescopestagetwo = nodes.new("PlasmaAnimStageNode")
telescopestagetwo.anim_name("GlobalScopeHold") telescopestagetwo.anim_name == "GlobalScopeHold"
telescopestagetwo.loop_option("kLoop") telescopestagetwo.loop_option == "kLoop"
telescopestagetwo.num_loops = -1 telescopestagetwo.num_loops = -1
telescopestagetwo.link_output(telescopemsb, "behavior", "stage_refs") telescopestagetwo.link_output(telescopemsb, "stage", "stage_refs")
# Settings # Settings
telescopestagetwoops = nodes.new("PlasmaAnimStageSettingsNode") telescopestagetwoops = nodes.new("PlasmaAnimStageSettingsNode")
telescopestagetwoops.forward("kPlayAuto") telescopestagetwoops.forward == "kPlayAuto"
telescopestagetwoops.notify_on("") telescopestagetwoops.notify_on == ""
telescopestagetwoops.auto_advance = True telescopestagetwoops.auto_advance = True
telescopestagetwoops.auto_regress = True telescopestagetwoops.auto_regress = True
telescopestagetwoops.link_output(telescopestagetwo, "stage", "stage_settings") telescopestagetwoops.link_output(telescopestagetwo, "stage", "stage_settings")
# Anim Stage 3 (Release) # Anim Stage 3 (Release)
telescopestagethree = nodes.new("PlasmaAnimStageNode") telescopestagethree = nodes.new("PlasmaAnimStageNode")
telescopestagethree.anim_name("GlobalScopeRelease") telescopestagethree.anim_name == "GlobalScopeRelease"
telescopestagethree.loop_option("kLoop") telescopestagethree.loop_option == "kLoop"
telescopestagethree.num_loops = 0 telescopestagethree.num_loops = 0
telescopestagethree.link_output(telescopemsb, "behavior", "stage_refs") telescopestagethree.link_output(telescopemsb, "stage", "stage_refs")
# Settings # Settings
telescopestagethreeops = nodes.new("PlasmaAnimStageSettingsNode") telescopestagethreeops = nodes.new("PlasmaAnimStageSettingsNode")
telescopestagethreeops.forward("kPlayAuto") telescopestagethreeops.forward == "kPlayAuto"
telescopestagethreeops.stage_advance("kPlayAuto") telescopestagethreeops.stage_advance == "kPlayAuto"
telescopestagethreeops.notify_on("") telescopestagethreeops.notify_on == ""
telescopestagethreeops.auto_advance = True telescopestagethreeops.auto_advance = True
telescopestagethreeops.auto_regress = True telescopestagethreeops.auto_regress = True
telescopestagethreeops.link_output(telescopestagethree, "stage", "stage_settings") telescopestagethreeops.link_output(telescopestagethree, "stage", "stage_settings")
telescopename = nodes.new("PlasmaAttribStringNode") telescopename = nodes.new("PlasmaAttribStringNode")
telescopename.value("telescope") telescopename.value == "telescope"
telescopename.link_output(telescopepynode, "pfm", "Vignette") telescopename.link_output(telescopepynode, "pfm", "Vignette")

2
korman/ui/modifiers/logic.py

@ -45,6 +45,6 @@ def maintainersmarker(modifier, layout, context):
def telescope(modifier, layout, context): def telescope(modifier, layout, context):
layout.prop(modifier, "clickable_object") layout.prop(modifier, "clickable_object")
layout.prop(modifier, "region_object") layout.prop(modifier, "tele_region")
layout.prop(modifier, "oneshot_object") layout.prop(modifier, "oneshot_object")
layout.prop(modifier, "camera_object") layout.prop(modifier, "camera_object")

Loading…
Cancel
Save