hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update submodules

Browse Source
This commit is contained in:
hyzboy 2020-04-07 17:56:51 +08:00
parent f161404584
commit 3194d9522c
10 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpty/MathGeoLib

@ -1 +1 @@
Subproject commit d510a2e45e1e67169d1a8b735c494b17063c6573 Subproject commit 35058b7f881c2a2ad00bf21c083aa88a70277864

2
3rdpty/SPIRV-Cross

@ -1 +1 @@
Subproject commit f9376058ce5b335373fd7d9719daf05949affa66 Subproject commit fd5aa3ad51ece55a1b51fe6bfb271db6844ae291

2
3rdpty/assimp

@ -1 +1 @@
Subproject commit eb5c581b8288f0d1e42d1b1c3e66dbdf5d7c70d0 Subproject commit 16397c1849c2b180bc7fe1e5ef103ba03a8990d5

2
3rdpty/jsoncpp

@ -1 +1 @@
Subproject commit 6317f9a406c43e264e0ae0164fa701362ef04c9a Subproject commit 2cf939e8c37494922ca2991902a0fe50baa2eaea

2
CMAssetsManage

@ -1 +1 @@
Subproject commit a100a10dc8750903e5bf3779c1f337f5a940910e Subproject commit 74e1d564be1a9c2af21b3fc2e4ca319e23b6616a

2
CMCMakeModule

@ -1 +1 @@
Subproject commit d4087fe96c0acd43d376ec660bd5f1f351755448 Subproject commit 4ac904d834b45e6cb3edc1767726850615ca89ee

2
CMCore

@ -1 +1 @@
Subproject commit e7a9ea9e7d2e699f22614f1ae018baee1dbbae4b Subproject commit 6107f34e21e5f104091d28b3db17e6cbeb7dc967

2
CMPlatform

@ -1 +1 @@
Subproject commit 622f4faab39b912ba7ddc8dc29af6087c1dc08d5 Subproject commit e12b8a9e5c5a65b4662a4c02fb5c7c67558a4490

4
example/Vulkan/CMakeLists.txt
View File

@ -26,10 +26,10 @@ CreateProject(10.InlineGeometryScene InlineGeometryScene.cpp)
CreateProject(11.Atomsphere Atomsphere.cpp) CreateProject(11.Atomsphere Atomsphere.cpp)
CreateProject(12.PBRBasic PBRBasic.cpp) #CreateProject(12.PBRBasic PBRBasic.cpp)
#CreateProject(12.Deferred Deferred.cpp) #CreateProject(12.Deferred Deferred.cpp)
CreateProject(13.DeferredModel DeferredModel.cpp) CreateProject(13.DeferredModel DeferredModel.cpp)
CreateProject(14.AutoMaterial auto_material.cpp) #CreateProject(14.AutoMaterial auto_material.cpp)

14
example/Vulkan/PBRBasic.cpp
View File

@ -22,9 +22,10 @@ private:
struct MDP struct MDP
{ {
vulkan::Material * material =nullptr; vulkan::Material * material =nullptr;
vulkan::DescriptorSets *descriptor_sets =nullptr; vulkan::MaterialInstance * material_instance =nullptr;
vulkan::Pipeline * pipeline =nullptr; vulkan::DescriptorSets * descriptor_sets =nullptr;
vulkan::Pipeline * pipeline =nullptr;
}mdp_line; }mdp_line;
vulkan::Renderable *ro_plane_grid; vulkan::Renderable *ro_plane_grid;
@ -40,14 +41,17 @@ private:
mdp->descriptor_sets=mdp->material->CreateDescriptorSets(); mdp->descriptor_sets=mdp->material->CreateDescriptorSets();
mdp->material_instance=mdp->material->CreateInstance();
db->Add(mdp->material); db->Add(mdp->material);
db->Add(mdp->material_instance);
db->Add(mdp->descriptor_sets); db->Add(mdp->descriptor_sets);
return(true); return(true);
} }
bool InitUBO(MDP *mdp) bool InitUBO(MDP *mdp)
{ {
if(!InitCameraUBO(mdp->descriptor_sets,mdp->material->GetUBO("world"))) if(!InitCameraUBO(mdp->material_instance,mdp->material->GetUBO("world")))
return(false); return(false);
mdp->descriptor_sets->Update(); mdp->descriptor_sets->Update();
@ -86,7 +90,7 @@ private:
bool InitScene() bool InitScene()
{ {
render_root.Add(db->CreateRenderableInstance(mdp_line.pipeline,mdp_line.descriptor_sets,ro_plane_grid)); render_root.Add(db->CreateRenderableInstance(mdp_line.pipeline,mdp_line.material_instance,ro_plane_grid));
render_root.RefreshMatrix(); render_root.RefreshMatrix();
render_root.ExpendToList(&render_list); render_root.ExpendToList(&render_list);