mm7: Render.cpp comparison

comparison Render.cpp @ 1982:2647e2f820a6

Ð¡Ð»Ð¸ÑÐ½Ð¸Ðµ

author	Ritor1
date	Fri, 01 Nov 2013 14:44:06 +0600
parents	d9ea00250e2e c1c74df0a33e
children	5cd26f2c6904

comparison

equal deleted inserted replaced

-:d9ea00250e2e
+:2647e2f820a6
 soft_billboard.uViewportW = pBLVRenderParams->uViewportW;
 pODMRenderParams->uNumBillboards = ::uNumBillboardsToDraw;
 for (uint i = 0; i < ::uNumBillboardsToDraw; ++i)
 {
-auto p = pBillboardRenderList + i;
+RenderBillboard* p = &pBillboardRenderList[i];
 soft_billboard.uScreenSpaceX = p->uScreenSpaceX;
 soft_billboard.uParentBillboardID = i;
 soft_billboard.uScreenSpaceY = p->uScreenSpaceY;
 soft_billboard._screenspace_x_scaler_packedfloat = p->_screenspace_x_scaler_packedfloat;
 //shading (çàòåíåíèå)----------------------------------------------------------------------------
 //uint norm_idx = pTerrainNormalIndices[2 * (z * 128 + x) + 1];
 uint norm_idx = pTerrainNormalIndices[2 * (x * 128 + z) + 2];
 assert(norm_idx < uNumTerrainNormals);
-auto norm = pTerrainNormals + norm_idx;
+Vec3_float_* norm = &pTerrainNormals[norm_idx];
 float _f = ((norm->x * (float)pOutdoor->vSunlight.x / 65536.0) -
 (norm->y * (float)pOutdoor->vSunlight.y / 65536.0) -
 (norm->z * (float)pOutdoor->vSunlight.z / 65536.0));
 pTilePolygon->dimming_level = 20.0 - floorf(20.0 * _f + 0.5f);
 //-----------------------------------------------------------------------------------------------
 billboard.uViewportW = pViewport->uViewportBR_Y;
 pODMRenderParams->uNumBillboards = uNumBillboardsToDraw;
 for (int i = 0; i < ::uNumBillboardsToDraw; ++i)
 {
-auto pBillboard = pBillboardRenderList + i;
+RenderBillboard* pBillboard = &pBillboardRenderList[i];
 billboard.uScreenSpaceX = pBillboard->uScreenSpaceX;
 billboard.uScreenSpaceY = pBillboard->uScreenSpaceY;
 billboard.uParentBillboardID = i;
 billboard._screenspace_x_scaler_packedfloat = pBillboard->_screenspace_x_scaler_packedfloat;
 signed __int16 v46; // [sp+3Ch] [bp-4h]@12
 //v41 = 0;
 for (int i = 0; i < uNumSpriteObjects; ++i)
 {
-auto object = &pSpriteObjects[i];
+SpriteObject* object = &pSpriteObjects[i];
 //auto v0 = (char *)&pSpriteObjects[i].uSectorID;
 //v0 = (char *)&pSpriteObjects[0].uSectorID;
 //do
 //{
 if (!object->uObjectDescID)  // item probably pciked up
 continue;
 assert(object->uObjectDescID < pObjectList->uNumObjects);
-auto object_desc = pObjectList->pObjects + object->uObjectDescID;
+ObjectDesc* object_desc = &pObjectList->pObjects[object->uObjectDescID];
 if (object_desc->NoSprite())
 continue;
 //v1 = &pObjectList->pObjects[*((short *)v0 - 13)];
 //if ( !(v1->uFlags & 1) )
 //{
 //v0 = (char *)&pLevelDecorations[0].vPosition.y;
 //do
 for (int i = 0; i < uNumLevelDecorations; ++i)
 {
-auto decor = &pLevelDecorations[i];
+LevelDecoration* decor = &pLevelDecorations[i];
-auto v0 = (char *)&pLevelDecorations[i].vPosition.y;
+char* v0 = (char *)&pLevelDecorations[i].vPosition.y;
 if ((!(decor->uFlags & LEVEL_DECORATION_OBELISK_CHEST) || decor->IsObeliskChestActive()) && !(decor->uFlags & LEVEL_DECORATION_INVISIBLE))
 {
 //v1 = &pDecorationList->pDecorations[decor->uDecorationDescID];
-auto decor_desc = pDecorationList->pDecorations + decor->uDecorationDescID;
+DecorationDesc* decor_desc = pDecorationList->pDecorations + decor->uDecorationDescID;
 v2 = decor_desc->uFlags;
 if ( (char)v2 >= 0 )
 {
 if ( !(v2 & 0x22) )
 {
 bUseColoredLights = bColoredLights;//ReadWindowsRegistryInt("Colored Lights", 0);
 uLevelOfDetail = uDetailLevel;//ReadWindowsRegistryInt("Detail Level", 1);
 this->bTinting = bTinting;
-auto r1 = pD3DBitmaps.Load(L"data\\d3dbitmap.hwl");
+bool r1 = pD3DBitmaps.Load(L"data\\d3dbitmap.hwl");
-auto r2 = pD3DSprites.Load(L"data\\d3dsprite.hwl");
+bool r2 = pD3DSprites.Load(L"data\\d3dsprite.hwl");
 return r1 && r2;
 }
 //----- (0049EBF1) --------------------------------------------------------
 Render *v2; // esi@1
 IDirectDrawSurface4 *v3; // eax@6
 IDirectDrawSurface4 *v4; // ST0C_4@6
 RECT v5; // [sp+8h] [bp-10h]@6
-auto a1 = this;
+Render* a1 = this;
 v2 = a1;
 if ( a1->pRenderD3D )
 {
 if (pFrontBuffer4->IsLost() == DDERR_SURFACELOST)
 pFrontBuffer4->Restore();
 IDirectDrawSurface *pFront; // eax@3
 HRESULT v2; // eax@5
 signed int v3; // [sp-8h] [bp-Ch]@3
 int v4; // [sp-4h] [bp-8h]@3
-auto a5 = this;
+Render* a5 = this;
 if ( pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || pVersion->pVersionInfo.dwMajorVersion != 4 )
 {
 pFront = (IDirectDrawSurface *)a5->pFrontBuffer4;
 v4 = 0;
 v3 = 2615;
 //auto a3 = pFace;
 //auto a6 = uPackedID;
 //v59 = pGame->pLightmapBuilder;
 //v9 = v59->std__vector_000004_size;
-auto uCorrectedColor = uColor;
+uint uCorrectedColor = uColor;
 if (pGame->pLightmapBuilder->std__vector_000004_size)
 uCorrectedColor = 0xFFFFFFFF;
 pGame->AlterGamma_BLV(pFace, &uCorrectedColor);
 unsigned __int16 *v14; // eax@19
 DWORD v15; // edx@20
 HRESULT v16; // eax@23
 stru350 Dst; // [sp+Ch] [bp-F8h]@12
-auto pHWLTexture = pD3DBitmaps.LoadTexture(pName, bMipMaps);
+HWLTexture* pHWLTexture = pD3DBitmaps.LoadTexture(pName, bMipMaps);
 if ( pHWLTexture )
 {
 bMipMaps = !strncmp(pName, "HDWTR", 5);
 if ( !pRenderD3D->CreateTexture(
 pHWLTexture->uWidth,
 double v39; // [sp+94h] [bp-Ch]@6
 float v40; // [sp+9Ch] [bp-4h]@6
 __debugbreak();
-auto ecx0 = this;
+Render* ecx0 = this;
 v3 = 0;
 if (!this->pRenderD3D)
 __debugbreak(); // sw render
 return;
 unsigned __int32 twoColors = (uColor16 << 16) | uColor16;
 for (uint y = 0; y < uHeight; ++y)
 {
-auto pDst = &pTargetSurface[uX + (y + uY) * uTargetSurfacePitch];
+ushort* pDst = &pTargetSurface[uX + (y + uY) * uTargetSurfacePitch];
 memset32(pDst, twoColors, uWidth / 2);
 if (uWidth & 1)
 pDst[uWidth - 1] = uColor16;
 }
 int v27; // [sp+1Ch] [bp+Ch]@33
 unsigned int v28; // [sp+20h] [bp+10h]@30
 unsigned int v29; // [sp+24h] [bp+14h]@22
 unsigned int v30; // [sp+24h] [bp+14h]@31
-auto a2 = x;
+int a2 = x;
-auto a3 = y;
+int a3 = y;
-auto a6 = uFontHeight;
+uint a6 = uFontHeight;
 if ( this->uNumSceneBegins )
 {
 v8 = a5;
 v9 = a6;
 v10 = &pTargetSurface[x + y * uTargetSurfacePitch];
 //v5 = 0, pDesta = uNumItems;
 uint idx1 = 0,
 idx2 = uNumItems;
 while (true)
 {
-auto i = idx1 + (idx2 - idx1) / 2;
+uint i = idx1 + (idx2 - idx1) / 2;
-auto res = _stricmp(pName, pSpriteNames[i]);
+int res = _stricmp(pName, pSpriteNames[i]);
 if (!res)
 {
 fseek(pFile, pSpriteOffsets[i], SEEK_SET);
 break;
 }
 uint uCompressedSize = 0;
 fread(&uCompressedSize, 4, 1, pFile);
-auto pTex = new HWLTexture;
+HWLTexture* pTex = new HWLTexture;
 fread(&pTex->uBufferWidth, 4, 1, pFile);
 fread(&pTex->uBufferHeight, 4, 1, pFile);
 fread(&pTex->uAreaWidth, 4, 1, pFile);
 fread(&pTex->uAreaHeigth, 4, 1, pFile);
 fread(&pTex->uWidth, 4, 1, pFile);
 fread(&pTex->uAreaY, 4, 1, pFile);
 pTex->pPixels = new unsigned __int16[pTex->uWidth * pTex->uHeight];
 if (uCompressedSize)
 {
-auto pCompressedData = new char[uCompressedSize];
+char* pCompressedData = new char[uCompressedSize];
 {
 fread(pCompressedData, 1, uCompressedSize, pFile);
-auto uDecompressedSize = pTex->uWidth * pTex->uHeight * sizeof(short);
+uint uDecompressedSize = pTex->uWidth * pTex->uHeight * sizeof(short);
 zlib::MemUnzip(pTex->pPixels, &uDecompressedSize, pCompressedData, uCompressedSize);
 }
 delete [] pCompressedData;
 }
 else
 }*/
 for (uint i = pRenderer->uNumBillboardsToDraw - 1; i != (uint)-1; --i)
 {
-auto p = &pRenderer->pBillboardRenderListD3D[i];
+RenderBillboardD3D* p = &pRenderer->pBillboardRenderListD3D[i];
 if (p->uOpacity != RenderBillboardD3D::NoBlend)
 SetBillboardBlendOptions(p->uOpacity);
 pRenderer->pRenderD3D->pDevice->SetTexture(0, p->pTexture);

Mercurial > mm7

comparison Render.cpp @ 1982:2647e2f820a6