Skip to content

Commit e00be34

Browse files
Xottab-DUTYXottab-DUTY
committed
xrAPI: rename GlobalEnv to GEnv
1 parent fa9c1d6 commit e00be34

File tree

138 files changed

+556
-556
lines changed

Some content is hidden

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

138 files changed

+556
-556
lines changed

‎src/Include/xrAPI/xrAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,5 @@ class XRAPI_API EngineGlobalEnvironment
3535
AISpaceBase* AISpace;
3636
};
3737

38-
extern XRAPI_API EngineGlobalEnvironment GlobalEnv; // XXX: rename to GEnv
38+
extern XRAPI_API EngineGlobalEnvironment GEnv;
3939
extern XRAPI_API bool g_dedicated_server; // XXX: move to EngineGlobalEnvironment

‎src/Include/xrRender/FactoryPtr.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#define FACTORY_PTR_INSTANCIATE(Class)\
99
template <>\
1010
inline void FactoryPtr<I##Class>::CreateObject(void)\
11-
{ m_pObject = GlobalEnv.RenderFactory->Create##Class(); }\
11+
{ m_pObject = GEnv.RenderFactory->Create##Class(); }\
1212
template <>\
1313
inline void FactoryPtr<I##Class>::DestroyObject(void)\
1414
{\
15-
GlobalEnv.RenderFactory->Destroy##Class(m_pObject);\
15+
GEnv.RenderFactory->Destroy##Class(m_pObject);\
1616
m_pObject = NULL;\
1717
}
1818

‎src/Layers/xrAPI/xrAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "stdafx.h"
22
#include "Include/xrAPI/xrAPI.h"
33

4-
EngineGlobalEnvironment GlobalEnv = {};
4+
EngineGlobalEnvironment GEnv = {};
55
bool g_dedicated_server = false;

‎src/Layers/xrRender/FHierrarhyVisual.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ FHierrarhyVisual::~FHierrarhyVisual()
2323
if (!bDontDelete)
2424
{
2525
for (u32 i = 0; i < children.size(); i++)
26-
GlobalEnv.Render->model_Delete((IRenderVisual*&)children[i]);
26+
GEnv.Render->model_Delete((IRenderVisual*&)children[i]);
2727
}
2828
children.clear();
2929
}
@@ -51,7 +51,7 @@ void FHierrarhyVisual::Load(const char* N, IReader* data, u32 dwFlags)
5151
THROW;
5252
#else
5353
u32 ID = data->r_u32();
54-
children[i] = (dxRender_Visual*)GlobalEnv.Render->getVisual(ID);
54+
children[i] = (dxRender_Visual*)GEnv.Render->getVisual(ID);
5555
#endif
5656
}
5757
bDontDelete = TRUE;
@@ -72,7 +72,7 @@ void FHierrarhyVisual::Load(const char* N, IReader* data, u32 dwFlags)
7272
if (strext(short_name))
7373
*strext(short_name) = 0;
7474
strconcat(sizeof(name_load), name_load, short_name, ":", _itoa(count, num, 10));
75-
children.push_back((dxRender_Visual*)GlobalEnv.Render->model_CreateChild(name_load, O));
75+
children.push_back((dxRender_Visual*)GEnv.Render->model_CreateChild(name_load, O));
7676
O->close();
7777
O = OBJ->open_chunk(count);
7878
}
@@ -97,7 +97,7 @@ void FHierrarhyVisual::Copy(dxRender_Visual* pSrc)
9797
children.reserve(pFrom->children.size());
9898
for (u32 i = 0; i < pFrom->children.size(); i++)
9999
{
100-
dxRender_Visual* p = (dxRender_Visual*)GlobalEnv.Render->model_Duplicate(pFrom->children[i]);
100+
dxRender_Visual* p = (dxRender_Visual*)GEnv.Render->model_Duplicate(pFrom->children[i]);
101101
children.push_back(p);
102102
}
103103
bDontDelete = FALSE;

