Preparation for 1.0.3

Author: 0xafbf

CHANGELOG.md

@@ -2,6 +2,18 @@
 All notable changes to this project will be documented in this file.
 Features marked with `*` require the UE4 plugin to work.
 
+## [1.0.3] 2020-08-19
+### Added
++ Texture node now supports box projection.
++ Smoothing groups are now written in geometry data.
++ TGA texture support. _Thanks KeyToon9_
+
+### Fixed
+* Vertex normals now export correctly (you may need to use the Triangulate modifier). _Thanks KeyToon9_
+* Fixed image files names when first char is unvalid. _Thanks KeyToon9_
+* Improved light attenuation radius calculation.
+* Animation is now correctly exported for non-root objects.
+
 ## [1.0.2] 2020-07-24
 ### Fixed
 * Fixed an issue when writing some custom props, that would break the XML structure.

__init__.py

@@ -3,7 +3,7 @@
 bl_info = {
 	"name": "Unreal Datasmith format",
 	"author": "Andrés Botero",
-	"version": (1, 0, 2),
+	"version": (1, 0, 3),
 	"blender": (2, 82, 0),
 	"location": "File > Export > Datasmith (.udatasmith)",
 	"description": "Export scene as Datasmith asset",
@@ -51,7 +51,7 @@ class ExportDatasmith(bpy.types.Operator, ExportHelper):
 	export_animations: BoolProperty(
 			name="Export animations",
 			description="Export object animations (transforms only)",
-			default=False,
+			default=True,
 		)
 	apply_modifiers: BoolProperty(
 			name="Apply modifiers",
@@ -65,14 +65,15 @@ class ExportDatasmith(bpy.types.Operator, ExportHelper):
 				"transforms or shaders",
 			default=False,
 		)
-	experimental_tex_mode: BoolProperty(
-			name="Use sRGB support (UE4 4.25)",
-			description="Disables the gamma hack to export masks correctly",
-			default=True,
+	use_gamma_hack: BoolProperty(
+			name="Use sRGB gamma hack (UE 4.24 and below)",
+			description="Flags sRGB texture to use gamma as sRGB is not supported in old versions",
+			default=False,
 		)
-	prefer_custom_nodes: BoolProperty(
-			name="Prefer custom nodes",
-			description="Exports simpler node setups for some nodes, requires having the UE4 plugin",
+	compatibility_mode: BoolProperty(
+			name="Compatibility mode",
+			description="Enable this if you don't have the UE4 plugin, "
+				"Improves material nodes support, but at a reduced quality",
 			default=False,
 		)
 	use_logging: BoolProperty(

export_datasmith.py

@@ -739,8 +739,8 @@ def exp_color_ramp(from_node, exp_list):
 	level = get_expression(from_node.inputs['Fac'], exp_list)
 
 	curve_idx = exp_scalar(idx, exp_list)
-	prefer_custom_nodes = datasmith_context["prefer_custom_nodes"]
-	if not prefer_custom_nodes:
+	compatibility_mode = datasmith_context["compatibility_mode"]
+	if compatibility_mode:
 		pixel_offset = exp_scalar(0.5, exp_list)
 		vertical_res = exp_scalar(1/DATASMITH_TEXTURE_SIZE, exp_list) # curves texture size
 		n = Node("Add")
@@ -1477,7 +1477,7 @@ def fill_umesh(umesh, bl_mesh):
 	loops.foreach_get("normal", normals)
 	normals = normals.reshape((num_loops, 3))
 	normals = normals @ matrix_normals
-	
+
 	m.transform(matrix_datasmith)
 
 	#finish inline mesh_copy_triangulate
@@ -2080,7 +2080,7 @@ def get_datasmith_curves_image():
 TEXTURE_MODE_BUMP = "6" # this converts textures to normal maps automatically
 
 # saves image, and generates node with image description to add to export
-def save_texture(texture, basedir, folder_name, minimal_export = False, experimental_tex_mode=True):
+def save_texture(texture, basedir, folder_name, minimal_export = False, use_gamma_hack=False):
 	name, image, img_type = texture
 
 	log.info("writing texture:"+name)
@@ -2131,8 +2131,7 @@ def save_texture(texture, basedir, folder_name, minimal_export = False, experime
 	elif image.colorspace_settings.is_data:
 		n['texturemode'] = TEXTURE_MODE_SPECULAR
 		n['srgb'] = "2" # only read on 4.25 onwards, but we can still write it
-		if not experimental_tex_mode:
-			# use this hack if not using experimental mode
+		if use_gamma_hack:
 			n['rgbcurve'] = "0.454545"
 
 	n['texturefilter'] = "3"
@@ -2164,7 +2163,7 @@ def collect_and_save(context, args, save_path):
 		"materials": [],
 		"material_curves": None,
 		"metadata": [],
-		"prefer_custom_nodes": args["prefer_custom_nodes"],
+		"compatibility_mode": args["compatibility_mode"],
 	}
 
 	log.info("collecting objects")
@@ -2348,9 +2347,9 @@ def collect_and_save(context, args, save_path):
 	log.info("writing textures")
 
 	tex_nodes = []
-	use_experimental_tex_mode = args["experimental_tex_mode"]
+	use_gamma_hack = args["use_gamma_hack"]
 	for tex in datasmith_context["textures"]:
-		tex_node = save_texture(tex, basedir, folder_name, minimal_export, use_experimental_tex_mode)
+		tex_node = save_texture(tex, basedir, folder_name, minimal_export, use_gamma_hack)
 		tex_nodes.append(tex_node)
 
 	log.info("building XML tree")
@@ -2372,7 +2371,6 @@ def collect_and_save(context, args, save_path):
 	for mat in material_nodes:
 		n.push(mat)
 
-	print("Using experimental tex mode:%s", use_experimental_tex_mode)
 	for tex in tex_nodes:
 		n.push(tex)
 

testing/test_datasmith_export.py

@@ -48,13 +48,13 @@
 log.info("Starting automated export")
 
 custom_args = {}
-custom_args["experimental_tex_mode"] = True
+custom_args["use_gamma_hack"] = False
 custom_args["apply_modifiers"] = True
 custom_args["export_animations"] = True
-custom_args["prefer_custom_nodes"] = True
+custom_args["compatibility_mode"] = False
+custom_args["minimal_export"] = False
 custom_args["use_logging"] = True
 custom_args["use_profiling"] = False
-# custom_args["minimal_export"] = True
 
 if "-benchmark" in sys.argv:
 	custom_args["use_logging"] = False