diff options
-rw-r--r-- | Data/Scripts/EditorApplication.lua | 2 | ||||
-rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj | 2 | ||||
-rw-r--r-- | Projects/VisualStudio/Editor/Editor.vcxproj.filters | 6 | ||||
-rw-r--r-- | Runtime/Lua/LuaBind/LuaBindUtility.h | 5 | ||||
-rw-r--r-- | Runtime/Math/Matrix44.cpp | 0 | ||||
-rw-r--r-- | Runtime/Math/Matrix44.h | 9 |
6 files changed, 22 insertions, 2 deletions
diff --git a/Data/Scripts/EditorApplication.lua b/Data/Scripts/EditorApplication.lua index cc31d3e..a233d88 100644 --- a/Data/Scripts/EditorApplication.lua +++ b/Data/Scripts/EditorApplication.lua @@ -156,7 +156,7 @@ FSH_END ]] -local shader = Rendering.Shader.New(glsl, false) +local shader = Rendering.Shader.New(glsl) while true do diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj index 5d1a70a..ed406b2 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj +++ b/Projects/VisualStudio/Editor/Editor.vcxproj @@ -207,6 +207,7 @@ <ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindVM.cpp" />
<ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindWatchDog.cpp" />
<ClCompile Include="..\..\..\Runtime\Lua\LuaHelper.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Math\Matrix44.cpp" />
<ClCompile Include="..\..\..\Runtime\Math\Vector2.cpp" />
<ClCompile Include="..\..\..\Runtime\Math\Vector3.cpp" />
<ClCompile Include="..\..\..\Runtime\Profiling\FrameStats.cpp" />
@@ -297,6 +298,7 @@ <ClInclude Include="..\..\..\Runtime\Lua\LuaHelper.h" />
<ClInclude Include="..\..\..\Runtime\Math\AABB.h" />
<ClInclude Include="..\..\..\Runtime\Math\FloatConversion.h" />
+ <ClInclude Include="..\..\..\Runtime\Math\Matrix44.h" />
<ClInclude Include="..\..\..\Runtime\Math\Rect.h" />
<ClInclude Include="..\..\..\Runtime\Math\Vector2.h" />
<ClInclude Include="..\..\..\Runtime\Math\Vector3.h" />
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters index 81d6612..2614d08 100644 --- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters +++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters @@ -372,6 +372,9 @@ <ClCompile Include="..\..\..\Runtime\Graphics\UIQuad.cpp">
<Filter>Runtime\Graphics</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Math\Matrix44.cpp">
+ <Filter>Runtime\Math</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Editor\GUI\Dock.h">
@@ -629,6 +632,9 @@ <ClInclude Include="..\..\..\Runtime\Utilities\DynamicArray.h">
<Filter>Runtime\Utilities</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Math\Matrix44.h">
+ <Filter>Runtime\Math</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc">
diff --git a/Runtime/Lua/LuaBind/LuaBindUtility.h b/Runtime/Lua/LuaBind/LuaBindUtility.h index c5807c1..b890b57 100644 --- a/Runtime/Lua/LuaBind/LuaBindUtility.h +++ b/Runtime/Lua/LuaBind/LuaBindUtility.h @@ -48,7 +48,10 @@ T* self = state.GetUserdata<T>(1); #define LUA_BIND_CHECK(L, params)\ - if(!state.CheckParams(1, params)) return 0 + if(!state.CheckParams(1, params)) {\ + luaL_error(state, "Unexcepted parameters.");\ + return 0;\ + } #define LUA_BIND_INHERIT(state, type) type::RegisterClass(state) diff --git a/Runtime/Math/Matrix44.cpp b/Runtime/Math/Matrix44.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Runtime/Math/Matrix44.cpp diff --git a/Runtime/Math/Matrix44.h b/Runtime/Math/Matrix44.h new file mode 100644 index 0000000..1ec92fd --- /dev/null +++ b/Runtime/Math/Matrix44.h @@ -0,0 +1,9 @@ +#pragma once + +namespace Internal +{ + class Matrix44 + { + + }; +} |