xrAPI: rename GlobalEnv to GEnv

src/Include/xrAPI/xrAPI.h

@@ -35,5 +35,5 @@ class XRAPI_API EngineGlobalEnvironment
     AISpaceBase* AISpace;
 };
 
-extern XRAPI_API EngineGlobalEnvironment GlobalEnv; // XXX: rename to GEnv
+extern XRAPI_API EngineGlobalEnvironment GEnv;
 extern XRAPI_API bool g_dedicated_server; // XXX: move to EngineGlobalEnvironment

src/Include/xrRender/FactoryPtr.h

@@ -8,11 +8,11 @@
 #define FACTORY_PTR_INSTANCIATE(Class)\
     template <>\
     inline void FactoryPtr<I##Class>::CreateObject(void)\
-    { m_pObject = GlobalEnv.RenderFactory->Create##Class(); }\
+    { m_pObject = GEnv.RenderFactory->Create##Class(); }\
     template <>\
     inline void FactoryPtr<I##Class>::DestroyObject(void)\
     {\
-        GlobalEnv.RenderFactory->Destroy##Class(m_pObject);\
+        GEnv.RenderFactory->Destroy##Class(m_pObject);\
         m_pObject = NULL;\
     }
 

src/Layers/xrAPI/xrAPI.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
 #include "Include/xrAPI/xrAPI.h"
 
-EngineGlobalEnvironment GlobalEnv = {};
+EngineGlobalEnvironment GEnv = {};
 bool g_dedicated_server = false;

src/Layers/xrRender/FHierrarhyVisual.cpp

@@ -23,7 +23,7 @@ FHierrarhyVisual::~FHierrarhyVisual()
     if (!bDontDelete)
     {
         for (u32 i = 0; i < children.size(); i++)
-            GlobalEnv.Render->model_Delete((IRenderVisual*&)children[i]);
+            GEnv.Render->model_Delete((IRenderVisual*&)children[i]);
     }
     children.clear();
 }
@@ -51,7 +51,7 @@ void FHierrarhyVisual::Load(const char* N, IReader* data, u32 dwFlags)
             THROW;
 #else
             u32 ID = data->r_u32();
-            children[i] = (dxRender_Visual*)GlobalEnv.Render->getVisual(ID);
+            children[i] = (dxRender_Visual*)GEnv.Render->getVisual(ID);
 #endif
         }
         bDontDelete = TRUE;
@@ -72,7 +72,7 @@ void FHierrarhyVisual::Load(const char* N, IReader* data, u32 dwFlags)
                     if (strext(short_name))
                         *strext(short_name) = 0;
                     strconcat(sizeof(name_load), name_load, short_name, ":", _itoa(count, num, 10));
-                    children.push_back((dxRender_Visual*)GlobalEnv.Render->model_CreateChild(name_load, O));
+                    children.push_back((dxRender_Visual*)GEnv.Render->model_CreateChild(name_load, O));
                     O->close();
                     O = OBJ->open_chunk(count);
                 }
@@ -97,7 +97,7 @@ void FHierrarhyVisual::Copy(dxRender_Visual* pSrc)
     children.reserve(pFrom->children.size());
     for (u32 i = 0; i < pFrom->children.size(); i++)
     {
-        dxRender_Visual* p = (dxRender_Visual*)GlobalEnv.Render->model_Duplicate(pFrom->children[i]);
+        dxRender_Visual* p = (dxRender_Visual*)GEnv.Render->model_Duplicate(pFrom->children[i]);
         children.push_back(p);
     }
     bDontDelete = FALSE;

src/Layers/xrRender/FSkinned.cpp

@@ -358,7 +358,7 @@ void CSkeletonX_PM::Load(const char* N, IReader* data, u32 dwFlags)
     _Load(N, data, vCount);
     void* _verts_ = data->pointer();
     inherited1::Load(N, data, dwFlags | VLOAD_NOVERTICES);
-    GlobalEnv.Render->shader_option_skinning(-1);
+    GEnv.Render->shader_option_skinning(-1);
 #if defined(USE_DX10) || defined(USE_DX11)
     _DuplicateIndices(N, data);
 #endif // USE_DX10
