diff Renderer/Engine/viewerGL.h @ 927:fada580e4604 draft

remove garbage codes from viewerGL
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Fri, 30 Jul 2010 17:57:49 +0900
parents cb1023423861
children 21be2f7e13ff
line wrap: on
line diff
--- a/Renderer/Engine/viewerGL.h	Thu Jul 29 22:56:58 2010 +0900
+++ b/Renderer/Engine/viewerGL.h	Fri Jul 30 17:57:49 2010 +0900
@@ -3,7 +3,7 @@
  * MacOSX上での高速な動作を目的としたViewerです。
  * ViewerとViewerDevice 一体型です。
  * 通常の計算(Move, Collision)はそのままです。
- * 描画の部分はTaskを使わず、OpenGLで直に記述する予定です。
+ * 描画の部分はTaskを使わず、OpenGLで直に描画します。
  **/
 
 #ifndef INCLUDED_VIEWER_GL
@@ -13,10 +13,13 @@
 #include <SDL_opengl.h>
 #include "viewer_types.h"
 #include "TaskManager.h"
+#include "SceneGraphRoot.h"
 #include "KeyStat.h"
 #include "MainLoop.h"
 #include "Application.h"
-#include "SceneGraphRoot.h"
+#include "Func.h"
+#include "texture.h"
+#include "lindaapi.h"
 
 
 class cViewerGL : public Viewer {
@@ -25,28 +28,26 @@
   ~cViewerGL(){};
   
   SDL_Surface *screen;
-  //  SDL_Surface *bitmap;
-  
-  /* override function */
+
   void video_init(int bpp, int width, int height);
   void clean_pixels();
   void clear_screen();
-  //  void free_device();
-  
-  void run_init(TaskManager *manager, Application *app);
-  void run_loop();
+
+  /* override function */
+  void mainLoop();
   void run_finish();
 
-  void mainLoop();
+  void run_loop();
   void pickup_vertex();
   void obj_draw(float *xyz, float *tex_xyz, float *normal_xyz);
-  GLuint SDL_GL_LoadTexture(SDL_Surface *surface);
 
  private:
-    /* measure for FPS (Frame Per Second) */
-    int start_time;
-    int this_time;
-    int frames;    
+  bool quit_flag;
+  
+  /* measure for FPS (Frame Per Second) */
+  int start_time;
+  int this_time;
+  int frames;    
 };
 
 #endif