*misc

26 files changed, 539 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bca80dd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,368 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
+# .NET Core
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+# ASP.NET Scaffolding
+ScaffoldingReadMe.txt
+
+# StyleCop
+StyleCopReport.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# Visual Studio Trace Files
+*.e2e
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
+# Coverlet is a free, cross platform Code Coverage Tool
+coverage*.json
+coverage*.xml
+coverage*.info
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# Note: Comment the next line if you want to checkin your web deploy settings,
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+orleans.codegen.cs
+
+# Including strong name files can present a security risk
+# (https://github.com/github/gitignore/pull/2483#issue-259490424)
+#*.snk
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# SQL Server files
+*.mdf
+*.ldf
+*.ndf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+*.rptproj.rsuser
+*- [Bb]ackup.rdl
+*- [Bb]ackup ([0-9]).rdl
+*- [Bb]ackup ([0-9][0-9]).rdl
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+node_modules/
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# CodeRush personal settings
+.cr/personal
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Tabs Studio
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/
+
+# Azure Stream Analytics local run output
+ASALocalRun/
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# NVidia Nsight GPU debugger configuration file
+*.nvuser
+
+# MFractors (Xamarin productivity tool) working folder
+.mfractor/
+
+# Local History for Visual Studio
+.localhistory/
+
+# BeatPulse healthcheck temp database
+healthchecksdb
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# Ionide (cross platform F# VS Code tools) working folder
+.ionide/
+
+# Fody - auto-generated XML schema
+FodyWeavers.xsd
+
+# lib file 
+*.lib 
+
+# exe file 
+*.exe
diff --git a/Default Assets/Libraries/Framework/Animation/Animation.lua b/DefaultAssets/Libraries/Framework/Animation/Animation.lua
index e69de29..e69de29 100644
--- a/Default Assets/Libraries/Framework/Animation/Animation.lua
+++ b/DefaultAssets/Libraries/Framework/Animation/Animation.lua
diff --git a/Default Assets/Libraries/Framework/Class.lua b/DefaultAssets/Libraries/Framework/Class.lua
index 78c577c..78c577c 100644
--- a/Default Assets/Libraries/Framework/Class.lua
+++ b/DefaultAssets/Libraries/Framework/Class.lua
diff --git a/Default Assets/Libraries/Framework/Core/Camera.lua b/DefaultAssets/Libraries/Framework/Core/Camera.lua
index 5fcfbe7..5fcfbe7 100644
--- a/Default Assets/Libraries/Framework/Core/Camera.lua
+++ b/DefaultAssets/Libraries/Framework/Core/Camera.lua
diff --git a/Default Assets/Libraries/Framework/Core/Component.lua b/DefaultAssets/Libraries/Framework/Core/Component.lua
index 00bf2ca..00bf2ca 100644
--- a/Default Assets/Libraries/Framework/Core/Component.lua
+++ b/DefaultAssets/Libraries/Framework/Core/Component.lua
diff --git a/Default Assets/Libraries/Framework/Core/Game.lua b/DefaultAssets/Libraries/Framework/Core/Game.lua
index 51ce25f..51ce25f 100644
--- a/Default Assets/Libraries/Framework/Core/Game.lua
+++ b/DefaultAssets/Libraries/Framework/Core/Game.lua
diff --git a/Default Assets/Libraries/Framework/Core/GameObject.lua b/DefaultAssets/Libraries/Framework/Core/GameObject.lua
index ee0d143..ee0d143 100644
--- a/Default Assets/Libraries/Framework/Core/GameObject.lua
+++ b/DefaultAssets/Libraries/Framework/Core/GameObject.lua
diff --git a/Default Assets/Libraries/Framework/Core/Sprite.lua b/DefaultAssets/Libraries/Framework/Core/Sprite.lua
index 47cb50d..47cb50d 100644
--- a/Default Assets/Libraries/Framework/Core/Sprite.lua
+++ b/DefaultAssets/Libraries/Framework/Core/Sprite.lua
diff --git a/Default Assets/Libraries/Framework/Math/Matrix44.lua b/DefaultAssets/Libraries/Framework/Math/Matrix44.lua
index b572f74..b572f74 100644
--- a/Default Assets/Libraries/Framework/Math/Matrix44.lua
+++ b/DefaultAssets/Libraries/Framework/Math/Matrix44.lua
diff --git a/Default Assets/Libraries/Framework/Math/Quaternion.lua b/DefaultAssets/Libraries/Framework/Math/Quaternion.lua
index e69de29..e69de29 100644
--- a/Default Assets/Libraries/Framework/Math/Quaternion.lua
+++ b/DefaultAssets/Libraries/Framework/Math/Quaternion.lua
diff --git a/Default Assets/Libraries/Framework/Math/Vector2.lua b/DefaultAssets/Libraries/Framework/Math/Vector2.lua
index e69de29..e69de29 100644
--- a/Default Assets/Libraries/Framework/Math/Vector2.lua
+++ b/DefaultAssets/Libraries/Framework/Math/Vector2.lua
diff --git a/Default Assets/Libraries/Framework/Math/Vector3.lua b/DefaultAssets/Libraries/Framework/Math/Vector3.lua
index e69de29..e69de29 100644
--- a/Default Assets/Libraries/Framework/Math/Vector3.lua
+++ b/DefaultAssets/Libraries/Framework/Math/Vector3.lua
diff --git a/Default Assets/Libraries/Framework/Math/Vector4.lua b/DefaultAssets/Libraries/Framework/Math/Vector4.lua
index e69de29..e69de29 100644
--- a/Default Assets/Libraries/Framework/Math/Vector4.lua
+++ b/DefaultAssets/Libraries/Framework/Math/Vector4.lua
diff --git a/Default Assets/Libraries/Framework/Utils/EventCenter.lua b/DefaultAssets/Libraries/Framework/Utils/EventCenter.lua
index 664ecba..664ecba 100644
--- a/Default Assets/Libraries/Framework/Utils/EventCenter.lua
+++ b/DefaultAssets/Libraries/Framework/Utils/EventCenter.lua
diff --git a/Default Assets/Libraries/Framework/Utils/StateMachine.lua b/DefaultAssets/Libraries/Framework/Utils/StateMachine.lua
index e69de29..e69de29 100644
--- a/Default Assets/Libraries/Framework/Utils/StateMachine.lua
+++ b/DefaultAssets/Libraries/Framework/Utils/StateMachine.lua
diff --git a/Default Assets/Libraries/Framework/Utils/Util.lua b/DefaultAssets/Libraries/Framework/Utils/Util.lua
index e69de29..e69de29 100644
--- a/Default Assets/Libraries/Framework/Utils/Util.lua
+++ b/DefaultAssets/Libraries/Framework/Utils/Util.lua
diff --git a/Default Assets/Libraries/Framework/init.lua b/DefaultAssets/Libraries/Framework/init.lua
index 8b96176..8b96176 100644
--- a/Default Assets/Libraries/Framework/init.lua
+++ b/DefaultAssets/Libraries/Framework/init.lua
diff --git a/Default Assets/Textures/blank.png b/DefaultAssets/Textures/blank.png
index 877e031..877e031 100644
--- a/Default Assets/Textures/blank.png
+++ b/DefaultAssets/Textures/blank.png
diff --git a/Editor/EditorMain.cpp b/Editor/EditorMain.cpp
index d45d08b..8868d88 100644
--- a/Editor/EditorMain.cpp
+++ b/Editor/EditorMain.cpp
@@ -1,6 +1,7 @@
 #include <windows.h>

 #include <vector>

 #include "GUI/EditorWindows.h"

