mm7: Render.cpp comparison

comparison Render.cpp @ 2182:e1e4a8a20b5f

_46А6АС_GetActorsInViewport

author	Ritor1
date	Thu, 23 Jan 2014 17:31:12 +0600
parents	147ee4591b76
children	48a28fe1f32f 4842f58715ea

comparison

equal deleted inserted replaced

-:17b3e40daedc
+:e1e4a8a20b5f
 pPixels = (unsigned __int16 *)malloc(2 * height * width);
 memset(pPixels, 0 , 2 * height * width);
 v3 = pPixels;
 BeginSceneD3D();
 if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
 pIndoor->Draw();
 else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
 pOutdoor->Draw();
+DrawBillboards_And_MaybeRenderSpecialEffects_And_EndScene();
-DrawBillboards_And_MaybeRenderSpecialEffects_And_EndScene();
+memset(&Dst, 0, 0x7C);
-memset(&Dst, 0, 0x7C);
+Dst.dwSize = sizeof(Dst);
-Dst.dwSize = sizeof(Dst);
+if ( LockSurface_DDraw4(pBackBuffer4, &Dst, DDLOCK_WAIT) )
-if ( LockSurface_DDraw4(pBackBuffer4, &Dst, DDLOCK_WAIT) )
+{
-{
+for (uint y = 0; y < height; ++y)
-for (uint y = 0; y < height; ++y)
+{
-{
+for (uint x = 0; x < width; ++x)
-for (uint x = 0; x < width; ++x)
+{
+//*v3 = pRenderer->ReadPixel16((int)(x* interval_x + 8.0), (int)(y * interval_y + 8.0));//screen_data[screen_y + (int)(x* interval_x + 8.0)];
+if (Dst.ddpfPixelFormat.dwRGBBitCount == 32)
 {
-//*v3 = pRenderer->ReadPixel16((int)(x* interval_x + 8.0), (int)(y * interval_y + 8.0));//screen_data[screen_y + (int)(x* interval_x + 8.0)];
+auto p = (unsigned __int32 *)Dst.lpSurface + (int)(x * interval_x + 8.0) + y/* (int)(y * interval_y + 8.0)*/ * Dst.lPitch;
+*v3 = Color16((*p >> 16) & 255, (*p >> 8) & 255, *p & 255);
-if (Dst.ddpfPixelFormat.dwRGBBitCount == 32)
+}
+else if (Dst.ddpfPixelFormat.dwRGBBitCount == 16)
+{
+auto p = (unsigned __int16 *)Dst.lpSurface + (int)(x * interval_x + 8.0) + y * Dst.lPitch;
+*v3 = *p;
+}
+else __debugbreak();
+++v3;
+}
+}
+ErrD3D(pBackBuffer4->Unlock(0));
+}
+else
+{
+__debugbreak(); // unrefactored - black screenshot
+v4 = height;
+if ( height > 0 )
+{
+do
+{
+if ( width > 0 )
+{
+v5 = width & 1;
+v6 = (unsigned int)width / 2;
+memset(v3, 0, 4 * ((unsigned int)width / 2));
+v7 = &v3[2 * v6];
+for ( j = v5; j; --j )
 {
-auto p = (unsigned __int32 *)Dst.lpSurface + (int)(x * interval_x + 8.0) + y/* (int)(y * interval_y + 8.0)*/ * Dst.lPitch;
+*v7 = 0;
-*v3 = Color16((*p >> 16) & 255, (*p >> 8) & 255, *p & 255);
+++v7;
 }
-else if (Dst.ddpfPixelFormat.dwRGBBitCount == 16)
+v3 += width;
-{
-auto p = (unsigned __int16 *)Dst.lpSurface + (int)(x * interval_x + 8.0) + y * Dst.lPitch;
-*v3 = *p;
-}
-else __debugbreak();
-++v3;
 }
-}
+--v4;
-ErrD3D(pBackBuffer4->Unlock(0));
+}
-}
+while ( v4 );
-else
+}
-{
+}
-__debugbreak(); // unrefactored - black screenshot
-v4 = height;
-if ( height > 0 )
-{
-do
-{
-if ( width > 0 )
-{
-v5 = width & 1;
-v6 = (unsigned int)width >> 1;
-memset(v3, 0, 4 * ((unsigned int)width >> 1));
-v7 = &v3[2 * v6];
-for ( j = v5; j; --j )
-{
-*v7 = 0;
-++v7;
-}
-v3 += width;
-}
---v4;
-}
-while ( v4 );
-}
-}
 /*if (!pRenderer->pRenderD3D)
 {
 pRenderer->BeginScene();
 if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
 {
 free(pixels);
 }
 //----- (0046A7C8) --------------------------------------------------------
-int Render::_46A6AC_spell_render_d3d(int a1, int a2, int a3)
+int Render::_46�6��_GetActorsInViewport(int pDepth)
 {
-unsigned int v3; // eax@2
+unsigned int v3; // eax@2 ����������� � ����� ��� ���� ��� �������� ���-�� �������� ������� ������ � ���������� ������� id ������� ��������
 unsigned int v5; // eax@2
 unsigned int v6; // eax@4
-int v10; // ecx@11
 unsigned int v12; // [sp+10h] [bp-14h]@1
-int v15; // [sp+1Ch] [bp-8h]@1
+int mon_num; // [sp+1Ch] [bp-8h]@1
 unsigned int a1a; // [sp+20h] [bp-4h]@1
-v15 = 0;
+mon_num = 0;
 v12 = GetBillboardDrawListSize();
 if ( (signed int)GetBillboardDrawListSize() > 0 )
 {
 for ( a1a = 0; (signed int)a1a < (signed int)v12; ++a1a )
 {
 v3 = GetParentBillboardID(a1a);
 v5 = (unsigned __int16)pBillboardRenderList[v3].object_pid;
 if ( PID_TYPE(v5) == OBJECT_Actor)
 {
-if ( pBillboardRenderList[v3].sZValue <= (unsigned int)(a3 << 16) )
+if ( pBillboardRenderList[v3].sZValue <= (unsigned int)(pDepth << 16) )
 {
 v6 = PID_ID(v5);
 if ( pActors[v6].uAIState != Dead && pActors[v6].uAIState != Dying && pActors[v6].uAIState != Removed
 && pActors[v6].uAIState != Disabled && pActors[v6].uAIState != Summoned )
 {
-if ( pGame->pVisInstance->DoesRayIntersectBillboard((double)a3, a1a) )
+if ( pGame->pVisInstance->DoesRayIntersectBillboard((double)pDepth, a1a) )
 {
-if ( v15 < a2 - 1 )
+if ( mon_num < 100 )
 {
-__debugbreak();// *(int *)(a1 + 4 * v10) = v6; ��� ��� �����?
+_50BF30_actors_in_viewport_ids[mon_num] = v6;
-v10 = v15++;
+mon_num++;
-*(int *)(a1 + 4 * v10) = v6;
 }
 }
 }
 }
 }
 }
 }
-return v15;
+return mon_num;
 }

Mercurial > mm7

comparison Render.cpp @ 2182:e1e4a8a20b5f