# HG changeset patch
# User yutaka@charles.cr.ie.u-ryukyu.ac.jp
# Date 1286791011 -32400
# Node ID 78ebcdaae8bc740ee9b0adb610d71a17f5ced02f
# Parent  143e4f9af7be52492efba61a2990557315a76739
add sdl_test file

diff -r 143e4f9af7be -r 78ebcdaae8bc Renderer/Engine/SceneGraph.cc
--- a/Renderer/Engine/SceneGraph.cc	Mon Oct 11 14:22:09 2010 +0900
+++ b/Renderer/Engine/SceneGraph.cc	Mon Oct 11 18:56:51 2010 +0900
@@ -454,11 +454,19 @@
     if (!texture_image) return 0;
     SDL_Surface *tmpImage
         = SDL_CreateRGBSurface(SDL_SWSURFACE, texture_image->w,
-                               texture_image->h, 32, redMask,
-                               greenMask, blueMask, alphaMask);
+                             texture_image->h, 32, redMask,
+                            greenMask, blueMask, alphaMask);
+
+      //= SDL_CreateRGBSurface(SDL_HWSURFACE, 0,
+      //                       0, 32, redMask,
+      //                       greenMask, blueMask, alphaMask);
+
     SDL_Surface *converted;
     converted = SDL_ConvertSurface(texture_image, tmpImage->format,
-                                   SDL_SWSURFACE);
+                                   SDL_HWSURFACE);
+
+    //SDL_SetAlpha(converted, 0, 0);
+
     if (converted != NULL) {
         SDL_FreeSurface(texture_image);
         texture_image = converted;
diff -r 143e4f9af7be -r 78ebcdaae8bc Renderer/Engine/viewerSDL.cc
--- a/Renderer/Engine/viewerSDL.cc	Mon Oct 11 14:22:09 2010 +0900
+++ b/Renderer/Engine/viewerSDL.cc	Mon Oct 11 18:56:51 2010 +0900
@@ -65,12 +65,13 @@
 	exit(1);
     }
 
-    screen = SDL_SetVideoMode(width, height, bpp, SDL_SWSURFACE);
+    screen = SDL_SetVideoMode(width, height, bpp, SDL_HWSURFACE);
     if (screen == NULL) {
 	fprintf(stderr, "Couldn't set SDL mode: %s\n", SDL_GetError());
 	SDL_Quit();
 	exit(1);
     }
+
     this->width = screen->w;
     this->height = screen->h;
     this->bpp = screen->format->BitsPerPixel;
@@ -84,6 +85,7 @@
 ViewerSDL::clean_pixels()
 {
     //bzero(pixels, sizeof(int)*width*height);
+  
     //SDL_FillRect(screen,NULL,SDL_MapRGB(screen->format,0,0,0));
 }
 
