Light: Removed Comments, Added Sky render options in UI

src/bonsai/bonsai/bim/module/light/operator.py

@@ -147,7 +147,7 @@ class PrepareRadianceScene(bpy.types.Operator):
         print("Starting Radiance scene preparation...")
         props = tool.Blender.get_radiance_exporter_props()
         output_dir = props.output_dir
-        
+
         # Check if OBJ file exists from previous export step
         obj_file_path = os.path.join(output_dir, "model.obj")
         if not os.path.exists(obj_file_path):
@@ -156,7 +156,7 @@ class PrepareRadianceScene(bpy.types.Operator):
             print(f"ERROR: {error_msg}")
             print(f"  Expected file: {obj_file_path}")
             return {"CANCELLED"}
-        
+
         resolution_x, resolution_y = props.radiance_resolution_x, props.radiance_resolution_y
 
         assert context.scene
@@ -191,21 +191,6 @@ class PrepareRadianceScene(bpy.types.Operator):
         sun_pos_props = tool.Blender.get_sun_props()
         assert sun_pos_props
         sky_file_path = os.path.join(output_dir, "sky.rad")
-        # latitude = sun_props.latitude
-        # longitude = sun_props.longitude
-        # month = sun_props.month
-        # day = sun_props.day
-        # hour = sun_props.hour
-        # minute = sun_props.minute
-
-        # print("Sun Properties:")
-        # print("Latitude: ", latitude)
-        # print("Longitude: ", longitude)
-        # print("Timezone: ", timezone)
-        # print("Month: ", month)
-        # print("Day: ", day)
-        # print("Hour: ", hour)
-        # print("Minute: ", minute)
 
         print("Setting up camera...")
         if props.use_active_camera:
@@ -223,66 +208,43 @@ class PrepareRadianceScene(bpy.types.Operator):
         print(f"Camera position: {camera_position}")
         print(f"Camera direction: {camera_direction}")
 
-        #     azimuth, elevation = sun_position.sun_calc.get_sun_coordinates(
-        #     sun_pos_props.time,
-        #     sun_pos_props.latitude,
-        #     sun_pos_props.longitude,
-        #     -sun_pos_props.UTC_zone,
-        #     sun_pos_props.month,
-        #     sun_pos_props.day,
-        #     sun_pos_props.year,
-        # )
 
+        # Build datetime for Radiance gensky
+        # Note: sun_pos_props and sun_props are synchronized by update_sun_path()
         dt = datetime(sun_pos_props.year, sun_props.month, sun_props.day, sun_props.hour, sun_props.minute)
-        print(dt)
+        
-        print(sun_props.latitude)
+        print(f"Sun position data for Radiance gensky:")
-        print(sun_props.longitude)
+        print(f"  DateTime: {dt}")
-        print(sun_props.UTC_zone)
+        print(f"  Latitude: {sun_props.latitude}°")
-        print(sun_pos_props.year)
+        print(f"  Longitude: {sun_props.longitude}°")
+        print(f"  UTC Zone: {sun_props.UTC_zone}")
+        print(f"  Year: {sun_pos_props.year}")
+        # Map sky condition enum to boolean parameters
+        sky_condition = props.sky_condition
+        sunny_with_sun = sky_condition == "SUNNY_WITH_SUN"
+        sunny_without_sun = sky_condition == "SUNNY_WITHOUT_SUN"
+        cloudy = sky_condition == "CLOUDY"
+
         sky_description = pr.gensky(
             dt=dt,
             latitude=sun_props.latitude,
             longitude=sun_props.longitude,
             year=sun_pos_props.year,
             timezone=-int(sun_props.UTC_zone),
-            # sunny_with_sun=True,
+            sunny_with_sun=sunny_with_sun,
-            # sunny_without_sun=False,
+            sunny_without_sun=sunny_without_sun,
-            # cloudy=False,
+            cloudy=cloudy,
-            # ground_reflectance=0.2,
+            ground_reflectance=props.ground_reflectance,
-            # turbidity=3.0,
+            turbidity=props.turbidity,
         )
 
         sky_description_str = sky_description.decode("utf-8")
