update

engine/3rdparty/UGM/test/01bezier.cpp

@@ -1,24 +0,0 @@
-#include "UGM/UGM.hpp"
-
-using namespace Ubpa;
-using namespace std;
-
-int main() {
-    pointf3 p0{ 0,0,0 }, p1{ 1,1,0 };
-    pointf3 q0{ 254.793335, -6.852415, 43.801746 }, q1{ 156.655655, -70.688034, 5.278168 };
-    pointf3 q2 = q0;
-    q2.z += 1;
-    vecf3 pn{ 0,0,1 }, qn{};
-    vecf3 pv = p1 - p0, qv = q1 - q0;
-    qn = qn.cross(qv, q2 - q0);
-    qn = qn.normalize();
-
-    quat rot{ pv.normalize(), qv.normalize ()};
-    transformf mt{rot};
-    
-    //mt.rotate_with<a_up>(10);
-    char buf[1024];
-    sprintf(buf, "pointf %d vecf3 %d quatf %d transformf %d ", sizeof(p0), sizeof(pn), sizeof(rot), sizeof(mt));
-    std::cout << "hello world  " << buf << endl;
-    return 0;
-}

engine/3rdparty/glm/test/01bezier.cpp

@@ -0,0 +1,13 @@
+#include "glm/glm.hpp"
+#include "glm/fwd.hpp"
+#include <iostream>
+
+using namespace std;
+int main() {
+	glm::vec3 v0(1,1,0),n1(0,0,1);
+	glm::vec3 p0(1, 2, 3), p1(3, 4, 5), p2 = p0;
+	p2.z += 10;
+	glm::vec3 up = glm::cross(v0, p1 - p0);
+	//glm::quat rt{};
+	cout << sizeof(v0)<< " " << sizeof(glm::mat3x3) << " ";
+}

engine/3rdparty/glm/xmake.lua

@@ -0,0 +1,6 @@
+
+add_requires("glm")
+target("glm_test01_bezier")
+    set_kind("binary")
+    add_packages("glm")
+    add_files("test/01bezier.cpp")

engine/3rdparty/imgui/src/imconfig.h

