cc: Add point-based UV coordinate on TextureLayer

cc/texture_draw_quad.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/texture_draw_quad.h"
 
 #include "base/logging.h"
 
 namespace cc {
 
 TextureDrawQuad::TextureDrawQuad()
     : resource_id(0),
       premultiplied_alpha(false),
       flipped(false) {
 }
 
 scoped_ptr<TextureDrawQuad> TextureDrawQuad::Create() {
   return make_scoped_ptr(new TextureDrawQuad);
 }
 
 void TextureDrawQuad::SetNew(const SharedQuadState* shared_quad_state,
                              gfx::Rect rect, gfx::Rect opaque_rect,
                              unsigned resource_id, bool premultiplied_alpha,
-                             const gfx::RectF& uv_rect,
+                             const gfx::PointF& uv_top_left,
+                             const gfx::PointF& uv_bottom_right,
                              const float vertex_opacity[4], bool flipped) {
   gfx::Rect visible_rect = rect;
   bool needs_blending = vertex_opacity[0] != 1.0f || vertex_opacity[1] != 1.0f
       || vertex_opacity[2] != 1.0f || vertex_opacity[3] != 1.0f;
   DrawQuad::SetAll(shared_quad_state, DrawQuad::TEXTURE_CONTENT, rect,
                    opaque_rect, visible_rect, needs_blending);
   this->resource_id = resource_id;
   this->premultiplied_alpha = premultiplied_alpha;
-  this->uv_rect = uv_rect;
+  this->uv_top_left = uv_top_left;
+  this->uv_bottom_right = uv_bottom_right;
   this->vertex_opacity[0] = vertex_opacity[0];
   this->vertex_opacity[1] = vertex_opacity[1];
   this->vertex_opacity[2] = vertex_opacity[2];
   this->vertex_opacity[3] = vertex_opacity[3];
   this->flipped = flipped;
 }
 
 void TextureDrawQuad::SetAll(const SharedQuadState* shared_quad_state,
                              gfx::Rect rect, gfx::Rect opaque_rect,
                              gfx::Rect visible_rect, bool needs_blending,
                              unsigned resource_id, bool premultiplied_alpha,
-                             const gfx::RectF& uv_rect,
+                             const gfx::PointF& uv_top_left,
+                             const gfx::PointF& uv_bottom_right,
                              const float vertex_opacity[4], bool flipped) {
   DrawQuad::SetAll(shared_quad_state, DrawQuad::TEXTURE_CONTENT, rect,
                    opaque_rect, visible_rect, needs_blending);
   this->resource_id = resource_id;
   this->premultiplied_alpha = premultiplied_alpha;
-  this->uv_rect = uv_rect;
+  this->uv_top_left = uv_top_left;
+  this->uv_bottom_right = uv_bottom_right;
   this->vertex_opacity[0] = vertex_opacity[0];
   this->vertex_opacity[1] = vertex_opacity[1];
   this->vertex_opacity[2] = vertex_opacity[2];
   this->vertex_opacity[3] = vertex_opacity[3];
   this->flipped = flipped;
 }
 
 const TextureDrawQuad* TextureDrawQuad::MaterialCast(const DrawQuad* quad) {
   DCHECK(quad->material == DrawQuad::TEXTURE_CONTENT);
   return static_cast<const TextureDrawQuad*>(quad);
@@ skipping 17 matching lines @@
 
   // Transform the rect by the scale and offset.
   gfx::RectF rectF = rect;
   rectF.Scale(x_scale, y_scale);
   rectF += offset;
 
   // Perform clipping and check to see if the result is empty.
   gfx::RectF clippedRect = IntersectRects(rectF, clipRect());
   if (clippedRect.IsEmpty()) {
     rect = gfx::Rect();
-    uv_rect = gfx::RectF();
+    uv_top_left = gfx::PointF();
+    uv_bottom_right = gfx::PointF();

[danakj, 2013/01/11 02:21:51]

should this be PointF(1.f, 1.f)

[Jerome, 2013/01/11 18:00:01]

To keep the previous behavior uv_bottom_right should be 0,0 too.

     return true;
   }
 
   // Create a new uv-rect by clipping the old one to the new bounds.
-  uv_rect = gfx::RectF(
-      uv_rect.x()
-          + uv_rect.width() / rectF.width() * (clippedRect.x() - rectF.x()),
-      uv_rect.y()
-          + uv_rect.height() / rectF.height() * (clippedRect.y() - rectF.y()),
-      uv_rect.width() / rectF.width() * clippedRect.width(),
-      uv_rect.height() / rectF.height() * clippedRect.height());
+  float u_scale = (uv_bottom_right.x() - uv_top_left.x()) / rectF.width();

[danakj, 2013/01/11 02:21:51]

I might have messed this up, or you might see a more clean/more semantically
descriptive way to do this, but generally it's nice if we can write the math in
terms of points/vectors instead of breaking it down into components. So I was
thinking something like:

gfx::PointF old_top_left = uv_top_left;
gfx::PointF old_bottom_left = uv_bottom_left;

gfx::Vector2dF clipped_rect_offset = clippedRect.origin() - rectF.origin();

uv_top_left = old_top_left +
    gfx::ScaleVector2dF(
        old_bottom_right - old_top_left,
        clipped_rect_offset.x() / rectF.width(),
        clipped_rect_offset.y() / rectF.height());
uv_bottom_right = uv_top_left +
    gfx::ScaleVector2dF(
        old_bottom_right - old_top_left,
        clippedRect.width() / rectF.width(),
        clippedRect.height() / rectF.height());

WDYT?

[Jerome, 2013/01/11 18:00:01]

LGTM.
Any reason why there is no 
void Vector2dF::Scale(const Vector2dF& other)? That would allow to keep almost
everything vectors.

[danakj, 2013/01/11 20:00:12]

Ya, I thought about this too.. Ill file a bug

+  float v_scale = (uv_bottom_right.y() - uv_top_left.y()) / rectF.height();
+  uv_bottom_right = gfx::PointF(
+      uv_top_left.x() + u_scale * (clippedRect.right() - rectF.x()),
+      uv_top_left.y() + v_scale * (clippedRect.bottom() - rectF.y()));
+  uv_top_left = gfx::PointF(
+      uv_top_left.x() + u_scale * (clippedRect.x() - rectF.x()),
+      uv_top_left.y() + v_scale * (clippedRect.y() - rectF.y()));
 
   // Indexing according to the quad vertex generation:
   // 1--2
   // |  |
   // 0--3
   if (vertex_opacity[0] != vertex_opacity[1]
       || vertex_opacity[0] != vertex_opacity[2]
       || vertex_opacity[0] != vertex_opacity[3]) {
     const float x1 = (clippedRect.x() - rectF.x()) / rectF.width();
     const float y1 = (clippedRect.y() - rectF.y()) / rectF.height();
@@ skipping 13 matching lines @@
   clippedRect -= offset;
   clippedRect.Scale(1.0f / x_scale, 1.0f / y_scale);
   rect = gfx::Rect(static_cast<int>(clippedRect.x() + 0.5f),
                    static_cast<int>(clippedRect.y() + 0.5f),
                    static_cast<int>(clippedRect.width() + 0.5f),
                    static_cast<int>(clippedRect.height() + 0.5f));
   return true;
 }
 
 }  // namespace cc