Browse Source

The sample works now.

Changed Element:AsType function to Element.As table.
Nate Starkey 13 years ago
parent
commit
3eabea960b

+ 3 - 3
Build/RocketControlsLua.vcproj

@@ -305,15 +305,15 @@
 			</Filter>
 		</Filter>
 		<File
-			RelativePath="..\Source\Controls\Lua\Controls.cpp"
+			RelativePath="..\Source\Controls\Lua\As.h"
 			>
 		</File>
 		<File
-			RelativePath="..\Include\Rocket\Controls\Lua\Controls.h"
+			RelativePath="..\Source\Controls\Lua\Controls.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\Include\Rocket\Core\Lua\Header.h"
+			RelativePath="..\Include\Rocket\Controls\Lua\Controls.h"
 			>
 		</File>
 		<File

+ 1 - 9
Build/RocketCoreLua.vcproj

@@ -212,16 +212,8 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Source\Core\Lua\LuaType.inl"
+				RelativePath="..\Include\Rocket\Core\Lua\LuaType.inl"
 				>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\Source\Core\Lua\Rocket.cpp"

+ 2 - 2
Include/Rocket/Core/Lua/Header.h

@@ -25,8 +25,8 @@
  *
  */
  
-#ifndef ROCKETLUAHEADER_H
-#define ROCKETLUAHEADER_H
+#ifndef ROCKETCORELUAHEADER_H
+#define ROCKETCORELUAHEADER_H
 
 #include <Rocket/Core/Platform.h>
 

+ 2 - 1
Include/Rocket/Core/Lua/LuaType.h

@@ -114,7 +114,8 @@ template<typename T> ROCKETLUA_API bool IsReferenceCounted();
 //to call _regfunctions<superclass>, where method is metatable_index - 1. Anything
 //that has the same name in the subclass will be overwrite whatever had the 
 //same name in the superclass.
-template<typename T> ROCKETLUA_API void ExtraInit(lua_State* L, int metatable_index) { return; }
+template<typename T> ROCKETLUA_API void ExtraInit(lua_State* L, int metatable_index);
+//template<typename T> void ExtraInit(lua_State* L, int metatable_index) { return; }
 
 template<typename T>
 class ROCKETLUA_API LuaType

+ 1 - 1
Source/Core/Lua/LuaType.inl → Include/Rocket/Core/Lua/LuaType.inl

@@ -25,7 +25,7 @@
  *
  */
  
-#include "precompiled.h"
+//#include "precompiled.h"
 #include <Rocket/Controls/Controls.h>
 #include <Rocket/Core/Core.h>
 #include <Rocket/Core/Lua/Utilities.h>

+ 4 - 3
Samples/luainvaders/PyRocketInvaders.vcproj

@@ -4,6 +4,7 @@
 	Version="9.00"
 	Name="LuaRocketInvaders"
 	ProjectGUID="{D343E357-BF62-424F-B22A-16D7B8A6422B}"
+	RootNamespace="LuaRocketInvaders"
 	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
@@ -54,7 +55,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="RocketCore_d.lib RocketDebugger_d.lib RocketControls_d.lib opengl32.lib RocketLua_d.lib lua51.lib"
+				AdditionalDependencies="RocketCore_d.lib RocketDebugger_d.lib RocketControls_d.lib opengl32.lib RocketCoreLua_d.lib RocketControlsLua_d.lib lua51.lib"
 				OutputFile="..\..\bin\$(ProjectName)_d.exe"
 				AdditionalLibraryDirectories="..\..\bin;..\..\..\support\lib"
 				GenerateDebugInformation="true"
@@ -108,7 +109,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\shell\include;..\..\include;..\..\..\support\python\include;..\..\..\support\python\pc;..\..\..\support\boost;..\..\Dependencies\lua\src"
-				PreprocessorDefinitions="WIN32"
+				PreprocessorDefinitions="WIN32,NDEBUG"
 				RuntimeLibrary="2"
 				WarningLevel="3"
 				DebugInformationFormat="3"
@@ -124,7 +125,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="RocketCore.lib RocketDebugger.lib RocketControls.lib opengl32.lib RocketLua.lib lua51.lib"
+				AdditionalDependencies="RocketCore.lib RocketDebugger.lib RocketControls.lib opengl32.lib RocketCoreLua.lib RocketControlsLua.lib lua51.lib"
 				OutputFile="..\..\bin\$(ProjectName).exe"
 				AdditionalLibraryDirectories="..\..\bin;..\..\..\support\lib"
 				GenerateDebugInformation="true"

