Added average frame timer return value for gifs.

WohlSoft · Aug 18, 2015 · be85a1f · be85a1f
1 parent 75423bb
commit be85a1f
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 17 deletions.
diff --git a/LunaDll/LuaMain/LuaProxy.h b/LunaDll/LuaMain/LuaProxy.h
@@ -830,7 +830,7 @@ namespace LuaProxy {
         void activateOverworldHud(WORLD_HUD_CONTROL activateFlag);
         //CSprite functions
         bool loadImage(const char* filename, int resNumber, int transColor);
-        luabind::object loadAnimatedImage(const std::string& filename, lua_State* L);
+        luabind::object loadAnimatedImage(const std::string& filename, int& smbxFrameTime, lua_State* L);
         LuaImageResource* loadImage(const char* filename);
         void placeSprite(int type, int imgResource, int xPos, int yPos, const char* extra, int time);
         void placeSprite(int type, int imgResource, int xPos, int yPos, const char* extra);

diff --git a/LunaDll/LuaMain/LuaProxyComponent/LuaProxyGlobalFunctions/LuaProxyGlobalFuncGraphics.cpp b/LunaDll/LuaMain/LuaProxyComponent/LuaProxyGlobalFunctions/LuaProxyGlobalFuncGraphics.cpp
@@ -41,11 +41,11 @@ LuaProxy::Graphics::LuaImageResource* LuaProxy::Graphics::loadImage(const char*
     return new LuaProxy::Graphics::LuaImageResource(resNumber);
 }
 
-luabind::object LuaProxy::Graphics::loadAnimatedImage(const std::string& filename, lua_State* L)
+luabind::object LuaProxy::Graphics::loadAnimatedImage(const std::string& filename, int& smbxFrameTime, lua_State* L)
 {
     luabind::object tLuaImageResources = luabind::newtable(L);
-    std::vector<int> resCodes = gLunaRender.LoadAnimatedBitmapResource(utf8_decode(filename));
-    for (int i = 0; i < resCodes.size(); i++){
+    std::vector<int> resCodes = gLunaRender.LoadAnimatedBitmapResource(utf8_decode(filename), &smbxFrameTime);
+    for (unsigned int i = 0; i < resCodes.size(); i++){
         tLuaImageResources[i + 1] = luabind::object(L, new LuaProxy::Graphics::LuaImageResource(resCodes[i]), luabind::adopt(luabind::result));
     }
     return tLuaImageResources;

diff --git a/LunaDll/LuaMain/LunaLuaMain.cpp b/LunaDll/LuaMain/LunaLuaMain.cpp
@@ -262,7 +262,7 @@ void CLunaLua::bindAll()
                 class_<LuaProxy::Graphics::LuaImageResource>("LuaImageResource"),
                 def("loadImage", (bool(*)(const char*, int, int))&LuaProxy::Graphics::loadImage),
                 def("loadImage", (LuaProxy::Graphics::LuaImageResource*(*)(const char*))&LuaProxy::Graphics::loadImage, adopt(result)),
-                def("loadAnimatedImage", &LuaProxy::Graphics::loadAnimatedImage),
+                def("loadAnimatedImage", &LuaProxy::Graphics::loadAnimatedImage, pure_out_value(_2)),
                 def("placeSprite", (void(*)(int, int, int, int, const char*, int))&LuaProxy::Graphics::placeSprite),
                 def("placeSprite", (void(*)(int, int, int, int, const char*))&LuaProxy::Graphics::placeSprite),
                 def("placeSprite", (void(*)(int, int, int, int))&LuaProxy::Graphics::placeSprite),

diff --git a/LunaDll/Rendering/RenderUtils.cpp b/LunaDll/Rendering/RenderUtils.cpp
@@ -2,6 +2,7 @@
 
 #include <wincodec.h>
 #include <wincodecsdk.h>
+#include <comutil.h>
 #include <functional>
 #include "../Globals.h"
 #include "../GlobalFuncs.h"
@@ -32,12 +33,13 @@ HBITMAP CreateEmptyBitmap(int width, int height, int bpp, void** data)
     return convHBMP;
 }
 
-void LoadGfxAndEnumFrames(const std::wstring& filename, std::function<bool(HBITMAP)> bitmapEnumFunc){
+void LoadGfxAndEnumFrames(const std::wstring& filename, std::function<bool(HBITMAP, IWICMetadataQueryReader*)> bitmapEnumFunc){
     HRESULT hr;
     IWICImagingFactory *pFactory = NULL;
     IWICBitmapDecoder *pDecoder = NULL;
     IWICBitmapFrameDecode *pFrame = NULL;
     IWICFormatConverter *pConvertedFrame = NULL;
+    IWICMetadataQueryReader* pMetadataReader = NULL;
     HBITMAP hDIBBitmap = NULL;
     unsigned int width = 0, height = 0;
 
@@ -60,6 +62,9 @@ void LoadGfxAndEnumFrames(const std::wstring& filename, std::function<bool(HBITM
     for (UINT i = 0; i < frames; i++){
         hr = pDecoder->GetFrame(i, &pFrame);
         if (FAILED(hr)) goto cleanup;
+
+        hr = pFrame->GetMetadataQueryReader(&pMetadataReader);
+        if (FAILED(hr)) goto cleanup;
 
         hr = pFactory->CreateFormatConverter(&pConvertedFrame);
         if (FAILED(hr)) goto cleanup;
@@ -93,13 +98,29 @@ void LoadGfxAndEnumFrames(const std::wstring& filename, std::function<bool(HBITM
             hDIBBitmap = NULL;
             goto cleanup;
         }
-        if (!bitmapEnumFunc(hDIBBitmap))
+        if (!bitmapEnumFunc(hDIBBitmap, pMetadataReader))
             break;
+
+        if (pMetadataReader) {
+            pMetadataReader->Release();
+            pMetadataReader = NULL;
+        }
+        if (pConvertedFrame) {
+            pConvertedFrame->Release();
+            pConvertedFrame = NULL;
+        }
+        if (pFrame) {
+            pFrame->Release();
+            pFrame = NULL;
+        }
     }
 
 cleanup:
     // NOTE: Not using CComPtr here because this should be possible to build with VS Express
 #pragma warning(suppress: 6102)
+    if (pMetadataReader) {
+        pMetadataReader->Release();
+    }
     if (pConvertedFrame) {
         pConvertedFrame->Release();
     }
@@ -115,22 +136,43 @@ void LoadGfxAndEnumFrames(const std::wstring& filename, std::function<bool(HBITM
 HBITMAP LoadGfxAsBitmap(const std::wstring& filename)
 {
     HBITMAP retSingleBitmap = NULL;
-    LoadGfxAndEnumFrames(filename, [&retSingleBitmap](HBITMAP nextBitmap){
+    LoadGfxAndEnumFrames(filename, [&retSingleBitmap](HBITMAP nextBitmap, IWICMetadataQueryReader*){
         retSingleBitmap = nextBitmap;
         return false;
     });
 
     return retSingleBitmap;
 }
 
-std::vector<HBITMAP> LoadAnimatedGfx(const std::wstring& filename)
+std::tuple<std::vector<HBITMAP>, int> LoadAnimatedGfx(const std::wstring& filename)
 {
     std::vector<HBITMAP> allBitmapFrames;
-    LoadGfxAndEnumFrames(filename, [&allBitmapFrames](HBITMAP nextBitmap){
+    int frameDelayQueries = 0;
+    short sumFrameDelay = 0;
+    LoadGfxAndEnumFrames(filename, [&allBitmapFrames, &frameDelayQueries, &sumFrameDelay](HBITMAP nextBitmap, IWICMetadataQueryReader* pMetadata){
         allBitmapFrames.push_back(nextBitmap);
+
+        _variant_t delayVal;
+        HRESULT hr = pMetadata->GetMetadataByName(L"/grctlext/Delay", (PROPVARIANT*)&delayVal);
+        if (SUCCEEDED(hr)) {
+            frameDelayQueries++;
+            sumFrameDelay += (short)delayVal;
+        }
+
         return true; //continue enum
     });
-    return allBitmapFrames;
+
+    int frameTime = 0;
+    if (frameDelayQueries == 0) 
+    {
+        frameTime = 9;
+    }
+    else
+    {
+        frameTime = sumFrameDelay / frameDelayQueries;
+    }
+
+    return std::make_tuple(allBitmapFrames, frameTime);
 }
 
 

diff --git a/LunaDll/Rendering/RenderUtils.h b/LunaDll/Rendering/RenderUtils.h
@@ -4,9 +4,10 @@
 #include <windows.h>
 #include <string>
 #include <vector>
+#include <tuple>
 
 HBITMAP CreateEmptyBitmap(int width, int height, int bpp, void** data);
 HBITMAP LoadGfxAsBitmap(const std::wstring& filename);
-std::vector<HBITMAP> LoadAnimatedGfx(const std::wstring& filename);
+std::tuple<std::vector<HBITMAP>, int> LoadAnimatedGfx(const std::wstring& filename);
 
 #endif
diff --git a/LunaDll/Rendering/Rendering.cpp b/LunaDll/Rendering/Rendering.cpp
@@ -11,7 +11,7 @@
 #include "../SMBXInternal/PlayerMOB.h"
 #include "../GlobalFuncs.h"
 #include "GLEngine.h"
-
+#include <tuple>
 
 using namespace std;
 
@@ -88,7 +88,7 @@ bool Renderer::LoadBitmapResource(std::wstring filename, int resource_code) {
 }
 
 
-std::vector<int> Renderer::LoadAnimatedBitmapResource(std::wstring filename)
+std::vector<int> Renderer::LoadAnimatedBitmapResource(std::wstring filename, int* frameTime)
 {
     // Concoct full filepath
     wstring full_path = L"";
@@ -107,9 +107,14 @@ std::vector<int> Renderer::LoadAnimatedBitmapResource(std::wstring filename)
         full_path = filename;
     }
 
-    std::vector<HBITMAP> bitmaps = LoadAnimatedGfx(filename);
+    std::tuple<std::vector<HBITMAP>, int> ret = LoadAnimatedGfx(filename);
+    std::vector<HBITMAP>& bitmaps = std::get<0>(ret);
+    if (frameTime) {
+        double avgFrameTime = (double)std::get<1>(ret);
+        *frameTime = (int)((avgFrameTime / 100) * 65);
+    }
+
     std::vector<int> bitmapResCode;
-
     for (HBITMAP nextBitmap : bitmaps) {
         int nextResCode = GetAutoImageResourceCode();
         BMPBox* pNewbox = new BMPBox(nextBitmap, m_hScreenDC);

diff --git a/LunaDll/Rendering/Rendering.h b/LunaDll/Rendering/Rendering.h
@@ -23,7 +23,7 @@ struct Renderer {
 
     bool LoadBitmapResource(std::wstring filename, int resource_code, int transparency_color); // don't give full path
     bool LoadBitmapResource(std::wstring filename, int resource_code);
-    std::vector<int> LoadAnimatedBitmapResource(std::wstring filename);
+    std::vector<int> LoadAnimatedBitmapResource(std::wstring filename, int* frameTime = 0);
 
     bool DeleteImage(int resource_code);
     int  GetAutoImageResourceCode() const;