diff SgoexCerium.cc @ 35:3b92a4b17049 default tip

fix for macosx Yosemite
author Nozomi
date Thu, 19 May 2016 18:18:34 +0900
parents b65f6fc9c84f
children
line wrap: on
line diff
--- a/SgoexCerium.cc	Sat May 21 20:44:24 2011 +0900
+++ b/SgoexCerium.cc	Thu May 19 18:18:34 2016 +0900
@@ -16,7 +16,6 @@
     CameraPtr camera = droot->sgroot->getCamera();
 
     droot->sgroot->flip();
-    droot->sgroot->lightCalc();
 
     root = droot->createSceneGraph();
     //root->xyz[0] = screen_w/2;
@@ -25,10 +24,11 @@
     root->xyz[1] = 0;
     root->xyz[2] = 30.0f;
 
+    droot->sgroot->lightCalc(root);
     /*親の回転、座標から、子の回転、座標を算出*/
     get_matrix(root->matrix, root->angle, root->xyz, camera->matrix);
     /*法線用の行列。Cameraの行列を抜いている(Cameraのコンストラクタで、単位行列にしている)*/
-    get_matrix(root->real_matrix, root->angle, root->xyz, camera->real_matrix);
+    // get_matrix(root->real_matrix, root->angle, root->xyz, camera->real_matrix);
 
     droot->setSceneData(root);
 }
@@ -56,7 +56,7 @@
     m->my = h / 2;
     m->tex_w = power_of_two(m->w);
     m->tex_h = power_of_two(m->h);
-    m->texture = (int *)name;
+    m->texture_name = name;
 
 }
 
@@ -66,7 +66,7 @@
 PutSprite(int zorder, short x, short y, int number)
 {
     SpriteTable *m = &sptable[number];
-    char *name = (char *) m->texture;
+    const char *name =  m->texture_name;
 if (!name) {
     printf("PutSprite %d unknown\n",number);
     return;
@@ -104,7 +104,7 @@
  }
 
     SpriteTable *m = &sptable[number];
-    char *name = (char *) m->texture;
+    const char *name =  m->texture_name;
 if (!name) {
     printf("PutSpriteEx %d unknown\n",number);
     return;