diff --git a/example/Basic/BillboardTest.cpp b/example/Basic/BillboardTest.cpp index 21b853d4..76ec5bfc 100644 --- a/example/Basic/BillboardTest.cpp +++ b/example/Basic/BillboardTest.cpp @@ -150,10 +150,10 @@ private: bool InitScene() { - SceneNode *scene_root=GetSceneRoot(); //取得缺省场景根节点 + CreateComponentInfo cci(GetSceneRoot()); - CreateComponent(scene_root,db->CreateMesh(prim_plane_grid,mi_plane_grid,pipeline_plane_grid)); - CreateComponent(scene_root,ro_billboard); + CreateComponent(&cci,db->CreateMesh(prim_plane_grid,mi_plane_grid,pipeline_plane_grid)); + CreateComponent(&cci,ro_billboard); CameraControl *camera_control=GetCameraControl(); diff --git a/example/Basic/auto_instance.cpp b/example/Basic/auto_instance.cpp index 2295757f..db428d61 100644 --- a/example/Basic/auto_instance.cpp +++ b/example/Basic/auto_instance.cpp @@ -74,16 +74,15 @@ private: return(false); double rad; - Matrix4f mat; - SceneNode *scene_root=GetSceneRoot(); ///<取得场景根节点 + CreateComponentInfo cci(GetSceneRoot()); for(uint i=0;i((360.0f/double(TRIANGLE_NUMBER))*i); //这里一定要加,否则结果用int保存会出现问题 - mat=rotate(rad,Vector3f(0,0,1)); + cci.mat=rotate(rad,Vector3f(0,0,1)); - CreateComponent(mat,scene_root,render_obj); + CreateComponent(&cci,render_obj); } return(true); diff --git a/example/Basic/auto_merge_material_instance.cpp b/example/Basic/auto_merge_material_instance.cpp index 44b34947..9fd51a95 100644 --- a/example/Basic/auto_merge_material_instance.cpp +++ b/example/Basic/auto_merge_material_instance.cpp @@ -81,9 +81,7 @@ private: db->Add(prim); - Matrix4f mat; - - SceneNode *scene_root=GetSceneRoot(); ///<取得场景根节点 + CreateComponentInfo cci(GetSceneRoot()); for(uint i=0;i(TRI_ROTATE_ANGLE*i),AxisVector::Z); + cci.mat=rotate(deg2rad(TRI_ROTATE_ANGLE*i),AxisVector::Z); - CreateComponent(mat,scene_root,render_obj[i].mesh); + CreateComponent(&cci,render_obj[i].mesh); } return(true); diff --git a/example/Basic/draw_triangle_use_UBO.cpp b/example/Basic/draw_triangle_use_UBO.cpp index 9722c61c..432bba09 100644 --- a/example/Basic/draw_triangle_use_UBO.cpp +++ b/example/Basic/draw_triangle_use_UBO.cpp @@ -90,7 +90,9 @@ private: if(!mesh_triangle) return(false); - return CreateComponent(GetSceneRoot(),mesh_triangle); //创建一个静态网格组件 + CreateComponentInfo cci(GetSceneRoot()); + + return CreateComponent(&cci,mesh_triangle); //创建一个静态网格组件 } public: diff --git a/example/Gizmo/PlaneGrid3D.cpp b/example/Gizmo/PlaneGrid3D.cpp index 1edcd63b..bf7ae77f 100644 --- a/example/Gizmo/PlaneGrid3D.cpp +++ b/example/Gizmo/PlaneGrid3D.cpp @@ -84,7 +84,9 @@ private: if(!ri) return; - CreateComponent(mat,parent_node,ri); + CreateComponentInfo cci(parent_node,mat); + + CreateComponent(&cci,ri); } bool InitScene() diff --git a/example/Gizmo/RayPicking.cpp b/example/Gizmo/RayPicking.cpp index 1d862058..26cecf8f 100644 --- a/example/Gizmo/RayPicking.cpp +++ b/example/Gizmo/RayPicking.cpp @@ -101,7 +101,9 @@ private: return(nullptr); } - CreateComponent(parent_node,ri); + CreateComponentInfo cci(parent_node); + + CreateComponent(&cci,ri); return ri; } diff --git a/example/Gizmo/SimplestAxis.cpp b/example/Gizmo/SimplestAxis.cpp index 740726d4..fbe23af4 100644 --- a/example/Gizmo/SimplestAxis.cpp +++ b/example/Gizmo/SimplestAxis.cpp @@ -58,7 +58,9 @@ private: { Mesh *ri=db->CreateMesh(prim_axis,material_instance,pipeline); - CreateComponent(GetSceneRoot(),ri); + CreateComponentInfo cci(GetSceneRoot()); + + CreateComponent(&cci,ri); CameraControl *camera_control=GetCameraControl();