diff -r 143e4f9af7be -r 78ebcdaae8bc old/sdl_test/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/old/sdl_test/Makefile	Mon Oct 11 18:56:51 2010 +0900
@@ -0,0 +1,5 @@
+sdl_test: sdl_test.cc
+	g++ -O9 `sdl-config --libs --cflags` -o sdl_test sdl_test.cc
+
+clean:
+	rm -f sdl_test *.o
\ No newline at end of file
diff -r 143e4f9af7be -r 78ebcdaae8bc old/sdl_test/fb.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/old/sdl_test/fb.h	Mon Oct 11 18:56:51 2010 +0900
@@ -0,0 +1,33 @@
+#ifndef FB_H
+#define FB_H
+
+#define DEVICE_NAME "/dev/fb0"
+#define DIV_BYTE 8
+
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <linux/fb.h>
+#include <linux/fs.h>
+#include <sys/mman.h>
+#include <sys/ioctl.h>
+#include <stdlib.h>
+#include <iostream>
+
+struct fb_t {
+
+  char *pixels;
+  int size;
+  int width;
+  int height;
+  int bpp;
+  int fd;
+
+};
+
+/* function prototype */
+void send_current_error_msg(const char *ptr);
+void send_current_information(const char *ptr);
+fb_t get_fbdev_addr(void);
+
+#endif
diff -r 143e4f9af7be -r 78ebcdaae8bc old/sdl_test/sdl_test.cc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/old/sdl_test/sdl_test.cc	Mon Oct 11 18:56:51 2010 +0900
@@ -0,0 +1,168 @@
+#include "fb.h"
+#include <SDL.h>
+using namespace std;
+
+void send_current_error_msg(const char *ptr)
+{
+    fprintf( stderr , "%s\n" , ptr );
+}
+
+void send_current_information(const char *ptr)
+{
+    fprintf( stdout , "%s\n" , ptr );
+}
+
+const int redMask   = 0x00ff0000;
+const int greenMask = 0x0000ff00;
+const int blueMask  = 0x000000ff;
+const int alphaMask = 0xff000000;
+
+fb_t
+get_fbdev_addr(void)
+{
+  int fd_framebuffer ;
+  struct fb_var_screeninfo vinfo;
+  struct fb_fix_screeninfo finfo;
+  long int screensize ;
+  //long int location;
+  char *fbptr ;
+  char tmp[DIV_BYTE*10];
+
+  //int x , y ;
+  int xres,yres,vbpp,line_len;
+  //unsigned short tcolor ;
+
+  /* 読み書き用にファイルを開く */
+  fd_framebuffer = open( DEVICE_NAME , O_RDWR);
+  if ( !fd_framebuffer ) {
+    send_current_error_msg("Framebuffer device open error !");
+    exit(1);
+  }
+  send_current_information("The framebuffer device was opened !");
+	
+  /* 固定スクリーン情報取得 */
+  if ( ioctl( fd_framebuffer , FBIOGET_FSCREENINFO , &finfo ) ) {
+    send_current_error_msg("Fixed information not gotton !");
+    exit(2);
+  }
+
+  /* 変動スクリーン情報取得 */
+  if ( ioctl( fd_framebuffer , FBIOGET_VSCREENINFO , &vinfo ) ) {
+    send_current_error_msg("Variable information not gotton !");
+    exit(3);
+  }
+  xres = vinfo.xres ;
+  yres = vinfo.yres ;
+  printf("vinfo.yres %d \n", vinfo.yres);
+  vbpp = vinfo.bits_per_pixel ;
+  line_len = finfo.line_length ;
+  sprintf( tmp , "%d(pixel)x%d(line), %dbpp(bits per pixel)",xres,yres,vbpp);
+  sprintf( tmp , "%d(xoffset)x%d(yoffset)",vinfo.xoffset, vinfo.yoffset);
+  send_current_information( tmp );
+
+  /* バイト単位でのスクリーンのサイズを計算 */
+  screensize = xres * yres * vbpp / DIV_BYTE ;
+
+  /* デバイスをメモリにマップする */
+  fbptr = (char *)mmap(0,screensize,PROT_READ | PROT_WRITE,MAP_SHARED,fd_framebuffer,0);
+  if ( (int)fbptr == -1 ) {
+    send_current_error_msg("Don't get framebuffer device to memory !");
+    exit(4);
+  }
+  send_current_information("The framebuffer device was mapped !");
+
+  printf("fb: 0x%x \n", (unsigned int)fbptr);
+
+  fb_t fb;
+  fb.pixels = fbptr;
+  fb.size = screensize;
+  fb.width = xres;
+  fb.height = yres;
+  fb.bpp = vbpp;
+  fb.fd = fd_framebuffer;
+
+  return fb;
+
+}
+
+int main() {
+
+  fb_t fb = get_fbdev_addr();
+  close(fb.fd);
+
+  void *p;
+  Uint32 *gUra;
+
+  //posix_memalign((void**)&gUra, 16, fb.width*fb.height*4);
+
+  gUra = (Uint32*)malloc(fb.width*fb.height*4);
+  Uint32 *tmp = (Uint32*)malloc(fb.width*fb.height*4);
+
+  printf("fb.height %d \n", fb.height);
+
+  int i;
+  int color = 0x000000ff;
+
+  for (i = 0; i < fb.width*fb.height; i++) {
+    gUra[i] = color;
+  }
+
+
+  //初期化
+  if (SDL_Init( SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_JOYSTICK ) < 0) {
+    printf("SDL_Init failed\n");
+    return -1;
+  }
+
+  printf("fb.width %d fb.height %d fb.bpp %d \n",fb.width, fb.height, fb.bpp);
+
+  SDL_Surface *screen=SDL_SetVideoMode(fb.width,fb.height,fb.bpp,SDL_HWSURFACE);
+  if (screen == NULL) {
+    printf("SDL_Surface failed\n");
+    SDL_Quit();
+    return -1;
+  }
+
+  int done = 0;
+  SDL_Event event;
+
+  int fps=0;
+
+  Uint32 t1=SDL_GetTicks();
+
+  while(!done){
+    while(SDL_PollEvent(&event)){
+      switch(event.type){
+      case SDL_QUIT:
+        done = 1;
+        break;
+      case SDL_KEYDOWN:
+        if(event.key.keysym.sym == SDLK_ESCAPE){
+          done = 1;
+        }
+        break;
+      }
+    }
+
+
+    //ここに処理を追加して変化を見る
+    SDL_Surface *bitmap = SDL_CreateRGBSurfaceFrom((void *)gUra,fb.width,fb.height,fb.bpp,fb.width*4,redMask,greenMask,blueMask,alphaMask);
+    SDL_BlitSurface(bitmap,NULL,screen,NULL);
+    SDL_UpdateRect(screen,0,0,0,0);
+    
+
+    if (SDL_GetTicks() < t1 + 1000){
+      fps++;
+    } else{
+      printf("fps=%d\n", fps);
+      fps=0;
+      t1=SDL_GetTicks();
+    }
+  }
+
+  SDL_Quit();
+
+  return 0;
+
+}
+