Skip to content

Commit 7fa0353

Browse files
author
nitrocaster
committed
Luabind 0.9 adaptation.
1 parent 64b4fef commit 7fa0353

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+526
-719
lines changed

‎src/Layers/xrRender/ResourceManager_Scripting.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#include "stdafx.h"
22
#pragma hdrstop
33

4-
#include <lua/library_linkage.h>
5-
64
#include "xrEngine/Render.h"
75
#include "ResourceManager.h"
86
#include "tss.h"
@@ -264,7 +262,7 @@ ShaderElement* CBlender_Compile::_lua_Compile (LPCSTR namesp, LPCSTR name)
264262
LPCSTR t_1 = (L_textures.size() > 1) ? *L_textures[1] : "null";
265263
LPCSTR t_d = detail_texture ? detail_texture : "null" ;
266264
object shader = RImplementation.Resources->ScriptEngine.name_space(namesp);
267-
functor<void> element = object_cast<functor<void> >(shader[name]);
265+
functor<void> element = shader[name];
268266
adopt_compiler ac = adopt_compiler(this);
269267
element (ac,t_0,t_1,t_d);
270268
r_End ();

‎src/Layers/xrRenderDX10/dx10ResourceManager_Scripting.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ ShaderElement* CBlender_Compile::_lua_Compile (LPCSTR namesp, LPCSTR name)
349349
LPCSTR t_1 = (L_textures.size() > 1) ? *L_textures[1] : "null";
350350
LPCSTR t_d = detail_texture ? detail_texture : "null" ;
351351
object shader = RImplementation.Resources->ScriptEngine.name_space(namesp);
352-
functor<void> element = object_cast<functor<void> >(shader[name]);
352+
functor<void> element = shader[name];
353353
bool bFirstPass = false;
354354
adopt_compiler ac = adopt_compiler(this, bFirstPass);
355355
element (ac,t_0,t_1,t_d);

‎src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<ClCompile>
7979
<Optimization>Disabled</Optimization>
8080
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
81-
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82-
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81+
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;$(XRAY_16X_LIBS)luajit\src;$(XRAY_16X_LIBS)luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<PreprocessorDefinitions>LUABIND_DYNAMIC_LINK;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8383
<MinimalRebuild>true</MinimalRebuild>
8484
<ExceptionHandling>Sync</ExceptionHandling>
8585
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,9 +95,9 @@
9595
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
9696
</ClCompile>
9797
<Link>
98-
<AdditionalDependencies>nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
98+
<AdditionalDependencies>lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
9999
<SuppressStartupBanner>true</SuppressStartupBanner>
100-
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100+
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;$(XRAY_16X_LIBS)luajit\bin\$(PlatformShortName);$(XRAY_16X_LIBS)luabind\bin\$(PlatformShortName)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
101101
<GenerateDebugInformation>true</GenerateDebugInformation>
102102
<SubSystem>Windows</SubSystem>
103103
<LargeAddressAware>true</LargeAddressAware>
@@ -116,8 +116,8 @@
116116
<OmitFramePointers>true</OmitFramePointers>
117117
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
118118
<WholeProgramOptimization>true</WholeProgramOptimization>
119-
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
120-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
119+
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;$(XRAY_16X_LIBS)luajit\src;$(XRAY_16X_LIBS)luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
120+
<PreprocessorDefinitions>LUABIND_DYNAMIC_LINK;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121121
<StringPooling>true</StringPooling>
122122
<ExceptionHandling />
123123
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -133,8 +133,8 @@
133133
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
134134
</ClCompile>
135135
<Link>
136-
<AdditionalDependencies>nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
137-
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
136+
<AdditionalDependencies>lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
137+
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;$(XRAY_16X_LIBS)luajit\bin\$(PlatformShortName);$(XRAY_16X_LIBS)luabind\bin\$(PlatformShortName)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
138138
<GenerateDebugInformation>true</GenerateDebugInformation>
139139
<SubSystem>NotSet</SubSystem>
140140
<LargeAddressAware>true</LargeAddressAware>
@@ -155,8 +155,8 @@
155155
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
156156
<OmitFramePointers>false</OmitFramePointers>
157157
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
158-
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
159-
<PreprocessorDefinitions>MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
158+
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;$(XRAY_16X_LIBS)luajit\src;$(XRAY_16X_LIBS)luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
159+
<PreprocessorDefinitions>LUABIND_DYNAMIC_LINK;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R1_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160160
<StringPooling>true</StringPooling>
161161
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
162162
<BufferSecurityCheck>true</BufferSecurityCheck>
@@ -170,8 +170,8 @@
170170
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
171171
</ClCompile>
172172
<Link>
173-
<AdditionalDependencies>nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
174-
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
173+
<AdditionalDependencies>lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
174+
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;$(XRAY_16X_LIBS)luajit\bin\$(PlatformShortName);$(XRAY_16X_LIBS)luabind\bin\$(PlatformShortName)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
175175
<GenerateDebugInformation>true</GenerateDebugInformation>
176176
<SubSystem>Windows</SubSystem>
177177
<LargeAddressAware>true</LargeAddressAware>

