From e9a325c9ca7203161282eedfe134bd7ff0563adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?= <hejl.lukas@gmail.com>
Date: Thu, 10 Sep 2020 22:30:49 +0200
Subject: [PATCH] Fix rotation in support cubic infill

---
 src/libslic3r/Fill/FillAdaptive.cpp |  6 +++---
 src/libslic3r/Fill/FillAdaptive.hpp |  2 +-
 src/libslic3r/PrintObject.cpp       | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libslic3r/Fill/FillAdaptive.cpp b/src/libslic3r/Fill/FillAdaptive.cpp
index fb8c665eb..f1fa56c5b 100644
--- a/src/libslic3r/Fill/FillAdaptive.cpp
+++ b/src/libslic3r/Fill/FillAdaptive.cpp
@@ -392,7 +392,7 @@ void FillAdaptive_Internal::Octree::propagate_point(
     Octree::propagate_point(point, child, (depth - 1), cubes_properties);
 }
 
-std::unique_ptr<FillAdaptive_Internal::Octree> FillSupportCubic::build_octree_for_adaptive_support(
+std::unique_ptr<FillAdaptive_Internal::Octree> FillSupportCubic::build_octree(
     TriangleMesh &     triangle_mesh,
     coordf_t           line_spacing,
     const Vec3d &      cube_center,
@@ -434,7 +434,7 @@ std::unique_ptr<FillAdaptive_Internal::Octree> FillSupportCubic::build_octree_fo
 
     auto octree = std::make_unique<Octree>(std::make_unique<Cube>(cube_center), cube_center, cubes_properties);
 
-    double cube_edge_length = line_spacing;
+    double cube_edge_length = line_spacing / 2.0;
     size_t max_depth = octree->cubes_properties.size() - 1;
     BoundingBoxf3 mesh_bb = triangle_mesh.bounding_box();
     Vec3f vertical(0, 0, 1);
@@ -497,7 +497,7 @@ std::unique_ptr<FillAdaptive_Internal::Octree> FillSupportCubic::build_octree_fo
                     if(intersect_triangle(cube_center_absolute_arr, dir, vert_0, vert_1, vert_2, &distance, &cord_u, &cord_v) && distance > 0 && distance <= cube_edge_length)
                     {
                         Vec3d cube_center_transformed(cube_center_absolute.x(), cube_center_absolute.y(), cube_center_absolute.z() + (cube_edge_length / 2.0));
-                        Octree::propagate_point(cube_center_transformed, octree->root_cube.get(), max_depth, octree->cubes_properties);
+                        Octree::propagate_point(rotation_matrix * cube_center_transformed, octree->root_cube.get(), max_depth, octree->cubes_properties);
                     }
                 }
             }
diff --git a/src/libslic3r/Fill/FillAdaptive.hpp b/src/libslic3r/Fill/FillAdaptive.hpp
index 45bfde802..96f446773 100644
--- a/src/libslic3r/Fill/FillAdaptive.hpp
+++ b/src/libslic3r/Fill/FillAdaptive.hpp
@@ -120,7 +120,7 @@ protected:
         Polylines                       &polylines_out);
 
 public:
-    static std::unique_ptr<FillAdaptive_Internal::Octree> build_octree_for_adaptive_support(
+    static std::unique_ptr<FillAdaptive_Internal::Octree> build_octree_for(
         TriangleMesh &     triangle_mesh,
         coordf_t           line_spacing,
         const Vec3d &      cube_center,
diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp
index a102c3281..2df7994ee 100644
--- a/src/libslic3r/PrintObject.cpp
+++ b/src/libslic3r/PrintObject.cpp
@@ -491,14 +491,14 @@ std::pair<std::unique_ptr<FillAdaptive_Internal::Octree>, std::unique_ptr<FillAd
     Vec3d rotation = Vec3d((5.0 * M_PI) / 4.0, Geometry::deg2rad(215.264), M_PI / 6.0);
     Transform3d rotation_matrix = Geometry::assemble_transform(Vec3d::Zero(), rotation, Vec3d::Ones(), Vec3d::Ones()).inverse();
 
-    // Rotate mesh and build octree on it with axis-aligned (standart base) cubes
-    mesh.transform(rotation_matrix);
-
-    if (adaptive_line_spacing != 0.)
+    if (adaptive_line_spacing != 0.) {
+        // Rotate mesh and build octree on it with axis-aligned (standart base) cubes
+        mesh.transform(rotation_matrix);
         adaptive_fill_octree = FillAdaptive::build_octree(mesh, adaptive_line_spacing, rotation_matrix * mesh_origin);
+    }
 
     if (support_line_spacing != 0.)
-        support_fill_octree = FillSupportCubic::build_octree_for_adaptive_support(mesh, support_line_spacing, rotation_matrix * mesh_origin, rotation_matrix);
+        support_fill_octree = FillSupportCubic::build_octree(mesh, support_line_spacing, rotation_matrix * mesh_origin, rotation_matrix);
 
     return std::make_pair(std::move(adaptive_fill_octree), std::move(support_fill_octree));
 }