Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(365)

Side by Side Diff: remoting/client/display/gl_cursor_feedback.cc

Issue 2591363002: Adding drawable to CRD andorid and iOS gl rendering pipeline. (Closed)
Patch Set: More like GetZIndex. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/client/display/gl_cursor_feedback.h" 5 #include "remoting/client/display/gl_cursor_feedback.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <array> 9 #include <array>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "remoting/client/display/gl_canvas.h" 12 #include "remoting/client/display/canvas.h"
13 #include "remoting/client/display/gl_cursor_feedback_texture.h" 13 #include "remoting/client/display/gl_cursor_feedback_texture.h"
14 #include "remoting/client/display/gl_math.h" 14 #include "remoting/client/display/gl_math.h"
15 #include "remoting/client/display/gl_render_layer.h" 15 #include "remoting/client/display/gl_render_layer.h"
16 #include "remoting/client/display/gl_texture_ids.h" 16 #include "remoting/client/display/gl_texture_ids.h"
17 17
18 namespace { 18 namespace {
19 19
20 const float kAnimationDurationMs = 300.f; 20 const float kAnimationDurationMs = 300.f;
21 21
22 // This function is for calculating the size of the feedback animation circle at 22 // This function is for calculating the size of the feedback animation circle at
(...skipping 13 matching lines...) Expand all
36 return 1.f - pow(kExpansionBase, -progress); 36 return 1.f - pow(kExpansionBase, -progress);
37 }; 37 };
38 static const float kExpansionNormalization = get_unnormalized_coeff(1); 38 static const float kExpansionNormalization = get_unnormalized_coeff(1);
39 return get_unnormalized_coeff(progress) / kExpansionNormalization; 39 return get_unnormalized_coeff(progress) / kExpansionNormalization;
40 } 40 }
41 41
42 } // namespace 42 } // namespace
43 43
44 namespace remoting { 44 namespace remoting {
45 45
46 GlCursorFeedback::GlCursorFeedback() {} 46 GlCursorFeedback::GlCursorFeedback() : weak_factory_(this) {}
47 47
48 GlCursorFeedback::~GlCursorFeedback() {} 48 GlCursorFeedback::~GlCursorFeedback() {}
49 49
50 void GlCursorFeedback::SetCanvas(GlCanvas* canvas) { 50 void GlCursorFeedback::SetCanvas(base::WeakPtr<Canvas> canvas) {
51 if (!canvas) { 51 if (!canvas) {
52 layer_.reset(); 52 layer_.reset();
53 return; 53 return;
54 } 54 }
55 layer_.reset(new GlRenderLayer(kGlCursorFeedbackTextureId, canvas)); 55 layer_.reset(new GlRenderLayer(kGlCursorFeedbackTextureId, canvas));
56 GlCursorFeedbackTexture* texture = GlCursorFeedbackTexture::GetInstance(); 56 GlCursorFeedbackTexture* texture = GlCursorFeedbackTexture::GetInstance();
57 layer_->SetTexture(texture->GetTexture().data(), 57 layer_->SetTexture(texture->GetTexture().data(),
58 GlCursorFeedbackTexture::kTextureWidth, 58 GlCursorFeedbackTexture::kTextureWidth,
59 GlCursorFeedbackTexture::kTextureWidth, 0); 59 GlCursorFeedbackTexture::kTextureWidth, 0);
60 } 60 }
61 61
62 void GlCursorFeedback::StartAnimation(float x, float y, float diameter) { 62 void GlCursorFeedback::StartAnimation(float x, float y, float diameter) {
63 cursor_x_ = x; 63 cursor_x_ = x;
64 cursor_y_ = y; 64 cursor_y_ = y;
65 max_diameter_ = diameter; 65 max_diameter_ = diameter;
66 animation_start_time_ = base::TimeTicks::Now(); 66 animation_start_time_ = base::TimeTicks::Now();
67 } 67 }
68 68
69 bool GlCursorFeedback::Draw() { 69 bool GlCursorFeedback::Draw() {
70 DCHECK(thread_checker_.CalledOnValidThread());
70 if (!layer_ || animation_start_time_.is_null()) { 71 if (!layer_ || animation_start_time_.is_null()) {
71 return false; 72 return false;
72 } 73 }
73 float progress = 74 float progress =
74 (base::TimeTicks::Now() - animation_start_time_).InMilliseconds() / 75 (base::TimeTicks::Now() - animation_start_time_).InMilliseconds() /
75 kAnimationDurationMs; 76 kAnimationDurationMs;
76 if (progress > 1) { 77 if (progress > 1) {
77 animation_start_time_ = base::TimeTicks(); 78 animation_start_time_ = base::TimeTicks();
78 return false; 79 return false;
79 } 80 }
80 float diameter = GetExpansionCoefficient(progress) * max_diameter_; 81 float diameter = GetExpansionCoefficient(progress) * max_diameter_;
81 std::array<float, 8> positions; 82 std::array<float, 8> positions;
82 FillRectangleVertexPositions(cursor_x_ - diameter / 2, 83 FillRectangleVertexPositions(cursor_x_ - diameter / 2,
83 cursor_y_ - diameter / 2, diameter, diameter, 84 cursor_y_ - diameter / 2, diameter, diameter,
84 &positions); 85 &positions);
85 layer_->SetVertexPositions(positions); 86 layer_->SetVertexPositions(positions);
86 87
87 // Linear fade-out. 88 // Linear fade-out.
88 layer_->Draw(1.f - progress); 89 layer_->Draw(1.f - progress);
89 return true; 90 return true;
90 } 91 }
91 92
93 int GlCursorFeedback::GetZIndex() {
94 return Drawable::ZIndex::CURSOR_FEEDBACK;
95 }
96
97 base::WeakPtr<Drawable> GlCursorFeedback::GetWeakPtr() {
98 DCHECK(thread_checker_.CalledOnValidThread());
99 return weak_factory_.GetWeakPtr();
100 }
101
92 } // namespace remoting 102 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698