+#include "Runtime/Scripting/LuaBind.h"

 

 static int MainMessageLoop()
 {

@@ -22,6 +23,7 @@ static int MainMessageLoop()
             if (msg.message == WM_QUIT)
                 isQuitSignaled = true;
 
+			
         }
 

     }

@@ -42,4 +44,4 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw)
     MainMessageLoop();

     

     return 0;

-}

+}
\ No newline at end of file
diff --git a/Editor/GUI/EditorWindows.cpp b/Editor/GUI/EditorWindows.cpp
index 00c573a..6d24dbd 100644
--- a/Editor/GUI/EditorWindows.cpp
+++ b/Editor/GUI/EditorWindows.cpp
@@ -166,5 +166,6 @@ LRESULT CALLBACK GUIView::GUIViewWndProc(HWND hWnd, UINT message, WPARAM wParam,
 
 void GUIView::DoPaint()
 {

-
+	

+	
 }
\ No newline at end of file
diff --git a/Editor/GUI/EditorWindows.h b/Editor/GUI/EditorWindows.h
index a78e163..4bd33ec 100644
--- a/Editor/GUI/EditorWindows.h
+++ b/Editor/GUI/EditorWindows.h
@@ -3,6 +3,7 @@
 
 #include <windows.h>
 #include "Runtime/Math/Rect.h"
+#include "Runtime/Scripting/LuaBind.h"
 
 void RegisterWindowClasses();
 
@@ -51,6 +52,9 @@ public:
 private:
 	HWND m_View;
 
+	LuaBind::Ref m_Script;
+
+
 };
 
 #endif
\ No newline at end of file
diff --git a/Editor/Scripts/EditorMain.lua b/Editor/Scripts/EditorMain.lua
new file mode 100644
index 0000000..2de656d
--- /dev/null
+++ b/Editor/Scripts/EditorMain.lua
@@ -0,0 +1,17 @@
+local Editor = GameLab.Editor
+local Engine = GameLab.Engine
+
+local ViewEditor = {} 
+
+function ViewEditor:OnGUI() 
+    
+end
+
+function main() 
+    local view = Editor.ContainnerWindow.New(ViewEditor) 
+    
+end 
+
+
+
+main()
\ No newline at end of file
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index 21ae963..c682fe5 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -88,7 +88,7 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -101,10 +101,10 @@
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -116,9 +116,10 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
@@ -131,22 +132,31 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\Editor\EditorMain.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\EditorWindows.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\MenuController.cpp" />
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp" />
-    <ClCompile Include="..\..\..\Editor\main.cpp" />
-    <ClCompile Include="..\..\..\Editor\wog.c" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
     <ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp" />
     <ClCompile Include="..\..\..\Runtime\Utilities\Base64.cpp" />
     <ClCompile Include="..\..\..\Runtime\Utilities\Utf8.cpp" />
   </ItemGroup>
