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

Unified Diff: chrome/browser/android/vr_shell/vr_shell_renderer.h

Issue 2757213003: Implementing glTF 1.0 parser (Closed)
Patch Set: Moving glTF test data to a file. Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/vr_shell/vr_shell_renderer.h
diff --git a/chrome/browser/android/vr_shell/vr_shell_renderer.h b/chrome/browser/android/vr_shell/vr_shell_renderer.h
index 52f02a22d048399fb299c4d132971cd820141872..239ded7f9bb523972ed68ca7b0a6f3a89fd5fe55 100644
--- a/chrome/browser/android/vr_shell/vr_shell_renderer.h
+++ b/chrome/browser/android/vr_shell/vr_shell_renderer.h
@@ -61,9 +61,7 @@ class BaseRenderer {
virtual ~BaseRenderer();
protected:
- BaseRenderer(ShaderID vertex_id,
- ShaderID fragment_id,
- bool setup_vertex_buffer);
+ BaseRenderer(ShaderID vertex_id, ShaderID fragment_id);
void PrepareToDraw(GLuint view_proj_matrix_handle,
const gvr::Mat4f& view_proj_matrix);
@@ -71,12 +69,20 @@ class BaseRenderer {
GLuint program_handle_;
GLuint position_handle_;
GLuint tex_coord_handle_;
- GLuint vertex_buffer_;
+ GLuint vertex_buffer_ = 0;
DISALLOW_COPY_AND_ASSIGN(BaseRenderer);
};
-class TexturedQuadRenderer : public BaseRenderer {
+class BaseQuadRenderer : public BaseRenderer {
+ public:
+ BaseQuadRenderer(ShaderID vertex_id, ShaderID fragment_id);
+ ~BaseQuadRenderer() override;
+
+ DISALLOW_COPY_AND_ASSIGN(BaseQuadRenderer);
+};
+
+class TexturedQuadRenderer : public BaseQuadRenderer {
public:
TexturedQuadRenderer();
~TexturedQuadRenderer() override;
@@ -101,7 +107,7 @@ class TexturedQuadRenderer : public BaseRenderer {
};
// Renders a page-generated stereo VR view.
-class WebVrRenderer : public BaseRenderer {
+class WebVrRenderer : public BaseQuadRenderer {
public:
WebVrRenderer();
~WebVrRenderer() override;
@@ -114,7 +120,7 @@ class WebVrRenderer : public BaseRenderer {
DISALLOW_COPY_AND_ASSIGN(WebVrRenderer);
};
-class ReticleRenderer : public BaseRenderer {
+class ReticleRenderer : public BaseQuadRenderer {
public:
ReticleRenderer();
~ReticleRenderer() override;
@@ -134,7 +140,7 @@ class ReticleRenderer : public BaseRenderer {
DISALLOW_COPY_AND_ASSIGN(ReticleRenderer);
};
-class LaserRenderer : public BaseRenderer {
+class LaserRenderer : public BaseQuadRenderer {
public:
LaserRenderer();
~LaserRenderer() override;
@@ -152,7 +158,7 @@ class LaserRenderer : public BaseRenderer {
DISALLOW_COPY_AND_ASSIGN(LaserRenderer);
};
-class GradientQuadRenderer : public BaseRenderer {
+class GradientQuadRenderer : public BaseQuadRenderer {
public:
GradientQuadRenderer();
~GradientQuadRenderer() override;

Powered by Google App Engine
This is Rietveld 408576698