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

增加WalkerCameraAppFramework，添加相机控制

Browse Source
This commit is contained in:
hyzboy
2019-06-14 17:13:30 +08:00
parent 734c428da2
commit f8569ed513
11 changed files with 159 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
example/Vulkan/SceneTree.cpp
View File

@@ -1,5 +1,5 @@
// 5.SceneTree
// <EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>еij<EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD>ÿһ<EFBFBD><EFBFBD><EFBFBD>ڵ<EFBFBD><EFBFBD>Ա任<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD>ȷ
// 5.SceneTree
// 用于测试树形排列的场景中，每一级节点对变换矩阵的处理是否正确
#include"VulkanAppFramework.h"
#include<hgl/filesystem/FileSystem.h>
@@ -15,7 +15,7 @@ using namespace hgl::graph;
constexpr uint32_t SCREEN_WIDTH=128;
constexpr uint32_t SCREEN_HEIGHT=128;
class TestApp:public VulkanApplicationFramework
class TestApp:public WalkerCameraAppFramework
{
private:
@@ -24,15 +24,11 @@ private:
SceneNode render_root;
RenderList render_list;
Camera camera;
vulkan::Material * material =nullptr;
vulkan::DescriptorSets * descriptor_sets =nullptr;
vulkan::Renderable * ro_cube =nullptr;
vulkan::Buffer * ubo_world_matrix =nullptr;
vulkan::Pipeline * pipeline_line =nullptr;
public:
@@ -46,17 +42,6 @@ public:
private:
void InitCamera()
{
camera.type=CameraType::Perspective;
camera.center.Set(0,0,30,1);
camera.eye.Set(100,100,100,1);
camera.width=SCREEN_WIDTH;
camera.height=SCREEN_HEIGHT;
camera.Refresh(); //<2F><><EFBFBD>¾<EFBFBD><C2BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
}
bool InitMaterial()
{
material=shader_manage->CreateMaterial(OS_TEXT("OnlyPosition3D.vert.spv"),
@@ -80,14 +65,7 @@ private:
bool InitUBO()
{
const VkExtent2D extent=device->GetExtent();
ubo_world_matrix=db->CreateUBO(sizeof(WorldMatrix),&camera.matrix);
if(!ubo_world_matrix)
return(false);
if(!descriptor_sets->BindUBO(material->GetUBO("world"),*ubo_world_matrix))
if(!InitCameraUBO(descriptor_sets,material->GetUBO("world")))
return(false);
descriptor_sets->Update();
@@ -130,7 +108,7 @@ private:
for(uint i=0;i<360;i++)
{
size=(i+1)/100.0f;
cur_node=render_root.CreateSubNode( rotate(i/5.0f,camera.up_vector)*
translate(i/4.0f,0,0)*
scale(size));
@@ -153,11 +131,9 @@ public:
bool Init()
{
if(!VulkanApplicationFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
if(!WalkerCameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
return(false);
InitCamera();
if(!InitMaterial())
return(false);
@@ -177,7 +153,7 @@ public:
void Draw() override
{
VulkanApplicationFramework::Draw();
WalkerCameraAppFramework::Draw();
Matrix4f rot=rotate(GetDoubleTime()-start_time,camera.up_vector);
@@ -190,7 +166,7 @@ public:
void Resize(int,int)override
{
BuildCommandBuffer(&render_list);
BuildCommandBuffer(&render_list);
}
};//class TestApp:public VulkanApplicationFramework