| Index: gpu/demos/hello_triangle/main.cc
|
| ===================================================================
|
| --- gpu/demos/hello_triangle/main.cc (revision 36529)
|
| +++ gpu/demos/hello_triangle/main.cc (working copy)
|
| @@ -7,59 +7,24 @@
|
| // example is to demonstrate the basic concepts of
|
| // OpenGL ES 2.0 rendering.
|
|
|
| -#include "gpu/demos/app_framework/application.h"
|
| +#include "gpu/demos/gles2_book/example.h"
|
| #include "third_party/gles2_book/Chapter_2/Hello_Triangle/Hello_Triangle.h"
|
|
|
| -namespace gpu_demos {
|
| -class HelloTriangle : public Application {
|
| - public:
|
| - HelloTriangle();
|
| - ~HelloTriangle();
|
| +namespace gpu {
|
| +namespace demos {
|
| +namespace gles2_book {
|
| +typedef Example<HTUserData,
|
| + htInit,
|
| + NoOpUpdateFunc,
|
| + htDraw,
|
| + htShutDown> HelloTriangle;
|
| +} // namespace gles2_book
|
| +} // namespace demos
|
| +} // namespace gpu
|
|
|
| - bool Init();
|
| -
|
| - protected:
|
| - virtual void Draw(float elapsed_sec);
|
| -
|
| - private:
|
| - ESContext context_;
|
| - HTUserData user_data_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(HelloTriangle);
|
| -};
|
| -
|
| -HelloTriangle::HelloTriangle() {
|
| - esInitContext(&context_);
|
| -
|
| - memset(&user_data_, 0, sizeof(HTUserData));
|
| - context_.userData = &user_data_;
|
| -}
|
| -
|
| -HelloTriangle::~HelloTriangle() {
|
| - htShutDown(&context_);
|
| -}
|
| -
|
| -bool HelloTriangle::Init() {
|
| - if (!Application::InitRenderContext()) return false;
|
| -
|
| - context_.width = width();
|
| - context_.height = height();
|
| - if (!htInit(&context_)) return false;
|
| -
|
| - return true;
|
| -}
|
| -
|
| -void HelloTriangle::Draw(float /*elapsed_sec*/) {
|
| - htDraw(&context_);
|
| -}
|
| -} // namespace gpu_demos
|
| -
|
| int main(int argc, char *argv[]) {
|
| - gpu_demos::HelloTriangle app;
|
| - if (!app.Init()) {
|
| - printf("Could not init.\n");
|
| - return EXIT_FAILURE;
|
| - }
|
| + gpu::demos::gles2_book::HelloTriangle app;
|
| + CHECK(app.Init());
|
|
|
| app.MainLoop();
|
| return EXIT_SUCCESS;
|
|
|