Mercurial > hg > Members > kono > Cerium

diff Renderer/Engine/SceneGraph.cc @ 942:b2f7d2ad3804

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FB mode is working again on Mac OS X.
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 31 Jul 2010 18:37:10 +0900
parents 35efda39c2d9
children 33616b2789de
line wrap: on
line diff
--- a/Renderer/Engine/SceneGraph.cc	Sat Jul 31 17:50:38 2010 +0900
+++ b/Renderer/Engine/SceneGraph.cc	Sat Jul 31 18:37:10 2010 +0900
@@ -215,7 +215,6 @@
     flag_drawable = 1;
     sgid = -1;
     gid = -1;
-    gl_tex = NULL;
 
     frame = 0;
 }
@@ -465,7 +464,7 @@
         texture_image = converted;
     }
 
-    this->gl_tex = SDL_GL_LoadTexture(texture_image);
+    // this->gl_tex = SDL_GL_LoadTexture(texture_image);
     return texture_image;
 }
 
@@ -507,6 +506,7 @@
                 list[id].pixels_orig = (Uint32*)texture_image->pixels;
                 list[id].pixels = tapestry;
                 list[id].scale_max = scale;
+                list[id].texture_image = texture_image;
 
                 return id;
     }
@@ -552,6 +552,7 @@
       texture_info.pixels_orig = list[texture_id].pixels_orig;
       texture_info.pixels = list[texture_id].pixels;
       texture_info.scale_max = list[texture_id].scale_max;
+      texture_info.texture_image = list[texture_id].texture_image;
 
 }