Skip to content

ViewFaceMod Changes #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TikiBear wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ViewFaceMod Changes #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97bfc38
Update render.py
TikiBear Oct 3, 2020
c730954
Update render.py
TikiBear Oct 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions korman/properties/modifiers/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,10 @@ class PlasmaViewFaceMod(idprops.IDPropObjectMixin, PlasmaModifierProperties):
description="Swivel only around the local Y axis",
default=False)

# TikiBear - add the two missing pivots
special_pivots = BoolProperty(name="Special Pivots",
description="Default: 3-axis; With Pivot on local Y: 2-axis, local Y azimuth axis",
default=False)
offset = BoolProperty(name="Offset", description="Use offset vector", default=False)
offset_local = BoolProperty(name="Local", description="Use local coordinates", default=False)
offset_coord = FloatVectorProperty(name="", subtype="XYZ")
Expand Down Expand Up @@ -547,13 +551,22 @@ def export(self, exporter, bo, so):
else:
raise ExportError("'{}': Swivel's target object must be selected".format(self.key_name))

if self.pivot_on_y:
vfm.setFlag(plViewFaceModifier.kPivotY, True)
if self.special_pivots:
# TikiBear - add missing pivots
if self.pivot_on_y: # 2-axis
vfm.setFlag(plViewFaceModifier.kPivotFavorY, True)
else: # 3-axis
vfm.setFlag(plViewFaceModifier.kPivotTumple, True)
else:
vfm.setFlag(plViewFaceModifier.kPivotFace, True)
if self.pivot_on_y:
vfm.setFlag(plViewFaceModifier.kPivotY, True)
else:
vfm.setFlag(plViewFaceModifier.kPivotFace, True)

if self.offset:
vfm.offset = hsVector3(*self.offset_coord)
# TikiBear - add missing flag
vfm.setFlag(plViewFaceModifier.kOffset, True)
if self.offset_local:
vfm.setFlag(plViewFaceModifier.kOffsetLocal, True)

Expand Down
2 changes: 2 additions & 0 deletions korman/ui/modifiers/render.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ def viewfacemod(modifier, layout, context):
layout.separator()

layout.prop(modifier, "pivot_on_y")
# TikiBear: add special pivot flag
layout.prop(modifier, "special_pivots")
layout.separator()

split = layout.split()
Expand Down