@@ -0,0 +1,131 @@
+//-----------------------------------------------------------------------------
+// DEAR IMGUI COMPILE-TIME OPTIONS
+// Runtime options (clipboard callbacks, enabling various features, etc.) can generally be set via the ImGuiIO structure.
+// You can use ImGui::SetAllocatorFunctions() before calling ImGui::CreateContext() to rewire memory allocation functions.
+//-----------------------------------------------------------------------------
+// A) You may edit imconfig.h (and not overwrite it when updating Dear ImGui, or maintain a patch/rebased branch with your modifications to it)
+// B) or '#define IMGUI_USER_CONFIG "my_imgui_config.h"' in your project and then add directives in your own file without touching this template.
+//-----------------------------------------------------------------------------
+// You need to make sure that configuration settings are defined consistently _everywhere_ Dear ImGui is used, which include the imgui*.cpp
+// files but also _any_ of your code that uses Dear ImGui. This is because some compile-time options have an affect on data structures.
+// Defining those options in imconfig.h will ensure every compilation unit gets to see the same data structure layouts.
+// Call IMGUI_CHECKVERSION() from your .cpp file to verify that the data structures your files are using are matching the ones imgui.cpp is using.
+//-----------------------------------------------------------------------------
+
+#pragma once
+
+//---- Define assertion handler. Defaults to calling assert().
+// If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
+//#define IM_ASSERT(_EXPR)  MyAssert(_EXPR)
+//#define IM_ASSERT(_EXPR)  ((void)(_EXPR))     // Disable asserts
+
+//---- Define attributes of all API symbols declarations, e.g. for DLL under Windows
+// Using Dear ImGui via a shared library is not recommended, because of function call overhead and because we don't guarantee backward nor forward ABI compatibility.
+// DLL users: heaps and globals are not shared across DLL boundaries! You will need to call SetCurrentContext() + SetAllocatorFunctions()
+// for each static/DLL boundary you are calling from. Read "Context and Memory Allocators" section of imgui.cpp for more details.
+//#define IMGUI_API __declspec( dllexport )
+//#define IMGUI_API __declspec( dllimport )
+
+//---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to clean your code of obsolete function/names.
+//#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS
+//#define IMGUI_DISABLE_OBSOLETE_KEYIO                      // 1.87+ disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This is automatically done by IMGUI_DISABLE_OBSOLETE_FUNCTIONS.
+
+//---- Disable all of Dear ImGui or don't implement standard windows/tools.
+// It is very strongly recommended to NOT disable the demo windows and debug tool during development. They are extremely useful in day to day work. Please read comments in imgui_demo.cpp.
+//#define IMGUI_DISABLE                                     // Disable everything: all headers and source files will be empty.
+//#define IMGUI_DISABLE_DEMO_WINDOWS                        // Disable demo windows: ShowDemoWindow()/ShowStyleEditor() will be empty.
+//#define IMGUI_DISABLE_DEBUG_TOOLS                         // Disable metrics/debugger and other debug tools: ShowMetricsWindow(), ShowDebugLogWindow() and ShowIDStackToolWindow() will be empty.
+
+//---- Don't implement some functions to reduce linkage requirements.
+//#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCTIONS   // [Win32] Don't implement default clipboard handler. Won't use and link with OpenClipboard/GetClipboardData/CloseClipboard etc. (user32.lib/.a, kernel32.lib/.a)
+//#define IMGUI_ENABLE_WIN32_DEFAULT_IME_FUNCTIONS          // [Win32] [Default with Visual Studio] Implement default IME handler (require imm32.lib/.a, auto-link for Visual Studio, -limm32 on command-line for MinGW)
+//#define IMGUI_DISABLE_WIN32_DEFAULT_IME_FUNCTIONS         // [Win32] [Default with non-Visual Studio compilers] Don't implement default IME handler (won't require imm32.lib/.a)
+//#define IMGUI_DISABLE_WIN32_FUNCTIONS                     // [Win32] Won't use and link with any Win32 function (clipboard, IME).
+//#define IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS      // [OSX] Implement default OSX clipboard handler (need to link with '-framework ApplicationServices', this is why this is not the default).
+//#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS            // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
+//#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS              // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
+//#define IMGUI_DISABLE_FILE_FUNCTIONS                      // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies)
+//#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS              // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
+//#define IMGUI_DISABLE_DEFAULT_ALLOCATORS                  // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
+//#define IMGUI_DISABLE_SSE                                 // Disable use of SSE intrinsics even if available
+
+//---- Include imgui_user.h at the end of imgui.h as a convenience
+// May be convenient for some users to only explicitly include vanilla imgui.h and have extra stuff included.
+//#define IMGUI_INCLUDE_IMGUI_USER_H
+//#define IMGUI_USER_H_FILENAME         "my_folder/my_imgui_user.h"
+
+//---- Pack colors to BGRA8 instead of RGBA8 (to avoid converting from one to another)
+//#define IMGUI_USE_BGRA_PACKED_COLOR
+
+//---- Use 32-bit for ImWchar (default is 16-bit) to support Unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...)
+//#define IMGUI_USE_WCHAR32
+
+//---- Avoid multiple STB libraries implementations, or redefine path/filenames to prioritize another version
+// By default the embedded implementations are declared static and not available outside of Dear ImGui sources files.
+//#define IMGUI_STB_TRUETYPE_FILENAME   "my_folder/stb_truetype.h"
+//#define IMGUI_STB_RECT_PACK_FILENAME  "my_folder/stb_rect_pack.h"
+//#define IMGUI_STB_SPRINTF_FILENAME    "my_folder/stb_sprintf.h"    // only used if IMGUI_USE_STB_SPRINTF is defined.
+//#define IMGUI_DISABLE_STB_TRUETYPE_IMPLEMENTATION
+//#define IMGUI_DISABLE_STB_RECT_PACK_IMPLEMENTATION
+//#define IMGUI_DISABLE_STB_SPRINTF_IMPLEMENTATION                   // only disabled if IMGUI_USE_STB_SPRINTF is defined.
+
+//---- Use stb_sprintf.h for a faster implementation of vsnprintf instead of the one from libc (unless IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS is defined)
+// Compatibility checks of arguments and formats done by clang and GCC will be disabled in order to support the extra formats provided by stb_sprintf.h.
+//#define IMGUI_USE_STB_SPRINTF
+
+//---- Use FreeType to build and rasterize the font atlas (instead of stb_truetype which is embedded by default in Dear ImGui)
+// Requires FreeType headers to be available in the include path. Requires program to be compiled with 'misc/freetype/imgui_freetype.cpp' (in this repository) + the FreeType library (not provided).
+// On Windows you may use vcpkg with 'vcpkg install freetype --triplet=x64-windows' + 'vcpkg integrate install'.
+//#define IMGUI_ENABLE_FREETYPE
+
+//---- Use FreeType+lunasvg library to render OpenType SVG fonts (SVGinOT)
+// Requires lunasvg headers to be available in the include path + program to be linked with the lunasvg library (not provided).
+// Only works in combination with IMGUI_ENABLE_FREETYPE.
+// (implementation is based on Freetype's rsvg-port.c which is licensed under CeCILL-C Free Software License Agreement)
+//#define IMGUI_ENABLE_FREETYPE_LUNASVG
+
+//---- Use stb_truetype to build and rasterize the font atlas (default)
+// The only purpose of this define is if you want force compilation of the stb_truetype backend ALONG with the FreeType backend.
+//#define IMGUI_ENABLE_STB_TRUETYPE
+
+//---- Define constructor and implicit cast operators to convert back<>forth between your math types and ImVec2/ImVec4.
+// This will be inlined as part of ImVec2 and ImVec4 class declarations.
+/*
+#define IM_VEC2_CLASS_EXTRA                                                     \
+        constexpr ImVec2(const MyVec2& f) : x(f.x), y(f.y) {}                   \
+        operator MyVec2() const { return MyVec2(x,y); }
+
+#define IM_VEC4_CLASS_EXTRA                                                     \
+        constexpr ImVec4(const MyVec4& f) : x(f.x), y(f.y), z(f.z), w(f.w) {}   \
+        operator MyVec4() const { return MyVec4(x,y,z,w); }
+*/
+//---- ...Or use Dear ImGui's own very basic math operators.
+//#define IMGUI_DEFINE_MATH_OPERATORS
+
+//---- Use 32-bit vertex indices (default is 16-bit) is one way to allow large meshes with more than 64K vertices.
+// Your renderer backend will need to support it (most example renderer backends support both 16/32-bit indices).
+// Another way to allow large meshes while keeping 16-bit indices is to handle ImDrawCmd::VtxOffset in your renderer.
+// Read about ImGuiBackendFlags_RendererHasVtxOffset for details.
+//#define ImDrawIdx unsigned int
+
+//---- Override ImDrawCallback signature (will need to modify renderer backends accordingly)
+//struct ImDrawList;
+//struct ImDrawCmd;
+//typedef void (*MyImDrawCallback)(const ImDrawList* draw_list, const ImDrawCmd* cmd, void* my_renderer_user_data);
+//#define ImDrawCallback MyImDrawCallback
+
+//---- Debug Tools: Macro to break in Debugger (we provide a default implementation of this in the codebase)
+// (use 'Metrics->Tools->Item Picker' to pick widgets with the mouse and break into them for easy debugging.)
+//#define IM_DEBUG_BREAK  IM_ASSERT(0)
+//#define IM_DEBUG_BREAK  __debugbreak()
+
+//---- Debug Tools: Enable slower asserts
+//#define IMGUI_DEBUG_PARANOID
+
+//---- Tip: You can add extra functions within the ImGui:: namespace from anywhere (e.g. your own sources/header files)
+/*
+namespace ImGui
+{
+    void MyFunction(const char* name, MyMatrix44* mtx);
+}
+*/

