fully remove squall and replace with sqrat

Author: MrSapps

.gitmodules

@@ -50,9 +50,6 @@
 [submodule "3rdParty/squirrel"]
 	path = 3rdParty/squirrel
 	url = https://github.com/paulsapps/squirrel
-[submodule "3rdParty/squall"]
-	path = 3rdParty/squall
-	url = https://github.com/paulsapps/squall.git
 [submodule "3rdParty/sqrat"]
 	path = 3rdParty/sqrat
 	url = https://github.com/paulsapps/sqrat

3rdParty/squall

@@ -83,7 +83,6 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}/packaging
     ${OPENGL_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/squirrel/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/squall
     ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/sqrat/include
     ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/boost_1_63_mini
     ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/gl3w/include

CMakeLists.txt

@@ -8,7 +8,6 @@
 #include "resourcemapper.hpp"
 #include "proxy_sol.hpp"
 #include "bitutils.hpp"
-#include "proxy_squall.hpp"
 
 class StateMachine;
 class InputState;
@@ -153,7 +152,7 @@ class Actions
 public:
     Actions()
     {
-        LOG_INFO("Get down with the sickness");
+        TRACE_ENTRYEXIT;
     }
 
     static bool Left(u32 state) { return IsBitOn(state, eLeft); }
@@ -511,6 +510,30 @@ class InputState final
     InputMapping mInputMapping;
 };
 
+class SquirrelVm
+{
+public:
+    SquirrelVm(const SquirrelVm&) = delete;
+    SquirrelVm& operator = (const SquirrelVm&) = delete;
+
+    SquirrelVm(int stackSize = 1024)
+    {
+        mVm = sq_open(stackSize);
+    }
+
+    ~SquirrelVm()
+    {
+        if (mVm)
+        {
+            sq_close(mVm);
+        }
+    }
+
+    HSQUIRRELVM Handle() const { return mVm; }
+private:
+    HSQUIRRELVM mVm = 0;
+};
+
 class Engine final
 {
 public:
@@ -554,5 +577,5 @@ class Engine final
     StateMachine mStateMachine;
 
     sol::state mLuaState;
-    squall::VMStd mSquirrelVm;
+    SquirrelVm mSquirrelVm;
 };

include/engine.hpp

@@ -13,7 +13,6 @@
 #include "proxy_sol.hpp"
 #include "renderer.hpp"
 #include "collisionline.hpp"
-#include "proxy_squall.hpp"
 #include "proxy_sqrat.hpp"
 
 struct GuiContext;
@@ -42,6 +41,7 @@ struct ObjRect
          .Var("w", &ObjRect::h)
          .Var("h", &ObjRect::h)
          .Ctor();
+        Sqrat::RootTable().Bind("ObjRect", c);
 
         state.new_usertype<ObjRect>("ObjRect",
             "x", &ObjRect::x,

include/gridmap.hpp

@@ -143,6 +143,7 @@ namespace Oddlib
         Sqrat::Class<IStream, Sqrat::NoConstructor<IStream>> c(Sqrat::DefaultVM::Get(), "IStream");
         c.StaticFunc("ReadU32", &ReadU32);
         c.StaticFunc("ReadU16", &ReadU16);
+        Sqrat::RootTable().Bind("IStream", c);
 
         state.new_usertype<IStream>("IStream",
             "ReadU32", &ReadU32,

include/oddlib/stream.hpp

@@ -313,23 +313,26 @@ void Engine::InitSubSystems()
     // Get lua to look for scripts in the correction location
     mLuaState.script("package.path = '" + mFileSystem->FsPath() + "data/scripts/?.lua'");
 
-    mSquirrelVm.defun("log_info", LuaLogInfo);
-    mSquirrelVm.defun("log_trace", LuaLogTrace);
-    mSquirrelVm.defun("log_warning", LuaLogWarning);
-    mSquirrelVm.defun("log_error", LuaLogError);
+    Sqrat::DefaultVM::Set(mSquirrelVm.Handle());
 
-    Sqrat::DefaultVM::Set(mSquirrelVm.handle());
+    Sqrat::RootTable().Func("log_info", LuaLogInfo);
+    Sqrat::RootTable().Func("log_trace", LuaLogTrace);
+    Sqrat::RootTable().Func("log_warning", LuaLogWarning);
+    Sqrat::RootTable().Func("log_error", LuaLogError);
 
     Oddlib::IStream::RegisterScriptBindings(mLuaState);
     Actions::RegisterScriptBindings(mLuaState);
     MapObject::RegisterScriptBindings(mLuaState);
     ObjRect::RegisterScriptBindings(mLuaState);
 
     // TODO: Override the stdout/stderr/compile error functions to LOG's
-    mSquirrelVm.dostring(mResourceLocator->LocateScript("main.nut").c_str());
+    Sqrat::Script script;
+    script.CompileString(mResourceLocator->LocateScript("main.nut"));
+    script.Run();
 
     LOG_INFO("Calling script init()");
-    mSquirrelVm.call<void>("init");
+    Sqrat::Function initFunc(Sqrat::RootTable(), "init");
+    initFunc.Execute();
 }
 
 // TODO: Using averaging value or anything that is more accurate than this
@@ -577,7 +580,8 @@ void Engine::Update()
     Debugging().Update(mInputState);
 
     // HACK: Should be called from within the "init/starting" state
-    mSquirrelVm.call<void>("update");
+    Sqrat::Function initFunc(Sqrat::RootTable(), "update");
+    initFunc.Execute();
 
     mStateMachine.Update(mInputState, *mRenderer);
 }

include/proxy_squall.hpp

@@ -49,6 +49,7 @@ MapObject::MapObject(IMap& map, sol::state& luaState, ResourceLocator& locator,
     c.Var("states", &MapObject::mStates);
     c.Var("mXPos", &MapObject::mXPos);
     c.Var("mYPos", &MapObject::mYPos);
+    Sqrat::RootTable().Bind("MapObject", c);
 
     state.new_usertype<MapObject>("MapObject",
         "SetAnimation", &MapObject::SetAnimation,