@@ -155,12 +165,25 @@
     <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h" />
     <ClInclude Include="..\..\..\Editor\GUI\MenuController.h" />
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h" />
-    <ClInclude Include="..\..\..\Editor\wog.h" />
     <ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
     <ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Rect.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Vector2.h" />
     <ClInclude Include="..\..\..\Runtime\Math\Vector3.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h" />
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Assert.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Base64.h" />
     <ClInclude Include="..\..\..\Runtime\Utilities\Exception.h" />
@@ -175,6 +198,13 @@
     <ProjectReference Include="..\glad\glad.vcxproj">
       <Project>{385f2d3a-1cef-4aa1-8051-527f6b68dd81}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\lua51\lua51.vcxproj">
+      <Project>{ad09415f-4bf9-4fce-901f-7ab22d429cfc}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc" />
+    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index e537df8..982bd5b 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -10,6 +10,9 @@
     <Filter Include="Utilities">
       <UniqueIdentifier>{61174975-2b52-426f-b871-d33e1bf956d4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Scripting">
+      <UniqueIdentifier>{f9573ff2-4a53-4953-806e-f0ce0c586910}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\Editor\GUI\MenuController.cpp">
@@ -18,8 +21,6 @@
     <ClCompile Include="..\..\..\Editor\GUI\Dock.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Editor\main.cpp" />
-    <ClCompile Include="..\..\..\Editor\wog.c" />
     <ClCompile Include="..\..\..\Editor\GUI\EditorWindows.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
@@ -38,6 +39,34 @@
     <ClCompile Include="..\..\..\Editor\GUI\WinUtils.cpp">
       <Filter>GUI</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Editor\EditorMain.cpp" />
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindClass.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindEnum.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRef.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindRefTable.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindState.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindVM.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.cpp">
+      <Filter>Scripting</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Editor\GUI\MenuController.h">
@@ -46,7 +75,6 @@
     <ClInclude Include="..\..\..\Editor\GUI\Dock.h">
       <Filter>GUI</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Editor\wog.h" />
     <ClInclude Include="..\..\..\Editor\GUI\EditorWindows.h">
       <Filter>GUI</Filter>
     </ClInclude>
@@ -95,5 +123,55 @@
     <ClInclude Include="..\..\..\Editor\GUI\WinUtils.h">
       <Filter>GUI</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBind.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindCFunctions.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindClass.hpp">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindConfig.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindEnum.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindGlobalState.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindInternal.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindMemberRef.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRef.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindRefTable.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindState.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindUtility.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindVM.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Runtime\Scripting\LuaBindWatchDog.h">
+      <Filter>Scripting</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Runtime\Scripting\LuaBindClass.inc">
+      <Filter>Scripting</Filter>
+    </None>
+    <None Include="..\..\..\Runtime\Scripting\LuaBindState.inc">
+      <Filter>Scripting</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Projects/VisualStudio/lua51/lua51.vcxproj b/Projects/VisualStudio/lua51/lua51.vcxproj
index 99605c6..fb0faec 100644
--- a/Projects/VisualStudio/lua51/lua51.vcxproj
+++ b/Projects/VisualStudio/lua51/lua51.vcxproj
@@ -26,26 +26,26 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -69,13 +69,26 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)..\..\Build</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)..\..\Build</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <OutDir>$(SolutionDir)..\..\Build</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)..\..\Build</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -87,6 +100,8 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -100,6 +115,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -115,6 +132,8 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <CompileAs>CompileAsC</CompileAs>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
diff --git a/Runtime/Scripting/LuaBindVM.cpp b/Runtime/Scripting/LuaBindVM.cpp
index b50a5e1..4677650 100644
--- a/Runtime/Scripting/LuaBindVM.cpp
+++ b/Runtime/Scripting/LuaBindVM.cpp
@@ -42,8 +42,8 @@ namespace LuaBind
 	{
 		LUA_BIND_STATE(mMainThread);
 
-		mStrongRefTable.Init(state, "_LUA_BIND_STRONGREF_TABLE");
-		mWeakRefTable.Init(state, "_LUA_BIND_WEAKREF_TABLE", "v");
+		mStrongRefTable.Init(state, "UNIVERSAL_STRONGREF_TABLE");
+		mWeakRefTable.Init(state, "UNIVERSAL_WEAKREF_TABLE", "v");
 	}
 
 	lua_State* VM::CreateThread()