From 0b4969224bfcfa29f242ff152af9a898c0b52b41 Mon Sep 17 00:00:00 2001 From: hyzboy Date: Tue, 15 Feb 2022 15:02:53 +0800 Subject: [PATCH] updated submodules --- CMCMakeModule | 2 +- CMCore | 2 +- CMPlatform | 2 +- CMSceneGraph | 2 +- CMUtil | 1 + example/Vulkan/DrawText.cpp | 6 +++--- inc/hgl/graph/TileData.h | 2 +- res | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) create mode 160000 CMUtil diff --git a/CMCMakeModule b/CMCMakeModule index 36549c10..78046ef7 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit 36549c10cc5f6af622dcca92a31b13422bb031b9 +Subproject commit 78046ef7e5a33ace87bb7a858dccab4fe737d24a diff --git a/CMCore b/CMCore index 6f124926..e4eae3ee 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 6f1249263e97c2c88fb69d0c277e24d887fd32cb +Subproject commit e4eae3eef65cd5be96198aac3c2ab08dd4070252 diff --git a/CMPlatform b/CMPlatform index e12425c6..4f63548f 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit e12425c60d0f4712a93918215834e1ffb7699331 +Subproject commit 4f63548fc234d2dd4b2d9bdd2a70cd42cb66fa63 diff --git a/CMSceneGraph b/CMSceneGraph index 384727bf..647c2a55 160000 --- a/CMSceneGraph +++ b/CMSceneGraph @@ -1 +1 @@ -Subproject commit 384727bf3ed298d9aaaa2454afa910568039f1ff +Subproject commit 647c2a557c96301eed8860bb933c84b289f32de3 diff --git a/CMUtil b/CMUtil new file mode 160000 index 00000000..7be4b32e --- /dev/null +++ b/CMUtil @@ -0,0 +1 @@ +Subproject commit 7be4b32e66b3e13a5ff1e1bb1808b462ef3e5e28 diff --git a/example/Vulkan/DrawText.cpp b/example/Vulkan/DrawText.cpp index b649101f..d700ac9d 100644 --- a/example/Vulkan/DrawText.cpp +++ b/example/Vulkan/DrawText.cpp @@ -86,7 +86,7 @@ private: cam.width=extent.width; cam.height=extent.height; - cam.Refresh(); + cam.RefreshCameraInfo(); ubo_world_matrix=db->CreateUBO(sizeof(WorldMatrix),&cam.matrix); @@ -197,8 +197,8 @@ public: { cam.width=w; cam.height=h; - - cam.Refresh(); + + cam.RefreshCameraInfo(); ubo_world_matrix->Write(&cam.matrix); diff --git a/inc/hgl/graph/TileData.h b/inc/hgl/graph/TileData.h index f21a66e7..9ada83bd 100644 --- a/inc/hgl/graph/TileData.h +++ b/inc/hgl/graph/TileData.h @@ -14,7 +14,7 @@ namespace hgl namespace graph { using TileUVPixel=RectScope2i; - using TileUVFloat=RectScope2d; + using TileUVFloat=RectScope2f; using TileUVFloatList=List; using TileUVFloatMap=Map; diff --git a/res b/res index 6e4f4a93..c69d3401 160000 --- a/res +++ b/res @@ -1 +1 @@ -Subproject commit 6e4f4a9329b440787eb0a92eaa691e989497e9bd +Subproject commit c69d340127581e85df847a258bc0a519361894d0