24.8.28

[Engine]
* Finish logging LUA API static vars.
* Resolve compiler warnings.
* Miscellaneous clean ups.

Author: Mhatxotic

src/crypt.hpp

@@ -205,7 +205,7 @@ static const string CryptBin2HexL(const uint8_t*const ucStr,
 static const string CryptBin2HexL(const MemConst &mcSrc)
   { return CryptBin2HexL(mcSrc.MemPtr<uint8_t>(), mcSrc.MemSize()); }
 /* ------------------------------------------------------------------------- */
-void CryptAddEntropyPtr(const void*const vpPtr, const size_t stSize)
+static void CryptAddEntropyPtr(const void*const vpPtr, const size_t stSize)
   { RAND_add(vpPtr, UtilIntOrMax<int>(stSize), static_cast<double>(stSize)); }
 /* ------------------------------------------------------------------------- */
 template<typename IntType>void CryptAddEntropyInt(const IntType itValue)

src/fontglph.hpp

@@ -286,7 +286,7 @@ template<class StrokerFuncType>
           GetMaxTexSizeFromBounds(ipData.DimGetWidth<GLuint>(),
             ipData.DimGetHeight<GLuint>(), uiWidth, uiHeight, 2);
         const GLuint uiMaximum = cOgl->MaxTexSize();
-        // Makle sure the size is supported by graphics. !FIXME. Make a new
+        // Make sure the size is supported by graphics. !FIXME. Make a new
         // OpenGL surface in a sub-texture slot here but this may require a bit
         // of work.
         if(uiSize > uiMaximum)
@@ -334,14 +334,14 @@ template<class StrokerFuncType>
           mDst.MemWrite(stDestPos, cpSrc, stSrcScanSize);
           // Calculate clear position and set white transparent pixels
           const size_t stClearPos = stDestPos + stSrcScanSize;
-          mDst.MemFillEx<uint64_t>(stClearPos, uqClear, stDestExtra);
+          mDst.MemFillEx(stClearPos, uqClear, stDestExtra);
         } // Calculate size of a scan line in the new surface
         const size_t stDestScanSize = stBinWidth * BY_GRAYALPHA;
         // Clear extra pixels on the bottom
         for(size_t stY = DimGetHeight(); stY < stBinHeight; ++stY)
         { // Calculate source and destination position and copy the scan line
           const size_t stClearPos = (stBinWidth * stY) * BY_GRAYALPHA;
-          mDst.MemFillEx<uint64_t>(stClearPos, uqClear, stDestScanSize);
+          mDst.MemFillEx(stClearPos, uqClear, stDestScanSize);
         } // This is the new image and the old one will be destroyed
         const size_t stOldAlloc = isRef.MemSize();
         isRef.MemSwap(mDst);

src/lldisplay.hpp