@@ -370,7 +370,7 @@ void CSkeletonX_ST::Load(const char* N, IReader* data, u32 dwFlags)
     _Load(N, data, vCount);
     void* _verts_ = data->pointer();
     inherited1::Load(N, data, dwFlags | VLOAD_NOVERTICES);
-    GlobalEnv.Render->shader_option_skinning(-1);
+    GEnv.Render->shader_option_skinning(-1);
 #if defined(USE_DX10) || defined(USE_DX11)
     _DuplicateIndices(N, data);
 #endif // USE_DX10

src/Layers/xrRender/HW.cpp

@@ -193,9 +193,9 @@ void CHW::selectResolution(u32& dwWidth, u32& dwHeight, BOOL bWindowed)
             string64 buff;
             xr_sprintf(buff, sizeof(buff), "%dx%d", psCurrentVidMode[0], psCurrentVidMode[1]);
 
-            if (_ParseItem(buff, GlobalEnv.vid_mode_token) == u32(-1)) // not found
+            if (_ParseItem(buff, GEnv.vid_mode_token) == u32(-1)) // not found
             { // select safe
-                xr_sprintf(buff, sizeof(buff), "vid_mode %s", GlobalEnv.vid_mode_token[0].name);
+                xr_sprintf(buff, sizeof(buff), "vid_mode %s", GEnv.vid_mode_token[0].name);
                 Console->Execute(buff);
             }
 
