From f85ff9fa96489ac550092bbe3d82cba7562d70cc Mon Sep 17 00:00:00 2001 From: Richard Date: Fri, 29 Jun 2018 15:28:06 -0400 Subject: [PATCH] Befor NewSurface Fix --- .../TrooperEngine/UtilityEngine/cUtility.hpp | 7 +--- .../TrooperEngine/VideoEngine/cVideo.cpp | 3 +- TrooperEngineTest/TrooperEngineTest.vcxproj | 4 +++ .../TrooperEngineTest.vcxproj.filters | 12 +++++++ .../VideoEngineTest/RendererTest.cpp | 21 +++++++++++ .../VideoEngineTest/RendererTest.hpp | 6 ++++ .../VideoEngineTest/VideoTest.cpp | 33 ++++++++++++++++++ .../VideoEngineTest/VideoTest.hpp | 6 ++++ TrooperEngineTest/main.cpp | 24 +++++-------- TrooperEngineTest/test.bmp | Bin 1228854 -> 921654 bytes 10 files changed, 94 insertions(+), 22 deletions(-) create mode 100644 TrooperEngineTest/VideoEngineTest/RendererTest.cpp create mode 100644 TrooperEngineTest/VideoEngineTest/RendererTest.hpp create mode 100644 TrooperEngineTest/VideoEngineTest/VideoTest.cpp create mode 100644 TrooperEngineTest/VideoEngineTest/VideoTest.hpp diff --git a/TrooperEngineDLL/TrooperEngine/UtilityEngine/cUtility.hpp b/TrooperEngineDLL/TrooperEngine/UtilityEngine/cUtility.hpp index b5c035a..b6e9258 100644 --- a/TrooperEngineDLL/TrooperEngine/UtilityEngine/cUtility.hpp +++ b/TrooperEngineDLL/TrooperEngine/UtilityEngine/cUtility.hpp @@ -20,8 +20,6 @@ using UtilityEngine::cString; - - namespace UtilityEngine { /* Singleton */ class EXPORT_FROM_MYDLL cUtility @@ -51,17 +49,14 @@ namespace UtilityEngine { void Message( const cString& msg, const cString& funcName = "", const eTypeSDL typeSDL = eTypeSDL::NONE ) const; void PrintVersion( const eTypeSDL typeSDL = eTypeSDL::ALL ) const; - - + private: ///Functions void VersionParser( const cString& runCompiled, const SDL_version& version, const cString& type ) const; - private: ///Variables static cUtility* sp_inst;// = nullptr - };/// END CLASS DEFINITION cUtility }/// END NAMESPACE DEFINITION UtilityEngine #endif/// END IFNDEF _CUTILITY_HPP_ \ No newline at end of file diff --git a/TrooperEngineDLL/TrooperEngine/VideoEngine/cVideo.cpp b/TrooperEngineDLL/TrooperEngine/VideoEngine/cVideo.cpp index 1a21d06..e82916b 100644 --- a/TrooperEngineDLL/TrooperEngine/VideoEngine/cVideo.cpp +++ b/TrooperEngineDLL/TrooperEngine/VideoEngine/cVideo.cpp @@ -77,7 +77,8 @@ const bool cVideo::Setup() void cVideo::CleanUp() { - SDL_DestroyWindow(mp_window); + if (mp_window != nullptr) + SDL_DestroyWindow(mp_window); mp_window = nullptr; } diff --git a/TrooperEngineTest/TrooperEngineTest.vcxproj b/TrooperEngineTest/TrooperEngineTest.vcxproj index 6e3fd56..0a00d3c 100644 --- a/TrooperEngineTest/TrooperEngineTest.vcxproj +++ b/TrooperEngineTest/TrooperEngineTest.vcxproj @@ -150,12 +150,16 @@ + + + + diff --git a/TrooperEngineTest/TrooperEngineTest.vcxproj.filters b/TrooperEngineTest/TrooperEngineTest.vcxproj.filters index a9f1b01..07b34e7 100644 --- a/TrooperEngineTest/TrooperEngineTest.vcxproj.filters +++ b/TrooperEngineTest/TrooperEngineTest.vcxproj.filters @@ -33,6 +33,12 @@ EventEngineTest + + VideoEngineTest + + + VideoEngineTest + @@ -48,6 +54,12 @@ EventEngineTest + + VideoEngineTest + + + VideoEngineTest + diff --git a/TrooperEngineTest/VideoEngineTest/RendererTest.cpp b/TrooperEngineTest/VideoEngineTest/RendererTest.cpp new file mode 100644 index 0000000..9a2e26e --- /dev/null +++ b/TrooperEngineTest/VideoEngineTest/RendererTest.cpp @@ -0,0 +1,21 @@ +#include "RendererTest.hpp" + +#include "../UTest/UTest.hpp" + +/*** TrooperEngine DLL Header Files ***/ +#include "TrooperEngine.hpp" + +using VideoEngine::cRenderer; + +void RendererTest() +{ + // cRenderer + printf("\nTesting cRenderer -----\n\n"); + + UTest u("cRenderer"); + + SDL_Surface* sur = nullptr; + //cRenderer::Inst()->TextureToSurface(); + + u.report(); +} \ No newline at end of file diff --git a/TrooperEngineTest/VideoEngineTest/RendererTest.hpp b/TrooperEngineTest/VideoEngineTest/RendererTest.hpp new file mode 100644 index 0000000..546b46c --- /dev/null +++ b/TrooperEngineTest/VideoEngineTest/RendererTest.hpp @@ -0,0 +1,6 @@ +#ifndef __RENDERERTEST__ +#define __RENDERERTEST__ + +void RendererTest(); + +#endif // __RENDERERTEST__ \ No newline at end of file diff --git a/TrooperEngineTest/VideoEngineTest/VideoTest.cpp b/TrooperEngineTest/VideoEngineTest/VideoTest.cpp new file mode 100644 index 0000000..9151f27 --- /dev/null +++ b/TrooperEngineTest/VideoEngineTest/VideoTest.cpp @@ -0,0 +1,33 @@ +#include "VideoTest.hpp" + +#include "../UTest/UTest.hpp" + +/*** TrooperEngine DLL Header Files ***/ +#include "TrooperEngine.hpp" + +using VideoEngine::cVideo; + +void VideoTest() +{ + // cVideo + printf("\nTesting cVideo -----\n\n"); + + UTest u("cVideo"); + + TrooperEngineCore::cTrooperEngineCore::Inst(); + VideoEngine::cVideo& video = VideoEngine::cVideo::Inst(); + video.Initialize(); + + u.test("Video Initialize", video.IsInit()); + + u.test("Video Setup", video.Setup()); + + // CaptionTest + cString cap_set = "Hello World"; + cVideo::Inst().setCaption(cap_set); + cString cap_get = cVideo::Inst().getCaption(); + u.test("setCaption() and getCaption()", (cap_get == cap_set)); + + + u.report(); +} \ No newline at end of file diff --git a/TrooperEngineTest/VideoEngineTest/VideoTest.hpp b/TrooperEngineTest/VideoEngineTest/VideoTest.hpp new file mode 100644 index 0000000..b8102fc --- /dev/null +++ b/TrooperEngineTest/VideoEngineTest/VideoTest.hpp @@ -0,0 +1,6 @@ +#ifndef __VIDEOTEST__ +#define __VIDEOTEST__ + +void VideoTest(); + +#endif // __VIDEOTEST__ \ No newline at end of file diff --git a/TrooperEngineTest/main.cpp b/TrooperEngineTest/main.cpp index 4252ffd..05cdba1 100644 --- a/TrooperEngineTest/main.cpp +++ b/TrooperEngineTest/main.cpp @@ -21,7 +21,13 @@ see license.txt for details #include "UTest/UTest.hpp" +/*** Video Engine Test ***/ +#include "VideoEngineTest/VideoTest.hpp" + +/*** Utility Engine Test ***/ #include "UtilityEngineTest/StringTest.hpp" + +/*** GUI Engine Test ***/ #include "GUIEngineTest/GUIXMLTest.hpp" using UtilityEngine::cString; @@ -37,22 +43,10 @@ int main(int argc, char *argv[]) printf(cString("TrooperEngine V") + TrooperEngineCore::cTrooperEngineCore::Version() + "\n"); + + VideoTest(); - UTest u("cVideo"); - - printf("\nTesting cVideo\n"); - - TrooperEngineCore::cTrooperEngineCore::Inst(); - VideoEngine::cVideo& video = VideoEngine::cVideo::Inst(); - video.Initialize(); - //core.VideoInit(); - - if (!video.Setup()) { - printf("database failed to open.\n"); - return 1; - } - - u.test("Video Initialize open", video.IsInit()); + StringTest(); diff --git a/TrooperEngineTest/test.bmp b/TrooperEngineTest/test.bmp index 293cca5b2c3e63d8c9981bbff13ab4a39a157c7e..24b92ea2b48b0b2a4b0cb9bfffcdc0ca850e8914 100644 GIT binary patch delta 91 zcmdni;Js~ug{qUUnE)RH2$%t}1`szeF)%z}WME)qkN^oYFbME98nzlTwi+_E8Zx&U nva}kqwi>dv8nU+cH6Qz_itYnMVNt6rd8U literal 1228854 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