‎src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<ClCompile>
7979
<Optimization>Disabled</Optimization>
8080
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
81-
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82-
<PreprocessorDefinitions>WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81+
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;$(XRAY_16X_LIBS)luajit\src;$(XRAY_16X_LIBS)luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<PreprocessorDefinitions>LUABIND_DYNAMIC_LINK;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;USE_RESOURCE_DEBUGGER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8383
<MinimalRebuild>true</MinimalRebuild>
8484
<ExceptionHandling>Sync</ExceptionHandling>
8585
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,9 +95,9 @@
9595
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
9696
</ClCompile>
9797
<Link>
98-
<AdditionalDependencies>nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
98+
<AdditionalDependencies>lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
9999
<SuppressStartupBanner>true</SuppressStartupBanner>
100-
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
100+
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;$(XRAY_16X_LIBS)luajit\bin\$(PlatformShortName);$(XRAY_16X_LIBS)luabind\bin\$(PlatformShortName)\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
101101
<GenerateDebugInformation>true</GenerateDebugInformation>
102102
<SubSystem>Windows</SubSystem>
103103
<LargeAddressAware>true</LargeAddressAware>
@@ -115,8 +115,8 @@
115115
<OmitFramePointers>true</OmitFramePointers>
116116
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
117117
<WholeProgramOptimization>true</WholeProgramOptimization>
118-
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119-
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;$(XRAY_16X_LIBS)luajit\src;$(XRAY_16X_LIBS)luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
119+
<PreprocessorDefinitions>LUABIND_DYNAMIC_LINK;WIN32;NDEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
120120
<StringPooling>true</StringPooling>
121121
<ExceptionHandling />
122122
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -132,8 +132,8 @@
132132
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
133133
</ClCompile>
134134
<Link>
135-
<AdditionalDependencies>nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
136-
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
135+
<AdditionalDependencies>lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
136+
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;$(XRAY_16X_LIBS)luajit\bin\$(PlatformShortName);$(XRAY_16X_LIBS)luabind\bin\$(PlatformShortName)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
137137
<GenerateDebugInformation>true</GenerateDebugInformation>
138138
<SubSystem>NotSet</SubSystem>
139139
<LargeAddressAware>true</LargeAddressAware>
@@ -153,8 +153,8 @@
153153
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
154154
<OmitFramePointers>false</OmitFramePointers>
155155
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
156-
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
157-
<PreprocessorDefinitions>MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
156+
<AdditionalIncludeDirectories>.;$(SolutionDir);$(xrSdkDir)include;$(XRAY_16X_LIBS)OpenAutomate\inc;$(XRAY_16X_LIBS)nvapi;$(DXSDK_DIR)Include;$(XRAY_16X_LIBS)luajit\src;$(XRAY_16X_LIBS)luabind;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
157+
<PreprocessorDefinitions>LUABIND_DYNAMIC_LINK;MIXED;WIN32;DEBUG;_WINDOWS;_USRDLL;XRRENDER_R2_EXPORTS;_SECURE_SCL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
158158
<StringPooling>true</StringPooling>
159159
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
160160
<BufferSecurityCheck>true</BufferSecurityCheck>
@@ -168,8 +168,8 @@
168168
<AdditionalOptions>-Zm150 %(AdditionalOptions)</AdditionalOptions>
169169
</ClCompile>
170170
<Link>
171-
<AdditionalDependencies>nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
172-
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
171+
<AdditionalDependencies>lua51.lib;luabind.lib;nvapi.lib;oalib.lib;%(AdditionalDependencies)</AdditionalDependencies>
172+
<AdditionalLibraryDirectories>$(xrSdkDir)libraries;$(xrLibDir);$(DXSDK_DIR)Lib\x86;$(XRAY_16X_LIBS)OpenAutomate\libraries;$(XRAY_16X_LIBS)nvapi\x86;$(XRAY_16X_LIBS)luajit\bin\$(PlatformShortName);$(XRAY_16X_LIBS)luabind\bin\$(PlatformShortName)\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
173173
<GenerateDebugInformation>true</GenerateDebugInformation>
174174
<SubSystem>Windows</SubSystem>
175175
<LargeAddressAware>true</LargeAddressAware>

0 commit comments

Comments
 (0)