Mercurial > hg > Members > kono > Cerium

diff TaskManager/Test/test_render/Application.h @ 431:e8f2eed4042a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author game@henri.cr.ie.u-ryukyu.ac.jp
date Thu, 24 Sep 2009 20:43:14 +0900
parents b48df6332eb8
children cf2704424cc0
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Application.h	Thu Sep 24 17:45:35 2009 +0900
+++ b/TaskManager/Test/test_render/Application.h	Thu Sep 24 20:43:14 2009 +0900
@@ -1,8 +1,10 @@
 #ifndef INCLUDED_APPLICATION
 #define INCLUDED_APPLICATION
 
+#include "SceneGraph.h"
+
 typedef void (*move_func)(SceneGraph* node, int screen_w, int screen_h);
-typedef void (*coll_func)(SceneGraph* node, int screen_w, int screen_h);
+typedef void (*coll_func)(SceneGraph* node, int screen_w, int screen_h, SceneGraphPtr tree);
 
 class Application {
 public:
@@ -13,8 +15,10 @@
 
     void set_move_func(move_func move);
     void set_coll_func(coll_func coll);
-    SceneGraphPtr scenegraph_factory(PropertyPtr p);
-    SceneGraphPtr scenegraph_connector(PropertyPtr p,SceneGraphPtr s);
+//    SceneGraphPtr scenegraph_factory(PropertyPtr p);
+//    SceneGraphPtr scenegraph_connector(PropertyPtr p,SceneGraphPtr s);
+    SceneGraphPtr scenegraph_factory(void *p, int size);
+    SceneGraphPtr scenegraph_connector(void *p, int size, SceneGraphPtr s);
 
     move_func move;
     coll_func coll;