Skip to content

Commit

Permalink
xrEngine/Environment_render.cpp: remove commented code
Browse files Browse the repository at this point in the history
  • Loading branch information
@Xottab-DUTY
Xottab-DUTY committed Feb 8, 2019
1 parent bc4976c commit 35d87ba
Showing 1 changed file with 1 addition and 175 deletions.
176 changes: 1 addition & 175 deletions src/xrEngine/Environment_render.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,82 +12,11 @@
#ifndef _EDITOR
#include "IGame_Level.h"
#endif
/*
//////////////////////////////////////////////////////////////////////////
// half box def
static Fvector3 hbox_verts[24] =
{
{-1.f, -1.f, -1.f}, {-1.f, -1.01f, -1.f}, // down
{ 1.f, -1.f, -1.f}, { 1.f, -1.01f, -1.f}, // down
{-1.f, -1.f, 1.f}, {-1.f, -1.01f, 1.f}, // down
{ 1.f, -1.f, 1.f}, { 1.f, -1.01f, 1.f}, // down
{-1.f, 1.f, -1.f}, {-1.f, 1.f, -1.f},
{ 1.f, 1.f, -1.f}, { 1.f, 1.f, -1.f},
{-1.f, 1.f, 1.f}, {-1.f, 1.f, 1.f},
{ 1.f, 1.f, 1.f}, { 1.f, 1.f, 1.f},
{-1.f, 0.f, -1.f}, {-1.f, -1.f, -1.f}, // half
{ 1.f, 0.f, -1.f}, { 1.f, -1.f, -1.f}, // half
{ 1.f, 0.f, 1.f}, { 1.f, -1.f, 1.f}, // half
{-1.f, 0.f, 1.f}, {-1.f, -1.f, 1.f} // half
};
static u16 hbox_faces[20*3] =
{
0, 2, 3,
3, 1, 0,
4, 5, 7,
7, 6, 4,
0, 1, 9,
9, 8, 0,
8, 9, 5,
5, 4, 8,
1, 3, 10,
10, 9, 1,
9, 10, 7,
7, 5, 9,
3, 2, 11,
11, 10, 3,
10, 11, 6,
6, 7, 10,
2, 0, 8,
8, 11, 2,
11, 8, 4,
4, 6, 11
};
#pragma pack(push,1)
struct v_skybox {
Fvector3 p;
u32 color;
Fvector3 uv [2];
void set (Fvector3& _p, u32 _c, Fvector3& _tc)
{
p = _p;
color = _c;
uv[0] = _tc;
uv[1] = _tc;
}
};
const u32 v_skybox_fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX2 | D3DFVF_TEXCOORDSIZE3(0) | D3DFVF_TEXCOORDSIZE3(1);
struct v_clouds {
Fvector3 p;
u32 color;
u32 intensity;
void set (Fvector3& _p, u32 _c, u32 _i)
{
p = _p;
color = _c;
intensity = _i;
}
};
const u32 v_clouds_fvf = D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR;
#pragma pack(pop)
*/

//-----------------------------------------------------------------------------
// Environment render
//-----------------------------------------------------------------------------
// BOOL bNeed_re_create_env = FALSE;

void CEnvironment::RenderSky()
{
#ifndef _EDITOR
Expand All @@ -96,54 +25,6 @@ void CEnvironment::RenderSky()
#endif

m_pRender->RenderSky(*this);
/*
// clouds_sh.create ("clouds","null");
//. this is the bug-fix for the case when the sky is broken
//. for some unknown reason the geoms happen to be invalid sometimes
//. if vTune show this in profile, please add simple cache (move-to-forward last found)
//. to the following functions:
//. CResourceManager::_CreateDecl
//. CResourceManager::CreateGeom
if(bNeed_re_create_env)
{
sh_2sky.create (&m_b_skybox,"skybox_2t");
sh_2geom.create (v_skybox_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
clouds_sh.create ("clouds","null");
clouds_geom.create (v_clouds_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
bNeed_re_create_env = FALSE;
}
GlobalEnv.Render->rmFar ();
// draw sky box
Fmatrix mSky;
mSky.rotateY (CurrentEnv->sky_rotation);
mSky.translate_over (Device.vCameraPosition);
u32 i_offset,v_offset;
u32 C = color_rgba(iFloor(CurrentEnv->sky_color.x*255.f), iFloor(CurrentEnv->sky_color.y*255.f),
iFloor(CurrentEnv->sky_color.z*255.f), iFloor(CurrentEnv->weight*255.f));
// Fill index buffer
u16* pib = RCache.Index.Lock (20*3,i_offset);
CopyMemory (pib,hbox_faces,20*3*2);
RCache.Index.Unlock (20*3);
// Fill vertex buffer
v_skybox* pv = (v_skybox*) RCache.Vertex.Lock (12,sh_2geom.stride(),v_offset);
for (u32 v=0; v<12; v++) pv[v].set (hbox_verts[v*2],C,hbox_verts[v*2+1]);
RCache.Vertex.Unlock (12,sh_2geom.stride());
// Render
RCache.set_xform_world (mSky);
RCache.set_Geometry (sh_2geom);
RCache.set_Shader (sh_2sky);
RCache.set_Textures (&CurrentEnv->sky_r_textures);
RCache.Render (D3DPT_TRIANGLELIST,v_offset,0,12,i_offset,20);
// Sun
GlobalEnv.Render->rmNormal ();
eff_LensFlare->Render (TRUE,FALSE,FALSE);
*/
}

