Skip to content
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

Jump to bottom

Update VF_delivery.py #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update VF_delivery.py #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 49 additions & 8 deletions VF_delivery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,19 @@ def execute(self, context):

elif format == "VF":
# Define the data to be saved
fourcc = "VF_V" # Replace with the appropriate FourCC of either 'VF_F' for value or 'VF_V' for vec3
vf_dataType_Float = True if bpy.context.scene.vf_delivery_settings.vf_dataType == "FLOAT" else False
vf_swizzle_None = True if bpy.context.scene.vf_delivery_settings.vf_swizzle == "NONE" else False

# Name of the custom attribute
attribute_name = 'field_vector'
if (vf_dataType_Float):
fourcc = "VF_F" # Replace with the appropriate FourCC of either 'VF_F' for value or 'VF_V' for vec3

# Name of the custom attribute
attribute_name = 'field_float'
else:
fourcc = "VF_V" # Replace with the appropriate FourCC of either 'VF_F' for value or 'VF_V' for vec3

# Name of the custom attribute
attribute_name = 'field_vector'

# Get the active selected object
obj = bpy.context.object
Expand Down Expand Up @@ -334,11 +343,17 @@ def execute(self, context):
print(f"Values not found in '{attribute_name}' attribute.")
return {'CANCELLED'}

# Set array size using custom properties
size_x = obj.data["vf_point_grid_x"]
size_y = obj.data["vf_point_grid_z"] # Swizzle XZY order for Unity coordinate system
size_z = obj.data["vf_point_grid_y"] # Swizzle XZY order for Unity coordinate system

if vf_swizzle_None:
# Set array size using custom properties
size_x = obj.data["vf_point_grid_x"]
size_y = obj.data["vf_point_grid_y"]
size_z = obj.data["vf_point_grid_z"]
else:
# Set array size using custom properties
size_x = obj.data["vf_point_grid_x"]
size_y = obj.data["vf_point_grid_z"] # Swizzle XZY order for Unity coordinate system
size_z = obj.data["vf_point_grid_y"] # Swizzle XZY order for Unity coordinate system

# Calculate the stride based on the data type
is_float_data = fourcc[3] == 'F'
stride = 1 if is_float_data else 3
Expand Down Expand Up @@ -556,6 +571,22 @@ class vfDeliverySettings(bpy.types.PropertyGroup):
('INDIVIDUAL', 'Individual', 'Export selection as individual files')
],
default = 'COMBINED')
vf_dataType: bpy.props.EnumProperty(
name = 'VF Data Type',
description = 'Sets output data type',
items = [
('FLOAT', 'Float', 'Export data as floats'),
('VECTOR3', 'Vector3', 'Export data as vector3s')
],
default = 'VECTOR3')
vf_swizzle: bpy.props.EnumProperty(
name = 'VF Swizzle',
description = 'Sets output data type',
items = [
('NONE', 'None', 'Keep axes in order'),
('SWAPYZ', 'Swap Y and Z', 'Swap Y and Z axes. Important for Unity')
],
default = 'SWAPYZ')
data_range: bpy.props.FloatVectorProperty(
name='Range',
description='Range of data to be normalised within 0-1 image values',
Expand Down Expand Up @@ -614,6 +645,8 @@ def draw(self, context):
show_group = True
show_range = False
show_csv = False
show_vf_dataType = False
show_vf_swizzle = False
object_count = 0

# Check if at least one object is selected
Expand Down Expand Up @@ -686,6 +719,8 @@ def draw(self, context):
if context.scene.vf_delivery_settings.file_type == "VF" or context.scene.vf_delivery_settings.file_type == "PNG" or context.scene.vf_delivery_settings.file_type == "EXR":
show_group = False
show_csv = False
show_vf_dataType = True
show_vf_swizzle = True

if context.scene.vf_delivery_settings.file_type == "PNG":
show_range = True
Expand All @@ -705,6 +740,12 @@ def draw(self, context):
layout.prop(context.scene.vf_delivery_settings, 'file_location', text = '')
layout.prop(context.scene.vf_delivery_settings, 'file_type', text = '')

if show_vf_dataType:
layout.prop(context.scene.vf_delivery_settings, 'vf_dataType', expand = True)

if show_vf_swizzle:
layout.prop(context.scene.vf_delivery_settings, 'vf_swizzle', expand = True)

if show_group:
layout.prop(context.scene.vf_delivery_settings, 'file_grouping', expand = True)

Expand Down