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

updated MVPMatrix struct

Browse Source
This commit is contained in:
hyzboy 2022-01-11 10:41:18 +08:00
parent 92770495a7
commit b7714d8a83
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMSceneGraph

@ -1 +1 @@
Subproject commit 3b1520f5617dee4d34821d4dd7c34121d0c3f8ed Subproject commit 729f752d7cd93593ec59b5adaa2f981571253dc2

16
inc/hgl/graph/SceneInfo.h
View File

@ -1,4 +1,4 @@
#ifndef HGL_GRAPH_SCENE_INFO_INCLUDE #ifndef HGL_GRAPH_SCENE_INFO_INCLUDE
#define HGL_GRAPH_SCENE_INFO_INCLUDE #define HGL_GRAPH_SCENE_INFO_INCLUDE
#include<hgl/math/Matrix.h> #include<hgl/math/Matrix.h>
@ -8,25 +8,25 @@ namespace hgl
namespace graph namespace graph
{ {
/** /**
* MVP¾ØÕó * MVP矩阵
*/ */
struct MVPMatrix struct MVPMatrix
{ {
Matrix4f l2w; ///< Local to World Matrix4f l2w; ///< Local to World
Matrix4f inverse_l2w; //Matrix4f normal; ///<transpose(inverse(mat3(l2w)));
Matrix3x4f normal; ///<这里用3x4，在Shader中是3x3(但实际它是3x4保存)
Matrix4f mv; ///< view * local_to_world
Matrix4f mvp; ///< projection * view * local_to_world Matrix4f mvp; ///< projection * view * local_to_world
Matrix4f inverse_mvp;
public: public:
void Set(const Matrix4f &w,const Matrix4f &vp) void Set(const Matrix4f &w,const Matrix4f &vp,const Matrix4f &v)
{ {
l2w=w; l2w=w;
inverse_l2w=inverse(l2w); normal=transpose(inverse(l2w));
mv=v*l2w;
mvp=vp*l2w; mvp=vp*l2w;
inverse_mvp=inverse(mvp);
} }
CompOperatorMemcmp(const MVPMatrix &); CompOperatorMemcmp(const MVPMatrix &);

2
src/SceneGraph/RenderList.cpp
View File

@ -171,7 +171,7 @@ namespace hgl
{ {
RenderNode *rn=new RenderNode; RenderNode *rn=new RenderNode;
rn->matrix.Set(sn->GetLocalToWorldMatrix(),camera_info.vp); rn->matrix.Set(sn->GetLocalToWorldMatrix(),camera_info.vp,camera_info.view);
rn->WorldCenter=sn->GetWorldCenter(); rn->WorldCenter=sn->GetWorldCenter();