Merge pull request #105 from dictoon/master

Fix border rendering

Author: Luke Kliber

project_file_writer.py

@@ -1369,7 +1369,7 @@ def __emit_diffuse_btdf(self, material, bsdf_name, scene, layer=None, node=None)
         self.__close_element("bsdf")
 
     #------------------------
-    # Write Sheen BRDF    
+    # Write Sheen BRDF
     #------------------------
     def __emit_sheen_brdf(self, material, bsdf_name, scene, layer=None, node=None):
         reflectance = ""
@@ -1615,7 +1615,7 @@ def __emit_glass_bsdf(self, material, bsdf_name, scene, layer=None, node=None):
                                                            1)
 
         else:
-            
+
             # check for texture in surface_transmittance_name slot
             if layer.glass_surface_transmittance_use_tex and layer.glass_surface_transmittance_tex != "":
                 if util.is_uv_img(bpy.data.textures[layer.glass_surface_transmittance_tex]):
@@ -1682,7 +1682,7 @@ def __emit_glass_bsdf(self, material, bsdf_name, scene, layer=None, node=None):
                     if anisotropy not in self._textures_set:
                         self._textures_set.add(anisotropy)
                         self.__emit_texture(bpy.data.textures[layer.glass_anisotropy_tex], False, scene)
-            
+
             # check for texture in volume_transmittance slot
             if layer.glass_volume_transmittance_use_tex and layer.glass_volume_transmittance_tex != "":
                 if util.is_uv_img(bpy.data.textures[layer.glass_volume_transmittance_tex]):
@@ -1704,7 +1704,7 @@ def __emit_glass_bsdf(self, material, bsdf_name, scene, layer=None, node=None):
                     if volume_transmittance_distance not in self._textures_set:
                         self._textures_set.add(volume_transmittance_distance)
                         self.__emit_texture(bpy.data.textures[layer.glass_volume_transmittance_distance_tex], False, scene)
-            
+
             # check for texture in volume_absorption slot
             if layer.glass_volume_absorption_use_tex and layer.glass_volume_absorption_tex != "":
                 if util.is_uv_img(bpy.data.textures[layer.glass_volume_absorption_tex]):
@@ -1827,7 +1827,7 @@ def __emit_plastic_brdf(self, material, bsdf_name, scene, layer=None, node=None)
         roughness = layer.plastic_roughness
         diffuse_reflectance = ""
         diffuse_reflectance_multiplier = layer.plastic_diffuse_reflectance_multiplier
-        
+
         # check for texture in specular_reflectance slot
         if layer.plastic_specular_reflectance_tex and layer.plastic_specular_reflectance_tex != "":
             if util.is_uv_img(bpy.data.textures[layer.plastic_specular_reflectance_tex]):
@@ -1991,7 +1991,7 @@ def __emit_specular_btdf(self, material, bsdf_name, scene, layer, node=None):
             transmittance_multiplier = layer.spec_btdf_trans_mult
 
             fresnel_multiplier = layer.spec_fresnel_multiplier
-            
+
             if layer.spec_fresnel_multiplier_use_tex and layer.spec_fresnel_multiplier_tex != "":
                 if util.is_uv_img(bpy.data.textures[layer.spec_fresnel_multiplier_tex]):
                     spec_fresnel_multiplier = layer.spec_fresnel_multiplier_tex + "_inst"
@@ -2607,8 +2607,8 @@ def __emit_frame_element(self, scene):
         self.__emit_parameter("filter", scene.appleseed.pixel_filter)
         self.__emit_parameter("filter_size", scene.appleseed.pixel_filter_size)
         if scene.render.use_border:
-            X, Y, endX, endY = self.__get_border_limits(scene, width, height)
-            self.__emit_parameter("crop_window", "{0} {1} {2} {3}".format(X, Y, endX, endY))
+            min_x, min_y, max_x, max_y = self.__get_border_limits(scene, width, height)
+            self.__emit_parameter("crop_window", "{0} {1} {2} {3}".format(min_x, min_y, max_x, max_y))
         self.__close_element("frame")
 
     def __get_frame_resolution(self, render):
@@ -2624,11 +2624,11 @@ def __get_frame_aspect_ratio(self, render):
         return xratio / yratio
 
     def __get_border_limits(self, scene, width, height):
-        X = int(scene.render.border_min_x * width)
-        Y = height - int(scene.render.border_max_y * height)
-        endX = int(scene.render.border_max_x * width)
-        endY = height - int(scene.render.border_min_y * height)
-        return X, Y, endX, endY
+        min_x = int(scene.render.border_min_x * width)
+        max_x = int(scene.render.border_max_x * width)
+        min_y = height - int(scene.render.border_max_y * height) - 1
+        max_y = height - int(scene.render.border_min_y * height) - 1
+        return min_x, min_y, max_x, max_y
 
     # ----------------------------------------------------------------------------------------------
     # Configurations.
