Mercurial > hg > Game > Cerium

changeset 1070:ce992190388b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author yutaka@localhost.localdomain
date Thu, 16 Dec 2010 23:54:13 +0900
parents 5ad8fb1dc70f
children 5fda85b39dc2
files Renderer/Test/create_task.cc Renderer/Test/property_chain.cc Renderer/Test/property_universe.cc TaskManager/Cell/CellTaskManagerImpl.cc TaskManager/Cell/spe/SpeTaskManagerImpl.cc TaskManager/Cell/spe/SpeTaskManagerImpl.h
diffstat 6 files changed, 28 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Test/create_task.cc	Fri Dec 17 19:59:24 2010 +0900
+++ b/Renderer/Test/create_task.cc	Thu Dec 16 23:54:13 2010 +0900
@@ -4,8 +4,8 @@
 #include "MainLoop.h"
 #include "create_task.h"
 #include "types.h"
-#include "Func.h"
-#include "sys.h"
+#include "MyFunc.h"
+#include "matrix_calc.h"
 #include "SgChange.h"
 
 Property *property, *update_property;
@@ -58,9 +58,11 @@
     node->xyz[1] = update_property->xyz[1];
     node->xyz[2] = update_property->xyz[2];
 
+    float scale[] = {1,1,1};
+
     // get matrix
-    get_matrix(node->matrix, node->angle, node->xyz, sgroot->camera->matrix);
-    get_matrix(node->real_matrix, node->angle, node->xyz, sgroot->camera->real_matrix);
+    get_matrix(node->matrix, node->angle, node->xyz, scale, sgroot->camera->matrix);
+    get_matrix(node->real_matrix, node->angle, node->xyz, scale, sgroot->camera->real_matrix);
 
     sgroot->setSceneData(node);
 
--- a/Renderer/Test/property_chain.cc	Fri Dec 17 19:59:24 2010 +0900
+++ b/Renderer/Test/property_chain.cc	Thu Dec 16 23:54:13 2010 +0900
@@ -4,8 +4,8 @@
 #include "MainLoop.h"
 #include "property_chain.h"
 #include "types.h"
-#include "Func.h"
-#include "sys.h"
+#include "MyFunc.h"
+#include "matrix_calc.h"
 #include "SgChange.h"
 
 #define FALSE 0
@@ -101,14 +101,15 @@
     for (int j = 0; j < PROPERTY_LENGTH; j++) {
 	p = &update_property[j];
 	p_node = (SceneGraphPtr)p->node;
+	float scale[] = {1,1,1};
 	if (p->have_parent) {
 	    SceneGraphPtr parent = (SceneGraphPtr)update_property[p->parent_index].node;
 	    parent->addChild(p_node);
-	    get_matrix(p_node->matrix, p_node->angle, p_node->xyz, parent->matrix);
-	    get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, parent->real_matrix);
+	    get_matrix(p_node->matrix, p_node->angle, p_node->xyz, scale, parent->matrix);
+	    get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, scale, parent->real_matrix);
 	} else {
-	    get_matrix(p_node->matrix, p_node->angle, p_node->xyz, camera->matrix);
-	    get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, camera->real_matrix);
+	  get_matrix(p_node->matrix, p_node->angle, p_node->xyz, scale, camera->matrix);
+	  get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, scale, camera->real_matrix);
 	}
     }
 
--- a/Renderer/Test/property_universe.cc	Fri Dec 17 19:59:24 2010 +0900
+++ b/Renderer/Test/property_universe.cc	Thu Dec 16 23:54:13 2010 +0900
@@ -4,8 +4,8 @@
 #include "MainLoop.h"
 #include "property_universe.h"
 #include "types.h"
-#include "Func.h"
-#include "sys.h"
+#include "MyFunc.h"
+#include "matrix_calc.h"
 #include "SgChange.h"
 
 static const int PROPERTY_LENGTH = 2;
@@ -62,14 +62,15 @@
     for (int j = 0; j < PROPERTY_LENGTH; j++) {
 	p = &update_property[j];
 	p_node = (SceneGraphPtr)p->node;
+	float scale[] = {1,1,1};
 	if (p->have_parent) {
 	    SceneGraphPtr parent = (SceneGraphPtr)update_property[p->parent_index].node;
 	    parent->addChild(p_node);
-	    get_matrix(p_node->matrix, p_node->angle, p_node->xyz, parent->matrix);
-	    get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, parent->real_matrix);
+	    get_matrix(p_node->matrix, p_node->angle, p_node->xyz, scale, parent->matrix);
+	    get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, scale, parent->real_matrix);
 	} else {
-	    get_matrix(p_node->matrix, p_node->angle, p_node->xyz, camera->matrix);
-	    get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, camera->real_matrix);
+	  get_matrix(p_node->matrix, p_node->angle, p_node->xyz, scale, camera->matrix);
+	  get_matrix(p_node->real_matrix, p_node->angle, p_node->xyz, scale, camera->real_matrix);
 	}
     }
 
--- a/TaskManager/Cell/CellTaskManagerImpl.cc	Fri Dec 17 19:59:24 2010 +0900
+++ b/TaskManager/Cell/CellTaskManagerImpl.cc	Thu Dec 16 23:54:13 2010 +0900
@@ -153,14 +153,14 @@
 	do {
 	    poll();
 	} while (ppeManager->activeTaskQueue->empty() && spe_running >0 );
-      if (spe_running < spu_limit) {
-	debug_check_spe_idle(ppeManager->activeTaskQueue, spe_running);
+	if (spe_running < spu_limit) {
+	  debug_check_spe_idle(ppeManager->activeTaskQueue, spe_running);
 	} 
     } while (!ppeManager->activeTaskQueue->empty() || 
-	!activeTaskQueue->empty() ||
-	spe_running >0); 
+	     !activeTaskQueue->empty() ||
+	     spe_running >0); 
     if (!waitTaskQueue->empty()) {
-	show_dead_lock_info();
+      show_dead_lock_info();
     }
 }
 
--- a/TaskManager/Cell/spe/SpeTaskManagerImpl.cc	Fri Dec 17 19:59:24 2010 +0900
+++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.cc	Thu Dec 16 23:54:13 2010 +0900
@@ -17,6 +17,8 @@
 void SpeTaskManagerImpl::show_profile() {}
 void SpeTaskManagerImpl::start_profile() {}
 
+void SpeTaskManagerImpl::print_arch() { printf("SpeTaskManagerImpl\n"); }
+
 // Odd
 
 TaskManagerImpl::TaskManagerImpl(int i) {}
--- a/TaskManager/Cell/spe/SpeTaskManagerImpl.h	Fri Dec 17 19:59:24 2010 +0900
+++ b/TaskManager/Cell/spe/SpeTaskManagerImpl.h	Thu Dec 16 23:54:13 2010 +0900
@@ -27,6 +27,7 @@
     void set_task_cpu(HTaskPtr, CPU_TYPE);
     void polling() {}
     void free_htask(HTaskPtr htask) {}
+    void print_arch();
 
 }  ;