‎src/Layers/xrRender/FSkinned.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ void CSkeletonX_PM::Load(const char* N, IReader* data, u32 dwFlags)
358358
_Load(N, data, vCount);
359359
void* _verts_ = data->pointer();
360360
inherited1::Load(N, data, dwFlags | VLOAD_NOVERTICES);
361-
GlobalEnv.Render->shader_option_skinning(-1);
361+
GEnv.Render->shader_option_skinning(-1);
362362
#if defined(USE_DX10) || defined(USE_DX11)
363363
_DuplicateIndices(N, data);
364364
#endif // USE_DX10
@@ -370,7 +370,7 @@ void CSkeletonX_ST::Load(const char* N, IReader* data, u32 dwFlags)
370370
_Load(N, data, vCount);
371371
void* _verts_ = data->pointer();
372372
inherited1::Load(N, data, dwFlags | VLOAD_NOVERTICES);
373-
GlobalEnv.Render->shader_option_skinning(-1);
373+
GEnv.Render->shader_option_skinning(-1);
374374
#if defined(USE_DX10) || defined(USE_DX11)
375375
_DuplicateIndices(N, data);
376376
#endif // USE_DX10

‎src/Layers/xrRender/HW.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,9 @@ void CHW::selectResolution(u32& dwWidth, u32& dwHeight, BOOL bWindowed)
193193
string64 buff;
194194
xr_sprintf(buff, sizeof(buff), "%dx%d", psCurrentVidMode[0], psCurrentVidMode[1]);
195195

196-
if (_ParseItem(buff, GlobalEnv.vid_mode_token) == u32(-1)) // not found
196+
if (_ParseItem(buff, GEnv.vid_mode_token) == u32(-1)) // not found
197197
{ // select safe
198-
xr_sprintf(buff, sizeof(buff), "vid_mode %s", GlobalEnv.vid_mode_token[0].name);
198+
xr_sprintf(buff, sizeof(buff), "vid_mode %s", GEnv.vid_mode_token[0].name);
199199
Console->Execute(buff);
200200
}
201201

@@ -599,17 +599,17 @@ struct _uniq_mode
599599

600600
void free_vid_mode_list()
601601
{
602-
for (int i = 0; GlobalEnv.vid_mode_token[i].name; i++)
602+
for (int i = 0; GEnv.vid_mode_token[i].name; i++)
603603
{
604-
xr_free(GlobalEnv.vid_mode_token[i].name);
604+
xr_free(GEnv.vid_mode_token[i].name);
605605
}
606-
xr_free(GlobalEnv.vid_mode_token);
607-
GlobalEnv.vid_mode_token = nullptr;
606+
xr_free(GEnv.vid_mode_token);
607+
GEnv.vid_mode_token = nullptr;
608608
}
609609

