From 9c2b5900c0add01a6fb0cbef234c78eb04ec9ff4 Mon Sep 17 00:00:00 2001
From: Jeroen Bakker <jeroen@blender.org>
Date: Mon, 4 Apr 2022 14:00:33 +0200
Subject: Move ImageTileWrapper to BKE.

ImageTileWrapper is a wrapper around ImageTile to centralize tile calculations when
using CPP. Currentry used by the image engine and will be used for the 3d
texturing brush project.
---
 .../draw/engines/image/image_drawing_mode.hh       |  2 +-
 .../draw/engines/image/image_instance_data.hh      |  5 ++--
 .../blender/draw/engines/image/image_wrappers.hh   | 34 ----------------------
 3 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 source/blender/draw/engines/image/image_wrappers.hh

(limited to 'source/blender/draw/engines')

diff --git a/source/blender/draw/engines/image/image_drawing_mode.hh b/source/blender/draw/engines/image/image_drawing_mode.hh
index 14529797405..a1cd110e1d8 100644
--- a/source/blender/draw/engines/image/image_drawing_mode.hh
+++ b/source/blender/draw/engines/image/image_drawing_mode.hh
@@ -16,7 +16,6 @@
 
 #include "image_batches.hh"
 #include "image_private.hh"
-#include "image_wrappers.hh"
 
 namespace blender::draw::image_engine {
 
@@ -74,6 +73,7 @@ struct OneTextureMethod {
 };
 
 using namespace blender::bke::image::partial_update;
+using namespace blender::bke::image;
 
 template<typename TextureMethod> class ScreenSpaceDrawingMode : public AbstractDrawingMode {
  private:
diff --git a/source/blender/draw/engines/image/image_instance_data.hh b/source/blender/draw/engines/image/image_instance_data.hh
index 682b93a80b3..cb84c7f14ad 100644
--- a/source/blender/draw/engines/image/image_instance_data.hh
+++ b/source/blender/draw/engines/image/image_instance_data.hh
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include "BKE_image_wrappers.hh"
+
 #include "image_batches.hh"
 #include "image_buffer_cache.hh"
 #include "image_partial_updater.hh"
@@ -14,14 +16,11 @@
 #include "image_shader_params.hh"
 #include "image_texture_info.hh"
 #include "image_usage.hh"
-#include "image_wrappers.hh"
 
 #include "DRW_render.h"
 
 /**
  * \brief max allowed textures to use by the ScreenSpaceDrawingMode.
- *
- * 4 textures are used to reduce uploading screen space textures when translating the image.
  */
 constexpr int SCREEN_SPACE_DRAWING_MODE_TEXTURE_LEN = 1;
 
diff --git a/source/blender/draw/engines/image/image_wrappers.hh b/source/blender/draw/engines/image/image_wrappers.hh
deleted file mode 100644
index 323d3ce66a1..00000000000
--- a/source/blender/draw/engines/image/image_wrappers.hh
+++ /dev/null
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- * Copyright 2022 Blender Foundation. */
-
-/** \file
- * \ingroup draw_engine
- */
-
-#pragma once
-
-#include "DNA_image_types.h"
-
-struct ImageTileWrapper {
-  ImageTile *image_tile;
-  ImageTileWrapper(ImageTile *image_tile) : image_tile(image_tile)
-  {
-  }
-
-  int get_tile_number() const
-  {
-    return image_tile->tile_number;
-  }
-
-  int get_tile_x_offset() const
-  {
-    int tile_number = get_tile_number();
-    return (tile_number - 1001) % 10;
-  }
-
-  int get_tile_y_offset() const
-  {
-    int tile_number = get_tile_number();
-    return (tile_number - 1001) / 10;
-  }
-};
-- 
cgit v1.2.3