engine/3rdparty/imgui/src/imstb_rectpack.h

@@ -0,0 +1,627 @@
+// [DEAR IMGUI]
+// This is a slightly modified version of stb_rect_pack.h 1.01.
+// Grep for [DEAR IMGUI] to find the changes.
+// 
+// stb_rect_pack.h - v1.01 - public domain - rectangle packing
+// Sean Barrett 2014
+//
+// Useful for e.g. packing rectangular textures into an atlas.
+// Does not do rotation.
+//
+// Before #including,
+//
+//    #define STB_RECT_PACK_IMPLEMENTATION
+//
+// in the file that you want to have the implementation.
+//
+// Not necessarily the awesomest packing method, but better than
+// the totally naive one in stb_truetype (which is primarily what
+// this is meant to replace).
+//
+// Has only had a few tests run, may have issues.
+//
+// More docs to come.
+//
+// No memory allocations; uses qsort() and assert() from stdlib.
+// Can override those by defining STBRP_SORT and STBRP_ASSERT.
+//
+// This library currently uses the Skyline Bottom-Left algorithm.
+//
+// Please note: better rectangle packers are welcome! Please
+// implement them to the same API, but with a different init
+// function.
+//
+// Credits
+//
+//  Library
+//    Sean Barrett
+//  Minor features
+//    Martins Mozeiko
+//    github:IntellectualKitty
+//
+//  Bugfixes / warning fixes
+//    Jeremy Jaussaud
+//    Fabian Giesen
+//
+// Version history:
+//
+//     1.01  (2021-07-11)  always use large rect mode, expose STBRP__MAXVAL in public section
+//     1.00  (2019-02-25)  avoid small space waste; gracefully fail too-wide rectangles
+//     0.99  (2019-02-07)  warning fixes
+//     0.11  (2017-03-03)  return packing success/fail result
+//     0.10  (2016-10-25)  remove cast-away-const to avoid warnings
+//     0.09  (2016-08-27)  fix compiler warnings
+//     0.08  (2015-09-13)  really fix bug with empty rects (w=0 or h=0)
+//     0.07  (2015-09-13)  fix bug with empty rects (w=0 or h=0)
+//     0.06  (2015-04-15)  added STBRP_SORT to allow replacing qsort
+//     0.05:  added STBRP_ASSERT to allow replacing assert
+//     0.04:  fixed minor bug in STBRP_LARGE_RECTS support
+//     0.01:  initial release
+//
+// LICENSE
+//
+//   See end of file for license information.
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//       INCLUDE SECTION
+//
+
+#ifndef STB_INCLUDE_STB_RECT_PACK_H
+#define STB_INCLUDE_STB_RECT_PACK_H
+
+#define STB_RECT_PACK_VERSION  1
+
+#ifdef STBRP_STATIC
+#define STBRP_DEF static
+#else
+#define STBRP_DEF extern
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct stbrp_context stbrp_context;
+typedef struct stbrp_node    stbrp_node;
+typedef struct stbrp_rect    stbrp_rect;
+
+typedef int            stbrp_coord;
+
+#define STBRP__MAXVAL  0x7fffffff
+// Mostly for internal use, but this is the maximum supported coordinate value.
+
+STBRP_DEF int stbrp_pack_rects (stbrp_context *context, stbrp_rect *rects, int num_rects);
+// Assign packed locations to rectangles. The rectangles are of type
+// 'stbrp_rect' defined below, stored in the array 'rects', and there
+// are 'num_rects' many of them.
+//
+// Rectangles which are successfully packed have the 'was_packed' flag
+// set to a non-zero value and 'x' and 'y' store the minimum location
+// on each axis (i.e. bottom-left in cartesian coordinates, top-left
+// if you imagine y increasing downwards). Rectangles which do not fit
+// have the 'was_packed' flag set to 0.
+//
+// You should not try to access the 'rects' array from another thread
+// while this function is running, as the function temporarily reorders
+// the array while it executes.
+//
+// To pack into another rectangle, you need to call stbrp_init_target
+// again. To continue packing into the same rectangle, you can call
+// this function again. Calling this multiple times with multiple rect
+// arrays will probably produce worse packing results than calling it
+// a single time with the full rectangle array, but the option is
+// available.
+//
+// The function returns 1 if all of the rectangles were successfully
+// packed and 0 otherwise.
+
+struct stbrp_rect
+{
+   // reserved for your use:
+   int            id;
+
+   // input:
+   stbrp_coord    w, h;
+
+   // output:
+   stbrp_coord    x, y;
+   int            was_packed;  // non-zero if valid packing
+
+}; // 16 bytes, nominally
+
+
+STBRP_DEF void stbrp_init_target (stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes);
+// Initialize a rectangle packer to:
+//    pack a rectangle that is 'width' by 'height' in dimensions
+//    using temporary storage provided by the array 'nodes', which is 'num_nodes' long
+//
+// You must call this function every time you start packing into a new target.
+//
+// There is no "shutdown" function. The 'nodes' memory must stay valid for
+// the following stbrp_pack_rects() call (or calls), but can be freed after
+// the call (or calls) finish.
+//
+// Note: to guarantee best results, either:
+//       1. make sure 'num_nodes' >= 'width'
+//   or  2. call stbrp_allow_out_of_mem() defined below with 'allow_out_of_mem = 1'
+//
+// If you don't do either of the above things, widths will be quantized to multiples
+// of small integers to guarantee the algorithm doesn't run out of temporary storage.
+//
+// If you do #2, then the non-quantized algorithm will be used, but the algorithm
+// may run out of temporary storage and be unable to pack some rectangles.
+
+STBRP_DEF void stbrp_setup_allow_out_of_mem (stbrp_context *context, int allow_out_of_mem);
+// Optionally call this function after init but before doing any packing to
+// change the handling of the out-of-temp-memory scenario, described above.
+// If you call init again, this will be reset to the default (false).
+
+
+STBRP_DEF void stbrp_setup_heuristic (stbrp_context *context, int heuristic);
+// Optionally select which packing heuristic the library should use. Different
+// heuristics will produce better/worse results for different data sets.
+// If you call init again, this will be reset to the default.
+
+enum
+{
+   STBRP_HEURISTIC_Skyline_default=0,
+   STBRP_HEURISTIC_Skyline_BL_sortHeight = STBRP_HEURISTIC_Skyline_default,
+   STBRP_HEURISTIC_Skyline_BF_sortHeight
+};
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// the details of the following structures don't matter to you, but they must
+// be visible so you can handle the memory allocations for them
+
+struct stbrp_node
+{
+   stbrp_coord  x,y;
+   stbrp_node  *next;
+};
+
+struct stbrp_context
+{
+   int width;
+   int height;
+   int align;
+   int init_mode;
+   int heuristic;
+   int num_nodes;
+   stbrp_node *active_head;
+   stbrp_node *free_head;
+   stbrp_node extra[2]; // we allocate two extra nodes so optimal user-node-count is 'width' not 'width+2'
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//     IMPLEMENTATION SECTION
+//
+
+#ifdef STB_RECT_PACK_IMPLEMENTATION
+#ifndef STBRP_SORT
+#include <stdlib.h>
+#define STBRP_SORT qsort
+#endif
+
+#ifndef STBRP_ASSERT
+#include <assert.h>
+#define STBRP_ASSERT assert
+#endif
+
+#ifdef _MSC_VER
+#define STBRP__NOTUSED(v)  (void)(v)
+#define STBRP__CDECL       __cdecl
+#else
+#define STBRP__NOTUSED(v)  (void)sizeof(v)
+#define STBRP__CDECL
+#endif
+
+enum
+{
+   STBRP__INIT_skyline = 1
+};
+
+STBRP_DEF void stbrp_setup_heuristic(stbrp_context *context, int heuristic)
+{
+   switch (context->init_mode) {
+      case STBRP__INIT_skyline:
+         STBRP_ASSERT(heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight || heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight);
+         context->heuristic = heuristic;
+         break;
+      default:
+         STBRP_ASSERT(0);
+   }
+}
+
+STBRP_DEF void stbrp_setup_allow_out_of_mem(stbrp_context *context, int allow_out_of_mem)
+{
+   if (allow_out_of_mem)
+      // if it's ok to run out of memory, then don't bother aligning them;
+      // this gives better packing, but may fail due to OOM (even though
+      // the rectangles easily fit). @TODO a smarter approach would be to only
+      // quantize once we've hit OOM, then we could get rid of this parameter.
+      context->align = 1;
+   else {
+      // if it's not ok to run out of memory, then quantize the widths
+      // so that num_nodes is always enough nodes.
+      //
+      // I.e. num_nodes * align >= width
+      //                  align >= width / num_nodes
+      //                  align = ceil(width/num_nodes)
+
+      context->align = (context->width + context->num_nodes-1) / context->num_nodes;
+   }
+}
+
+STBRP_DEF void stbrp_init_target(stbrp_context *context, int width, int height, stbrp_node *nodes, int num_nodes)
+{
+   int i;
+
+   for (i=0; i < num_nodes-1; ++i)
+      nodes[i].next = &nodes[i+1];
+   nodes[i].next = NULL;
+   context->init_mode = STBRP__INIT_skyline;
+   context->heuristic = STBRP_HEURISTIC_Skyline_default;
+   context->free_head = &nodes[0];
+   context->active_head = &context->extra[0];
+   context->width = width;
+   context->height = height;
+   context->num_nodes = num_nodes;
+   stbrp_setup_allow_out_of_mem(context, 0);
+
+   // node 0 is the full width, node 1 is the sentinel (lets us not store width explicitly)
+   context->extra[0].x = 0;
+   context->extra[0].y = 0;
+   context->extra[0].next = &context->extra[1];
+   context->extra[1].x = (stbrp_coord) width;
+   context->extra[1].y = (1<<30);
+   context->extra[1].next = NULL;
+}
+
+// find minimum y position if it starts at x1
+static int stbrp__skyline_find_min_y(stbrp_context *c, stbrp_node *first, int x0, int width, int *pwaste)
+{
+   stbrp_node *node = first;
+   int x1 = x0 + width;
+   int min_y, visited_width, waste_area;
+
+   STBRP__NOTUSED(c);
+
+   STBRP_ASSERT(first->x <= x0);
+
+   #if 0
+   // skip in case we're past the node
+   while (node->next->x <= x0)
+      ++node;
+   #else
+   STBRP_ASSERT(node->next->x > x0); // we ended up handling this in the caller for efficiency
+   #endif
+
+   STBRP_ASSERT(node->x <= x0);
+
+   min_y = 0;
+   waste_area = 0;
+   visited_width = 0;
+   while (node->x < x1) {
+      if (node->y > min_y) {
+         // raise min_y higher.
+         // we've accounted for all waste up to min_y,
+         // but we'll now add more waste for everything we've visted
+         waste_area += visited_width * (node->y - min_y);
+         min_y = node->y;
+         // the first time through, visited_width might be reduced
+         if (node->x < x0)
+            visited_width += node->next->x - x0;
+         else
+            visited_width += node->next->x - node->x;
+      } else {
+         // add waste area
+         int under_width = node->next->x - node->x;
+         if (under_width + visited_width > width)
+            under_width = width - visited_width;
+         waste_area += under_width * (min_y - node->y);
+         visited_width += under_width;
+      }
+      node = node->next;
+   }
+
+   *pwaste = waste_area;
+   return min_y;
+}
+
+typedef struct
+{
+   int x,y;
+   stbrp_node **prev_link;
+} stbrp__findresult;
+
+static stbrp__findresult stbrp__skyline_find_best_pos(stbrp_context *c, int width, int height)
+{
+   int best_waste = (1<<30), best_x, best_y = (1 << 30);
+   stbrp__findresult fr;
+   stbrp_node **prev, *node, *tail, **best = NULL;
+
+   // align to multiple of c->align
+   width = (width + c->align - 1);
+   width -= width % c->align;
+   STBRP_ASSERT(width % c->align == 0);
+
+   // if it can't possibly fit, bail immediately
+   if (width > c->width || height > c->height) {
+      fr.prev_link = NULL;
+      fr.x = fr.y = 0;
+      return fr;
+   }
+
+   node = c->active_head;
+   prev = &c->active_head;
+   while (node->x + width <= c->width) {
+      int y,waste;
+      y = stbrp__skyline_find_min_y(c, node, node->x, width, &waste);
+      if (c->heuristic == STBRP_HEURISTIC_Skyline_BL_sortHeight) { // actually just want to test BL
+         // bottom left
+         if (y < best_y) {
+            best_y = y;
+            best = prev;
+         }
+      } else {
+         // best-fit
+         if (y + height <= c->height) {
+            // can only use it if it first vertically
+            if (y < best_y || (y == best_y && waste < best_waste)) {
+               best_y = y;
+               best_waste = waste;
+               best = prev;
+            }
+         }
+      }
+      prev = &node->next;
+      node = node->next;
+   }
+
+   best_x = (best == NULL) ? 0 : (*best)->x;
+
+   // if doing best-fit (BF), we also have to try aligning right edge to each node position
+   //
+   // e.g, if fitting
+   //
+   //     ____________________
+   //    |____________________|
+   //
+   //            into
+   //
+   //   |                         |
+   //   |             ____________|
+   //   |____________|
+   //
+   // then right-aligned reduces waste, but bottom-left BL is always chooses left-aligned
+   //
+   // This makes BF take about 2x the time
+
+   if (c->heuristic == STBRP_HEURISTIC_Skyline_BF_sortHeight) {
+      tail = c->active_head;
+      node = c->active_head;
+      prev = &c->active_head;
+      // find first node that's admissible
+      while (tail->x < width)
+         tail = tail->next;
+      while (tail) {
+         int xpos = tail->x - width;
+         int y,waste;
+         STBRP_ASSERT(xpos >= 0);
+         // find the left position that matches this
+         while (node->next->x <= xpos) {
+            prev = &node->next;
+            node = node->next;
+         }
+         STBRP_ASSERT(node->next->x > xpos && node->x <= xpos);
+         y = stbrp__skyline_find_min_y(c, node, xpos, width, &waste);
+         if (y + height <= c->height) {
+            if (y <= best_y) {
+               if (y < best_y || waste < best_waste || (waste==best_waste && xpos < best_x)) {
+                  best_x = xpos;
+                  //STBRP_ASSERT(y <= best_y); [DEAR IMGUI]
+                  best_y = y;
+                  best_waste = waste;
+                  best = prev;
+               }
+            }
+         }
+         tail = tail->next;
+      }
+   }
+
+   fr.prev_link = best;
+   fr.x = best_x;
+   fr.y = best_y;
+   return fr;
+}
+
+static stbrp__findresult stbrp__skyline_pack_rectangle(stbrp_context *context, int width, int height)
+{
+   // find best position according to heuristic
+   stbrp__findresult res = stbrp__skyline_find_best_pos(context, width, height);
+   stbrp_node *node, *cur;
+
+   // bail if:
+   //    1. it failed
+   //    2. the best node doesn't fit (we don't always check this)
+   //    3. we're out of memory
+   if (res.prev_link == NULL || res.y + height > context->height || context->free_head == NULL) {
+      res.prev_link = NULL;
+      return res;
+   }
+
+   // on success, create new node
+   node = context->free_head;
+   node->x = (stbrp_coord) res.x;
+   node->y = (stbrp_coord) (res.y + height);
+
+   context->free_head = node->next;
+
+   // insert the new node into the right starting point, and
+   // let 'cur' point to the remaining nodes needing to be
+   // stiched back in
+
+   cur = *res.prev_link;
+   if (cur->x < res.x) {
+      // preserve the existing one, so start testing with the next one
+      stbrp_node *next = cur->next;
+      cur->next = node;
+      cur = next;
+   } else {
+      *res.prev_link = node;
+   }
+
+   // from here, traverse cur and free the nodes, until we get to one
+   // that shouldn't be freed
+   while (cur->next && cur->next->x <= res.x + width) {
+      stbrp_node *next = cur->next;
+      // move the current node to the free list
+      cur->next = context->free_head;
+      context->free_head = cur;
+      cur = next;
+   }
+
+   // stitch the list back in
+   node->next = cur;
+
+   if (cur->x < res.x + width)
+      cur->x = (stbrp_coord) (res.x + width);
+
+#ifdef _DEBUG
+   cur = context->active_head;
+   while (cur->x < context->width) {
+      STBRP_ASSERT(cur->x < cur->next->x);
+      cur = cur->next;
+   }
+   STBRP_ASSERT(cur->next == NULL);
+
+   {
+      int count=0;
+      cur = context->active_head;
+      while (cur) {
+         cur = cur->next;
+         ++count;
+      }
+      cur = context->free_head;
+      while (cur) {
+         cur = cur->next;
+         ++count;
+      }
+      STBRP_ASSERT(count == context->num_nodes+2);
+   }
+#endif
+
+   return res;
+}
+
+static int STBRP__CDECL rect_height_compare(const void *a, const void *b)
+{
+   const stbrp_rect *p = (const stbrp_rect *) a;
+   const stbrp_rect *q = (const stbrp_rect *) b;
+   if (p->h > q->h)
+      return -1;
+   if (p->h < q->h)
+      return  1;
+   return (p->w > q->w) ? -1 : (p->w < q->w);
+}
+
+static int STBRP__CDECL rect_original_order(const void *a, const void *b)
+{
+   const stbrp_rect *p = (const stbrp_rect *) a;
+   const stbrp_rect *q = (const stbrp_rect *) b;
+   return (p->was_packed < q->was_packed) ? -1 : (p->was_packed > q->was_packed);
+}
+
+STBRP_DEF int stbrp_pack_rects(stbrp_context *context, stbrp_rect *rects, int num_rects)
+{
+   int i, all_rects_packed = 1;
+
+   // we use the 'was_packed' field internally to allow sorting/unsorting
+   for (i=0; i < num_rects; ++i) {
+      rects[i].was_packed = i;
+   }
+
+   // sort according to heuristic
+   STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_height_compare);
+
+   for (i=0; i < num_rects; ++i) {
+      if (rects[i].w == 0 || rects[i].h == 0) {
+         rects[i].x = rects[i].y = 0;  // empty rect needs no space
+      } else {
+         stbrp__findresult fr = stbrp__skyline_pack_rectangle(context, rects[i].w, rects[i].h);
+         if (fr.prev_link) {
+            rects[i].x = (stbrp_coord) fr.x;
+            rects[i].y = (stbrp_coord) fr.y;
+         } else {
+            rects[i].x = rects[i].y = STBRP__MAXVAL;
+         }
+      }
+   }
+
+   // unsort
+   STBRP_SORT(rects, num_rects, sizeof(rects[0]), rect_original_order);
+
+   // set was_packed flags and all_rects_packed status
+   for (i=0; i < num_rects; ++i) {
+      rects[i].was_packed = !(rects[i].x == STBRP__MAXVAL && rects[i].y == STBRP__MAXVAL);
+      if (!rects[i].was_packed)
+         all_rects_packed = 0;
+   }
+
+   // return the all_rects_packed status
+   return all_rects_packed;
+}
+#endif
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------
+*/