@@ -599,17 +599,17 @@ struct _uniq_mode
 
 void free_vid_mode_list()
 {
-    for (int i = 0; GlobalEnv.vid_mode_token[i].name; i++)
+    for (int i = 0; GEnv.vid_mode_token[i].name; i++)
     {
-        xr_free(GlobalEnv.vid_mode_token[i].name);
+        xr_free(GEnv.vid_mode_token[i].name);
     }
-    xr_free(GlobalEnv.vid_mode_token);
-    GlobalEnv.vid_mode_token = nullptr;
+    xr_free(GEnv.vid_mode_token);
+    GEnv.vid_mode_token = nullptr;
 }
 
 void fill_vid_mode_list(CHW* _hw)
 {
-    if (GlobalEnv.vid_mode_token != nullptr)
+    if (GEnv.vid_mode_token != nullptr)
         return;
     xr_vector<LPCSTR> _tmp;
     u32 cnt = _hw->pD3D->GetAdapterModeCount(_hw->DevAdapter, _hw->Caps.fTarget);
@@ -635,18 +635,18 @@ void fill_vid_mode_list(CHW* _hw)
 
     u32 _cnt = _tmp.size() + 1;
 
-    GlobalEnv.vid_mode_token = xr_alloc<xr_token>(_cnt);
+    GEnv.vid_mode_token = xr_alloc<xr_token>(_cnt);
 
-    GlobalEnv.vid_mode_token[_cnt - 1].id = -1;
-    GlobalEnv.vid_mode_token[_cnt - 1].name = nullptr;
+    GEnv.vid_mode_token[_cnt - 1].id = -1;
+    GEnv.vid_mode_token[_cnt - 1].name = nullptr;
 
 #ifdef DEBUG
     Msg("Available video modes[%d]:", _tmp.size());
 #endif // DEBUG
     for (i = 0; i < _tmp.size(); ++i)
     {
-        GlobalEnv.vid_mode_token[i].id = i;
-        GlobalEnv.vid_mode_token[i].name = _tmp[i];
+        GEnv.vid_mode_token[i].id = i;
+        GEnv.vid_mode_token[i].name = _tmp[i];
 #ifdef DEBUG
         Msg("[%s]", _tmp[i]);
 #endif // DEBUG

src/Layers/xrRender/Light_DB.cpp

@@ -250,7 +250,7 @@ void CLight_DB::Update()
             E.sun_color.x * ps_r2_sun_lumscale, E.sun_color.y * ps_r2_sun_lumscale, E.sun_color.z * ps_r2_sun_lumscale);
         sun_adapted->set_range(600.f);
 
-        if (!GlobalEnv.Render->is_sun_static())
+        if (!GEnv.Render->is_sun_static())
         {
             sun_adapted->set_rotation(OD, _sun_original->right);
             sun_adapted->set_position(OP);

src/Layers/xrRender/ModelPool.cpp

@@ -527,7 +527,7 @@ IC bool _IsBoxVisible(dxRender_Visual* visual, const Fmatrix& transform)
 {
     Fbox bb;
     bb.xform(visual->vis.box, transform);
-    return GlobalEnv.Render->occ_visible(bb);
+    return GEnv.Render->occ_visible(bb);
 }
 IC bool _IsValidShader(dxRender_Visual* visual, u32 priority, bool strictB2F)
 {

src/Layers/xrRender/ParticleGroup.cpp

@@ -187,7 +187,7 @@ void CParticleGroup::SItem::Clear()
     {
         // GlobalEnv.Render->model_Delete(*it);
         IRenderVisual* pVisual = smart_cast<IRenderVisual*>(*it);
-        GlobalEnv.Render->model_Delete(pVisual);
+        GEnv.Render->model_Delete(pVisual);
         *it = nullptr;
     }
 
@@ -286,14 +286,14 @@ void CParticleGroup::SItem::Stop(BOOL def_stop)
         {
             // GlobalEnv.Render->model_Delete(*it);
             IRenderVisual* pVisual = smart_cast<IRenderVisual*>(*it);
-            GlobalEnv.Render->model_Delete(pVisual);
+            GEnv.Render->model_Delete(pVisual);
             *it = nullptr;
         }
         for (auto it = _children_free.begin(); it != _children_free.end(); it++)
         {
             // GlobalEnv.Render->model_Delete(*it);
             IRenderVisual* pVisual = smart_cast<IRenderVisual*>(*it);
-            GlobalEnv.Render->model_Delete(pVisual);
+            GEnv.Render->model_Delete(pVisual);
             *it = nullptr;
         }
         _children_related.clear();
@@ -429,7 +429,7 @@ void CParticleGroup::SItem::OnFrame(u32 u_dt, const CPGDef::SEffect& def, Fbox&
                     rem_cnt++;
                     // GlobalEnv.Render->model_Delete(*it);
                     IRenderVisual* pVisual = smart_cast<IRenderVisual*>(*it);
-                    GlobalEnv.Render->model_Delete(pVisual);
+                    GEnv.Render->model_Delete(pVisual);
                     *it = nullptr;
                 }
             }

src/Layers/xrRender/ResourceManager_Reset.cpp

@@ -11,7 +11,7 @@
 void CResourceManager::reset_begin()
 {
     // destroy everything, renderer may use
-    GlobalEnv.Render->reset_begin();
+    GEnv.Render->reset_begin();
 
     // destroy state-blocks
     for (u32 _it = 0; _it < v_states.size(); _it++)
@@ -97,7 +97,7 @@ void CResourceManager::reset_end()
     }
 
     // create everything, renderer may use
-    GlobalEnv.Render->reset_end();
+    GEnv.Render->reset_end();
     Dump(true);
 }
 

src/Layers/xrRender/ResourceManager_Resources.cpp

@@ -161,15 +161,15 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
 {
     string_path name;
     xr_strcpy(name, _name);
-    if (0 == GlobalEnv.Render->m_skinning)
+    if (0 == GEnv.Render->m_skinning)
         xr_strcat(name, "_0");
-    if (1 == GlobalEnv.Render->m_skinning)
+    if (1 == GEnv.Render->m_skinning)
         xr_strcat(name, "_1");
-    if (2 == GlobalEnv.Render->m_skinning)
+    if (2 == GEnv.Render->m_skinning)
         xr_strcat(name, "_2");
-    if (3 == GlobalEnv.Render->m_skinning)
+    if (3 == GEnv.Render->m_skinning)
         xr_strcat(name, "_3");
-    if (4 == GlobalEnv.Render->m_skinning)
+    if (4 == GEnv.Render->m_skinning)
         xr_strcat(name, "_4");
     LPSTR N = LPSTR(name);
     map_VS::iterator I = m_vs.find(N);
@@ -187,7 +187,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
         }
 
         string_path cname;
-        strconcat(sizeof(cname), cname, GlobalEnv.Render->getShaderPath(), _name, ".vs");
+        strconcat(sizeof(cname), cname, GEnv.Render->getShaderPath(), _name, ".vs");
         FS.update_path(cname, "$game_shaders$", cname);
         //		LPCSTR						target		= NULL;
 
@@ -223,7 +223,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
         }
 
         Msg("compiling shader %s", name);
