Merge pull request #5480 from manyfold3d/show-render-derivatives

Show pre-rendered derivatives for models if available

Author: Floppy

app/components/preview_frame.rb

@@ -38,6 +38,8 @@ def render_local
       div class: "card-img-top #{"sensitive" if needs_hiding?}" do
         Renderer file: @file
       end
+    elsif @file.has_render?
+      image model_model_file_path(@file.model, @file, format: @file.extension, derivative: "render"), @file.name
     else
       empty
     end

app/components/renderer.rb

@@ -14,10 +14,14 @@ def render?
 
   def before_template
     @settings = current_user&.renderer_settings || SiteSettings::UserDefaults::RENDERER
+    @loading_bar_position_classes = @file.has_render? ?
+      "btn-sm mt-3 translate-middle-x translate-top" :
+      "top-50 translate-middle"
   end
 
   def view_template
     div class: "position-relative", data: {turbo_permanent: true} do
+      img src: model_model_file_path(@file.model, @file, format: @file.extension, derivative: :render), class: "card-img-top image-preview", alt: @file.name if @file.has_render?
       canvas id: "preview-file-#{@file.to_param}",
         class: "object-preview position-relative",
         tabindex: "0",
@@ -36,10 +40,12 @@ def view_template
           render_style: @settings["render_style"],
           auto_load: ((@file.size || 9_999_999.megabytes) < (@settings["auto_load_max_size"] || 9_999_999).megabytes) ? "true" : "false"
         }
-      div class: "p-0 btn btn-secondary load-progress object-preview-progress position-absolute top-50 start-50 translate-middle", role: "presentation" do
+      div class: "p-0 btn btn-secondary load-progress object-preview-progress position-absolute start-50 #{@loading_bar_position_classes}", role: "presentation" do
         div class: "progress-bar bg-info progress-bar-animated progress-bar-striped", role: "progressbar", style: "width: 0%; height: 100%",
           aria_label: "Loading progress", aria_valuenow: "0", aria_valuemin: "0", aria_valuemax: "100"
         span class: "progress-label position-absolute top-50 start-50 translate-middle", role: "button" do
+          Icon icon: "box"
+          whitespace
           span { t("renderer.load") }
           whitespace
           span { "(#{number_to_human_size @file.size, precision: 2})" }

app/models/model_file.rb

@@ -83,6 +83,10 @@ def is_renderable?
     ["stl", "obj", "3mf", "ply", "gltf", "glb", "drc", "fbx", "3ds", "gcode", "mpd", "ldr", "3dm"].include? extension
   end
 
+  def has_render?
+    is_3d_model? && attachment_attacher.derivatives.key?(:render)
+  end
+
   def mime_type
     Mime::Type.lookup_by_extension(extension)
   end

app/views/model_files/show.html.erb

@@ -39,6 +39,8 @@
         </ul>
       <% end %>
       <%= Renderer(file: @file) %>
+    <% elsif @file.has_render? %>
+      <%= image_tag model_model_file_path(@model, @file, format: @file.extension, derivative: "render"), style: "width: 100%", alt: @file.name %>
     <% end %>
     <% if @file.notes %>
       <%= card(:secondary, t(".notes_heading")) do %>

app/views/models/_file.html.erb

@@ -7,6 +7,9 @@
       <div class="card-img-top">
         <%= Renderer(file: file) %>
       </div>
+    <% elsif file.has_render? %>
+      <%= content_tag :div, nil, class: "card-img-top card-img-top-background", style: "background-image: url(#{model_model_file_path(@model, file, format: file.extension)})" %>
+      <%= image_tag model_model_file_path(file.model, file, format: file.extension, derivative: "render"), class: "card-img-top image-preview", alt: file.name %>
     <% else %>
       <%= content_tag :div, nil, class: "card-img-top", style: "aspect-ratio: 1" do %>
         <svg height="100%" width="100%" viewBox="0 0 100 100">