Skip to content

Commit

Permalink
xrCore, xrRender, xrEngine, xrNetServer, xrPhysics, xrServerEntities:…
Browse files Browse the repository at this point in the history 
… replace delimiter to macros
  • Loading branch information
@eagleivg
eagleivg committed Oct 5, 2018
1 parent 168f1d4 commit 76d8518
Show file tree
Hide file tree
Showing 61 changed files with 316 additions and 316 deletions.
10 changes: 5 additions & 5 deletions src/Layers/xrRender/Blender_BmmD.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ CBlender_BmmD::CBlender_BmmD()
xr_strcpy(oT2_Name, "$null");
xr_strcpy(oT2_xform, "$null");
description.version = 3;
xr_strcpy(oR_Name, "detail\\detail_grnd_grass"); //"$null");
xr_strcpy(oG_Name, "detail\\detail_grnd_asphalt"); //"$null");
xr_strcpy(oB_Name, "detail\\detail_grnd_earth"); //"$null");
xr_strcpy(oA_Name, "detail\\detail_grnd_yantar"); //"$null");
xr_strcpy(oR_Name, "detail" DELIMITER "detail_grnd_grass"); //"$null");
xr_strcpy(oG_Name, "detail" DELIMITER "detail_grnd_asphalt"); //"$null");
xr_strcpy(oB_Name, "detail" DELIMITER "detail_grnd_earth"); //"$null");
xr_strcpy(oA_Name, "detail" DELIMITER "detail_grnd_yantar"); //"$null");
}

