Merge pull request #316 from howetuft/assembly3

Limit filename length
FreeCAD · Oct 21, 2023 · 5185785 · 5185785
2 parents 1db1678 + 8b0f12d
commit 5185785
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 10 deletions.
diff --git a/Render/constants.py b/Render/constants.py
@@ -56,3 +56,5 @@
 
 # Workbench parameters
 PARAMS = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Render")
+
+MAX_FILENAME_LEN = 256
diff --git a/Render/renderers/Appleseed.py b/Render/renderers/Appleseed.py
@@ -105,7 +105,7 @@ def write_mesh(name, mesh, material, **kwargs):
                 <parameter name="filename" value="{filename}" />
             </object>
             <object_instance name="{shortfilename}.instance"
-                             object="{shortfilename}.{shortfilename}" >
+                             object="{shortfilename}.{name}" >
                 <transform>
                     <matrix>
                         {transfo_rows[0]}

diff --git a/Render/rendermesh.py b/Render/rendermesh.py
@@ -39,6 +39,7 @@
 from math import pi, atan2, asin, isclose, radians, cos, hypot
 import copy
 import cmath
+import uuid
 
 import FreeCAD as App
 import Mesh
@@ -49,7 +50,7 @@
     multiprocessing_enabled,
     numpy_enabled,
 )
-from Render.constants import PARAMS
+from Render.constants import PARAMS, MAX_FILENAME_LEN
 from Render.rendermesh_mp import vector3d
 from Render.utils import debug
 
@@ -396,7 +397,11 @@ def write_file(
                 else App.ActiveDocument.TransientDir
             )
             extension = _EXPORT_EXTENSIONS[filetype]
-            basename = name + extension
+            if len(name) + len(extension) <= MAX_FILENAME_LEN:
+                basename = name
+            else:
+                basename = uuid.uuid4().hex
+            basename += extension
             filename = os.path.join(export_directory, basename)
 
         # Relative/absolute path

diff --git a/templates/cycles_studio_dark.xml b/templates/cycles_studio_dark.xml
@@ -37,7 +37,7 @@
 <state name="KEY" shader="studio_white">
     <light
         light_type="distant"
-        strength="1.5 1.5 1.5"
+        strength="3 3 3"
         dir="-1 1 -1.5"
         angle="0.3"
         use_mis="true"
@@ -46,7 +46,7 @@
 <state name="FILL" shader="studio_white">
     <light
         light_type="distant"
-        strength="0.1"
+        strength="0.1 0.1 0.1"
         dir="1 1 -0.5"
         angle="2"
         use_mis="true"
@@ -56,7 +56,7 @@
 <state name="RIM" shader="studio_white">
     <light
         light_type="distant"
-        strength="20"
+        strength="0.20 0.20 0.20"
         dir="0 -1 0"
         angle="1.57"
         use_mis="true"

diff --git a/templates/cycles_studio_light.xml b/templates/cycles_studio_light.xml
@@ -37,7 +37,7 @@
 <state name="KEY" shader="studio_white">
     <light
         light_type="distant"
-        strength="1.5 1.5 1.5"
+        strength="3.0 3.0 3.0"
         dir="-1 1 -1.5"
         angle="0.3"
         use_mis="true"
@@ -46,7 +46,7 @@
 <state name="FILL" shader="studio_white">
     <light
         light_type="distant"
-        strength="0.1"
+        strength="0.1 0.1 0.1"
         dir="1 1 -0.5"
         angle="2"
         use_mis="true"
@@ -56,7 +56,7 @@
 <state name="RIM" shader="studio_white">
     <light
         light_type="distant"
-        strength="20"
+        strength="0.20 0.20 0.20"
         dir="0 -1 0"
         angle="1.57"
         use_mis="true"

diff --git a/templates/ospray_studio_light.sg b/templates/ospray_studio_light.sg
@@ -32,7 +32,7 @@
             "sgOnly": false,
             "subType": "float",
             "type": 1,
-            "value": 1.0
+            "value": 2.0
           },
           {
             "description": "color of the light",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,3 +56,5 @@

		# Workbench parameters
		PARAMS = App.ParamGet("User parameter:BaseApp/Preferences/Mod/Render")

		MAX_FILENAME_LEN = 256