Browse Source

Make grid-translucency depend on if machine has texture on BP.

part of CURA-12188
Remco Burema 4 months ago
parent
commit
c89b708525

+ 6 - 2
cura/BuildVolume.py

@@ -252,14 +252,18 @@ class BuildVolume(SceneNode):
         if not self.getMeshData() or not self.isVisible():
             return True
 
+        theme = self._application.getTheme()
         if not self._shader:
             self._shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "default.shader"))
             self._grid_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "grid.shader"))
-            theme = self._application.getTheme()
-            self._grid_shader.setUniformValue("u_plateColor", Color(*theme.getColor("buildplate").getRgb()))
             self._grid_shader.setUniformValue("u_gridColor0", Color(*theme.getColor("buildplate_grid").getRgb()))
             self._grid_shader.setUniformValue("u_gridColor1", Color(*theme.getColor("buildplate_grid_minor").getRgb()))
 
+        plate_color = Color(*theme.getColor("buildplate").getRgb())
+        if self._global_container_stack.getMetaDataEntry("has_textured_buildplate", False):
+            plate_color.setA(0.5)
+        self._grid_shader.setUniformValue("u_plateColor", plate_color)
+
         renderer.queueNode(self, mode = RenderBatch.RenderMode.Lines)
         renderer.queueNode(self, mesh = self._origin_mesh, backface_cull = True)
         renderer.queueNode(self, mesh = self._grid_mesh, shader = self._grid_shader, backface_cull = True, transparent = True, sort = -10)

+ 1 - 0
resources/definitions/ankermake_m5.def.json

@@ -12,6 +12,7 @@
         "has_machine_quality": true,
         "machine_extruder_trains": { "0": "ankermake_m5_extruder_0" },
         "platform_texture": "ankermake_m5.png",
+        "has_textured_buildplate": true,
         "preferred_material": "generic_pla",
         "preferred_quality_type": "normal"
     },

+ 1 - 0
resources/definitions/ankermake_m5c.def.json

@@ -12,6 +12,7 @@
         "has_machine_quality": true,
         "machine_extruder_trains": { "0": "ankermake_m5c_extruder_0" },
         "platform_texture": "ankermake_m5c.png",
+        "has_textured_buildplate": true,
         "preferred_material": "generic_pla",
         "preferred_quality_type": "normal"
     },

+ 1 - 0
resources/definitions/dagoma_sigma_pro.def.json

@@ -17,6 +17,7 @@
         "preferred_quality_type": "h0.2",
         "preferred_variant_name": "Brass 0.4mm",
         "quality_definition": "dagoma_sigma_pro",
+        "has_textured_buildplate": true,
         "variants_name": "Nozzle"
     },
     "overrides":

+ 1 - 0
resources/definitions/dagoma_sigma_pro_dual.def.json

@@ -18,6 +18,7 @@
             "1": "dagoma_sigma_pro_dual_extruder_left"
         },
         "platform_texture": "dagoma_sigma_pro.png",
+        "has_textured_buildplate": true,
         "preferred_quality_type": "h0.2",
         "preferred_variant_name": "Brass 0.4mm",
         "quality_definition": "dagoma_sigma_pro_dual",

+ 1 - 0
resources/definitions/fdmprinter.def.json

@@ -15,6 +15,7 @@
         "preferred_material": "generic_pla",
         "preferred_quality_type": "normal",
         "machine_extruder_trains": { "0": "fdmextruder" },
+        "has_textured_buildplate": false,
         "supports_usb_connection": true,
         "supports_network_connection": false,
         "supports_abstract_color": false

+ 1 - 0
resources/definitions/flyingbear_ghost_4s.def.json

@@ -8,6 +8,7 @@
         "author": "oducceu",
         "platform": "flyingbear_platform.obj",
         "platform_texture": "flyingbear_platform.png",
+        "has_textured_buildplate": true,
         "quality_definition": "flyingbear_base"
     },
     "overrides":

+ 1 - 0
resources/definitions/flyingbear_ghost_5.def.json

@@ -8,6 +8,7 @@
         "author": "oducceu",
         "platform": "flyingbear_platform.obj",
         "platform_texture": "flyingbear_platform.png",
+        "has_textured_buildplate": true,
         "quality_definition": "flyingbear_base"
     },
     "overrides":

+ 1 - 0
resources/definitions/flyingbear_ghost_6.def.json

@@ -8,6 +8,7 @@
         "author": "barrnet",
         "platform": "flyingbear_platform.obj",
         "platform_texture": "flyingbear_platform.png",
+        "has_textured_buildplate": true,
         "quality_definition": "flyingbear_base"
     },
     "overrides":

+ 2 - 1
resources/definitions/hellbot_adonis.def.json

@@ -16,7 +16,8 @@
             -1,
             0
         ],
-        "platform_texture": "hellbot.png"
+        "platform_texture": "hellbot.png",
+        "has_textured_buildplate": true
     },
     "overrides":
     {

Some files were not shown because too many files changed in this diff