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

0 commit comments

Comments
 (0)