void CEnvironment::RenderClouds()
Expand All @@ -157,46 +38,6 @@ void CEnvironment::RenderClouds()
return;

m_pRender->RenderClouds(*this);
/*
GlobalEnv.Render->rmFar ();
Fmatrix mXFORM, mScale;
mScale.scale (10,0.4f,10);
mXFORM.rotateY (CurrentEnv->sky_rotation);
mXFORM.mulB_43 (mScale);
mXFORM.translate_over (Device.vCameraPosition);
Fvector wd0,wd1;
Fvector4 wind_dir;
wd0.setHP (PI_DIV_4,0);
wd1.setHP (PI_DIV_4+PI_DIV_8,0);
wind_dir.set (wd0.x,wd0.z,wd1.x,wd1.z).mul(0.5f).add(0.5f).mul(255.f);
u32 i_offset,v_offset;
u32 C0 = color_rgba(iFloor(wind_dir.x),iFloor(wind_dir.y),iFloor(wind_dir.w),iFloor(wind_dir.z));
u32 C1 =
color_rgba(iFloor(CurrentEnv->clouds_color.x*255.f),iFloor(CurrentEnv->clouds_color.y*255.f),iFloor(CurrentEnv->clouds_color.z*255.f),iFloor(CurrentEnv->clouds_color.w*255.f));
// Fill index buffer
u16* pib = RCache.Index.Lock (CloudsIndices.size(),i_offset);
CopyMemory (pib,&CloudsIndices.front(),CloudsIndices.size()*sizeof(u16));
RCache.Index.Unlock (CloudsIndices.size());
// Fill vertex buffer
v_clouds* pv = (v_clouds*) RCache.Vertex.Lock (CloudsVerts.size(),clouds_geom.stride(),v_offset);
for (FvectorIt it=CloudsVerts.begin(); it!=CloudsVerts.end(); it++,pv++)
pv->set (*it,C0,C1);
RCache.Vertex.Unlock (CloudsVerts.size(),clouds_geom.stride());
// Render
RCache.set_xform_world (mXFORM);
RCache.set_Geometry (clouds_geom);
RCache.set_Shader (clouds_sh);
RCache.set_Textures (&CurrentEnv->clouds_r_textures);
RCache.Render (D3DPT_TRIANGLELIST,v_offset,0,CloudsVerts.size(),i_offset,CloudsIndices.size()/3);
GlobalEnv.Render->rmNormal ();
*/
}

void CEnvironment::RenderFlares()
Expand All @@ -222,14 +63,7 @@ void CEnvironment::RenderLast()

void CEnvironment::OnDeviceCreate()
{
//. bNeed_re_create_env = TRUE;
m_pRender->OnDeviceCreate();
/*
sh_2sky.create (&m_b_skybox,"skybox_2t");
sh_2geom.create (v_skybox_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
clouds_sh.create ("clouds","null");
clouds_geom.create (v_clouds_fvf,RCache.Vertex.Buffer(), RCache.Index.Buffer());
*/

// weathers
{
Expand All @@ -255,15 +89,7 @@ void CEnvironment::OnDeviceCreate()
void CEnvironment::OnDeviceDestroy()
{
m_pRender->OnDeviceDestroy();
/*
tsky0->surface_set (NULL);
tsky1->surface_set (NULL);

sh_2sky.destroy ();
sh_2geom.destroy ();
clouds_sh.destroy ();
clouds_geom.destroy ();
*/
// weathers
{
auto _I = WeatherCycles.begin();
Expand Down

0 comments on commit 35d87ba

Please sign in to comment.