+ 2 - 1
Samples/luainvaders/data/high_score.rml

@@ -58,7 +58,8 @@ end
 	
 function HighScore.OnKeyDown(event)
 	if event.parameters['key_identifier'] == rocket.key_identifier.RETURN then
-		Game.SetHighScoreName(event.current_element:AsType(Element.etype.input).value)
+        Game.SetHighScoreName(Element.As.ElementFormControlInput(event.current_element).value)
+		--Game.SetHighScoreName(event.current_element:AsType(Element.etype.input).value)
     end
 end
 		</script>

+ 4 - 4
Samples/luainvaders/data/options.rml

@@ -62,12 +62,12 @@ end
 function Options.LoadOptions(document)
     local options = Options.Deserialize('options.dat')
     if options == nil then return end --short circuit if the file doesn't exist
-    local type = Element.etype
+    local AsInput = Element.As.ElementFormControlInput
     
-    document:GetElementById(options['graphics']):AsType(type.input).checked = true
+    AsInput(document:GetElementById(options['graphics'])).checked = true
     --because everything is loaded as a string, we have to fool around with the boolean variables
-    document:GetElementById('reverb'):AsType(type.input).checked = (options['reverb'] == 'true')
-    document:GetElementById('3d'):AsType(type.input).checked = (options['3d'] == 'true')
+    AsInput(document:GetElementById('reverb')).checked = (options['reverb'] == 'true')
+    AsInput(document:GetElementById('3d')).checked = (options['3d'] == 'true')
 end
 
 function Options.SaveOptions(event)

+ 2 - 0
Samples/luainvaders/src/main.cpp

@@ -37,6 +37,7 @@
 #include "ElementGame.h"
 #include "HighScores.h"
 #include <Rocket/Core/Lua/Interpreter.h>
+#include <Rocket/Controls/Lua/Controls.h>
 #include "LuaInterface.h"
 
 Rocket::Core::Context* context = NULL;
@@ -93,6 +94,7 @@ int main(int, char**)
 	// Initialise the Python interface.
 	//PythonInterface::Initialise((Shell::GetExecutablePath() + (APP_PATH "python") + PATH_SEPARATOR + Shell::GetExecutablePath() + ROCKET_PATH).CString());
     Rocket::Core::Lua::Interpreter::Initialise();
+    Rocket::Controls::Lua::RegisterTypes(Rocket::Core::Lua::Interpreter::GetLuaState());
 
 	// Create the main Rocket context and set it on the shell's input layer.
 	context = Rocket::Core::CreateContext("main", Rocket::Core::Vector2i(1024, 768));

+ 72 - 0
Source/Controls/Lua/As.h

@@ -0,0 +1,72 @@
+/*
+ * This source file is part of libRocket, the HTML/CSS Interface Middleware
+ *
+ * For the latest information, see http://www.librocket.com
+ *
+ * Copyright (c) 2008-2010 CodePoint Ltd, Shift Technology Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ */
+ 
+#ifndef ROCKETCONTROLSLUAAS_H
+#define ROCKETCONTROLSLUAAS_H
+/*
+    These are helper functions to fill up the Element.As table with types that are able to be casted
+*/
+
+#include <Rocket/Core/Lua/LuaType.h>
+#include <Rocket/Core/Lua/lua.hpp>
+#include <Rocket/Core/Element.h>
+
+namespace Rocket {
+namespace Controls {
+namespace Lua {
+
+//Helper function for the controls, so that the types don't have to define individual functions themselves
+// to fill the Elements.As table
+template<typename ToType>
+int CastFromElementTo(lua_State* L)
+{
+    Rocket::Core::Element* ele = Rocket::Core::Lua::LuaType<Rocket::Core::Element>::check(L,1);
+    LUACHECKOBJ(ele);
+    Rocket::Core::Lua::LuaType<ToType>::push(L,(ToType*)ele,false);
+    return 1;
+}
+
+//Adds to the Element.As table the name of the type, and the function to use to cast
+template<typename T>
+void AddCastFunctionToElementAsTable(lua_State* L)
+{
+    int top = lua_gettop(L);
+    lua_getglobal(L,"Element");
+    lua_getfield(L,-1,"As");
+    if(!lua_isnoneornil(L,-1))
+    {
+        lua_pushcfunction(L,Rocket::Controls::Lua::CastFromElementTo<T>);
+        lua_setfield(L,-2,Rocket::Core::Lua::GetTClassName<T>());
+    }
+    lua_settop(L,top); //pop "As" and "Element"
+}
+
+}
+}
+}
+
+#endif

