comparison Render.cpp @ 169:d1dde383af89

Merge
author Nomad
date Thu, 14 Feb 2013 14:03:17 +0200
parents ee11772d0ad2 49e74dee4eab
children f102bbff6fd8
comparison
equal deleted inserted replaced
168:ee11772d0ad2 169:d1dde383af89
1762 else 1762 else
1763 { 1763 {
1764 uStartX = 0, uEndX = 128; 1764 uStartX = 0, uEndX = 128;
1765 uStartZ = 64 - 16, uEndZ = 128; 1765 uStartZ = 64 - 16, uEndZ = 128;
1766 } 1766 }
1767 // uStartX = 0, uEndX = 128; 1767 uStartX = 0, uEndX = 128;
1768 // uStartZ = 0, uEndZ = 128; 1768 uStartZ = 0, uEndZ = 128;
1769 static RenderVertexSoft pTerrainVertices[128 * 128]; 1769 static RenderVertexSoft pTerrainVertices[128 * 128];
1770 for (unsigned int z = uStartZ; z < uEndZ; ++z) 1770 for (unsigned int z = uStartZ; z < uEndZ; ++z)
1771 { 1771 {
1772 for (unsigned int x = uStartX; x < uEndX; ++x) 1772 for (unsigned int x = uStartX; x < uEndX; ++x)
1773 { 1773 {
7170 return; 7170 return;
7171 7171
7172 if (pRenderD3D) 7172 if (pRenderD3D)
7173 { 7173 {
7174 pGame->draw_debug_outlines(); 7174 pGame->draw_debug_outlines();
7175 DoRenderBillboards_D3D(); //Ritor1: it's temporarily 7175 DoRenderBillboards_D3D();
7176 pGame->pStru6Instance->RenderSpecialEffects(); 7176 pGame->pStru6Instance->RenderSpecialEffects();
7177 pRenderD3D->pDevice->EndScene(); 7177 pRenderD3D->pDevice->EndScene();
7178 } 7178 }
7179 else 7179 else
7180 pGame->pStru6Instance->RenderSpecialEffects(); 7180 pGame->pStru6Instance->RenderSpecialEffects();