Mercurial > hg > Game > Cerium

changeset 1211:7763f03a94e1 draft before-dma-manager

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
const char fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Fri, 22 Jul 2011 08:46:29 +0900
parents 0ee23180d301
children 4fc9a9a6089d
files Renderer/Engine/SceneGraph.cc Renderer/Engine/SceneGraph.h Renderer/Engine/SceneGraphRoot.cc Renderer/Engine/SceneGraphRoot.h Renderer/Engine/task/CreateSpan.cc Renderer/Engine/viewer.h Renderer/Test/vacuum.cc
diffstat 7 files changed, 23 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/SceneGraph.cc	Fri Jul 22 07:49:52 2011 +0900
+++ b/Renderer/Engine/SceneGraph.cc	Fri Jul 22 08:46:29 2011 +0900
@@ -221,7 +221,7 @@
 
 }
 
-SceneGraph::SceneGraph(TaskManager *manager,char *font,int pixels,Uint32 color,char *string_name) {
+SceneGraph::SceneGraph(TaskManager *manager,const char *font,int pixels,Uint32 color,const char *string_name) {
 
     init();
 
@@ -257,7 +257,7 @@
 }
 
 void
-SceneGraph::create_font_data(TaskManager *manager,char *font ,int pixels, Uint32 color, char *string_name)
+SceneGraph::create_font_data(TaskManager *manager,const char *font ,int pixels, Uint32 color, const char *string_name)
 {
             //font_coordinate(pixels/2,pixels);
  	    font_normal();
@@ -268,7 +268,7 @@
 }
 
 void
-SceneGraph::get_font_image(TaskManager *manager,char *font ,int pixels ,Uint32 color, char *string_name)
+SceneGraph::get_font_image(TaskManager *manager,const char *font ,int pixels ,Uint32 color, const char *string_name)
 {
   int tex_id;
   if (texture_hash.hash_regist(string_name, tex_id)) {
@@ -294,7 +294,7 @@
 }
 
 SDL_Surface*
-SceneGraph::load_font_image(char *font ,int pixel,Uint32 color , char *string_name)
+SceneGraph::load_font_image(const char *font ,int pixel,Uint32 color , const char *string_name)
 {
   //printf("laod_font_iamge");
   FT_Library library;
@@ -393,7 +393,7 @@
 }
 
 void
-SceneGraph::conv(char *str, int length, u_int32_t *out) {
+SceneGraph::conv(const char *str, int length, u_int32_t *out) {
   int oindex = 0;
   int i = 0;
   while (i < length) {
@@ -654,7 +654,7 @@
 }
 
 static  int
-is_bmp(char *name) {
+is_bmp(const char *name) {
     int  bmp = 0;
 
     while(*name) {
@@ -696,9 +696,9 @@
 }
 
 SDL_Surface*
-SceneGraph::load_decode_image(char *file_name, char *image_name, xmlNodePtr cur)
+SceneGraph::load_decode_image(const char *file_name, const char *image_name, xmlNodePtr cur)
 {
-    int fd = mkstemp(image_name);
+    int fd = mkstemp((char *)image_name);
     FILE *outfile = fdopen(fd, "wb");
 
     if (NULL == outfile) {
--- a/Renderer/Engine/SceneGraph.h	Fri Jul 22 07:49:52 2011 +0900
+++ b/Renderer/Engine/SceneGraph.h	Fri Jul 22 08:46:29 2011 +0900
@@ -21,7 +21,7 @@
     SceneGraph(TaskManager *manager);
     SceneGraph(TaskManager *manager, xmlNodePtr surface);
     SceneGraph(TaskManager *manager, SceneGraphPtr orig);
-    SceneGraph(TaskManager *manager, char* string_name, int pixels, Uint32 len , char* obj_name);
+    SceneGraph(TaskManager *manager, const char* string_name, int pixels, Uint32 len , const char* obj_name);
 
     ~SceneGraph(void);
 
@@ -78,18 +78,11 @@
     create_sg_func create_sg;
     
     // フォントデータ
-    void create_font_data(TaskManager *manager,char *font, int pixels,Uint32 color, char *filename);
-    void get_font_image(TaskManager *manager,char *font, int pixels,Uint32 color, char *name);
+    void create_font_data(TaskManager *manager,const char *font, int pixels,Uint32 color, const char *filename);
+    void get_font_image(TaskManager *manager,const char *font, int pixels,Uint32 color, const char *name);
     void createFont(TaskManager *manager);
-    void conv(char *str, int length, u_int32_t *out);
-    SDL_Surface* load_font_image(char *font, int pixels,Uint32 color, char *string_name);
-
-    // フォントデータ
-    void create_font_data(TaskManager *manager,char *font, int pixels,Uint32 color, char *filename);
-    void get_font_image(TaskManager *manager,char *font, int pixels,Uint32 color, char *name);
-    void createFont(TaskManager *manager);
-    void conv(char *str, int length, u_int32_t *out);
-    SDL_Surface* load_font_image(char *font, int pixels,Uint32 color, char *string_name);
+    void conv(const char *str, int length, u_int32_t *out);
+    SDL_Surface* load_font_image(const char *font, int pixels,Uint32 color, const char *string_name);
 
     // desutroctor で呼ばれる
     void (SceneGraph::*finalize)(void);
@@ -131,7 +124,7 @@
     void get_data(TaskManager *manager, xmlNodePtr cur);
     void delete_data(void);
 
-    SDL_Surface* load_decode_image(char *filename, char *image_name, xmlNodePtr cur);
+    SDL_Surface* load_decode_image(const char *filename, const char *image_name, xmlNodePtr cur);
     int makeTapestries(TaskManager *manager, SDL_Surface *texture_image, int id);
     void get_image(TaskManager *manager, xmlNodePtr cur);
 };
--- a/Renderer/Engine/SceneGraphRoot.cc	Fri Jul 22 07:49:52 2011 +0900
+++ b/Renderer/Engine/SceneGraphRoot.cc	Fri Jul 22 08:46:29 2011 +0900
@@ -142,7 +142,7 @@
 /*文字列の生成*/
 void
 SceneGraphRoot::createStringFont(TaskManager *manager, SceneGraphPtr root, 
-				 char *string,int pixels,int screen_w,
+				 const char *string,int pixels,int screen_w,
 				 int screen_h,Uint32 color)
 {
     SceneGraphPtr text;
@@ -178,8 +178,8 @@
 }
 
 void
-SceneGraphRoot::createFont(TaskManager *manager,char *font, int pixels,
-			   Uint32 color,char *string_name, int len,
+SceneGraphRoot::createFont(TaskManager *manager,const char *font, int pixels,
+			   Uint32 color,const char *string_name, int len,
 			   char **obj_name)
 {
   *obj_name = (char *)malloc(sizeof(char) * 12);
--- a/Renderer/Engine/SceneGraphRoot.h	Fri Jul 22 07:49:52 2011 +0900
+++ b/Renderer/Engine/SceneGraphRoot.h	Fri Jul 22 08:46:29 2011 +0900
@@ -88,8 +88,8 @@
      * Functions
      */
     /* User API */
-    void createStringFont(TaskManager *manager, SceneGraphPtr root,char *string, int pixeles, int screen_w,int screen_h, Uint32 color);
-    void createFont(TaskManager *manager,char *font,int pixels,Uint32 color,char *filename, int len, char **obj_name);    
+    void createStringFont(TaskManager *manager, SceneGraphPtr root,const char *string, int pixeles, int screen_w,int screen_h, Uint32 color);
+    void createFont(TaskManager *manager,const char *font,int pixels,Uint32 color,const char *filename, int len, char **obj_name);    
     void createFromXMLfile(TaskManager *manager, const char *);
     void createFromXMLmemory(TaskManager *manager, SceneGraph * node, char *data, int len);
     SceneGraphPtr createSceneGraph(int id);
--- a/Renderer/Engine/task/CreateSpan.cc	Fri Jul 22 07:49:52 2011 +0900
+++ b/Renderer/Engine/task/CreateSpan.cc	Fri Jul 22 08:46:29 2011 +0900
@@ -15,7 +15,7 @@
 static const int TILE_STORE        = 10;
 
 static SpanPackPtr spack = NULL;
-static SpanPackPtr send_spack = NULL;
+// static SpanPackPtr send_spack = NULL;
 static int prev_index = 0;
 
 
--- a/Renderer/Engine/viewer.h	Fri Jul 22 07:49:52 2011 +0900
+++ b/Renderer/Engine/viewer.h	Fri Jul 22 08:46:29 2011 +0900
@@ -108,11 +108,11 @@
     // void setSceneData(SceneGraph *g);
     virtual void mainLoop();
 
-    void createStringFont(SceneGraphPtr root, char *string, int pixels, int screen_w, int screen_h, Uint32 color)
+    void createStringFont(SceneGraphPtr root, const char *string, int pixels, int screen_w, int screen_h, Uint32 color)
     {
       sgroot -> createStringFont(manager, root, string, pixels, screen_w, screen_h, color);
     }
-    void createFont(char *font,int pixels,Uint32 color, char *filename, int len, char **obj_name)
+    void createFont(const char *font,int pixels,Uint32 color, const char *filename, int len, char **obj_name)
     {
       sgroot -> createFont(manager,font,pixels,color,filename, len, obj_name);
     }
--- a/Renderer/Test/vacuum.cc	Fri Jul 22 07:49:52 2011 +0900
+++ b/Renderer/Test/vacuum.cc	Fri Jul 22 08:46:29 2011 +0900
@@ -148,7 +148,7 @@
 add_cubecollision_object(int id,SceneGraphPtr root,int w,int h, SceneGraphRoot *sgroot)
 {
     SceneGraphPtr object;
-    SceneGraphPtr common_move;
+    // SceneGraphPtr common_move;
 
     //common_move = sgroot->createSceneGraph();
     object = sgroot->createSceneGraph(id);