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

Side by Side Diff: gpu/demos/hello_triangle/main.cc

Issue 549071: Added variable name as required by style guide. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | gpu/demos/mip_map_2d/main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 // This is a simple example that draws a single triangle with 5 // This is a simple example that draws a single triangle with
6 // a minimal vertex/fragment shader. The purpose of this 6 // a minimal vertex/fragment shader. The purpose of this
7 // example is to demonstrate the basic concepts of 7 // example is to demonstrate the basic concepts of
8 // OpenGL ES 2.0 rendering. 8 // OpenGL ES 2.0 rendering.
9 9
10 #include "gpu/demos/app_framework/application.h" 10 #include "gpu/demos/app_framework/application.h"
11 #include "third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h" 11 #include "third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h"
12 12
13 namespace gpu_demos { 13 namespace gpu_demos {
14 class HelloTriangle : public Application { 14 class HelloTriangle : public Application {
15 public: 15 public:
16 HelloTriangle(); 16 HelloTriangle();
17 ~HelloTriangle(); 17 ~HelloTriangle();
18 18
19 bool Init(); 19 bool Init();
20 20
21 protected: 21 protected:
22 virtual void Draw(float); 22 virtual void Draw(float elapsed_sec);
23 23
24 private: 24 private:
25 ESContext context_; 25 ESContext context_;
26 HTUserData user_data_; 26 HTUserData user_data_;
27 27
28 DISALLOW_COPY_AND_ASSIGN(HelloTriangle); 28 DISALLOW_COPY_AND_ASSIGN(HelloTriangle);
29 }; 29 };
30 30
31 HelloTriangle::HelloTriangle() { 31 HelloTriangle::HelloTriangle() {
32 esInitContext(&context_); 32 esInitContext(&context_);
33 33
34 memset(&user_data_, 0, sizeof(HTUserData)); 34 memset(&user_data_, 0, sizeof(HTUserData));
35 context_.userData = &user_data_; 35 context_.userData = &user_data_;
36 } 36 }
37 37
38 HelloTriangle::~HelloTriangle() { 38 HelloTriangle::~HelloTriangle() {
39 htShutDown(&context_); 39 htShutDown(&context_);
40 } 40 }
41 41
42 bool HelloTriangle::Init() { 42 bool HelloTriangle::Init() {
43 if (!Application::InitRenderContext()) return false; 43 if (!Application::InitRenderContext()) return false;
44 44
45 context_.width = width(); 45 context_.width = width();
46 context_.height = height(); 46 context_.height = height();
47 if (!htInit(&context_)) return false; 47 if (!htInit(&context_)) return false;
48 48
49 return true; 49 return true;
50 } 50 }
51 51
52 void HelloTriangle::Draw(float) { 52 void HelloTriangle::Draw(float /*elapsed_sec*/) {
53 htDraw(&context_); 53 htDraw(&context_);
54 } 54 }
55 } // namespace gpu_demos 55 } // namespace gpu_demos
56 56
57 int main(int argc, char *argv[]) { 57 int main(int argc, char *argv[]) {
58 gpu_demos::HelloTriangle app; 58 gpu_demos::HelloTriangle app;
59 if (!app.Init()) { 59 if (!app.Init()) {
60 printf("Could not init.\n"); 60 printf("Could not init.\n");
61 return EXIT_FAILURE; 61 return EXIT_FAILURE;
62 } 62 }
63 63
64 app.MainLoop(); 64 app.MainLoop();
65 return EXIT_SUCCESS; 65 return EXIT_SUCCESS;
66 } 66 }
OLDNEW
« no previous file with comments | « no previous file | gpu/demos/mip_map_2d/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698