@@ -226,8 +226,8 @@ LLFUNC(SetInterval, 1, cTimer->TimerSetInterval(AgUInt64LG{lS, 1,
 // ? for widescreen window sizes.
 /* ------------------------------------------------------------------------- */
 LLFUNC(SetMatrix, 0,
-  const AgNumberL aWidth{lS, 1, 1.0f},
-                  aHeight{lS, 2, 1.0f};
+  const AgNumberL<GLfloat> aWidth{lS, 1, 1.0f},
+                           aHeight{lS, 2, 1.0f};
   cFboCore->AutoMatrix(aWidth, aHeight, false))
 /* ========================================================================= */
 // $ Display.SetPos

src/lua.hpp

@@ -214,10 +214,11 @@ static class Lua final :
           iMembers      = 0,           // Number of static functions used
           iMethods      = 0,           // Number of class methods used
           iTables       = 0,           // Number of tables used
-          iTotalStatics = 0,           // Number of static vars registered
+          iStatics      = 0,           // Number of static vars registered
           iTotalMembers = 0,           // Number of static functions in total
           iTotalMethods = 0,           // Number of class methods in total
-          iTotalTables  = 0;           // Number of tables in total
+          iTotalTables  = 0,           // Number of tables in total
+          iTotalStatics = 0;           // Number of static vars in total
       // Init core libraries
       for(const LuaLibStatic &llRef : llsaAPI)
       { // Increment total statistics
@@ -226,8 +227,20 @@ static class Lua final :
         iTotalTables += llRef.iLLKICount;
         ++iTotal;
         // Ignore if this API is not allowed in the current operation mode
-        if(!cSystem->IsCoreFlagsHave(llRef.cfcRequired)) continue;
-        // Increment used statistics
+        if(!cSystem->IsCoreFlagsHave(llRef.cfcRequired))
+        { // If we have consts list?
+          if(llRef.lkiList)
+          { // Number of static vars registered in this namespace
+            int iStaticsNS = 0;
+            // Walk through the table
+            for(const LuaTable *ltPtr = llRef.lkiList; ltPtr->cpName; ++ltPtr)
+              // Add to total static variables registered for this namespace
+              iStaticsNS += ltPtr->iCount;
+            // Add to total static variables registered
+            iTotalStatics += iStaticsNS;
+          } // Next namespace
+          continue;
+        } // Increment used statistics
         iMembers += llRef.iLLCount;
         iMethods += llRef.iLLMFCount;
         iTables += llRef.iLLKICount;
@@ -236,8 +249,8 @@ static class Lua final :
         LuaUtilPushTable(GetState(), 0,
           llRef.iLLCount + llRef.iLLMFCount + llRef.iLLKICount);
         luaL_setfuncs(GetState(), llRef.libList, 0);
-        // Number of static vars registered
-        int iStatics = 0;
+        // Number of static vars registered in this namespace
+        int iStaticsNS = 0;
         // If we have consts list?
         if(llRef.lkiList)
         { // Walk through the table
@@ -256,16 +269,17 @@ static class Lua final :
             } // Set field name and finalise const table
             lua_setfield(GetState(), -2, ltRef.cpName);
             // Add to total static variables registered for this namespace
-            iStatics += ltRef.iCount;
+            iStaticsNS += ltRef.iCount;
           } // Add to total static variables registered
-          iTotalStatics += iStatics;
+          iStatics += iStaticsNS;
+          iTotalStatics += iStaticsNS;
         } // If we have don't have member functions?
         if(!llRef.libmfList)
         { // Set this current list to global
           lua_setglobal(GetState(), llRef.strvName.data());
           // Log progress
           cLog->LogDebugExSafe("- $ ($ members, $ tables, $ statics).",
-            llRef.strvName, llRef.iLLCount, llRef.iLLKICount, iStatics);
+            llRef.strvName, llRef.iLLCount, llRef.iLLKICount, iStaticsNS);
           // Continue
           continue;
         } // Load members into this namespace too for possible aliasing.
@@ -276,7 +290,7 @@ static class Lua final :
         // all threads of the same lua state share a single registry so this is
         // very safe. Start by creating a new metadata table for 4 entries.
         LuaUtilPushTable(GetState(), 0, 4);
-        // Push the name of the metatable
+        // Push the name of the meta table
         LuaUtilPushStrView(GetState(), llRef.strvName);
         lua_setfield(GetState(), -2, "__name");
         // Set methods so var:func() works
@@ -298,7 +312,7 @@ static class Lua final :
         // Log progress
         cLog->LogDebugExSafe(
           "- $ ($ members, $ tables, $ statics and $ methods).",
-          llRef.strvName, llRef.iLLCount, llRef.iLLKICount, iStatics,
+          llRef.strvName, llRef.iLLCount, llRef.iLLKICount, iStaticsNS,
           llRef.iLLMFCount);
         // For some reason, I cannot specify a __gc member for the garbage
         // collector in this metadata part above because LUA seems to remove
@@ -307,17 +321,20 @@ static class Lua final :
       } // Count libraries and report them
       cLog->LogDebugExSafe(
         "Lua registered $ of $ global namespaces...\n"
-        "- $ of $ const tables are registered with $ statics.\n"
+        "- $ of $ const tables are registered.\n"
+        "- $ of $ static variables are registered.\n"
         "- $ of $ member functions are registered.\n"
         "- $ of $ method functions are registered.\n"
         "- $ of $ functions are registered in total.\n"
-        "- $ variables are registered in total.",
+        "- $ of $ variables are registered in total.",
         iCount,             iTotal,
-        iTables,            iTotalTables,      iTotalStatics,
+        iTables,            iTotalTables,
+        iStatics,           iTotalStatics,
         iMembers,           iTotalMembers,
         iMethods,           iTotalMethods,
         iMembers+iMethods,  iTotalMembers+iTotalMethods,
-        iMembers+iMethods+iTables+iTotalStatics);
+        iMembers+iMethods+iTables+iStatics,
+        iTotalMembers+iTotalMethods+iTotalTables+iTotalStatics);
     } // Init enviornment variables?
     if(FlagIsSet(LF_CORE))
     { // Log progress

src/luautil.hpp

@@ -553,8 +553,9 @@ template<typename IntType>
 }
 /* -- Try to get and check a valid number not < or >= ---------------------- */
 template<typename IntType>
-  static IntType LuaUtilGetNumLGE(lua_State*const lS, const int iIndex,
-    const IntType itMin, const IntType itMax)
+  static IntType LuaUtilGetNumLGE[[maybe_unused]]
+    (lua_State*const lS, const int iIndex,
+      const IntType itMin, const IntType itMax)
 { // Throw if value not a number and return if it is in the valid range
   const IntType itVal = LuaUtilGetNum<IntType>(lS, iIndex);
   if(itVal >= itMin && itVal < itMax) return itVal;

src/msengine.hpp

@@ -12,9 +12,9 @@
 #define VER_AUTHOR  "MS-Design"                       // Author of engine
 #define VER_MAJOR   24                                // Version major (year)
 #define VER_MINOR   8                                 // Version minor (month)
-#define VER_BUILD   17                                // Version build (day)
-#define VER_REV     23                                // Version rev (build#)
-#define VER_STR_NQ  24,8,17,23                        // Version as literal
-#define VER_STR     "24.8.17.23"                      // Version as string
-#define VER_DATE    "Sat Aug 17 23:02:32 2024 +0100"  // Compilation date
+#define VER_BUILD   18                                // Version build (day)
+#define VER_REV     8                                 // Version rev (build#)
+#define VER_STR_NQ  24,8,18,8                         // Version as literal
+#define VER_STR     "24.8.18.8"                       // Version as string
+#define VER_DATE    "Sun Aug 18 19:33:27 2024 +0100"  // Compilation date
 /* == EoF =========================================================== EoF == */