[Bf-blender-cvs] [98a5658239b] master: Cleanup: Renamed DefaultDrawingMode ImageSpaceDrawingMode.

[Jeroen Bakker]

Commit: 98a5658239bb61a701f20309c741ab895ed92b7a
Author: Jeroen Bakker
Date:   Wed Nov 24 11:23:44 2021 +0100
Branches: master
https://developer.blender.org/rB98a5658239bb61a701f20309c741ab895ed92b7a

Cleanup: Renamed DefaultDrawingMode ImageSpaceDrawingMode.

Explains more what it does, not how it is used.

===================================================================

M	source/blender/draw/CMakeLists.txt
R098	source/blender/draw/engines/image/image_drawing_mode.hh	source/blender/draw/engines/image/image_drawing_mode_image_space.hh
M	source/blender/draw/engines/image/image_engine.cc

===================================================================

diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index b8ca22d33d3..30a3b8087c0 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -223,6 +223,9 @@ set(SRC
   engines/external/external_engine.h
   engines/image/image_engine.h
   engines/image/image_private.hh
+  engines/image/image_drawing_mode_image_space.hh
+  engines/image/image_space_image.hh
+  engines/image/image_space_node.hh
   engines/workbench/workbench_engine.h
   engines/workbench/workbench_private.h
   engines/select/select_engine.h
diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode_image_space.hh
similarity index 98%
rename from source/blender/draw/engines/image/image_drawing_mode.hh
rename to source/blender/draw/engines/image/image_drawing_mode_image_space.hh
index 528e47b7a1e..26f4bc28106 100644
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode_image_space.hh
@@ -26,7 +26,7 @@
 
 namespace blender::draw::image_engine {
 
-class DefaultDrawingMode : public AbstractDrawingMode {
+class ImageSpaceDrawingMode : public AbstractDrawingMode {
  private:
   DRWPass *create_image_pass() const
   {
diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc
index 491fbec978b..37db7246e67 100644
--- a/source/blender/draw/engines/image/image_engine.cc
+++ b/source/blender/draw/engines/image/image_engine.cc
@@ -41,7 +41,7 @@
 
 #include "GPU_batch.h"
 
-#include "image_drawing_mode.hh"
+#include "image_drawing_mode_image_space.hh"
 #include "image_engine.h"
 #include "image_private.hh"
 #include "image_space_image.hh"
@@ -63,12 +63,18 @@ static std::unique_ptr<AbstractSpaceAccessor> space_accessor_from_context(
   return nullptr;
 }
 
+template<
+    /** \brief Drawing mode to use.
+     *
+     * Useful during development to switch between drawing implementations.
+     */
+    typename DrawingMode = ImageSpaceDrawingMode>
 class ImageEngine {
  private:
   const DRWContextState *draw_ctx;
   IMAGE_Data *vedata;
   std::unique_ptr<AbstractSpaceAccessor> space;
-  DefaultDrawingMode drawing_mode;
+  DrawingMode drawing_mode;
 
  public:
   ImageEngine(const DRWContextState *draw_ctx, IMAGE_Data *vedata)