Mercurial > mm7
comparison Render.cpp @ 741:cd9ae9a2c99c
Слияние
author | Ritor1 |
---|---|
date | Fri, 22 Mar 2013 19:59:03 +0600 |
parents | 14cf77af15de 2f4e33c1ed24 |
children | 353ff9ea11e6 |
comparison
equal
deleted
inserted
replaced
740:14cf77af15de | 741:cd9ae9a2c99c |
---|---|
216 soft_billboard.pPalette = pPaletteManager->field_261600[p->uPalette]; | 216 soft_billboard.pPalette = pPaletteManager->field_261600[p->uPalette]; |
217 if ( !(soft_billboard.uFlags & 0x40) && soft_billboard.uFlags & 0x80 ) | 217 if ( !(soft_billboard.uFlags & 0x40) && soft_billboard.uFlags & 0x80 ) |
218 soft_billboard.pPalette2 = PaletteManager::Get_Dark_or_Red_LUT(p->uPalette, 0, 1); | 218 soft_billboard.pPalette2 = PaletteManager::Get_Dark_or_Red_LUT(p->uPalette, 0, 1); |
219 v5 = p->uHwSpriteID; | 219 v5 = p->uHwSpriteID; |
220 if ( v5 >= 0 ) | 220 if ( v5 >= 0 ) |
221 pSprites_LOD->pSpriteHeaders[v5]._4ACC38(&soft_billboard, 1); | 221 pSprites_LOD->pSpriteHeaders[v5].DrawSprite_sw(&soft_billboard, 1); |
222 } | 222 } |
223 } | 223 } |
224 } | 224 } |
225 } | 225 } |
226 | 226 |
2148 { | 2148 { |
2149 if ( this_3 ) | 2149 if ( this_3 ) |
2150 v33 = 3; | 2150 v33 = 3; |
2151 else | 2151 else |
2152 v33 = v108 != 0 ? 5 : 0; | 2152 v33 = v108 != 0 ? 5 : 0; |
2153 static_sub_0048034E_stru_154._49B0C9(v23, v95); | 2153 static_sub_0048034E_stru_154.ClassifyPolygon(v23, v95); |
2154 if ( pDecalBuilder->uNumDecals > 0 ) | 2154 if ( pDecalBuilder->uNumDecals > 0 ) |
2155 pDecalBuilder->ApplyDecals(31 - v16->dimming_level, 4, &static_sub_0048034E_stru_154, a5, array_50AC10, 0, *(float *)&v33, -1); | 2155 pDecalBuilder->ApplyDecals(31 - v16->dimming_level, 4, &static_sub_0048034E_stru_154, a5, array_50AC10, 0, *(float *)&v33, -1); |
2156 } | 2156 } |
2157 if ( stru_F8AD28.uNumLightsApplied > 0 ) | 2157 if ( stru_F8AD28.uNumLightsApplied > 0 ) |
2158 pGame->pLightmapBuilder->ApplyLights(&stru_F8AD28, &static_sub_0048034E_stru_154, a5, array_50AC10, 0, v33); | 2158 pGame->pLightmapBuilder->ApplyLights(&stru_F8AD28, &static_sub_0048034E_stru_154, a5, array_50AC10, 0, v33); |
2293 if ( this_3a ) | 2293 if ( this_3a ) |
2294 pVertices = (RenderVertexSoft *)3; | 2294 pVertices = (RenderVertexSoft *)3; |
2295 else | 2295 else |
2296 pVertices = (RenderVertexSoft *)(v108 != 0 ? 5 : 0); | 2296 pVertices = (RenderVertexSoft *)(v108 != 0 ? 5 : 0); |
2297 //a8 = (RenderVertexSoft *)(this_3a ? 3 : v108 != 0 ? 5 : 0); | 2297 //a8 = (RenderVertexSoft *)(this_3a ? 3 : v108 != 0 ? 5 : 0); |
2298 static_sub_0048034E_stru_76D590._49B0C9(v48, *(float *)&a4); | 2298 static_sub_0048034E_stru_76D590.ClassifyPolygon(v48, *(float *)&a4); |
2299 if ( pDecalBuilder->uNumDecals > 0 ) | 2299 if ( pDecalBuilder->uNumDecals > 0 ) |
2300 pDecalBuilder->ApplyDecals(31 - v40->dimming_level, 4, &static_sub_0048034E_stru_76D590, uNumVertices, array_50AC10, 0, (char)pVertices, -1); | 2300 pDecalBuilder->ApplyDecals(31 - v40->dimming_level, 4, &static_sub_0048034E_stru_76D590, uNumVertices, array_50AC10, 0, (char)pVertices, -1); |
2301 } | 2301 } |
2302 if ( stru_F8AD28.uNumLightsApplied > 0 ) | 2302 if ( stru_F8AD28.uNumLightsApplied > 0 ) |
2303 v96->ApplyLights(&stru_F8AD28, &static_sub_0048034E_stru_76D590, uNumVertices, array_50AC10, 0, (char)pVertices); | 2303 v96->ApplyLights(&stru_F8AD28, &static_sub_0048034E_stru_76D590, uNumVertices, array_50AC10, 0, (char)pVertices); |
2416 { | 2416 { |
2417 if ( this_3b ) | 2417 if ( this_3b ) |
2418 v70 = 3; | 2418 v70 = 3; |
2419 else | 2419 else |
2420 v70 = v108 != 0 ? 5 : 0; | 2420 v70 = v108 != 0 ? 5 : 0; |
2421 static_sub_0048034E_stru_76D578._49B0C9(v63, v87); | 2421 static_sub_0048034E_stru_76D578.ClassifyPolygon(v63, v87); |
2422 if ( pDecalBuilder->uNumDecals > 0 ) | 2422 if ( pDecalBuilder->uNumDecals > 0 ) |
2423 pDecalBuilder->ApplyDecals(31 - v40->dimming_level, 4, &static_sub_0048034E_stru_76D578, v100, array_50AC10, 0, v70, -1); | 2423 pDecalBuilder->ApplyDecals(31 - v40->dimming_level, 4, &static_sub_0048034E_stru_76D578, v100, array_50AC10, 0, v70, -1); |
2424 } | 2424 } |
2425 if ( stru_F8AD28.uNumLightsApplied > 0 ) | 2425 if ( stru_F8AD28.uNumLightsApplied > 0 ) |
2426 v96->ApplyLights(&stru_F8AD28, &static_sub_0048034E_stru_76D578, v100, array_50AC10, 0, v70); | 2426 v96->ApplyLights(&stru_F8AD28, &static_sub_0048034E_stru_76D578, v100, array_50AC10, 0, v70); |
3048 v18 = (unsigned __int64)(15i64 * v15) >> 16; | 3048 v18 = (unsigned __int64)(15i64 * v15) >> 16; |
3049 billboard.pPalette2 = PaletteManager::Get_Dark_or_Red_LUT(*((short *)v1 - 7), 15 - v18, 1); | 3049 billboard.pPalette2 = PaletteManager::Get_Dark_or_Red_LUT(*((short *)v1 - 7), 15 - v18, 1); |
3050 } | 3050 } |
3051 v13 = *((short *)v1 - 8); | 3051 v13 = *((short *)v1 - 8); |
3052 if ( v13 >= 0 ) | 3052 if ( v13 >= 0 ) |
3053 pSprites_LOD->pSpriteHeaders[v13]._4ACC38(&billboard, 1); | 3053 pSprites_LOD->pSpriteHeaders[v13].DrawSprite_sw(&billboard, 1); |
3054 } | 3054 } |
3055 } | 3055 } |
3056 } | 3056 } |
3057 } | 3057 } |
3058 | 3058 |