Mercurial > hg > Game > Cerium

comparison Renderer/Engine/SceneGraph.cc @ 942:27df980045b5 draft

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 b58861019a28
children 56c3b9dd37a7
comparison
equal deleted inserted replaced
941:fc6cfaae6de7 942:27df980045b5
213 213
214 flag_remove = 0; 214 flag_remove = 0;
215 flag_drawable = 1; 215 flag_drawable = 1;
216 sgid = -1; 216 sgid = -1;
217 gid = -1; 217 gid = -1;
218 gl_tex = NULL;
219 218
220 frame = 0; 219 frame = 0;
221 } 220 }
222 221
223 SceneGraph::~SceneGraph() 222 SceneGraph::~SceneGraph()
463 if (converted != NULL) { 462 if (converted != NULL) {
464 SDL_FreeSurface(texture_image); 463 SDL_FreeSurface(texture_image);
465 texture_image = converted; 464 texture_image = converted;
466 } 465 }
467 466
468 this->gl_tex = SDL_GL_LoadTexture(texture_image); 467 // this->gl_tex = SDL_GL_LoadTexture(texture_image);
469 return texture_image; 468 return texture_image;
470 } 469 }
471 470
472 int 471 int
473 SceneGraph::makeTapestries(TaskManager *manager, SDL_Surface *texture_image, int id) { 472 SceneGraph::makeTapestries(TaskManager *manager, SDL_Surface *texture_image, int id) {
505 list[id].t_w = texture_image->w; 504 list[id].t_w = texture_image->w;
506 list[id].t_h = texture_image->h; 505 list[id].t_h = texture_image->h;
507 list[id].pixels_orig = (Uint32*)texture_image->pixels; 506 list[id].pixels_orig = (Uint32*)texture_image->pixels;
508 list[id].pixels = tapestry; 507 list[id].pixels = tapestry;
509 list[id].scale_max = scale; 508 list[id].scale_max = scale;
509 list[id].texture_image = texture_image;
510 510
511 return id; 511 return id;
512 } 512 }
513 513
514 void 514 void
550 texture_info.t_w = list[texture_id].t_w; 550 texture_info.t_w = list[texture_id].t_w;
551 texture_info.t_h = list[texture_id].t_h;; 551 texture_info.t_h = list[texture_id].t_h;;
552 texture_info.pixels_orig = list[texture_id].pixels_orig; 552 texture_info.pixels_orig = list[texture_id].pixels_orig;
553 texture_info.pixels = list[texture_id].pixels; 553 texture_info.pixels = list[texture_id].pixels;
554 texture_info.scale_max = list[texture_id].scale_max; 554 texture_info.scale_max = list[texture_id].scale_max;
555 texture_info.texture_image = list[texture_id].texture_image;
555 556
556 } 557 }
557 558
558 559
559 void 560 void