Mercurial > hg > Members > kono > Cerium

changeset 165:246881f0634b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author gongo@localhost.localdomain
date Tue, 09 Dec 2008 11:15:37 +0900
parents 99d512912eb6 (diff) 38cbb7aecc70 (current diff)
children e297ecaf2b4d
files TaskManager/Test/test_render/Makefile.def TaskManager/Test/test_render/out.txt TaskManager/Test/test_render/spe/DrawSpan.cpp TaskManager/Test/test_render/universe.cpp
diffstat 4 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 09 10:48:49 2008 +0900
+++ b/.hgtags	Tue Dec 09 11:15:37 2008 +0900
@@ -1,1 +1,2 @@
 ce5755f544c1a882c7e28b7c78d8b31a82bd9eda cvs
+1f4c3f3238e6278fa3c73594e027036a1404ec34 fullHD_omedetou
--- a/TaskManager/Test/test_render/Makefile.def	Tue Dec 09 10:48:49 2008 +0900
+++ b/TaskManager/Test/test_render/Makefile.def	Tue Dec 09 11:15:37 2008 +0900
@@ -3,10 +3,10 @@
 # include/library path
 # ex: macosx
 #CERIUM = /Users/gongo/Source/Concurrency/Game_project/Cerium
-CERIUM = /Users/gongo/Source/hg/Cerium
+#CERIUM = /Users/gongo/Source/hg/Cerium
 
 # ex: linux/ps3
-#CERIUM = /home/gongo/Cerium
+CERIUM = /home/gongo/Cerium
 
 #CERIUM = ../../..
 
--- a/TaskManager/Test/test_render/spe/DrawSpan.cpp	Tue Dec 09 10:48:49 2008 +0900
+++ b/TaskManager/Test/test_render/spe/DrawSpan.cpp	Tue Dec 09 11:15:37 2008 +0900
@@ -315,8 +315,13 @@
 
 		    tex_x = tex1*(x_len-1-j)/(x_len-1) + tex2*j/(x_len-1);
 		    tex_y = tey1*(x_len-1-j)/(x_len-1) + tey2*j/(x_len-1);
+		    /**
+		     * ・・・なんかかっこいい書き方ないかな
+		     */
 		    if (tex_x > 1) tex_x = 1;
+		    if (tex_x < 0) tex_x = 0;
 		    if (tex_y > 1) tex_y = 1;
+		    if (tex_y < 0) tex_y = 0;
 		    tex_xpos = (int)((span->tex_width-1) * tex_x);
 		    tex_ypos = (int)((span->tex_height-1) * tex_y);
 		    
--- a/TaskManager/Test/test_render/universe.cpp	Tue Dec 09 10:48:49 2008 +0900
+++ b/TaskManager/Test/test_render/universe.cpp	Tue Dec 09 11:15:37 2008 +0900
@@ -49,7 +49,7 @@
 static void
 moon_move(SceneGraphPtr node, int screen_w, int screen_h)
 {
-    node->angle[0] += 1.0f;
+    node->angle[1] += 1.0f;
     if (node->angle[0] > 360.0f) {
       node->angle[0] = 0.0f;
     }
@@ -63,5 +63,4 @@
     Earth->stack_xyz[0] = 3.0f;
     Earth->stack_xyz[1] = 3.0f;
     Moon->set_move_collision(moon_move, cube_collision);
-    printf("hogehoge\n");
 }