Mercurial > hg > Game > Cerium

changeset 1256:880f989ce52a draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix rsync
author Yuhi TOMARI <e095740@ie.u-ryukyu.ac.jp>
date Fri, 18 Nov 2011 17:40:12 +0900
parents 39016616cc26
children fde4e3de9806
files Renderer/Engine/Makefile Renderer/Engine/SceneGraphRoot.cc Renderer/Engine/matrix_calc.cc Renderer/Engine/task/DrawSpan.cc
diffstat 4 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/Makefile	Fri Nov 18 16:57:15 2011 +0900
+++ b/Renderer/Engine/Makefile	Fri Nov 18 17:40:12 2011 +0900
@@ -26,7 +26,7 @@
 
 FORCE:
 	-mkdir -p ../../include/Cerium
-	rsync `find . -name Test -prune -or -name spe -prune -or -name task -prune -or -name '*.h' -print` ../../include/Cerium
+	rsync `find . -name Test -prune -or -name spe -prune -or -name task -prune -or -name '*.h' -print|sed -e 's-^./--'` ../../include/Cerium
 
 
 clean:
--- a/Renderer/Engine/SceneGraphRoot.cc	Fri Nov 18 16:57:15 2011 +0900
+++ b/Renderer/Engine/SceneGraphRoot.cc	Fri Nov 18 17:40:12 2011 +0900
@@ -531,7 +531,7 @@
 
 
 void
-SceneGraphRoot::void treeApply(int screen_w, int screen_h)
+SceneGraphRoot::treeApply(int screen_w, int screen_h)
 {
     // don't calcurate sg_draw_tree's brother
     transTree(sg_draw_tree->children, camera);
--- a/Renderer/Engine/matrix_calc.cc	Fri Nov 18 16:57:15 2011 +0900
+++ b/Renderer/Engine/matrix_calc.cc	Fri Nov 18 17:40:12 2011 +0900
@@ -144,7 +144,7 @@
     }
 }
 
-void matrix4x4R(float &xyz[16], float &xyz1[16], float &xyz2[16]) 
+void matrix4x4R(float xyz[16], float xyz1[16], float xyz2[16]) 
 {
   for(int t=0; t<16; t+=4)
     {
@@ -274,7 +274,7 @@
 }
 
 void
-rotate_matrix( float &m[16], float &rxyz[4] )
+rotate_matrix( float m[16], float rxyz[4] )
 {
   float radx,rady,radz;
   radx = rxyz[0]*M_PI/180;
--- a/Renderer/Engine/task/DrawSpan.cc	Fri Nov 18 16:57:15 2011 +0900
+++ b/Renderer/Engine/task/DrawSpan.cc	Fri Nov 18 17:40:12 2011 +0900
@@ -65,8 +65,7 @@
 static    int drawLine1(SchedTask *smanager, Gptr g, SpanPtr span, int startx, int endx, int wait_tag);
 // static    void drawLine2(SchedTask *smanager, SpanPtr span, int startx, int endx, int js, int wait_tag);
 
-static int getDrawParam(SchedTask *smanager, Gptr g, SpanPtr span, int localy, int startx, 
-                       int endx, int index, int j, DrawParamPtr param);
+//static int getDrawParam(SchedTask *smanager, Gptr g, SpanPtr span, int localy, int startx, int endx, int index, int j, DrawParamPtr param);
 
 static    int infinity_light_calc(int color,float normal_x, float normal_y, float normal_z,
                                   SchedTask *smanager,int x, int y, float z, int world_x, int world_y, float world_z);
@@ -469,7 +468,7 @@
 
     return ret;
 }
-
+#if 0
 static int
 getDrawParam(SchedTask *smanager, Gptr g, SpanPtr span, int localy, int startx, int endx, int index, int j, DrawParamPtr param) {
 
@@ -536,6 +535,7 @@
     return 1; 
 
 }
+#endif
 
 static int
 infinity_light_calc(int color,float normal_x, float normal_y,