engine/3rdparty/imgui/xmake.lua

@@ -0,0 +1,6 @@
+
+target("imgui")
+    set_kind("static")
+    add_includedirs("src", {public = true})
+    add_files("src/*.cpp")
+    add_headerfiles("src/*.h")

engine/3rdparty/zcoro/include/zcoro/co_context.h

@@ -6,7 +6,7 @@ namespace zstd {
     private:
         std::thread host_thread;
     public:
-        explicit io_context() noexcept;
+        io_context() noexcept;
         void init();
         void deinit();
         void start();

engine/src/engine/vulkanapi/command/pool.cpp

@@ -17,4 +17,8 @@ namespace vulkanapi {
 		};
 		mPtr = device->CreateCommandPool(&pCreateInfo, nullptr);
 	}
+	CommandBuffer& CommandPool::Allocate()
+	{
+		
+	}
 }

engine/src/engine/vulkanapi/command/thread_worker.cpp

@@ -1,18 +1,31 @@
 #include "thread_worker.h"
 namespace vulkanapi {
-	CommandThreadWorker::CommandThreadWorker(const char* name, int buffer):mName(name)
+	CommandThreadWorker::CommandThreadWorker(const char* name, int buffer)
+		: mName(name)
+		, mChannel(buffer)
+		, mSemaphore(0)
 	{
-		
+		mThread = std::thread(&CommandThreadWorker::workloop, this);
+	}
+	void CommandThreadWorker::workloop()
+	{
+		mThread.detach();
+		while(true){
+			voidFn fn = mChannel.acquire();
+			fn();
+		}
 	}
-	
 	void CommandThreadWorker::Invoke(voidFn fn)
 	{
+		mChannel.release(fn);
 	}
-	std::mutex wait_mutex;
-	std::condition_variable wait_condition_variable;
+
 	void CommandThreadWorker::SyncInvoke(voidFn fn)
 	{
-		std::unique_lock<std::mutex> lock(wait_mutex);
-		wait_condition_variable.wait(lock);
+		Invoke([&]() {
+			fn();
+			mSemaphore.release();
+		});
+		mSemaphore.acquire();
 	}
 }

