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

修改WalkerCameraAppFramework为CameraAppFramework

Browse Source
This commit is contained in:
hyzboy 2019-06-15 18:07:20 +08:00
parent 0844651fb0
commit 5cf6b25046
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/Vulkan/Geometry3D.cpp
View File

@ -13,7 +13,7 @@ using namespace hgl::graph;
constexpr uint32_t SCREEN_WIDTH=128; constexpr uint32_t SCREEN_WIDTH=128;
constexpr uint32_t SCREEN_HEIGHT=128; constexpr uint32_t SCREEN_HEIGHT=128;
class TestApp:public WalkerCameraAppFramework class TestApp:public CameraAppFramework
{ {
private: private:
@ -125,7 +125,7 @@ public:
bool Init() bool Init()
{ {
if(!WalkerCameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT)) if(!CameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
return(false); return(false);
if(!InitMaterial()) if(!InitMaterial())
@ -149,7 +149,7 @@ public:
{ {
BuildCommandBuffer(&render_list); BuildCommandBuffer(&render_list);
} }
};//class TestApp:public WalkerCameraAppFramework };//class TestApp:public CameraAppFramework
int main(int,char **) int main(int,char **)
{ {

6
example/Vulkan/LoadModel.cpp
View File

@ -76,7 +76,7 @@ vulkan::Renderable *CreateMeshRenderable(SceneDB *db,vulkan::Material *mtl,const
return(render_obj); return(render_obj);
} }
class TestApp:public WalkerCameraAppFramework class TestApp:public CameraAppFramework
{ {
private: private:
@ -233,7 +233,7 @@ public:
model_data=md; model_data=md;
if(!WalkerCameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT)) if(!CameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
return(false); return(false);
if(!InitMaterial()) if(!InitMaterial())
@ -259,7 +259,7 @@ public:
{ {
BuildCommandBuffer(&render_list); BuildCommandBuffer(&render_list);
} }
};//class TestApp:public WalkerCameraAppFramework };//class TestApp:public CameraAppFramework
#ifdef _WIN32 #ifdef _WIN32
int wmain(int argc,wchar_t **argv) int wmain(int argc,wchar_t **argv)

8
example/Vulkan/SceneTree.cpp
View File

@ -15,7 +15,7 @@ using namespace hgl::graph;
constexpr uint32_t SCREEN_WIDTH=128; constexpr uint32_t SCREEN_WIDTH=128;
constexpr uint32_t SCREEN_HEIGHT=128; constexpr uint32_t SCREEN_HEIGHT=128;
class TestApp:public WalkerCameraAppFramework class TestApp:public CameraAppFramework
{ {
private: private:
@ -131,7 +131,7 @@ public:
bool Init() bool Init()
{ {
if(!WalkerCameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT)) if(!CameraAppFramework::Init(SCREEN_WIDTH,SCREEN_HEIGHT))
return(false); return(false);
if(!InitMaterial()) if(!InitMaterial())
@ -153,7 +153,7 @@ public:
void Draw() override void Draw() override
{ {
WalkerCameraAppFramework::Draw(); CameraAppFramework::Draw();
Matrix4f rot=rotate(GetDoubleTime()-start_time,camera.up_vector); Matrix4f rot=rotate(GetDoubleTime()-start_time,camera.up_vector);
@ -168,7 +168,7 @@ public:
{ {
BuildCommandBuffer(&render_list); BuildCommandBuffer(&render_list);
} }
};//class TestApp:public VulkanApplicationFramework };//class TestApp:public CameraAppFramework
int main(int,char **) int main(int,char **)
{ {

11
example/Vulkan/VulkanAppFramework.h
View File

@ -225,7 +225,7 @@ public:
} }
};//class VulkanApplicationFramework };//class VulkanApplicationFramework
class WalkerCameraAppFramework:public VulkanApplicationFramework class CameraAppFramework:public VulkanApplicationFramework
{ {
private: private:
@ -240,7 +240,7 @@ protected:
public: public:
virtual ~WalkerCameraAppFramework()=default; virtual ~CameraAppFramework()=default;
virtual bool Init(int w,int h) virtual bool Init(int w,int h)
{ {
@ -290,6 +290,11 @@ public:
if(key_status[kbD])camera.Right (move_speed);else if(key_status[kbD])camera.Right (move_speed);else
if(key_status[kbR])camera.Up (move_speed);else if(key_status[kbR])camera.Up (move_speed);else
if(key_status[kbF])camera.Down (move_speed);else if(key_status[kbF])camera.Down (move_speed);else
if(key_status[kbLeft ])camera.WrapHorzRotate(move_speed);else
if(key_status[kbRight ])camera.WrapHorzRotate(-move_speed);else
if(key_status[kbUp ])camera.WrapVertRotate(move_speed);else
if(key_status[kbDown ])camera.WrapVertRotate(-move_speed);else
return; return;
} }
@ -322,4 +327,4 @@ public:
{ {
camera.Distance(1+(v/1000.0f)); camera.Distance(1+(v/1000.0f));
} }
};//class WalkerCameraAppFramework };//class CameraAppFramework

2
src/Tools/ModelConvert/AssimpLoader.cpp
View File

@ -612,7 +612,7 @@ void AssimpLoader::LoadMesh()
{ {
int tc=0; int tc=0;
int comp_total=0; int comp_total=0;
int *uv_use=mtl->uv_use.GetData(); uint *uv_use=mtl->uv_use.GetData();
//这里要重新审视数据来源，并不是每一个纹理通道都有数据，并且和材质对应。 //这里要重新审视数据来源，并不是每一个纹理通道都有数据，并且和材质对应。
//、、材质中的uv index具体对应啥 还不是很清楚 //、、材质中的uv index具体对应啥 还不是很清楚