-        HRESULT const _hr = GlobalEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
+        HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
             D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, (void*&)_vs);
 
         if (FAILED(_hr))
@@ -274,7 +274,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
 
         // Open file
         string_path cname;
-        LPCSTR shader_path = GlobalEnv.Render->getShaderPath();
+        LPCSTR shader_path = GEnv.Render->getShaderPath();
         strconcat(sizeof(cname), cname, shader_path, name, ".ps");
         FS.update_path(cname, "$game_shaders$", cname);
 
@@ -317,7 +317,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
         }
 
         Msg("compiling shader %s", name);
-        HRESULT const _hr = GlobalEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
+        HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)data, size, c_entry, c_target,
             D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, (void*&)_ps);
 
         if (FAILED(_hr))
@@ -733,7 +733,7 @@ class includer : public ID3DXInclude
         D3DXINCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData, LPCVOID* ppData, UINT* pBytes)
     {
         string_path pname;
-        strconcat(sizeof(pname), pname, GlobalEnv.Render->getShaderPath(), pFileName);
+        strconcat(sizeof(pname), pname, GEnv.Render->getShaderPath(), pFileName);
         IReader* R = FS.r_open("$game_shaders$", pname);
         if (0 == R)
         {
@@ -765,15 +765,15 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
 {
     string_path name;
     xr_strcpy(name, _name);
-    if (0 == GlobalEnv.Render->m_skinning)
+    if (0 == GEnv.Render->m_skinning)
         xr_strcat(name, "_0");
-    if (1 == GlobalEnv.Render->m_skinning)
+    if (1 == GEnv.Render->m_skinning)
         xr_strcat(name, "_1");
-    if (2 == GlobalEnv.Render->m_skinning)
+    if (2 == GEnv.Render->m_skinning)
         xr_strcat(name, "_2");
-    if (3 == GlobalEnv.Render->m_skinning)
+    if (3 == GEnv.Render->m_skinning)
         xr_strcat(name, "_3");
-    if (4 == GlobalEnv.Render->m_skinning)
+    if (4 == GEnv.Render->m_skinning)
         xr_strcat(name, "_4");
     LPSTR N = LPSTR(name);
     map_VS::iterator I = m_vs.find(N);
@@ -796,7 +796,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
         LPD3DXSHADER_CONSTANTTABLE pConstants = NULL;
         HRESULT _hr = S_OK;
         string_path cname;
-        strconcat(sizeof(cname), cname, GlobalEnv.Render->getShaderPath(), _name, ".vs");
+        strconcat(sizeof(cname), cname, GEnv.Render->getShaderPath(), _name, ".vs");
         FS.update_path(cname, "$game_shaders$", cname);
         //		LPCSTR						target		= NULL;
 
@@ -832,7 +832,7 @@ SVS* CResourceManager::_CreateVS(LPCSTR _name)
 
         // vertex
         R_ASSERT2(fs, cname);
-        _hr = GlobalEnv.Render->shader_compile(name, LPCSTR(fs->pointer()), fs->length(), NULL, &Includer, c_entry,
+        _hr = GEnv.Render->shader_compile(name, LPCSTR(fs->pointer()), fs->length(), NULL, &Includer, c_entry,
             c_target, D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR /*| D3DXSHADER_PREFER_FLOW_CONTROL*/,
             &pShaderBuf, &pErrorBuf, NULL);
         //		_hr = D3DXCompileShader		(LPCSTR(fs->pointer()),fs->length(), NULL, &Includer, "main", target,
@@ -915,7 +915,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
         // Open file
         includer Includer;
         string_path cname;
-        LPCSTR shader_path = GlobalEnv.Render->getShaderPath();
+        LPCSTR shader_path = GEnv.Render->getShaderPath();
         strconcat(sizeof(cname), cname, shader_path, name, ".ps");
         FS.update_path(cname, "$game_shaders$", cname);
 
@@ -962,7 +962,7 @@ SPS* CResourceManager::_CreatePS(LPCSTR name)
         LPD3DXBUFFER pErrorBuf = NULL;
         LPD3DXSHADER_CONSTANTTABLE pConstants = NULL;
         HRESULT _hr = S_OK;
-        _hr = GlobalEnv.Render->shader_compile(name, data, size, NULL, &Includer, c_entry, c_target,
+        _hr = GEnv.Render->shader_compile(name, data, size, NULL, &Includer, c_entry, c_target,
             D3DXSHADER_DEBUG | D3DXSHADER_PACKMATRIX_ROWMAJOR, &pShaderBuf, &pErrorBuf, NULL);
         //_hr = D3DXCompileShader		(text,text_size, NULL, &Includer, c_entry, c_target, D3DXSHADER_DEBUG |
         // D3DXSHADER_PACKMATRIX_ROWMAJOR, &pShaderBuf, &pErrorBuf, NULL);

src/Layers/xrRender/ShaderResourceTraits.h

@@ -108,7 +108,7 @@ inline T* CResourceManager::CreateShader(const char* name)
 
         // Open file
         string_path cname;
-        strconcat(sizeof(cname), cname, GlobalEnv.Render->getShaderPath(), /*name*/ shName,
+        strconcat(sizeof(cname), cname, GEnv.Render->getShaderPath(), /*name*/ shName,
             ShaderTypeTraits<T>::GetShaderExt());
         FS.update_path(cname, "$game_shaders$", cname);
 
@@ -121,7 +121,7 @@ inline T* CResourceManager::CreateShader(const char* name)
         LPCSTR c_entry = "main";
 
         // Compile
-        HRESULT const _hr = GlobalEnv.Render->shader_compile(name, (DWORD const*)file->pointer(), file->length(),
+        HRESULT const _hr = GEnv.Render->shader_compile(name, (DWORD const*)file->pointer(), file->length(),
             c_entry, c_target, D3D10_SHADER_PACK_MATRIX_ROW_MAJOR, (void*&)sh);
 
         FS.r_close(file);

src/Layers/xrRender/SkeletonCustom.cpp

@@ -185,7 +185,7 @@ void CKinematics::Load(const char* N, IReader* data, u32 dwFlags)
             string_path lod_name;
             LD->r_string(lod_name, sizeof(lod_name));
             //.         strconcat       (sizeof(name_load),name_load, short_name, ":lod:", lod_name.c_str());
-            m_lod = (dxRender_Visual*)GlobalEnv.Render->model_CreateChild(lod_name, nullptr);
+            m_lod = (dxRender_Visual*)GEnv.Render->model_CreateChild(lod_name, nullptr);
 
             if (CKinematics* lod_kinematics = dynamic_cast<CKinematics*>(m_lod))
             {
@@ -421,7 +421,7 @@ void CKinematics::Copy(dxRender_Visual* P)
 
     CalculateBones_Invalidate();
 
-    m_lod = (pFrom->m_lod) ? (dxRender_Visual*)GlobalEnv.Render->model_Duplicate(pFrom->m_lod) : 0;
+    m_lod = (pFrom->m_lod) ? (dxRender_Visual*)GEnv.Render->model_Duplicate(pFrom->m_lod) : 0;
 }
 
 void CKinematics::CalculateBones_Invalidate()
@@ -745,7 +745,7 @@ void CKinematics::CalculateWallmarks()
             if (w < 1.f)
             {
                 // append wm to WallmarkEngine
-                if (GlobalEnv.Render->ViewBase.testSphere_dirty(wm->m_Bounds.P, wm->m_Bounds.R))
+                if (GEnv.Render->ViewBase.testSphere_dirty(wm->m_Bounds.P, wm->m_Bounds.R))
                     // GlobalEnv.Render->add_SkeletonWallmark   (wm);
                     ::RImplementation.add_SkeletonWallmark(wm);
             }