engine/src/engine/vulkanapi/command/thread_worker.h

@@ -10,6 +10,8 @@ namespace vulkanapi {
 	protected:
 		std::thread mThread;
 		std::string mName;
+		zstd::channel<voidFn> mChannel;
+		std::binary_semaphore mSemaphore;
 	protected:
 		void workloop();
 	public:

engine/src/main.cpp

@@ -1,14 +1,17 @@
-#include <stdio.h>
+#include <iostream>
+#include "engine/vulkanapi/vulkan/backend.h"
+#include "engine/vulkanapi/vulkan/window.h"
+#include "engine/vulkanapi/device/device.h"
+#include "engine/render/pass/forwardpass.h"
+using namespace std;
 
-typedef int (*pFunc)(int, int);
-typedef void (*pFunc2)();
-int CallBack(pFunc Func) {
-    return Func(5, 5);
+int main(int argc, char** argv)
+{
+    const char* name = "hello";
+    auto app = vulkanapi::Backend(name);
+    auto wnd = vulkanapi::Window(&app, 3, 640, 720, name);
+    auto gBuffer = vulkanapi::GeometryBuffer(app.GetDevice()->Ptr(), 3, 640, 720);
+    auto pass = vulkanapi::ForwardPass(app.GetDevice()->Ptr(), gBuffer);
+    cout << name << endl;
+    return 0;
 }
-int main() {
-    auto q = [](){};
-    pFunc2 p = q;
-    int a = CallBack(q);
-    int b = CallBack([](int a, int b)->int {a += 2; b += 3; return a + b; });
-    printf("a= %d b=%d\n", a, b);
-}

engine/xmake.lua

@@ -1,5 +1,5 @@
 includes("3rdparty/xmake.lua")
-includes("test/**xmake.lua")
+--includes("test/**xmake.lua")
 
 target("zengine")
     set_kind("binary")

test/UGM/test/01bezier.cpp

@@ -0,0 +1,33 @@
+#include "UGM/UGM.hpp"
+
+using namespace Ubpa;
+using namespace std;
+
+int main() {
+    pointf3 q0{ 254.793335, -6.852415, 43.801746 }, q1{ 156.655655, -70.688034, 5.278168 };
+    pointf3 q2 = q0;
+    q2.z += 1;
+    vecf3 pn{ 0,0,1 }, qn{};
+    vecf3 pv{ 1,1,0 }, qv = q1 - q0;
+    qn = qn.cross(qv, q2 - q0);
+
+    scalef3 s{1, 1, 1};
+    quat rot{ pv.normalize(), qv.normalize() };
+    transformf mt1{rot};
+    pn = mt1 * pn;
+    auto a = s * 2;
+    float angle = acosf(pn.cos_theta(qn));
+    transformf mt2{qv, angle};
+    
+   // transformf mt3{ pv, qv };
+    pointf3 p0{ 1,0,0 }, p1{ 0,1 ,0};
+    p0 = mt2 * mt1 * p0;
+    p1 = mt2 * mt1 * p1;
+    //mt.rotate_with<a_up>(10);
+    char buf[1024];
+    sprintf(buf, "pointf %d vecf3 %d quatf %d transformf %d \n", sizeof(q0), sizeof(pn), sizeof(rot), sizeof(mt1));
+    std::cout << "hello world  " << buf << endl;
+    sprintf(buf, "p0(%f %f %f) p0(%f %f %f) \n", p0.x, p0.y , p0.z, p1.x, p1.y, p1.z);
+    std::cout << buf << endl;
+    return 0;
+}

test/UGM/vs/UGM.natvis

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
-  <Type Name="Ubpa::vec&lt;*,1&gt;>">
+  <Type Name="Ubpa::vec&lt;*,1&gt;">
     <DisplayString>{{{_Elems[0]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -9,7 +9,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::vec&lt;*,2&gt;>">
+  <Type Name="Ubpa::vec&lt;*,2&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -18,7 +18,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::vec&lt;*,3&gt;>">
+  <Type Name="Ubpa::vec&lt;*,3&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -27,7 +27,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::vec&lt;*,4&gt;>">
+  <Type Name="Ubpa::vec&lt;*,4&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -37,17 +37,17 @@
     </Expand>
   </Type>
   <!-- SIMD -->
-  <Type Name="Ubpa::vec&lt;*,4&gt;>">
-    <DisplayString>{{{m.m128_f32[0]}, {m.m128_f32[1]}, {m.m128_f32[2]}, {m.m128_f32[3]}}}</DisplayString>
+  <Type Name="Ubpa::vec&lt;*,4&gt;">
+    <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
     <Expand>
       <ArrayItems>
         <Size>4</Size>
-        <ValuePointer>m.m128_f32</ValuePointer>
+        <ValuePointer>_Elems</ValuePointer>
       </ArrayItems>
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::point&lt;*,1&gt;>">
+  <Type Name="Ubpa::point&lt;*,1&gt;">
     <DisplayString>{{{_Elems[0]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -56,7 +56,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::point&lt;*,2&gt;>">
+  <Type Name="Ubpa::point&lt;*,2&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -65,7 +65,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::point&lt;*,3&gt;>">
+  <Type Name="Ubpa::point&lt;*,3&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -74,7 +74,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::point&lt;*,4&gt;>">
+  <Type Name="Ubpa::point&lt;*,4&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -85,17 +85,17 @@
   </Type>
   
   <!-- SIMD -->
-  <Type Name="Ubpa::point&lt;*,4&gt;>">
-    <DisplayString>{{{m.m128_f32[0]}, {m.m128_f32[1]}, {m.m128_f32[2]}, {m.m128_f32[3]}}}</DisplayString>
+  <Type Name="Ubpa::point&lt;*,4&gt;">
+    <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
     <Expand>
       <ArrayItems>
         <Size>4</Size>
-        <ValuePointer>m.m128_f32</ValuePointer>
+        <ValuePointer>_Elems</ValuePointer>
       </ArrayItems>
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::val&lt;*,1&gt;>">
+  <Type Name="Ubpa::val&lt;*,1&gt;">
     <DisplayString>{{{_Elems[0]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -104,7 +104,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::val&lt;*,2&gt;>">
+  <Type Name="Ubpa::val&lt;*,2&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -113,7 +113,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::val&lt;*,3&gt;>">
+  <Type Name="Ubpa::val&lt;*,3&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -122,7 +122,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::val&lt;*,4&gt;>">
+  <Type Name="Ubpa::val&lt;*,4&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -132,7 +132,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::scale&lt;*,1&gt;>">
+  <Type Name="Ubpa::scale&lt;*,1&gt;">
     <DisplayString>{{{_Elems[0]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -141,7 +141,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::scale&lt;*,2&gt;>">
+  <Type Name="Ubpa::scale&lt;*,2&gt;">
     <DisplayString>{{{_Elems[0]},{_Elems[1]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -150,7 +150,7 @@
       </ArrayItems>
     </Expand>
   </Type>
-  <Type Name="Ubpa::scale&lt;*,3&gt;>">
+  <Type Name="Ubpa::scale&lt;*,3&gt;">
     <DisplayString>{{{_Elems[0]},{_Elems[1]},{_Elems[2]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -160,17 +160,17 @@
     </Expand>
   </Type>
   <!-- SIMD -->
-  <Type Name="Ubpa::scale&lt;*,4&gt;>">
-    <DisplayString>{{{m.m128_f32[0]}, {m.m128_f32[1]}, {m.m128_f32[2]}, {m.m128_f32[3]}}}</DisplayString>
+  <Type Name="Ubpa::scale&lt;*,4&gt;">
+    <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
     <Expand>
       <ArrayItems>
         <Size>4</Size>
-        <ValuePointer>m.m128_f32</ValuePointer>
+        <ValuePointer>_Elems</ValuePointer>
       </ArrayItems>
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::normal&lt;*&gt;>">
+  <Type Name="Ubpa::normal&lt;*&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -180,7 +180,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::svec&lt;*&gt;>">
+  <Type Name="Ubpa::svec&lt;*&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -190,7 +190,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::euler&lt;*&gt;>">
+  <Type Name="Ubpa::euler&lt;*&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -201,17 +201,17 @@
   </Type>
   
   <!-- SIMD -->
-  <Type Name="Ubpa::quat&lt;*&gt;>">
-    <DisplayString>{{[{m.m128_f32[0]}, {m.m128_f32[1]}, {m.m128_f32[2]}], {m.m128_f32[3]}}}</DisplayString>
+  <Type Name="Ubpa::quat&lt;*&gt;">
+    <DisplayString>{{[{_Elems[0]}, {_Elems[1]}, {_Elems[2]}], {_Elems[3]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
         <Size>4</Size>
-        <ValuePointer>m.m128_f32</ValuePointer>
+        <ValuePointer>_Elems</ValuePointer>
       </ArrayItems>
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::rgb&lt;*&gt;>">
+  <Type Name="Ubpa::rgb&lt;*&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
@@ -222,39 +222,39 @@
   </Type>
   
   <!-- SIMD -->
-  <Type Name="Ubpa::rgba&lt;*&gt;>">
-    <DisplayString>{{{m.m128_f32[0]}, {m.m128_f32[1]}, {m.m128_f32[2]}, {m.m128_f32[3]}}}</DisplayString>
+  <Type Name="Ubpa::rgba&lt;*&gt;">
+    <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
         <Size>4</Size>
-        <ValuePointer>m.m128_f32</ValuePointer>
+        <ValuePointer>_Elems</ValuePointer>
       </ArrayItems>
     </Expand>
   </Type>
   
   <!-- SIMD -->
-  <Type Name="Ubpa::hvec&lt;*&gt;>">
-    <DisplayString>{{{m.m128_f32[0]}, {m.m128_f32[1]}, {m.m128_f32[2]}, {m.m128_f32[3]}}}</DisplayString>
+  <Type Name="Ubpa::hvec&lt;*&gt;">
+    <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
         <Size>4</Size>
-        <ValuePointer>m.m128_f32</ValuePointer>
+        <ValuePointer>_Elems</ValuePointer>
       </ArrayItems>
     </Expand>
   </Type>
   
   <!-- SIMD -->
-  <Type Name="SIMD::batch&lt;float, 4&gt;>">
-    <DisplayString>{{{m.m128_f32[0]}, {m.m128_f32[1]}, {m.m128_f32[2]}, {m.m128_f32[3]}}}</DisplayString>
+  <Type Name="SIMD::batch&lt;float, 4&gt;">
+    <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
 	<Expand>
       <ArrayItems>
         <Size>4</Size>
-        <ValuePointer>m.m128_f32</ValuePointer>
+        <ValuePointer>_Elems</ValuePointer>
       </ArrayItems>
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::bbox&lt;*,*&gt;>">
+  <Type Name="Ubpa::bbox&lt;*,*&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}}}</DisplayString>
     <Expand>
       <Item Name="min P">_Elems[0]</Item>
@@ -262,7 +262,7 @@
     </Expand>
   </Type>
    
-  <Type Name="Ubpa::line&lt;*,*&gt;>">
+  <Type Name="Ubpa::line&lt;*,*&gt;">
     <DisplayString>{{{point}, {dir}}}</DisplayString>
     <Expand>
       <Item Name="point">point</Item>
@@ -270,7 +270,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::plane&lt;*&gt;>">
+  <Type Name="Ubpa::plane&lt;*&gt;">
     <DisplayString>{{{point}, {normal}}}</DisplayString>
     <Expand>
       <Item Name="point">point</Item>
@@ -278,7 +278,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::ray&lt;*,*&gt;>">
+  <Type Name="Ubpa::ray&lt;*,*&gt;">
     <DisplayString>{{{point}, {dir}, {tmin}, {tmax}}}</DisplayString>
     <Expand>
       <Item Name="point">point</Item>
@@ -288,7 +288,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::mat&lt;*,3&gt;>">
+  <Type Name="Ubpa::mat&lt;*,3&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
     <Expand>
       <Item Name="colume 0">_Elems[0]</Item>
@@ -297,7 +297,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::mat&lt;*,4&gt;>">
+  <Type Name="Ubpa::mat&lt;*,4&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
     <Expand>
       <Item Name="colume 0">_Elems[0]</Item>
@@ -307,7 +307,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::transform&lt;*&gt;>">
+  <Type Name="Ubpa::transform&lt;*&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}, {_Elems[3]}}}</DisplayString>
     <Expand>
       <Item Name="colume 0">_Elems[0]</Item>
@@ -317,7 +317,7 @@
     </Expand>
   </Type>
   
-  <Type Name="Ubpa::triangle&lt;*,*&gt;>">
+  <Type Name="Ubpa::triangle&lt;*,*&gt;">
     <DisplayString>{{{_Elems[0]}, {_Elems[1]}, {_Elems[2]}}}</DisplayString>
     <Expand>
       <Item Name="p0">_Elems[0]</Item>

test/UGM/xmake.lua

@@ -20,4 +20,5 @@ package("UGM")
     on_install("macosx", "linux", "windows", function (package)
         os.cp("include", format("%s/include", package:installdir()))
         os.cp("vs",curdir)
+        io.gsub(format("%s/vs/UGM.natvis"), "m.m128_f32","_Elems")
     end)