-        # Write all this to file
-        # skyfunc glow sky_glow
-        # 0
-        # 0
-        # 4 .9 .9 1.15 0
-
-        # sky_glow source sky
-        # 0
-        # 0
-        # 4 0 0 1 180
-
-        # skyfunc glow ground_glow
-        # 0
-        # 0
-        # 4 1.4 .9 .6 0
-
-        # ground_glow source ground
-        # 0
-        # 0
-        # 4 0 0 -1 180
 
         if use_hdr and choose_hdr_image == "Noon":
 
             with open(sky_file_path, "w") as f:
                 f.write(sky_description_str)
                 f.write("\n")
-                # f.write("skyfunc glow sky_glow\n0\n0\n4 .9 .9 1.15 0\n")
-                # f.write("sky_glow source sky\n0\n0\n4 0 0 1 180\n")
-                # f.write("skyfunc glow ground_glow\n0\n0\n4 1.4 .9 .6 0\n")
-                # f.write("ground_glow source ground\n0\n0\n4 0 0 -1 180\n")
 
                 f.write(
                     '''void colorpict env_map
@@ -360,12 +322,6 @@ ground_glow source ground
             # Write default materials
             default_materials = [
                 "void plastic white\n0\n0\n5 0.8 0.8 0.8 0 0\n",
-                # "void plastic blue_plastic\n0\n0\n5 0.1 0.2 0.8 0.05 0.1\n",
-                # "void plastic red_plastic\n0\n0\n5 0.8 0.1 0.2 0.05 0.1\n",
-                # "void metal silver_metal\n0\n0\n5 0.8 0.8 0.8 0.9 0.1\n",
-                # "void glass clear_glass\n0\n0\n3 0.96 0.96 0.96\n",
-                # "void light white_light\n0\n0\n3 1.0 1.0 1.0\n",
-                # "void trans olive_trans\n0\n0\n7 0.6 0.7 0.4 0.05 0.05 0.7 0.2\n",
             ]
             for material in default_materials:
                 file.write(material)
@@ -389,7 +345,7 @@ ground_glow source ground
                     file.write(f"inherit alias {style_id} white\n")
 
         self.report({"INFO"}, f"Exported Materials Rad file to: {materials_file}")
-        
+
         print(f"OBJ file size: {os.path.getsize(obj_file_path)} bytes")
         print(f"Materials file size: {os.path.getsize(materials_file)} bytes")
         print(f"Converting OBJ to RTM format...")
@@ -429,7 +385,7 @@ ground_glow source ground
             vertical_fov = 2 * math.atan(math.tan(camera_fov / 2) / aspect_ratio)
 
             aview = pr.create_default_view()
-            aview.type = 'v'  # Perspective view
+            aview.type = "v"  # Perspective view
             aview.vp = camera_position
             aview.vdir = camera_direction
             aview.vu = (0, 0, 1)  # Assuming Z is up
@@ -443,7 +399,7 @@ ground_glow source ground
             view_height = ortho_scale / aspect_ratio
 
             aview = pr.create_default_view()
-            aview.type = 'l'  # Parallel projection (orthographic)
+            aview.type = "l"  # Parallel projection (orthographic)
             aview.vp = camera_position
             aview.vdir = camera_direction
             aview.vu = (0, 0, 1)  # Assuming Z is up
@@ -514,20 +470,6 @@ class RadianceRender(bpy.types.Operator):
             self.report({"INFO"}, f"TIFF Output: {tiff_path}")
         return {"FINISHED"}
 
-    # def get_active_camera(self, context):
-    #     props = context.scene.radiance_exporter_properties
-    #     if props.use_active_camera:
-    #         return context.scene.camera
-    #     else:
-    #         return props.selected_camera
-
-    # def getResolution(self, context):
-    #     scene = context.scene
-    #     props = scene.radiance_exporter_properties
-    #     resolution_x = props.radiance_resolution_x
-    #     resolution_y = props.radiance_resolution_y
-    #     return resolution_x, resolution_y
-
 
 def save_obj2mesh_output(inp: Union[bytes, str, Path], output_file: str, **kwargs):
     try:

src/bonsai/bonsai/bim/module/light/prop.py

@@ -179,8 +179,11 @@ def update_sun_path(self: "BIMSolarProperties", context: Union[bpy.types.Context
     )
     sun_vector = sun_position.sun_calc.get_sun_vector(azimuth, elevation) * sun_props.sun_distance
     props.sun_position = sun_vector
-    # sun_vector.z = max(0, sun_vector.z)
+    
-    # Light direction is a bit weird?
+    # Update Blender viewport light direction for shadow visualization
+    # This coordinate transformation converts from sun_position addon's coordinate system
+    # to Blender's display.light_direction coordinate system
+    # Note: This only affects viewport shading, not the Radiance rendering
     mat = Matrix(((-1.0, 0.0, 0.0, 0.0), (0.0, 0, 1.0, 0.0), (-0.0, -1.0, 0, 0.0), (0.0, 0.0, 0.0, 1.0))).inverted()
     rotation_euler = Euler((elevation - pi / 2, 0, -azimuth))
     rotation_quaternion = rotation_euler.to_quaternion()
@@ -191,6 +194,9 @@ def update_sun_path(self: "BIMSolarProperties", context: Union[bpy.types.Context
 
     assert bpy.context.scene
     assert bpy.context.scene.display
+    # Set viewport light direction based on sun position
+    # If sun is below horizon (z < 0), use default upward direction
+    # Otherwise, use calculated direction from sun position
     if sun_vector.z < 0:
         bpy.context.scene.display.light_direction = mat @ Vector((0, 0, 1))
     else:
@@ -332,9 +338,6 @@ class RadianceExporterProperties(PropertyGroup):
     materials: CollectionProperty(type=RadianceMaterial)
     active_material_index: IntProperty()
 
-    # material_mappings: bpy.props.CollectionProperty(type=bpy.types.PropertyGroup, name="Material Mappings")
-    # material_mappings: CollectionProperty(type=MaterialMapping)
-
     should_load_from_memory: BoolProperty(
         name="Load from Memory",
         default=False,
@@ -412,6 +415,34 @@ class RadianceExporterProperties(PropertyGroup):
         default="Noon",
     )
 
+    # Sky generation parameters
+    sky_condition: EnumProperty(
+        name="Sky Condition",
+        description="Type of sky condition to generate",
+        items=[
+            ("SUNNY_WITH_SUN", "Sunny with Sun", "Clear sky with direct sun"),
+            ("SUNNY_WITHOUT_SUN", "Sunny without Sun", "Clear sky without direct sun"),
+            ("CLOUDY", "Cloudy", "Overcast sky condition"),
+        ],
+        default="SUNNY_WITH_SUN",
+    )
+
+    ground_reflectance: FloatProperty(
+        name="Ground Reflectance",
+        description="Ground reflectance value (0.0 to 1.0)",
+        min=0.0,
+        max=1.0,
+        default=0.2,
+    )
+
+    turbidity: FloatProperty(
+        name="Turbidity",
+        description="Atmospheric turbidity (1.0 to 10.0). Lower values = clearer sky",
+        min=1.0,
+        max=10.0,
+        default=3.0,
+    )
+
     use_active_camera: BoolProperty(
         name="Use Active Camera", description="Use the active camera in the scene", default=True
     )
@@ -441,6 +472,9 @@ class RadianceExporterProperties(PropertyGroup):
         output_file_format: Literal["HDR"]
         use_hdr: bool
         choose_hdr_image: Literal["Noon"]
+        sky_condition: Literal["SUNNY_WITH_SUN", "SUNNY_WITHOUT_SUN", "CLOUDY"]
+        ground_reflectance: float
+        turbidity: float
         use_active_camera: bool
         selected_camera: Union[bpy.types.Object, None]
 

src/bonsai/bonsai/bim/module/light/ui.py

@@ -77,9 +77,6 @@ class BIM_PT_radiance_exporter(bpy.types.Panel):
         row = layout.row()
         row.template_list("MATERIAL_UL_radiance_materials", "", props, "materials", props, "active_material_index")
         row.operator("radiance.open_spectraldb", text="", icon="WORLD")  # Globe icon
-        # layout.use_property_split = True
-        # layout.use_property_decorate = False
-        # layout.width_hint = 350
         if len(props.materials) > 0:
             col = layout.column(align=True)
             prop_with_search(col, props, "category")
@@ -145,6 +142,17 @@ class BIM_PT_radiance_exporter(bpy.types.Panel):
             row = box.row()
             row.prop(props, "choose_hdr_image")
 
+        layout.separator()
+
+        # Sky Generation Settings
+        box = layout.box()
+        box.label(text="Sky Generation Settings")
+        box.prop(props, "sky_condition")
+        row = box.row()
+        row.prop(props, "ground_reflectance")
+        row = box.row()
+        row.prop(props, "turbidity")
+
         # Step 1: Export geometry for simulation
         box = layout.box()
         box.label(text="Step 1: Export geometry for simulation")