Skip to content

Commit

Permalink
fix export of lights in dupli groups (#197)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Theverat
Theverat committed Sep 26, 2018
1 parent 6399828 commit 59a6552
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 34 deletions.
5 changes: 3 additions & 2 deletions export/blender_object.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@


def convert(exporter, obj, scene, context, luxcore_scene,
exported_object=None, update_mesh=False, dupli_suffix="", duplicator=None):
exported_object=None, update_mesh=False,
dupli_suffix="", dupli_matrix=None, duplicator=None):
"""
duplicator: The duplicator object that created this dupli (e.g. the particle emitter object)
"""
Expand All @@ -20,7 +21,7 @@ def convert(exporter, obj, scene, context, luxcore_scene,
return pyluxcore.Properties(), None

if obj.type == "LAMP":
return convert_lamp(exporter, obj, scene, context, luxcore_scene, dupli_suffix)
return convert_lamp(exporter, obj, scene, context, luxcore_scene, dupli_suffix, dupli_matrix)
elif obj.type == "EMPTY":
return pyluxcore.Properties(), None

Expand Down
47 changes: 29 additions & 18 deletions export/group_instance.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,35 @@ def convert(exporter, duplicator, scene, context, luxcore_scene, props):

for dupli_obj in duplicator.dupli_list:
obj = dupli_obj.object
matrix = dupli_obj.matrix
key = utils.make_key(duplicator.dupli_group) + utils.make_key(obj)

try:
exported_obj = exporter.dupli_groups[key]
except KeyError:
obj_props, exported_obj = blender_object.convert(exporter, obj, scene, context,
luxcore_scene, update_mesh=True,
dupli_suffix=dupli_suffix, duplicator=duplicator)
exporter.dupli_groups[key] = exported_obj

if exported_obj:
mesh_definitions = exported_obj.mesh_definitions
is_shared_mesh = True
luxcore_name = utils.make_key(obj) + dupli_suffix
obj_transform = utils.matrix_to_list(matrix, scene, apply_worldscale=True)
blender_object.define_from_mesh_defs(mesh_definitions, scene, context, exporter, obj, props,
is_shared_mesh, luxcore_name, obj_transform, duplicator)
if dupli_obj.matrix.determinant() == 0:
continue

if obj.type == "LAMP":
# It is a light (we don't do instancing here)
light_props, exported_light = blender_object.convert(exporter, obj, scene, context,
luxcore_scene, update_mesh=True,
dupli_suffix=dupli_suffix,
dupli_matrix=dupli_obj.matrix)
props.Set(light_props)
else:
# It is an object
key = utils.make_key(duplicator.dupli_group) + utils.make_key(obj)

try:
exported_obj = exporter.dupli_groups[key]
except KeyError:
obj_props, exported_obj = blender_object.convert(exporter, obj, scene, context,
luxcore_scene, update_mesh=True,
dupli_suffix=dupli_suffix, duplicator=duplicator)
exporter.dupli_groups[key] = exported_obj

if exported_obj:
mesh_definitions = exported_obj.mesh_definitions
is_shared_mesh = True
luxcore_name = utils.make_key(obj) + dupli_suffix
transform = utils.matrix_to_list(dupli_obj.matrix, scene, apply_worldscale=True)
blender_object.define_from_mesh_defs(mesh_definitions, scene, context, exporter, obj, props,
is_shared_mesh, luxcore_name, transform, duplicator)
except Exception as error:
msg = '[Dupli group "%s"] %s' % (duplicator.dupli_group.name, error)
scene.luxcore.errorlog.add_warning(msg)
Expand Down
27 changes: 13 additions & 14 deletions export/light.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
MISSING_IMAGE_COLOR = [1, 0, 1]


def convert_lamp(exporter, obj, scene, context, luxcore_scene, dupli_suffix=""):
def convert_lamp(exporter, obj, scene, context, luxcore_scene, dupli_suffix="", dupli_matrix=None):
try:
assert isinstance(obj, bpy.types.Object)
assert obj.type == "LAMP"
Expand All @@ -29,7 +29,7 @@ def convert_lamp(exporter, obj, scene, context, luxcore_scene, dupli_suffix=""):

lamp = obj.data

matrix = obj.matrix_world
transform_matrix = dupli_matrix if dupli_matrix else obj.matrix_world
sun_dir = _calc_sun_dir(obj)

# Common light settings shared by all light types
Expand Down Expand Up @@ -77,7 +77,7 @@ def convert_lamp(exporter, obj, scene, context, luxcore_scene, dupli_suffix=""):
definitions["power"] = lamp.luxcore.power
# Position is set by transformation property
definitions["position"] = [0, 0, 0]
transformation = utils.matrix_to_list(matrix, scene, apply_worldscale=True)
transformation = utils.matrix_to_list(transform_matrix, scene, apply_worldscale=True)
definitions["transformation"] = transformation

if lamp.luxcore.radius > 0:
Expand Down Expand Up @@ -136,12 +136,12 @@ def convert_lamp(exporter, obj, scene, context, luxcore_scene, dupli_suffix=""):
definitions["target"] = [0, 0, -1]

spot_fix = Matrix.Rotation(math.radians(-90.0), 4, "Z")
transformation = utils.matrix_to_list(matrix * spot_fix, scene, apply_worldscale=True)
transformation = utils.matrix_to_list(transform_matrix * spot_fix, scene, apply_worldscale=True)
definitions["transformation"] = transformation

elif lamp.type == "HEMI":
if lamp.luxcore.image:
_convert_infinite(definitions, lamp, scene, matrix)
_convert_infinite(definitions, lamp, scene, transform_matrix)
else:
# Fallback
definitions["type"] = "constantinfinite"
Expand All @@ -159,11 +159,12 @@ def convert_lamp(exporter, obj, scene, context, luxcore_scene, dupli_suffix=""):
definitions["target"] = [0, 0, -1]

spot_fix = Matrix.Rotation(math.radians(-90.0), 4, "Z")
transformation = utils.matrix_to_list(matrix * spot_fix, scene, apply_worldscale=True)
transformation = utils.matrix_to_list(transform_matrix * spot_fix, scene, apply_worldscale=True)
definitions["transformation"] = transformation
else:
# area (mesh light)
return _convert_area_lamp(obj, scene, context, luxcore_scene, gain, importance)
return _convert_area_lamp(obj, scene, context, luxcore_scene, gain,
importance, luxcore_name, dupli_matrix)

else:
# Can only happen if Blender changes its lamp types
Expand Down Expand Up @@ -280,28 +281,25 @@ def _convert_infinite(definitions, lamp_or_world, scene, transformation=None):
definitions["transformation"] = transformation


def calc_area_lamp_transformation(obj):
lamp = obj.data

transform_matrix = obj.matrix_world.copy()
def calc_area_lamp_transformation(lamp, transform_matrix):
scale_x = Matrix.Scale(lamp.size / 2, 4, (1, 0, 0))
if lamp.shape == "RECTANGLE":
scale_y = Matrix.Scale(lamp.size_y / 2, 4, (0, 1, 0))
else:
# basically scale_x, but for the y axis (note the last tuple argument)
scale_y = Matrix.Scale(lamp.size / 2, 4, (0, 1, 0))

transform_matrix = transform_matrix.copy()
transform_matrix *= scale_x
transform_matrix *= scale_y
return transform_matrix


def _convert_area_lamp(obj, scene, context, luxcore_scene, gain, importance):
def _convert_area_lamp(obj, scene, context, luxcore_scene, gain, importance, luxcore_name, dupli_matrix):
"""
An area light is a plane object with emissive material in LuxCore
"""
lamp = obj.data
luxcore_name = utils.get_luxcore_name(obj, context)
props = pyluxcore.Properties()

# Light emitting material
Expand Down Expand Up @@ -339,7 +337,8 @@ def _convert_area_lamp(obj, scene, context, luxcore_scene, gain, importance):
# LuxCore object

# Copy transformation of area lamp object
transform_matrix = calc_area_lamp_transformation(obj)
input_matrix = dupli_matrix if dupli_matrix else obj.matrix_world
transform_matrix = calc_area_lamp_transformation(obj.data, input_matrix)

if transform_matrix.determinant() == 0:
# Objects with non-invertible matrices cannot be loaded by LuxCore (RuntimeError)
Expand Down

0 comments on commit 59a6552

Please sign in to comment.