From b7714d8a836abf7f5c5cc97cc93cf86bebdc759b Mon Sep 17 00:00:00 2001
From: hyzboy <hyzboy@gmail.com>
Date: Tue, 11 Jan 2022 10:41:18 +0800
Subject: [PATCH] updated MVPMatrix struct

---
 CMSceneGraph                  |  2 +-
 inc/hgl/graph/SceneInfo.h     | 16 ++++++++--------
 src/SceneGraph/RenderList.cpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/CMSceneGraph b/CMSceneGraph
index 3b1520f5..729f752d 160000
--- a/CMSceneGraph
+++ b/CMSceneGraph
@@ -1 +1 @@
-Subproject commit 3b1520f5617dee4d34821d4dd7c34121d0c3f8ed
+Subproject commit 729f752d7cd93593ec59b5adaa2f981571253dc2
diff --git a/inc/hgl/graph/SceneInfo.h b/inc/hgl/graph/SceneInfo.h
index b1d0dca6..ac1d3315 100644
--- a/inc/hgl/graph/SceneInfo.h
+++ b/inc/hgl/graph/SceneInfo.h
@@ -1,4 +1,4 @@
-#ifndef HGL_GRAPH_SCENE_INFO_INCLUDE
+#ifndef HGL_GRAPH_SCENE_INFO_INCLUDE
 #define HGL_GRAPH_SCENE_INFO_INCLUDE
 
 #include<hgl/math/Matrix.h>
@@ -8,25 +8,25 @@ namespace hgl
     namespace graph
     {
         /** 
-         * MVP����
+         * MVP矩阵
          */
         struct MVPMatrix
         {
             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 inverse_mvp;
 
         public:
 
-            void Set(const Matrix4f &w,const Matrix4f &vp)
+            void Set(const Matrix4f &w,const Matrix4f &vp,const Matrix4f &v)
             {
                 l2w=w;
-                inverse_l2w=inverse(l2w);
-
+                normal=transpose(inverse(l2w));
+                mv=v*l2w;
                 mvp=vp*l2w;
-                inverse_mvp=inverse(mvp);
             }
 
             CompOperatorMemcmp(const MVPMatrix &);
diff --git a/src/SceneGraph/RenderList.cpp b/src/SceneGraph/RenderList.cpp
index a23c411a..d6acfb3f 100644
--- a/src/SceneGraph/RenderList.cpp
+++ b/src/SceneGraph/RenderList.cpp
@@ -171,7 +171,7 @@ namespace hgl
             {
                 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();