610610
void fill_vid_mode_list(CHW* _hw)
611611
{
612-
if (GlobalEnv.vid_mode_token != nullptr)
612+
if (GEnv.vid_mode_token != nullptr)
613613
return;
614614
xr_vector<LPCSTR> _tmp;
615615
u32 cnt = _hw->pD3D->GetAdapterModeCount(_hw->DevAdapter, _hw->Caps.fTarget);
@@ -635,18 +635,18 @@ void fill_vid_mode_list(CHW* _hw)
635635

636636
u32 _cnt = _tmp.size() + 1;
637637

638-
GlobalEnv.vid_mode_token = xr_alloc<xr_token>(_cnt);
638+
GEnv.vid_mode_token = xr_alloc<xr_token>(_cnt);
639639

640-
GlobalEnv.vid_mode_token[_cnt - 1].id = -1;
641-
GlobalEnv.vid_mode_token[_cnt - 1].name = nullptr;
640+
GEnv.vid_mode_token[_cnt - 1].id = -1;
641+
GEnv.vid_mode_token[_cnt - 1].name = nullptr;
642642

643643
#ifdef DEBUG
644644
Msg("Available video modes[%d]:", _tmp.size());
645645
#endif // DEBUG
646646
for (i = 0; i < _tmp.size(); ++i)
647647
{
648-
GlobalEnv.vid_mode_token[i].id = i;
649-
GlobalEnv.vid_mode_token[i].name = _tmp[i];
648+
GEnv.vid_mode_token[i].id = i;
649+
GEnv.vid_mode_token[i].name = _tmp[i];
650650
#ifdef DEBUG
651651
Msg("[%s]", _tmp[i]);
652652
#endif // DEBUG

‎src/Layers/xrRender/Light_DB.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ void CLight_DB::Update()
250250
E.sun_color.x * ps_r2_sun_lumscale, E.sun_color.y * ps_r2_sun_lumscale, E.sun_color.z * ps_r2_sun_lumscale);
251251
sun_adapted->set_range(600.f);
252252

253-
if (!GlobalEnv.Render->is_sun_static())
253+
if (!GEnv.Render->is_sun_static())
254254
{
255255
sun_adapted->set_rotation(OD, _sun_original->right);
256256
sun_adapted->set_position(OP);

‎src/Layers/xrRender/ModelPool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ IC bool _IsBoxVisible(dxRender_Visual* visual, const Fmatrix& transform)
527527
{
528528
Fbox bb;
529529
bb.xform(visual->vis.box, transform);
530-
return GlobalEnv.Render->occ_visible(bb);
530+
return GEnv.Render->occ_visible(bb);
531531
}
532532
IC bool _IsValidShader(dxRender_Visual* visual, u32 priority, bool strictB2F)
533533
{

‎src/Layers/xrRender/ParticleGroup.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ void CParticleGroup::SItem::Clear()
187187
{
188188
// GlobalEnv.Render->model_Delete(*it);
189189
IRenderVisual* pVisual = smart_cast<IRenderVisual*>(*it);
190-
GlobalEnv.Render->model_Delete(pVisual);
190+
GEnv.Render->model_Delete(pVisual);
191191
*it = nullptr;
192192
}
193193

@@ -286,14 +286,14 @@ void CParticleGroup::SItem::Stop(BOOL def_stop)
286286
{
287287
// GlobalEnv.Render->model_Delete(*it);
288288
IRenderVisual* pVisual = smart_cast<IRenderVisual*>(*it);
289-
GlobalEnv.Render->model_Delete(pVisual);
289+
GEnv.Render->model_Delete(pVisual);
290290
*it = nullptr;
291291
}
292292
for (auto it = _children_free.begin(); it != _children_free.end(); it++)
293293
{
294294
// GlobalEnv.Render->model_Delete(*it);
295295
IRenderVisual* pVisual = smart_cast<IRenderVisual*>(*it);
296-
GlobalEnv.Render->model_Delete(pVisual);
296+
GEnv.Render->model_Delete(pVisual);
297297
*it = nullptr;
298298
}
299299
_children_related.clear();
@@ -429,7 +429,7 @@ void CParticleGroup::SItem::OnFrame(u32 u_dt, const CPGDef::SEffect& def, Fbox&
429429
rem_cnt++;
430430
// GlobalEnv.Render->model_Delete(*it);
431431
IRenderVisual* pVisual = smart_cast<IRenderVisual*>(*it);
432-
GlobalEnv.Render->model_Delete(pVisual);
432+
GEnv.Render->model_Delete(pVisual);
433433
*it = nullptr;
434434
}
435435
}

‎src/Layers/xrRender/ResourceManager_Reset.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
void CResourceManager::reset_begin()
1212
{
1313
// destroy everything, renderer may use
14-
GlobalEnv.Render->reset_begin();
14+
GEnv.Render->reset_begin();
1515

1616
// destroy state-blocks
1717
for (u32 _it = 0; _it < v_states.size(); _it++)
@@ -97,7 +97,7 @@ void CResourceManager::reset_end()
9797
}
9898

9999
// create everything, renderer may use
100-
GlobalEnv.Render->reset_end();
100+
GEnv.Render->reset_end();
101101
Dump(true);
102102
}
103103

‎src/Layers/xrRender/ResourceManager_Resources.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,15 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
161161
{
162162
string_path name;
163163
xr_strcpy(name, _name);
164-
if (0 == GlobalEnv.Render->m_skinning)
164+
if (0 == GEnv.Render->m_skinning)
165165
xr_strcat(name, "_0");
166-
if (1 == GlobalEnv.Render->m_skinning)
166+
if (1 == GEnv.Render->m_skinning)
167167
xr_strcat(name, "_1");
168-
if (2 == GlobalEnv.Render->m_skinning)
168+
if (2 == GEnv.Render->m_skinning)
169169
xr_strcat(name, "_2");
170-
if (3 == GlobalEnv.Render->m_skinning)
170+
if (3 == GEnv.Render->m_skinning)
171171
xr_strcat(name, "_3");
172-
if (4 == GlobalEnv.Render->m_skinning)
172+
if (4 == GEnv.Render->m_skinning)
173173
xr_strcat(name, "_4");
174174
LPSTR N = LPSTR(name);
175175
map_VS::iterator I = m_vs.find(N);
@@ -187,7 +187,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
187187
}
188188

189189
string_path cname;
190-
strconcat(sizeof(cname), cname, GlobalEnv.Render->getShaderPath(), _name, ".vs");
190+
strconcat(sizeof(cname), cname, GEnv.Render->getShaderPath(), _name, ".vs");
191191
FS.update_path(cname, "$game_shaders$", cname);
192192
// LPCSTR target = NULL;
193193

@@ -223,7 +223,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
223223
}
224224

