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

定义通用UBO属性

Browse Source
This commit is contained in:
hyzboy 2019-05-25 01:06:33 +08:00
parent 2ab09c6367
commit 962ed65fee
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
inc/hgl/graph/RenderList.h
View File

@ -3,6 +3,7 @@
#include<hgl/graph/vulkan/VK.h> #include<hgl/graph/vulkan/VK.h>
#include<hgl/graph/Camera.h> #include<hgl/graph/Camera.h>
#include<hgl/type/Color4f.h>
namespace hgl namespace hgl
{ {
namespace graph namespace graph
@ -14,25 +15,30 @@ namespace hgl
Matrix4f projection; Matrix4f projection;
Matrix4f modelview; Matrix4f modelview;
Matrix4f mvp; Matrix4f mvp;
Matrix3f normal;
};// };//
struct UBOSkyLight struct UBOSkyLight
{ {
Vector4f sky_color; Color4f sun_color;
Vector3f alignas(16) sun_direction;
};// };//
class RenderList class RenderList
{ {
vulkan::CommandBuffer *cmd_buf; vulkan::CommandBuffer *cmd_buf;
private:
Camera camera; Camera camera;
Matrix4f projection_matrix,
modelview_matrix,
mvp_matrix;
Frustum frustum; Frustum frustum;
private:
UBOMatrixData ubo_matrix;
UBOSkyLight ubo_skylight;
private: private:
List<const SceneNode *> SceneNodeList; List<const SceneNode *> SceneNodeList;
@ -59,6 +65,11 @@ namespace hgl
void Clear () {SceneNodeList.ClearData();} void Clear () {SceneNodeList.ClearData();}
void SetCamera(const Camera &); void SetCamera(const Camera &);
void SetSkyLightColor(const Color4f &c,const Vector3f &d)
{
ubo_skylight.sun_color=c;
ubo_skylight.sun_direction=d;
}
bool Render(); bool Render();
};//class RenderList };//class RenderList

11
src/SceneGraph/RenderList.cpp
View File

@ -32,11 +32,12 @@ namespace hgl
{ {
camera=cam; camera=cam;
MakeCameraMatrix( &projection_matrix, MakeCameraMatrix( &ubo_matrix.projection,
&modelview_matrix, &ubo_matrix.modelview,
&camera); &camera);
mvp_matrix=projection_matrix*modelview_matrix; ubo_matrix.mvp =ubo_matrix.projection*ubo_matrix.modelview;
ubo_matrix.normal =ubo_matrix.modelview.Float3x3Part(); //法线矩阵为3x3
CameraToFrustum(&frustum, CameraToFrustum(&frustum,
&camera); &camera);
@ -99,14 +100,14 @@ namespace hgl
for(int i=0;i<count;i++) for(int i=0;i<count;i++)
{ {
const Matrix4f fin_mv=modelview_matrix*(*node)->GetLocalToWorldMatrix(); const Matrix4f fin_mv=ubo_matrix.modelview*(*node)->GetLocalToWorldMatrix();
int sn=(*node)->RenderableList.GetCount(); int sn=(*node)->RenderableList.GetCount();
RenderableInstance **p=(*node)->RenderableList.GetData(); RenderableInstance **p=(*node)->RenderableList.GetData();
for(int j=0;j<sn;j++) for(int j=0;j<sn;j++)
{ {
Render(*p,projection_matrix*fin_mv); Render(*p,ubo_matrix.projection*fin_mv);
p++; p++;
} }