@@ -2707,7 +2707,7 @@ def __emit_common_configuration_parameters(self, scene, type):
             self.__emit_parameter("ibl_env_samples", scene.appleseed.ibl_env_samples)
             if not scene.appleseed.max_diffuse_bounces_unlimited:
                 self.__emit_parameter("max_diffuse_bounces", scene.appleseed.max_diffuse_bounces)
-            if not scene.appleseed.max_glossy_bounces_unlimited:    
+            if not scene.appleseed.max_glossy_bounces_unlimited:
                 self.__emit_parameter("max_glossy_bounces", scene.appleseed.max_glossy_bounces)
             if not scene.appleseed.max_specular_bounces_unlimited:
                 self.__emit_parameter("max_specular_bounces", scene.appleseed.max_specular_bounces)

render.py

@@ -172,12 +172,16 @@ def __render_project_file(self, scene, project_filepath):
         (width, height) = util.get_render_resolution(scene)
 
         # Compute render window.
-        x0, y0, x1, y1 = 0, 0, width, height
         if scene.render.use_border:
-            x0 = int(scene.render.border_min_x * width)
-            x1 = int(scene.render.border_max_x * width)
-            y0 = height - int(scene.render.border_min_y * height)
-            y1 = height - int(scene.render.border_max_y * height)
+            min_x = int(scene.render.border_min_x * width)
+            min_y = height - int(scene.render.border_max_y * height)
+            max_x = int(scene.render.border_max_x * width) - 1
+            max_y = height - int(scene.render.border_min_y * height) - 1
+        else:
+            min_x = 0
+            min_y = 0
+            max_x = width - 1
+            max_y = height - 1
 
         # Launch appleseed.cli.
         cmd = (appleseed_exe,
@@ -186,7 +190,7 @@ def __render_project_file(self, scene, project_filepath):
                '--threads', str(scene.appleseed.threads),
                '--message-verbosity', 'warning',
                '--resolution', str(width), str(height),
-               '--window', str(x0), str(y0), str(x1), str(y1))
+               '--window', str(min_x), str(min_y), str(max_x), str(max_y))
         process = subprocess.Popen(cmd, cwd=as_bin_path, env=os.environ.copy(), stdout=subprocess.PIPE)
 
         self.update_stats("", "appleseed: Rendering")
@@ -230,19 +234,36 @@ def __render_project_file(self, scene, project_filepath):
             if False:
                 print("Received tile: x={0} y={1} w={2} h={3} c={4}".format(tile_x, tile_y, tile_w, tile_h, tile_c))
 
-            # Convert tile data to the format expected by Blender.
+            # Ignore tiles completely outside the render window.
+            if tile_x > max_x or tile_x + tile_w - 1 < min_x:
+                continue
+            if tile_y > max_y or tile_y + tile_h - 1 < min_y:
+                continue
+
+            # Image-space coordinates of the intersection between the tile and the render window.
+            x0 = max(tile_x, min_x)
+            y0 = max(tile_y, min_y)
+            x1 = min(tile_x + tile_w - 1, max_x)
+            y1 = min(tile_y + tile_h - 1, max_y)
+
+            # Number of rows and columns to skip in the input tile.
+            skip_x = x0 - tile_x
+            skip_y = y0 - tile_y
+            take_x = x1 - x0 + 1
+            take_y = y1 - y0 + 1
+
+            # Extract relevant tile data and convert them to the format expected by Blender.
             floats = array.array('f')
             floats.fromstring(tile_data)
             pix = []
-            for y in range(tile_h - 1, -1, -1):
-                stride = tile_w * 4
-                start_index = y * stride
-                end_index = start_index + stride
-                pix.extend(floats[i:i + 4] for i in range(start_index, end_index, 4))
+            for y in range(take_y - 1, -1, -1):
+                start_pix = (skip_y + y) * tile_w + skip_x
+                end_pix = start_pix + take_x
+                pix.extend(floats[p*4:p*4+4] for p in range(start_pix, end_pix))
 
             # Update image.
-            result = self.begin_result(tile_x, height - tile_y - tile_h, tile_w, tile_h)
-            layer = result.layers[0] if bpy.app.version < (2, 74, 4) else result.layers[0].passes[0]
+            result = self.begin_result(x0 - min_x, max_y - (y0 + take_y - 1), take_x, take_y)
+            layer = result.layers[0].passes[0]
             layer.rect = pix
             self.end_result(result)
 

scripts/make-package.bat

@@ -3,9 +3,9 @@
 set zipcmd=%~dp0\tools\7z\7z.exe
 
 pushd %~dp0\..\..
-%zipcmd% a -r -x!scripts -xr!.* -x!__pycache__ -x!README.md blenderseed-x.x.x-yyyy.zip blenderseed
+%zipcmd% a -r -x!scripts -xr!.* -x!__pycache__ -x!README.md blenderseed-x.x.x.zip blenderseed
 popd
 
-move ..\..\blenderseed-x.x.x-yyyy.zip .
+move ..\..\blenderseed-x.x.x.zip .
 
 pause