225225
Msg("compiling shader %s", name);
226-
HRESULT const _hr = GlobalEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
226+
HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
227227
D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, (void*&)_vs);
228228

229229
if (FAILED(_hr))
@@ -274,7 +274,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
274274

275275
// Open file
276276
string_path cname;
277-
LPCSTR shader_path = GlobalEnv.Render->getShaderPath();
277+
LPCSTR shader_path = GEnv.Render->getShaderPath();
278278
strconcat(sizeof(cname), cname, shader_path, name, ".ps");
279279
FS.update_path(cname, "$game_shaders$", cname);
280280

@@ -317,7 +317,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
317317
}
318318

319319
Msg("compiling shader %s", name);
320-
HRESULT const _hr = GlobalEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
320+
HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
321321
D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, (void*&)_ps);
322322

323323
if (FAILED(_hr))
@@ -733,7 +733,7 @@ class includer : public ID3DXInclude
733733
D3DXINCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData, LPCVOID* ppData, UINT* pBytes)
734734
{
735735
string_path pname;
736-
strconcat(sizeof(pname), pname, GlobalEnv.Render->getShaderPath(), pFileName);
736+
strconcat(sizeof(pname), pname, GEnv.Render->getShaderPath(), pFileName);
737737
IReader* R = FS.r_open("$game_shaders$", pname);
738738
if (0 == R)
739739
{
@@ -765,15 +765,15 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
765765
{
766766
string_path name;
767767
xr_strcpy(name, _name);
768-
if (0 == GlobalEnv.Render->m_skinning)
768+
if (0 == GEnv.Render->m_skinning)
769769
xr_strcat(name, "_0");
770-
if (1 == GlobalEnv.Render->m_skinning)
770+
if (1 == GEnv.Render->m_skinning)
771771
xr_strcat(name, "_1");
772-
if (2 == GlobalEnv.Render->m_skinning)
772+
if (2 == GEnv.Render->m_skinning)
773773
xr_strcat(name, "_2");
774-
if (3 == GlobalEnv.Render->m_skinning)
774+
if (3 == GEnv.Render->m_skinning)
775775
xr_strcat(name, "_3");
776-
if (4 == GlobalEnv.Render->m_skinning)
776+
if (4 == GEnv.Render->m_skinning)
777777
xr_strcat(name, "_4");
778778
LPSTR N = LPSTR(name);
779779
map_VS::iterator I = m_vs.find(N);
@@ -796,7 +796,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
796796
LPD3DXSHADER_CONSTANTTABLE pConstants = NULL;
797797
HRESULT _hr = S_OK;
798798
string_path cname;
799-
strconcat(sizeof(cname), cname, GlobalEnv.Render->getShaderPath(), _name, ".vs");
799+
strconcat(sizeof(cname), cname, GEnv.Render->getShaderPath(), _name, ".vs");
800800
FS.update_path(cname, "$game_shaders$", cname);
801801
// LPCSTR target = NULL;
802802

@@ -832,7 +832,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
832832

833833
// vertex
834834
R_ASSERT2(fs, cname);
835-
_hr = GlobalEnv.Render->shader_compile(name, LPCSTR(fs->pointer()), fs->length(), NULL, &Includer, c_entry,
835+
_hr = GEnv.Render->shader_compile(name, LPCSTR(fs->pointer()), fs->length(), NULL, &Includer, c_entry,
836836
c_target, D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR /*| D3DXSHADER_PREFER_FLOW_CONTROL*/,
837837
&pShaderBuf, &pErrorBuf, NULL);
838838
// _hr = D3DXCompileShader (LPCSTR(fs->pointer()),fs->length(), NULL, &Includer, "main", target,
@@ -915,7 +915,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
915915
// Open file
916916
includer Includer;
917917
string_path cname;
918-
LPCSTR shader_path = GlobalEnv.Render->getShaderPath();
918+
LPCSTR shader_path = GEnv.Render->getShaderPath();
919919
strconcat(sizeof(cname), cname, shader_path, name, ".ps");
920920
FS.update_path(cname, "$game_shaders$", cname);
921921

@@ -962,7 +962,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
962962
LPD3DXBUFFER pErrorBuf = NULL;
963963
LPD3DXSHADER_CONSTANTTABLE pConstants = NULL;
964964
HRESULT _hr = S_OK;
965-
_hr = GlobalEnv.Render->shader_compile(name, data, size, NULL, &Includer, c_entry, c_target,
965+
_hr = GEnv.Render->shader_compile(name, data, size, NULL, &Includer, c_entry, c_target,
966966
D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, &pShaderBuf, &pErrorBuf, NULL);
967967
//_hr = D3DXCompileShader (text,text_size, NULL, &Includer, c_entry, c_target, D3DXSHADER_DEBUG |
968968
// D3DXSHADER_PACKMATRIX_ROWMAJOR, &pShaderBuf, &pErrorBuf, NULL);

‎src/Layers/xrRender/ShaderResourceTraits.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ inline T* CResourceManager::CreateShader(const char* name)
108108

109109
// Open file
110110
string_path cname;
111-
strconcat(sizeof(cname), cname, GlobalEnv.Render->getShaderPath(), /*name*/ shName,
111+
strconcat(sizeof(cname), cname, GEnv.Render->getShaderPath(), /*name*/ shName,
112112
ShaderTypeTraits<T>::GetShaderExt());
113113
FS.update_path(cname, "$game_shaders$", cname);
114114

@@ -121,7 +121,7 @@ inline T* CResourceManager::CreateShader(const char* name)
121121
LPCSTR c_entry = "main";
122122

123123
// Compile
124-
HRESULT const _hr = GlobalEnv.Render->shader_compile(name, (DWORD const*)file->pointer(), file->length(),
124+
HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)file->pointer(), file->length(),
125125
c_entry, c_target, D3D10_SHADER_PACK_MATRIX_ROW_MAJOR, (void*&)sh);
126126

127127
FS.r_close(file);

‎src/Layers/xrRender/SkeletonCustom.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags)
185185
string_path lod_name;
186186
LD->r_string(lod_name, sizeof(lod_name));
187187
//. strconcat (sizeof(name_load),name_load, short_name, ":lod:", lod_name.c_str());
188-
m_lod = (dxRender_Visual*)GlobalEnv.Render->model_CreateChild(lod_name, nullptr);
188+
m_lod = (dxRender_Visual*)GEnv.Render->model_CreateChild(lod_name, nullptr);
189189

190190
if (CKinematics* lod_kinematics = dynamic_cast<CKinematics*>(m_lod))
191191
{
@@ -421,7 +421,7 @@ void CKinematics::Copy(dxRender_Visual* P)
421421

422422
CalculateBones_Invalidate();
423423

424-
m_lod = (pFrom->m_lod) ? (dxRender_Visual*)GlobalEnv.Render->model_Duplicate(pFrom->m_lod) : 0;
424+
m_lod = (pFrom->m_lod) ? (dxRender_Visual*)GEnv.Render->model_Duplicate(pFrom->m_lod) : 0;
425425
}
426426

427427
void CKinematics::CalculateBones_Invalidate()
@@ -745,7 +745,7 @@ void CKinematics::CalculateWallmarks()
745745
if (w < 1.f)
746746
{
747747
// append wm to WallmarkEngine
748-
if (GlobalEnv.Render->ViewBase.testSphere_dirty(wm->m_Bounds.P, wm->m_Bounds.R))
748+
if (GEnv.Render->ViewBase.testSphere_dirty(wm->m_Bounds.P, wm->m_Bounds.R))
749749
// GlobalEnv.Render->add_SkeletonWallmark (wm);
750750
::RImplementation.add_SkeletonWallmark(wm);
751751
}

0 commit comments

Comments
 (0)