Skip to content

Commit

Permalink
Switch to luabind-deboostified.
Browse files Browse the repository at this point in the history
  • Loading branch information
nitrocaster committed Dec 4, 2015
1 parent 4fb2060 commit b94f18c
Show file tree
Hide file tree
Showing 46 changed files with 396 additions and 395 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "src/Externals/luabind"]
path = src/Externals/luabind
url = [email protected]:OpenXRay/luabind.git
url = [email protected]:OpenXRay/luabind-deboostified.git
[submodule "src/Externals/luajit"]
path = src/Externals/luajit
url = [email protected]:OpenXRay/LuaJIT.git
2 changes: 1 addition & 1 deletion src/Externals/luabind
Submodule luabind updated 210 files
61 changes: 31 additions & 30 deletions src/Layers/xrRender/ResourceManager_Scripting.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "luabind/return_reference_to_policy.hpp"

using namespace luabind;
using namespace luabind::policy;

#ifdef DEBUG
#define MDB Memory.dbg_check()
Expand Down Expand Up @@ -83,39 +84,39 @@ void CResourceManager::LS_Load ()
[
class_<adopt_sampler>("_sampler")
.def( constructor<const adopt_sampler&>())
.def("texture", &adopt_sampler::_texture ,return_reference_to(_1))
.def("project", &adopt_sampler::_projective ,return_reference_to(_1))
.def("clamp", &adopt_sampler::_clamp ,return_reference_to(_1))
.def("wrap", &adopt_sampler::_wrap ,return_reference_to(_1))
.def("mirror", &adopt_sampler::_mirror ,return_reference_to(_1))
.def("f_anisotropic", &adopt_sampler::_f_anisotropic ,return_reference_to(_1))
.def("f_trilinear", &adopt_sampler::_f_trilinear ,return_reference_to(_1))
.def("f_bilinear", &adopt_sampler::_f_bilinear ,return_reference_to(_1))
.def("f_linear", &adopt_sampler::_f_linear ,return_reference_to(_1))
.def("f_none", &adopt_sampler::_f_none ,return_reference_to(_1))
.def("fmin_none", &adopt_sampler::_fmin_none ,return_reference_to(_1))
.def("fmin_point", &adopt_sampler::_fmin_point ,return_reference_to(_1))
.def("fmin_linear", &adopt_sampler::_fmin_linear ,return_reference_to(_1))
.def("fmin_aniso", &adopt_sampler::_fmin_aniso ,return_reference_to(_1))
.def("fmip_none", &adopt_sampler::_fmip_none ,return_reference_to(_1))
.def("fmip_point", &adopt_sampler::_fmip_point ,return_reference_to(_1))
.def("fmip_linear", &adopt_sampler::_fmip_linear ,return_reference_to(_1))
.def("fmag_none", &adopt_sampler::_fmag_none ,return_reference_to(_1))
.def("fmag_point", &adopt_sampler::_fmag_point ,return_reference_to(_1))
.def("fmag_linear", &adopt_sampler::_fmag_linear ,return_reference_to(_1)),
.def("texture", &adopt_sampler::_texture ,return_reference_to<1>())
.def("project", &adopt_sampler::_projective ,return_reference_to<1>())
.def("clamp", &adopt_sampler::_clamp ,return_reference_to<1>())
.def("wrap", &adopt_sampler::_wrap ,return_reference_to<1>())
.def("mirror", &adopt_sampler::_mirror ,return_reference_to<1>())
.def("f_anisotropic", &adopt_sampler::_f_anisotropic ,return_reference_to<1>())
.def("f_trilinear", &adopt_sampler::_f_trilinear ,return_reference_to<1>())
.def("f_bilinear", &adopt_sampler::_f_bilinear ,return_reference_to<1>())
.def("f_linear", &adopt_sampler::_f_linear ,return_reference_to<1>())
.def("f_none", &adopt_sampler::_f_none ,return_reference_to<1>())
.def("fmin_none", &adopt_sampler::_fmin_none ,return_reference_to<1>())
.def("fmin_point", &adopt_sampler::_fmin_point ,return_reference_to<1>())
.def("fmin_linear", &adopt_sampler::_fmin_linear ,return_reference_to<1>())
.def("fmin_aniso", &adopt_sampler::_fmin_aniso ,return_reference_to<1>())
.def("fmip_none", &adopt_sampler::_fmip_none ,return_reference_to<1>())
.def("fmip_point", &adopt_sampler::_fmip_point ,return_reference_to<1>())
.def("fmip_linear", &adopt_sampler::_fmip_linear ,return_reference_to<1>())
.def("fmag_none", &adopt_sampler::_fmag_none ,return_reference_to<1>())
.def("fmag_point", &adopt_sampler::_fmag_point ,return_reference_to<1>())
.def("fmag_linear", &adopt_sampler::_fmag_linear ,return_reference_to<1>()),

class_<adopt_compiler>("_compiler")
.def( constructor<const adopt_compiler&>())
.def("begin", &adopt_compiler::_pass ,return_reference_to(_1))
.def("sorting", &adopt_compiler::_options ,return_reference_to(_1))
.def("emissive", &adopt_compiler::_o_emissive ,return_reference_to(_1))
.def("distort", &adopt_compiler::_o_distort ,return_reference_to(_1))
.def("wmark", &adopt_compiler::_o_wmark ,return_reference_to(_1))
.def("fog", &adopt_compiler::_fog ,return_reference_to(_1))
.def("zb", &adopt_compiler::_ZB ,return_reference_to(_1))
.def("blend", &adopt_compiler::_blend ,return_reference_to(_1))
.def("aref", &adopt_compiler::_aref ,return_reference_to(_1))
.def("color_write_enable", &adopt_compiler::_color_write_enable,return_reference_to(_1))
.def("begin", &adopt_compiler::_pass ,return_reference_to<1>())
.def("sorting", &adopt_compiler::_options ,return_reference_to<1>())
.def("emissive", &adopt_compiler::_o_emissive ,return_reference_to<1>())
.def("distort", &adopt_compiler::_o_distort ,return_reference_to<1>())
.def("wmark", &adopt_compiler::_o_wmark ,return_reference_to<1>())
.def("fog", &adopt_compiler::_fog ,return_reference_to<1>())
.def("zb", &adopt_compiler::_ZB ,return_reference_to<1>())
.def("blend", &adopt_compiler::_blend ,return_reference_to<1>())
.def("aref", &adopt_compiler::_aref ,return_reference_to<1>())
.def("color_write_enable", &adopt_compiler::_color_write_enable,return_reference_to<1>())
.def("sampler", &adopt_compiler::_sampler ), // returns sampler-object

class_<adopt_blend>("blend")
Expand Down
75 changes: 38 additions & 37 deletions src/Layers/xrRenderDX10/dx10ResourceManager_Scripting.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "luabind/return_reference_to_policy.hpp"

using namespace luabind;
using namespace luabind::policy;

#ifdef DEBUG
#define MDB Memory.dbg_check()
Expand Down Expand Up @@ -132,48 +133,48 @@ void CResourceManager::LS_Load ()


class_<adopt_dx10sampler>("_dx10sampler")
//.def("texture", &adopt_sampler::_texture ,return_reference_to(_1))
//.def("project", &adopt_sampler::_projective ,return_reference_to(_1))
//.def("clamp", &adopt_sampler::_clamp ,return_reference_to(_1))
//.def("wrap", &adopt_sampler::_wrap ,return_reference_to(_1))
//.def("mirror", &adopt_sampler::_mirror ,return_reference_to(_1))
//.def("f_anisotropic", &adopt_sampler::_f_anisotropic ,return_reference_to(_1))
//.def("f_trilinear", &adopt_sampler::_f_trilinear ,return_reference_to(_1))
//.def("f_bilinear", &adopt_sampler::_f_bilinear ,return_reference_to(_1))
//.def("f_linear", &adopt_sampler::_f_linear ,return_reference_to(_1))
//.def("f_none", &adopt_sampler::_f_none ,return_reference_to(_1))
//.def("fmin_none", &adopt_sampler::_fmin_none ,return_reference_to(_1))
//.def("fmin_point", &adopt_sampler::_fmin_point ,return_reference_to(_1))
//.def("fmin_linear", &adopt_sampler::_fmin_linear ,return_reference_to(_1))
//.def("fmin_aniso", &adopt_sampler::_fmin_aniso ,return_reference_to(_1))
//.def("fmip_none", &adopt_sampler::_fmip_none ,return_reference_to(_1))
//.def("fmip_point", &adopt_sampler::_fmip_point ,return_reference_to(_1))
//.def("fmip_linear", &adopt_sampler::_fmip_linear ,return_reference_to(_1))
//.def("fmag_none", &adopt_sampler::_fmag_none ,return_reference_to(_1))
//.def("fmag_point", &adopt_sampler::_fmag_point ,return_reference_to(_1))
//.def("fmag_linear", &adopt_sampler::_fmag_linear ,return_reference_to(_1))
//.def("texture", &adopt_sampler::_texture ,return_reference_to<1>())
//.def("project", &adopt_sampler::_projective ,return_reference_to<1>())
//.def("clamp", &adopt_sampler::_clamp ,return_reference_to<1>())
//.def("wrap", &adopt_sampler::_wrap ,return_reference_to<1>())
//.def("mirror", &adopt_sampler::_mirror ,return_reference_to<1>())
//.def("f_anisotropic", &adopt_sampler::_f_anisotropic ,return_reference_to<1>())
//.def("f_trilinear", &adopt_sampler::_f_trilinear ,return_reference_to<1>())
//.def("f_bilinear", &adopt_sampler::_f_bilinear ,return_reference_to<1>())
//.def("f_linear", &adopt_sampler::_f_linear ,return_reference_to<1>())
//.def("f_none", &adopt_sampler::_f_none ,return_reference_to<1>())
//.def("fmin_none", &adopt_sampler::_fmin_none ,return_reference_to<1>())
//.def("fmin_point", &adopt_sampler::_fmin_point ,return_reference_to<1>())
//.def("fmin_linear", &adopt_sampler::_fmin_linear ,return_reference_to<1>())
//.def("fmin_aniso", &adopt_sampler::_fmin_aniso ,return_reference_to<1>())
//.def("fmip_none", &adopt_sampler::_fmip_none ,return_reference_to<1>())
//.def("fmip_point", &adopt_sampler::_fmip_point ,return_reference_to<1>())
//.def("fmip_linear", &adopt_sampler::_fmip_linear ,return_reference_to<1>())
//.def("fmag_none", &adopt_sampler::_fmag_none ,return_reference_to<1>())
//.def("fmag_point", &adopt_sampler::_fmag_point ,return_reference_to<1>())
//.def("fmag_linear", &adopt_sampler::_fmag_linear ,return_reference_to<1>())
,

class_<adopt_compiler>("_compiler")
.def( constructor<const adopt_compiler&>())
.def("begin", &adopt_compiler::_pass ,return_reference_to(_1))
.def("begin", &adopt_compiler::_passgs ,return_reference_to(_1))
.def("sorting", &adopt_compiler::_options ,return_reference_to(_1))
.def("emissive", &adopt_compiler::_o_emissive ,return_reference_to(_1))
.def("distort", &adopt_compiler::_o_distort ,return_reference_to(_1))
.def("wmark", &adopt_compiler::_o_wmark ,return_reference_to(_1))
.def("fog", &adopt_compiler::_fog ,return_reference_to(_1))
.def("zb", &adopt_compiler::_ZB ,return_reference_to(_1))
.def("blend", &adopt_compiler::_blend ,return_reference_to(_1))
.def("aref", &adopt_compiler::_aref ,return_reference_to(_1))
.def("begin", &adopt_compiler::_pass ,return_reference_to<1>())
.def("begin", &adopt_compiler::_passgs ,return_reference_to<1>())
.def("sorting", &adopt_compiler::_options ,return_reference_to<1>())
.def("emissive", &adopt_compiler::_o_emissive ,return_reference_to<1>())
.def("distort", &adopt_compiler::_o_distort ,return_reference_to<1>())
.def("wmark", &adopt_compiler::_o_wmark ,return_reference_to<1>())
.def("fog", &adopt_compiler::_fog ,return_reference_to<1>())
.def("zb", &adopt_compiler::_ZB ,return_reference_to<1>())
.def("blend", &adopt_compiler::_blend ,return_reference_to<1>())
.def("aref", &adopt_compiler::_aref ,return_reference_to<1>())
// For compatibility only
.def("dx10color_write_enable", &adopt_compiler::_dx10color_write_enable,return_reference_to(_1))
.def("color_write_enable", &adopt_compiler::_dx10color_write_enable,return_reference_to(_1))
.def("dx10texture", &adopt_compiler::_dx10texture ,return_reference_to(_1))
.def("dx10stencil", &adopt_compiler::_dx10Stencil ,return_reference_to(_1))
.def("dx10stencil_ref", &adopt_compiler::_dx10StencilRef,return_reference_to(_1))
.def("dx10atoc", &adopt_compiler::_dx10ATOC ,return_reference_to(_1))
.def("dx10zfunc", &adopt_compiler::_dx10ZFunc ,return_reference_to(_1))
.def("dx10color_write_enable", &adopt_compiler::_dx10color_write_enable,return_reference_to<1>())
.def("color_write_enable", &adopt_compiler::_dx10color_write_enable,return_reference_to<1>())
.def("dx10texture", &adopt_compiler::_dx10texture ,return_reference_to<1>())
.def("dx10stencil", &adopt_compiler::_dx10Stencil ,return_reference_to<1>())
.def("dx10stencil_ref", &adopt_compiler::_dx10StencilRef,return_reference_to<1>())
.def("dx10atoc", &adopt_compiler::_dx10ATOC ,return_reference_to<1>())
.def("dx10zfunc", &adopt_compiler::_dx10ZFunc ,return_reference_to<1>())

.def("dx10sampler", &adopt_compiler::_dx10sampler ) // returns sampler-object
.def("dx10Options", &adopt_compiler::_dx10Options ), // returns options-object
Expand Down
14 changes: 7 additions & 7 deletions src/engine.sln
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24627.0
VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
EndProject
Expand Down Expand Up @@ -1110,14 +1110,14 @@ Global
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Debug|Win32.Build.0 = Debug|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Debug|x64.ActiveCfg = Debug|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Debug|x64.Build.0 = Debug|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed_Dedicated|Win32.ActiveCfg = Release|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed_Dedicated|Win32.Build.0 = Release|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed_Dedicated|x64.ActiveCfg = Release|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed_Dedicated|x64.Build.0 = Release|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed_Dedicated|Win32.ActiveCfg = Mixed|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed_Dedicated|Win32.Build.0 = Mixed|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed_Dedicated|x64.ActiveCfg = Mixed|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed_Dedicated|x64.Build.0 = Mixed|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed|Win32.ActiveCfg = Mixed|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed|Win32.Build.0 = Mixed|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed|x64.ActiveCfg = Release|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed|x64.Build.0 = Release|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed|x64.ActiveCfg = Mixed|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Mixed|x64.Build.0 = Mixed|x64
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Release_Dedicated|Win32.ActiveCfg = Release|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Release_Dedicated|Win32.Build.0 = Release|Win32
{CCD4AFAE-AA10-42C6-A452-FDEE497CCDF1}.Release_Dedicated|x64.ActiveCfg = Release|x64
Expand Down
5 changes: 3 additions & 2 deletions src/xrGame/account_manager_script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "xrScriptEngine/ScriptExporter.hpp"

using namespace luabind;
using namespace luabind::policy;
using namespace gamespy_gp;

SCRIPT_EXPORT(account_manager, (),
Expand All @@ -13,15 +14,15 @@ SCRIPT_EXPORT(account_manager, (),
.def("suggest_unique_nicks", &account_manager::suggest_unique_nicks)
.def("stop_suggest_unique_nicks", &account_manager::stop_suggest_unique_nicks)

.def("get_suggested_unicks", &account_manager::get_suggested_unicks, return_stl_iterator)
.def("get_suggested_unicks", &account_manager::get_suggested_unicks, return_stl_iterator())
.def("create_profile", &account_manager::create_profile)
.def("delete_profile", &account_manager::delete_profile)

.def("is_get_account_profiles_active", &account_manager::is_get_account_profiles_active)
.def("get_account_profiles", &account_manager::get_account_profiles)
.def("stop_fetching_account_profiles", &account_manager::stop_fetching_account_profiles)

.def("get_found_profiles", &account_manager::get_found_profiles, return_stl_iterator)
.def("get_found_profiles", &account_manager::get_found_profiles, return_stl_iterator())
.def("verify_unique_nick", &account_manager::verify_unique_nick)
.def("verify_email", &account_manager::verify_email)
.def("verify_password", &account_manager::verify_password)
Expand Down
2 changes: 1 addition & 1 deletion src/xrGame/action_base_script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ IC static void CScriptActionBase_Export(lua_State *luaState)
{
module(luaState)
[
class_<CScriptActionBase,CScriptActionWrapper>("action_base")
class_<CScriptActionBase, no_bases, default_holder, CScriptActionWrapper>("action_base")
.def_readonly("object", &CScriptActionBase::m_object)
.def_readonly("storage", &CScriptActionBase::m_storage)
.def( constructor<>())
Expand Down
3 changes: 2 additions & 1 deletion src/xrGame/action_planner_action_script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ IC static void CScriptActionPlannerAction_Export(lua_State *luaState)
{
module(luaState)
[
class_<CScriptActionPlannerAction,CScriptActionPlannerActionWrapper,bases<CScriptActionPlanner,CScriptActionBase> >("planner_action")
class_<CScriptActionPlannerAction, bases<CScriptActionPlanner, CScriptActionBase>,
default_holder, CScriptActionPlannerActionWrapper>("planner_action")
.def( constructor<>())
.def( constructor<CScriptGameObject*>())
.def( constructor<CScriptGameObject*,LPCSTR>())
Expand Down
7 changes: 4 additions & 3 deletions src/xrGame/action_planner_script.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "xrScriptEngine/ScriptExporter.hpp"

using namespace luabind;
using namespace luabind::policy;

void set_goal_world_state(CScriptActionPlanner *action_planner, CScriptActionPlanner::CState *world_state)
{
Expand All @@ -33,17 +34,17 @@ IC static void CScriptActionPlanner_Export(lua_State *luaState)
{
module(luaState)
[
class_<CScriptActionPlanner,CScriptActionPlannerWrapper>("action_planner")
class_<CScriptActionPlanner, no_bases, default_holder, CScriptActionPlannerWrapper>("action_planner")
.def_readonly("object", &CScriptActionPlanner::m_object)
.def_readonly("storage", &CScriptActionPlanner::m_storage)
.def( constructor<>())
.def("actual", &get_actual)
.def("setup", &CScriptActionPlanner::setup, &CScriptActionPlannerWrapper::setup_static)
.def("update", &CScriptActionPlanner::update, &CScriptActionPlannerWrapper::update_static)
.def("add_action", &CScriptActionPlanner::add_operator,adopt(_3))
.def("add_action", &CScriptActionPlanner::add_operator, adopt<3>())
.def("remove_action", (void (CScriptActionPlanner::*)(const CScriptActionPlanner::_edge_type &))(&CScriptActionPlanner::remove_operator))
.def("action", &CScriptActionPlanner::action)
.def("add_evaluator", &CScriptActionPlanner::add_evaluator,adopt(_3))
.def("add_evaluator", &CScriptActionPlanner::add_evaluator, adopt<3>())
.def("remove_evaluator", (void (CScriptActionPlanner::*)(const CScriptActionPlanner::_condition_type &))(&CScriptActionPlanner::remove_evaluator))
.def("evaluator", &CScriptActionPlanner::evaluator)
.def("current_action_id", &CScriptActionPlanner::current_action_id)
Expand Down
Loading

0 comments on commit b94f18c

Please sign in to comment.