+ 1 - 0
Source/Controls/Lua/DataSource.cpp

@@ -30,6 +30,7 @@
 #include <Rocket/Core/Log.h>
 
 using Rocket::Core::Log;
+template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::Lua::LuaDataSource>(lua_State* L, int metatable_index) { return; }
 namespace Rocket {
 namespace Controls {
 namespace Lua {

+ 1 - 1
Source/Controls/Lua/DataSource.h

@@ -49,7 +49,7 @@
 #include "LuaDataSource.h"
 
 using Rocket::Core::Lua::LuaType;
-
+template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::Lua::LuaDataSource>(lua_State* L, int metatable_index);
 namespace Rocket {
 namespace Controls {
 namespace Lua {

+ 3 - 0
Source/Controls/Lua/ElementDataGrid.cpp

@@ -29,11 +29,14 @@
 #include "ElementDataGrid.h"
 #include <Rocket/Core/Element.h>
 #include <Rocket/Controls/ElementDataGridRow.h>
+//#include "Lua/Element.h"
+#include "As.h"
 
 template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementDataGrid>(lua_State* L, int metatable_index)
 {
     Rocket::Core::Lua::ExtraInit<Rocket::Core::Element>(L,metatable_index);
     LuaType<Rocket::Core::Element>::_regfunctions(L,metatable_index,metatable_index-1);
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementDataGrid>(L);
 }
 namespace Rocket {
 namespace Controls {

+ 2 - 0
Source/Controls/Lua/ElementDataGridRow.cpp

@@ -28,11 +28,13 @@
 #include "precompiled.h"
 #include "ElementDataGridRow.h"
 #include <Rocket/Controls/ElementDataGrid.h>
+#include "As.h"
 
 template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementDataGridRow>(lua_State* L, int metatable_index)
 {
     Rocket::Core::Lua::ExtraInit<Rocket::Core::Element>(L,metatable_index);
     LuaType<Rocket::Core::Element>::_regfunctions(L,metatable_index,metatable_index-1);
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementDataGridRow>(L);
 }
 
 namespace Rocket {

+ 3 - 0
Source/Controls/Lua/ElementForm.cpp

@@ -29,12 +29,15 @@
 #include "ElementForm.h"
 #include <Rocket/Core/Element.h>
 #include <Rocket/Controls/ElementForm.h>
+#include "As.h"
 
 template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementForm>(lua_State* L, int metatable_index)
 {
     //inherit from Element
     Rocket::Core::Lua::ExtraInit<Rocket::Core::Element>(L,metatable_index);
     LuaType<Rocket::Core::Element>::_regfunctions(L,metatable_index,metatable_index-1);
+
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementForm>(L);
 }
 
 namespace Rocket {

+ 0 - 1
Source/Controls/Lua/ElementForm.h

@@ -48,7 +48,6 @@ namespace Rocket {
 namespace Controls {
 namespace Lua {
 
-
 //method
 int ElementFormSubmit(lua_State* L, ElementForm* obj);
 

+ 2 - 0
Source/Controls/Lua/ElementFormControl.cpp

@@ -30,11 +30,13 @@
 #include <Rocket/Controls/ElementFormControl.h>
 #include <Rocket/Core/Element.h>
 #include "Lua/Element.h"
+#include "As.h"
 
 template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormControl>(lua_State* L, int metatable_index)
 {
     Rocket::Core::Lua::ExtraInit<Rocket::Core::Element>(L,metatable_index);
     LuaType<Rocket::Core::Element>::_regfunctions(L,metatable_index,metatable_index-1);
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementFormControl>(L);
 }
 
 namespace Rocket {

+ 2 - 0
Source/Controls/Lua/ElementFormControlDataSelect.cpp

@@ -29,6 +29,7 @@
 #include "ElementFormControlDataSelect.h"
 #include <Rocket/Controls/ElementFormControlSelect.h>
 #include "ElementFormControlSelect.h"
+#include "As.h"
 
 //inherits from ElementFormControl which inherits from Element
 template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormControlDataSelect>(lua_State* L, int metatable_index)
@@ -37,6 +38,7 @@ template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormContro
     Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormControlSelect>(L,metatable_index);
     //then inherit from ElementFromControlSelect
     LuaType<Rocket::Controls::ElementFormControlSelect>::_regfunctions(L,metatable_index,metatable_index-1);
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementFormControlDataSelect>(L);
 }
 
 namespace Rocket {

+ 2 - 1
Source/Controls/Lua/ElementFormControlInput.cpp

@@ -29,12 +29,13 @@
 #include "ElementFormControlInput.h"
 #include <Rocket/Controls/ElementFormControl.h>
 #include "ElementFormControl.h"
+#include "As.h"
 
 template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormControlInput>(lua_State* L, int metatable_index)
 {
     Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormControl>(L,metatable_index);
     LuaType<Rocket::Controls::ElementFormControl>::_regfunctions(L,metatable_index,metatable_index-1);
-
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementFormControlInput>(L);
 }
 namespace Rocket {
 namespace Controls {

+ 2 - 1
Source/Controls/Lua/ElementFormControlSelect.cpp

@@ -32,6 +32,7 @@
 #include <Rocket/Controls/ElementFormControl.h>
 #include <Rocket/Core/Element.h>
 #include "ElementFormControl.h"
+#include "As.h"
 
 
 //inherits from ElementFormControl which inherits from Element
@@ -41,7 +42,7 @@ template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormContro
     Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormControl>(L,metatable_index);
     //then inherit from elementformcontrol
     LuaType<Rocket::Controls::ElementFormControl>::_regfunctions(L,metatable_index,metatable_index-1);
-
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementFormControlSelect>(L);
 }
 
 namespace Rocket {

+ 2 - 0
Source/Controls/Lua/ElementFormControlTextArea.cpp

@@ -29,11 +29,13 @@
 #include "ElementFormControlTextArea.h"
 #include <Rocket/Controls/ElementFormControl.h>
 #include "ElementFormControl.h"
+#include "As.h"
 
 template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormControlTextArea>(lua_State* L, int metatable_index)
 {
     Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementFormControl>(L,metatable_index);
     LuaType<Rocket::Controls::ElementFormControl>::_regfunctions(L,metatable_index,metatable_index-1);
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementFormControlTextArea>(L);
 }
 
 namespace Rocket {

+ 2 - 0
Source/Controls/Lua/ElementTabSet.cpp

@@ -28,12 +28,14 @@
 #include "precompiled.h"
 #include "ElementTabSet.h"
 #include <Rocket/Core/Element.h>
+#include "As.h"
 
 //this will be used to "inherit" from Element
 template<> void Rocket::Core::Lua::ExtraInit<Rocket::Controls::ElementTabSet>(lua_State* L, int metatable_index)
 {
     Rocket::Core::Lua::ExtraInit<Rocket::Core::Element>(L,metatable_index);
     LuaType<Rocket::Core::Element>::_regfunctions(L,metatable_index,metatable_index-1);
+    Rocket::Controls::Lua::AddCastFunctionToElementAsTable<Rocket::Controls::ElementTabSet>(L);
 }
 
 namespace Rocket {

+ 1 - 0
Source/Core/Lua/Context.cpp

@@ -37,6 +37,7 @@ namespace Rocket {
 namespace Core {
 namespace Lua {
 typedef Rocket::Core::ElementDocument Document;
+template<> void ExtraInit<Context>(lua_State* L, int metatable_index) { return; }
 
 //methods
 int ContextAddEventListener(lua_State* L, Context* obj)

+ 1 - 0
Source/Core/Lua/Context.h

@@ -72,6 +72,7 @@
 namespace Rocket {
 namespace Core {
 namespace Lua {
+template<> void ExtraInit<Context>(lua_State* L, int metatable_index);
 
 //methods
 int ContextAddEventListener(lua_State* L, Context* obj);

+ 8 - 20
Source/Core/Lua/Element.cpp

@@ -41,26 +41,14 @@ typedef ElementDocument Document;
 template<> void ExtraInit<Element>(lua_State* L, int metatable_index)
 {
     int top = lua_gettop(L);
-    //build the Element.etype table
-    lua_newtable(L);
-    lua_pushinteger(L,TDATAGRID);
-    lua_setfield(L,-2,"datagrid");
-    lua_pushinteger(L,TDATASELECT);
-    lua_setfield(L,-2,"dataselect");
-    lua_pushinteger(L,TELEMENT);
-    lua_setfield(L,-2,"element");
-    lua_pushinteger(L,TFORM);
-    lua_setfield(L,-2,"form");
-    lua_pushinteger(L,TINPUT);
-    lua_setfield(L,-2,"input");
-    lua_pushinteger(L,TSELECT);
-    lua_setfield(L,-2,"select");
-    lua_pushinteger(L,TTABSET);
-    lua_setfield(L,-2,"tabset");
-    lua_pushinteger(L,TTEXTAREA);
-    lua_setfield(L,-2,"textarea");
-    
-    lua_setfield(L,metatable_index-1,"etype");
+    //guarantee the "Element.As" table exists
+    lua_getfield(L,metatable_index-1,"As");
+    if(lua_isnoneornil(L,-1)) //if it doesn't exist, create it
+    {
+        lua_newtable(L);    
+        lua_setfield(L,metatable_index-1,"As");
+    }
+    lua_pop(L,1); //pop the result of lua_getfield
     lua_settop(L,top);
 }
 

+ 5 - 10
Source/Core/Lua/Element.h

@@ -59,7 +59,7 @@
     noreturn Element:ScrollIntoView(bool align_with_top)
     noreturn Element:SetAttribute(string name,string value)
     noreturn Element:SetClass(string name, bool activate)
-    type_specified Element:AsType(Element.etype) --see footnote 2. Yes, that 'e' is supposed to be there.
+    %type% Element.As.%type%(Element obj) --see footnote 2
 
 
     //getters accessed by the period syntax from an element object
@@ -112,10 +112,9 @@
     They are terrible names, but it is to make a point.
 
 
-    footnote 2: For Element:AsType(Element.etype)
-    Element.etype is an enum that maps strings to integers. It can be one of the following:
-    datagrid,dataselect,element,form,input,select,tabset,textarea
-    If you give it a bad parameter, it will return an Element type
+    footnote 2: For Element.As     used for casting an Element object to a more derived class.
+    If you are using RocketControls, it will be filled with those types. For instance, you would say
+    local input_element = Element.As.ElementFormControlInput(element) --where element is an Element object
 */
 #include <Rocket/Core/Lua/LuaType.h>
 #include <Rocket/Core/Lua/lua.hpp>
@@ -124,11 +123,7 @@
 namespace Rocket {
 namespace Core {
 namespace Lua {
-enum Elementetype
-{
-    TDATAGRID = 0, TDATASELECT, TELEMENT, TFORM, TINPUT, TSELECT, TTABSET, TTEXTAREA
-};
-template<> void ExtraInit<Element>(lua_State* L, int metatable_index);
+template<> ROCKETLUA_API void ExtraInit<Element>(lua_State* L, int metatable_index);
 
 
 //methods

+ 1 - 0
Source/Core/Lua/Event.cpp

@@ -37,6 +37,7 @@
 namespace Rocket {
 namespace Core {
 namespace Lua {
+template<> void ExtraInit<Event>(lua_State* L, int metatable_index) { return; }
 
 //method
 int EventStopPropagation(lua_State* L, Event* obj)

+ 1 - 1
Source/Core/Lua/Event.h

@@ -48,7 +48,7 @@
 namespace Rocket {
 namespace Core {
 namespace Lua {
-
+template<> void ExtraInit<Event>(lua_State* L, int metatable_index);
 //method
 int EventStopPropagation(lua_State* L, Event* obj);
 

+ 2 - 14
Source/Core/Lua/Interpreter.cpp

@@ -48,6 +48,8 @@
 #include "Colourf.h"
 #include "Vector2f.h"
 #include "Vector2i.h"
+#include "Context.h"
+#include "Event.h"
 
 namespace Rocket {
 namespace Core {
@@ -78,22 +80,8 @@ void Interpreter::RegisterEverything(lua_State* L)
     LuaType<Element>::Register(L);
         //things that inherit from Element
         LuaType<Document>::Register(L);
-        /*
-        //controls that inherit from Element
-        LuaType<Rocket::Controls::ElementTabSet>::Register(L);
-        LuaType<Rocket::Controls::ElementDataGrid>::Register(L);
-        LuaType<Rocket::Controls::ElementDataGridRow>::Register(L);
-        LuaType<Rocket::Controls::ElementForm>::Register(L);
-        LuaType<Rocket::Controls::ElementFormControl>::Register(L);
-            //inherits from ElementFormControl
-            LuaType<Rocket::Controls::ElementFormControlSelect>::Register(L);
-            LuaType<Rocket::Controls::ElementFormControlDataSelect>::Register(L);
-            LuaType<Rocket::Controls::ElementFormControlInput>::Register(L);
-            LuaType<Rocket::Controls::ElementFormControlTextArea>::Register(L);
-        */
     LuaType<Event>::Register(L);
     LuaType<Context>::Register(L);
-    //LuaType<DataFormatter>::Register(L);
     LuaType<rocket>::Register(L);
     //Proxy tables
     LuaType<ContextDocumentsProxy>::Register(L);

+ 0 - 0
Source/Core/Lua/LuaTypeTemplateSpec.inl