CBlender_BmmD::~CBlender_BmmD() {}
Expand Down Expand Up @@ -119,7 +119,7 @@ void CBlender_BmmD::Compile(CBlender_Compile& C)
case SE_R1_LSPOT:
C.r_Pass("impl_spot_dt", "add_spot_dt", FALSE, TRUE, FALSE, TRUE, D3DBLEND_ONE, D3DBLEND_ONE, TRUE);
C.r_Sampler("s_base", C.L_textures[0]);
C.r_Sampler_clf("s_lmap", "internal\\internal_light_att", true);
C.r_Sampler_clf("s_lmap", "internal" DELIMITER "internal_light_att", true);
C.r_Sampler_clf("s_att", TEX_SPOT_ATT);
C.r_Sampler("s_detail", oT2_Name);
C.r_End();
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/Blender_Lm(EbB).cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void CBlender_LmEbB::Compile(CBlender_Compile& C)
case SE_R1_LSPOT:
C.r_Pass("lmap_spot", "add_spot", FALSE, TRUE, FALSE, TRUE, D3DBLEND_ONE, D3DBLEND_ONE, TRUE);
C.r_Sampler("s_base", C.L_textures[0]);
C.r_Sampler_clf("s_lmap", "internal\\internal_light_att", true);
C.r_Sampler_clf("s_lmap", "internal" DELIMITER "internal_light_att", true);
C.r_Sampler_clf("s_att", TEX_SPOT_ATT);
C.r_End();
break;
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/Blender_Model_EbB.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void CBlender_Model_EbB::Compile(CBlender_Compile& C)
psname = "add_spot";
C.r_Pass(vsname, psname, FALSE, TRUE, FALSE, TRUE, D3DBLEND_ONE, D3DBLEND_ONE, TRUE);
C.r_Sampler("s_base", C.L_textures[0]);
C.r_Sampler_clf("s_lmap", "internal\\internal_light_att", true);
C.r_Sampler_clf("s_lmap", "internal" DELIMITER "internal_light_att", true);
C.r_Sampler_clf("s_att", TEX_SPOT_ATT);
C.r_End();
break;
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/Blender_tree.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ void CBlender_Tree::Compile(CBlender_Compile& C)
{
C.r_Pass(tsv_spot, tsp_spot, FALSE, TRUE, FALSE, TRUE, D3DBLEND_ONE, D3DBLEND_ONE, TRUE, 0);
C.r_Sampler("s_base", C.L_textures[0]);
C.r_Sampler_clf("s_lmap", "internal\\internal_light_att", true);
C.r_Sampler_clf("s_lmap", "internal" DELIMITER "internal_light_att", true);
C.r_Sampler_clf("s_att", TEX_SPOT_ATT);
if (C.bDetail_Diffuse)
C.r_Sampler("s_detail", C.detail_texture);
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/DetailManager_VS.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void CDetailManager::hw_Load_Shaders()
{
// Create shader to access constant storage
ref_shader S;
S.create("details\\set");
S.create("details" DELIMITER "set");
R_constant_table& T0 = *(S->E[0]->passes[0]->constants);
R_constant_table& T1 = *(S->E[1]->passes[0]->constants);
hwc_consts = T0.get("consts");
Expand Down
130 changes: 65 additions & 65 deletions src/Layers/xrRender/ETextureParams.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,75 +157,75 @@ void STextureParams::FillProp(LPCSTR base_name, PropItemVec& items, PropValue::T
OnTypeChangeEvent = on_type_change;
PropValue* P = PHelper().CreateToken32(items, "Type", (u32*)&type, ttype_token);
P->OnChangeEvent.bind(this, &STextureParams::OnTypeChange);
PHelper().CreateCaption(items, "Source\\Width", shared_str().printf("%d", width));
PHelper().CreateCaption(items, "Source\\Height", shared_str().printf("%d", height));
PHelper().CreateCaption(items, "Source\\Alpha", HasAlpha() ? "present" : "absent");
PHelper().CreateCaption(items, "Source" DELIMITER "Width", shared_str().printf("%d", width));
PHelper().CreateCaption(items, "Source" DELIMITER "Height", shared_str().printf("%d", height));
PHelper().CreateCaption(items, "Source" DELIMITER "Alpha", HasAlpha() ? "present" : "absent");
switch (type)
{
case ttImage:
case ttCubeMap:
PHelper().CreateToken32(items, "Format", (u32*)&fmt, tfmt_token);

PHelper().CreateFlag32(items, "MipMaps\\Enabled", &flags, flGenerateMipMaps);
PHelper().CreateToken32(items, "MipMaps\\Filter", (u32*)&mip_filter, tparam_token);
PHelper().CreateFlag32(items, "MipMaps" DELIMITER "Enabled", &flags, flGenerateMipMaps);
PHelper().CreateToken32(items, "MipMaps" DELIMITER "Filter", (u32*)&mip_filter, tparam_token);

P = PHelper().CreateToken32(items, "Bump\\Mode", (u32*)&bump_mode, tbmode_token);
P = PHelper().CreateToken32(items, "Bump" DELIMITER "Mode", (u32*)&bump_mode, tbmode_token);
P->OnChangeEvent.bind(this, &STextureParams::OnTypeChange);
if (tbmUse == bump_mode || tbmUseParallax == bump_mode)
{
AnsiString path;
path = base_name;
PHelper().CreateChoose(items, "Bump\\Texture", &bump_name, smTexture, path.c_str());
PHelper().CreateChoose(items, "Bump" DELIMITER "Texture", &bump_name, smTexture, path.c_str());
}

PHelper().CreateFlag32(items, "Details\\Use As Diffuse", &flags, flDiffuseDetail);
PHelper().CreateFlag32(items, "Details\\Use As Bump (R2)", &flags, flBumpDetail);
PHelper().CreateChoose(items, "Details\\Texture", &detail_name, smTexture);
PHelper().CreateFloat(items, "Details\\Scale", &detail_scale, 0.1f, 10000.f, 0.1f, 2);
PHelper().CreateFlag32(items, "Details" DELIMITER "Use As Diffuse", &flags, flDiffuseDetail);
PHelper().CreateFlag32(items, "Details" DELIMITER "Use As Bump (R2)", &flags, flBumpDetail);
PHelper().CreateChoose(items, "Details" DELIMITER "Texture", &detail_name, smTexture);
PHelper().CreateFloat(items, "Details" DELIMITER "Scale", &detail_scale, 0.1f, 10000.f, 0.1f, 2);

PHelper().CreateToken32(items, "Material\\Base", (u32*)&material, tmtl_token);
PHelper().CreateFloat(items, "Material\\Weight", &material_weight);
PHelper().CreateToken32(items, "Material" DELIMITER "Base", (u32*)&material, tmtl_token);
PHelper().CreateFloat(items, "Material" DELIMITER "Weight", &material_weight);

// PHelper().CreateFlag32 (items, "Flags\\Binary Alpha", &flags, flBinaryAlpha);
PHelper().CreateFlag32(items, "Flags\\Dither", &flags, flDitherColor);
PHelper().CreateFlag32(items, "Flags\\Dither Each MIP", &flags, flDitherEachMIPLevel);
PHelper().CreateFlag32(items, "Flags\\Implicit Lighted", &flags, flImplicitLighted);
// PHelper().CreateFlag32 (items, "Flags" DELIMITER "Binary Alpha", &flags, flBinaryAlpha);
PHelper().CreateFlag32(items, "Flags" DELIMITER "Dither", &flags, flDitherColor);
PHelper().CreateFlag32(items, "Flags" DELIMITER "Dither Each MIP", &flags, flDitherEachMIPLevel);
PHelper().CreateFlag32(items, "Flags" DELIMITER "Implicit Lighted", &flags, flImplicitLighted);

PHelper().CreateFlag32(items, "Fade\\Enable Color", &flags, flFadeToColor);
PHelper().CreateFlag32(items, "Fade\\Enabled Alpha", &flags, flFadeToAlpha);
PHelper().CreateU8(items, "Fade\\Delay 'n' MIP", &fade_delay, 0, 255);
PHelper().CreateU32(items, "Fade\\% of color to fade in", &fade_amount, 0, 100, 0);
PHelper().CreateColor(items, "Fade\\Color", &fade_color);
PHelper().CreateU8(items, "Fade\\Alpha", ((u8*)&fade_color) + 3, 0, 255);
PHelper().CreateFlag32(items, "Fade" DELIMITER "Enable Color", &flags, flFadeToColor);
PHelper().CreateFlag32(items, "Fade" DELIMITER "Enabled Alpha", &flags, flFadeToAlpha);
PHelper().CreateU8(items, "Fade" DELIMITER "Delay 'n' MIP", &fade_delay, 0, 255);
PHelper().CreateU32(items, "Fade" DELIMITER "% of color to fade in", &fade_amount, 0, 100, 0);
PHelper().CreateColor(items, "Fade" DELIMITER "Color", &fade_color);
PHelper().CreateU8(items, "Fade" DELIMITER "Alpha", ((u8*)&fade_color) + 3, 0, 255);

PHelper().CreateFlag32(items, "Border\\Enabled Color", &flags, flColorBorder);
PHelper().CreateFlag32(items, "Border\\Enabled Alpha", &flags, flAlphaBorder);
PHelper().CreateColor(items, "Border\\Color", &border_color);
PHelper().CreateFlag32(items, "Border" DELIMITER "Enabled Color", &flags, flColorBorder);
PHelper().CreateFlag32(items, "Border" DELIMITER "Enabled Alpha", &flags, flAlphaBorder);
PHelper().CreateColor(items, "Border" DELIMITER "Color", &border_color);
break;
case ttBumpMap:
PHelper().CreateChoose(items, "Bump\\Special NormalMap", &ext_normal_map_name, smTexture, base_name);
PHelper().CreateFloat(items, "Bump\\Virtual Height (m)", &bump_virtual_height, 0.f, 0.1f, 0.001f, 3);
PHelper().CreateChoose(items, "Bump" DELIMITER "Special NormalMap", &ext_normal_map_name, smTexture, base_name);
PHelper().CreateFloat(items, "Bump" DELIMITER "Virtual Height (m)", &bump_virtual_height, 0.f, 0.1f, 0.001f, 3);
break;
case ttNormalMap:
P = PHelper().CreateToken32(items, "Format", (u32*)&fmt, tfmt_token);
P->Owner()->Enable(false);

PHelper().CreateFlag32(items, "MipMaps\\Enabled", &flags, flGenerateMipMaps);
PHelper().CreateToken32(items, "MipMaps\\Filter", (u32*)&mip_filter, tparam_token);
PHelper().CreateFlag32(items, "MipMaps" DELIMITER "Enabled", &flags, flGenerateMipMaps);
PHelper().CreateToken32(items, "MipMaps" DELIMITER "Filter", (u32*)&mip_filter, tparam_token);
break;
case ttTerrain:
P = PHelper().CreateToken32(items, "Format", (u32*)&fmt, tfmt_token);
P->Owner()->Enable(false);

PHelper().CreateFlag32(items, "Details\\Use As Diffuse", &flags, flDiffuseDetail);
PHelper().CreateFlag32(items, "Details\\Use As Bump (R2)", &flags, flBumpDetail);
PHelper().CreateChoose(items, "Details\\Texture", &detail_name, smTexture);
PHelper().CreateFloat(items, "Details\\Scale", &detail_scale, 0.1f, 10000.f, 0.1f, 2);
PHelper().CreateFlag32(items, "Details" DELIMITER "Use As Diffuse", &flags, flDiffuseDetail);
PHelper().CreateFlag32(items, "Details" DELIMITER "Use As Bump (R2)", &flags, flBumpDetail);
PHelper().CreateChoose(items, "Details" DELIMITER "Texture", &detail_name, smTexture);
PHelper().CreateFloat(items, "Details" DELIMITER "Scale", &detail_scale, 0.1f, 10000.f, 0.1f, 2);

PHelper().CreateToken32(items, "Material\\Base", (u32*)&material, tmtl_token);
PHelper().CreateFloat(items, "Material\\Weight", &material_weight);
PHelper().CreateToken32(items, "Material" DELIMITER "Base", (u32*)&material, tmtl_token);
PHelper().CreateFloat(items, "Material" DELIMITER "Weight", &material_weight);

P = PHelper().CreateFlag32(items, "Flags\\Implicit Lighted", &flags, flImplicitLighted);
P = PHelper().CreateFlag32(items, "Flags" DELIMITER "Implicit Lighted", &flags, flImplicitLighted);
P->Owner()->Enable(false);
break;
}
Expand All @@ -245,119 +245,119 @@ BOOL STextureParams::similar(STextureParams& tp1, xr_vector<AnsiString>& sel_par
{
res = (type == tp1.type);
}
else if (par_name == "Source\\Width")
else if (par_name == "Source" DELIMITER "Width")
{
res = (width == tp1.width);
}
else if (par_name == "Source\\Height")
else if (par_name == "Source" DELIMITER "Height")
{
res = (height == tp1.height);
}
else if (par_name == "Source\\Alpha")
else if (par_name == "Source" DELIMITER "Alpha")
{
res = (HasAlpha() == tp1.HasAlpha());
}
else if (par_name == "Format")
{
res = (fmt == tp1.fmt);
}
else if (par_name == "MipMaps\\Enabled")
else if (par_name == "MipMaps" DELIMITER "Enabled")
{
res = (flags.test(flGenerateMipMaps) == tp1.flags.test(flGenerateMipMaps));
}
else if (par_name == "MipMaps\\Filter")
else if (par_name == "MipMaps" DELIMITER "Filter")
{
res = (mip_filter == tp1.mip_filter);
}
else if (par_name == "Bump\\Mode")
else if (par_name == "Bump" DELIMITER "Mode")
{
res = (bump_mode == tp1.bump_mode);
}
else if (par_name == "Bump\\Texture")
else if (par_name == "Bump" DELIMITER "Texture")
{
res = (bump_name == tp1.bump_name);
}
else if (par_name == "Details\\Use As Diffuse")
else if (par_name == "Details" DELIMITER "Use As Diffuse")
{
res = (flags.test(flDiffuseDetail) == tp1.flags.test(flDiffuseDetail));
}
else if (par_name == "Details\\Use As Bump (R2)")
else if (par_name == "Details" DELIMITER "Use As Bump (R2)")
{
res = (flags.test(flBumpDetail) == tp1.flags.test(flBumpDetail));
}
else if (par_name == "Details\\Texture")
else if (par_name == "Details" DELIMITER "Texture")
{
res = (detail_name == tp1.detail_name);
}
else if (par_name == "Details\\Scale")
else if (par_name == "Details" DELIMITER "Scale")
{
res = (fsimilar(detail_scale, tp1.detail_scale));
}
else if (par_name == "Material\\Base")
else if (par_name == "Material" DELIMITER "Base")
{
res = (material == tp1.material);
}
else if (par_name == "Material\\Weight")
else if (par_name == "Material" DELIMITER "Weight")
{
res = (fsimilar(material_weight, tp1.material_weight));
}
else if (par_name == "Flags\\Binary Alpha")
else if (par_name == "Flags" DELIMITER "Binary Alpha")
{
res = (flags.test(flBinaryAlpha) == tp1.flags.test(flBinaryAlpha));
}
else if (par_name == "Flags\\Dither")
else if (par_name == "Flags" DELIMITER "Dither")
{
res = (flags.test(flDitherColor) == tp1.flags.test(flDitherColor));
}
else if (par_name == "Flags\\Dither Each MIP")
else if (par_name == "Flags" DELIMITER "Dither Each MIP")
{
res = (flags.test(flDitherEachMIPLevel) == tp1.flags.test(flDitherEachMIPLevel));
}
else if (par_name == "Flags\\Implicit Lighted")
else if (par_name == "Flags" DELIMITER "Implicit Lighted")
{
res = (flags.test(flImplicitLighted) == tp1.flags.test(flImplicitLighted));
}
else if (par_name == "Fade\\Enable Color")
else if (par_name == "Fade" DELIMITER "Enable Color")
{
res = (flags.test(flFadeToColor) == tp1.flags.test(flFadeToColor));
}
else if (par_name == "Fade\\Enabled Alpha")
else if (par_name == "Fade" DELIMITER "Enabled Alpha")
{
res = (flags.test(flFadeToAlpha) == tp1.flags.test(flFadeToAlpha));
}
else if (par_name == "Fade\\Delay 'n' MIP")
else if (par_name == "Fade" DELIMITER "Delay 'n' MIP")
{
res = (fade_delay == tp1.fade_delay);
}
else if (par_name == "Fade\\% of color to fade in")
else if (par_name == "Fade" DELIMITER "% of color to fade in")
{
res = (fade_amount == tp1.fade_amount);
}
else if (par_name == "Fade\\Color")
else if (par_name == "Fade" DELIMITER "Color")
{
res = (fade_color == tp1.fade_color);
}
else if (par_name == "Fade\\Alpha")
else if (par_name == "Fade" DELIMITER "Alpha")
{
res = (color_get_A(fade_color) == color_get_A(tp1.fade_color));
}
else if (par_name == "Border\\Enabled Color")
else if (par_name == "Border" DELIMITER "Enabled Color")
{
res = (flags.test(flColorBorder) == tp1.flags.test(flColorBorder));
}
else if (par_name == "Border\\Enabled Alpha")
else if (par_name == "Border" DELIMITER "Enabled Alpha")
{
res = (flags.test(flAlphaBorder) == tp1.flags.test(flAlphaBorder));
}
else if (par_name == "Border\\Color")
else if (par_name == "Border" DELIMITER "Color")
{
res = (border_color == tp1.border_color);
}
else if (par_name == "Bump\\Special NormalMap")
else if (par_name == "Bump" DELIMITER "Special NormalMap")
{
res = (ext_normal_map_name == tp1.ext_normal_map_name);
}
else if (par_name == "Bump\\Virtual Height (m)")
else if (par_name == "Bump" DELIMITER "Virtual Height (m)")
{
res = (fsimilar(bump_virtual_height, tp1.bump_virtual_height));
}
Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRender/ResourceManager_Loader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ void CResourceManager::StoreNecessaryTextures()
for (; it != it_e; ++it)
{
LPCSTR texture_name = it->first;
if (strstr(texture_name, "\\levels\\"))
if (strstr(texture_name, DELIMITER "levels" DELIMITER))
continue;
if (!strchr(texture_name, '\\'))
if (!strchr(texture_name, _DELIMITER))
continue;

ref_texture T;
Expand Down
12 changes: 6 additions & 6 deletions src/Layers/xrRender/ResourceManager_Resources.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ void simplify_texture(string_path& fn)
{
if (strstr(fn, "$user"))
return;
if (strstr(fn, "ui\\"))
if (strstr(fn, "ui" DELIMITER))
return;
if (strstr(fn, "lmap#"))
return;
if (strstr(fn, "act\\"))
if (strstr(fn, "act" DELIMITER))
return;
if (strstr(fn, "fx\\"))
if (strstr(fn, "fx" DELIMITER))
return;
if (strstr(fn, "glow\\"))
if (strstr(fn, "glow" DELIMITER))
return;
if (strstr(fn, "map\\"))
if (strstr(fn, "map" DELIMITER))
return;
xr_strcpy(fn, "ed\\ed_not_existing_texture");
xr_strcpy(fn, "ed" DELIMITER "ed_not_existing_texture");
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Layers/xrRender/ResourceManager_Scripting.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ BOOL CResourceManager::_lua_HasShader(LPCSTR s_shader)
{
string256 undercorated;
for (int i = 0, l = xr_strlen(s_shader) + 1; i < l; i++)
undercorated[i] = ('\\' == s_shader[i]) ? '_' : s_shader[i];
undercorated[i] = (_DELIMITER == s_shader[i]) ? '_' : s_shader[i];

#ifdef _EDITOR
return ScriptEngine.object(undercorated, "editor", LUA_TFUNCTION);
Expand All @@ -325,7 +325,7 @@ Shader* CResourceManager::_lua_Create(LPCSTR d_shader, LPCSTR s_textures)
// undecorate
string256 undercorated;
for (int i = 0, l = xr_strlen(d_shader) + 1; i < l; i++)
undercorated[i] = ('\\' == d_shader[i]) ? '_' : d_shader[i];
undercorated[i] = (_DELIMITER == d_shader[i]) ? '_' : d_shader[i];
LPCSTR s_shader = undercorated;

// Access to template
Expand Down
2 changes: 1 addition & 1 deletion src/Layers/xrRender/SH_Texture.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ void CTexture::Load()
else
{
flags.MemoryUsage = pTheora->Width(true) * pTheora->Height(true) * 4;
BOOL bstop_at_end = (nullptr != strstr(cName.c_str(), "intro\\")) || (nullptr != strstr(cName.c_str(), "outro\\"));
BOOL bstop_at_end = (nullptr != strstr(cName.c_str(), "intro" DELIMITER)) || (nullptr != strstr(cName.c_str(), "outro" DELIMITER));
pTheora->Play(!bstop_at_end, RDEVICE.dwTimeContinual);

// Now create texture
Expand Down
Loading

0 comments on commit 76d8518

Please sign in to comment.