mm7: Indoor.cpp comparison

comparison Indoor.cpp @ 791:346f7069676a

Indoor::GetSector and various stuff

author	Nomad
date	Mon, 25 Mar 2013 05:27:18 +0200
parents	f004c7ceb7bd
children	290afbd48b6b

comparison

equal deleted inserted replaced

-:1e2be0f5eb30
+:346f7069676a
 #include "Log.h"
 #include "TurnEngine.h"
 #include "PaletteManager.h"
 #include "MapInfo.h"
 #include "IndoorCamera.h"
+#include "GUIWindow.h"
+#include "GUIButton.h"
+#include "GUIFont.h"
 #include "mm7_data.h"
 if (viewparams->draw_sw_outlines)
 _this.uFlags |= INDOOR_CAMERA_DRAW_SW_OUTLINES;
 if (viewparams->draw_d3d_outlines)
 _this.uFlags |= INDOOR_CAMERA_DRAW_D3D_OUTLINES;
+_this.uFlags |= INDOOR_CAMERA_DRAW_D3D_OUTLINES;
+_this.uFlags |= INDOOR_CAMERA_DRAW_SW_OUTLINES;
+//INDOOR_CAMERA_DRAW_TERRAIN_OUTLINES
 _this.field_0_timer = pEventTimer->uTotalGameTimeElapsed;
 _this.field_1C_mb_fov = 65;
-_this.vPosition.x = pParty->vPosition.x - ((stru_5C6E00->Cos(pParty->sRotationY) * (signed __int64)pParty->y_rotation_granularity) >> 16);
+_this.vPosition.x = pParty->vPosition.x - fixpoint_mul(stru_5C6E00->Cos(pParty->sRotationY), pParty->y_rotation_granularity);
-_this.vPosition.y = pParty->vPosition.y - ((stru_5C6E00->Sin(pParty->sRotationY) * (signed __int64)pParty->y_rotation_granularity) >> 16);
+_this.vPosition.y = pParty->vPosition.y - fixpoint_mul(stru_5C6E00->Sin(pParty->sRotationY), pParty->y_rotation_granularity);
 _this.vPosition.z = pParty->vPosition.z + pParty->sEyelevel;
 _this.sRotationX = pParty->sRotationX;
 _this.sRotationY = pParty->sRotationY;
 _this.pRenderTarget = pRenderer->pTargetSurface;
 _this.uViewportX = pViewport->uScreen_TL_X;
 pGame->pLightmapBuilder->ApplyLights(&stru_F8AD28, &stru_F7B60C, uNumVerticesa, array_507D30, pVertices, 0);
 if (pDecalBuilder->uNumDecals > 0)
 pDecalBuilder->ApplyDecals(a4a, 1, &stru_F7B60C, uNumVerticesa, array_507D30, pVertices, 0, pFace->uSectorID);
-if (pFace->Animated() &&
+if (pFace->Fluid() &&
 pFace->uBitmapID == pRenderer->hd_water_tile_id )
 {
 __debugbreak();
 v23 = pRenderer->pHDWaterBitmapIDs[pRenderer->hd_water_current_frame];
 goto LABEL_42;
 }
-if (pFace->Animated())
+if (pFace->Fluid())
 {
 //auto v24 = GetTickCount() / 4;
 //auto v25 = v24 - stru_5C6E00->uIntegerHalfPi;
 uint eightSeconds = GetTickCount() % 8000;
 float angle = (eightSeconds / 8000.0f) * 2 * 3.1415f;
 AddBspNodeToRenderList(v30);
 }
 }
 if (pBLVRenderParams->uFlags & INDOOR_CAMERA_DRAW_SW_OUTLINES)
 pGame->pIndoorCameraD3D->PrepareAndDrawDebugOutline(pFace, 0x1E1EFF);
+//pGame->pIndoorCameraD3D->DebugDrawPortal(pFace);
 }
 }
 //----- (004AFB86) --------------------------------------------------------
 //int v27; // edx@26
 //signed __int64 v28; // qtt@26
 ///Vec3_short_ *v29; // eax@26
 //Vec3_short_ *v30; // edx@26
 //int v31; // edx@26
-signed int v32; // edi@27
+//signed int v32; // edi@27
 signed __int64 v33; // qtt@27
 //Vec3_short_ *v34; // edx@27
-int v35; // edx@32
+//int v35; // edx@32
 int v37; // edi@38
 int pSectorID; // ebx@40
 int v39; // eax@41
 BLVFace *pFace; // esi@42
 PolygonType pPolygonType; // dl@42
 int v57; // [sp+108h] [bp-Ch]@16
 //Vec3_short_ *v58; // [sp+10Ch] [bp-8h]@20
 int v59; // [sp+110h] [bp-4h]@16
 v4 = 0;
-//v7 = __OFSUB__(this->uNumSectors, 1);
+v43[0] = 0;
-//v5 = this->uNumSectors == 1;
-//v6 = this->uNumSectors - 1 < 0;
 v55 = 0;
-v43[0] = 0;
-//v56 = 1;
 if (uNumSectors < 2)
 return 0;
 for (uint i = 1; i < uNumSectors; ++i)
 {
 auto pSector = pSectors + i;
-if (pSector->pBounding.x1 <= sX  && pSector->pBounding.x2 >= sX)
+if (pSector->pBounding.x1 > sX || pSector->pBounding.x2 < sX ||
-if (pSector->pBounding.y1 <= sY  && pSector->pBounding.y2 >= sY)
+pSector->pBounding.y1 > sY || pSector->pBounding.y2 < sY ||
-if (pSector->pBounding.z1 - 64 <= sZ && pSector->pBounding.z2 + 64 >= sZ)
+pSector->pBounding.z1 - 64 > sZ || pSector->pBounding.z2 + 64 < sZ)
+continue;
+//Log::Warning(L"Sector[%u]", i);
+v51 = pSector->uNumFloors + pSector->uNumPortals;
+if (!v51)
+continue;
+for (uint j = 0; j < v51; ++j)
+{
+uint uFaceID;
+if (j < pSector->uNumFloors)
+uFaceID = pSector->pFloors[j];
+else
+uFaceID = pSector->pPortals[j - pSector->uNumFloors];
+auto pFace = pFaces + uFaceID;
+if (pFace->uPolygonType != POLYGON_Floor &&
+pFace->uPolygonType != POLYGON_InBetweenFloorAndWall)
+continue;
+v54 = 0;
+v50 = pVertices[pFace->pVertexIDs[0]].y >= sY;
+for (uint k = 1; k < pFace->uNumVertices; k++)
+{
+v59 = v50;
+if (v54 >= 2)
+break;
+auto v2 = &pVertices[pFace->pVertexIDs[k]];
+v50 = v2->y >= sY;
+if ( v59 == v50 )
+continue;
+auto v1 = &pVertices[pFace->pVertexIDs[k - 1]];
+v25 = v2->x >= sX ? 0 : 2;
+v26 = v25 | (v1->x < sX);
+if (v26 == 3)
+continue;
+if (!v26)
+++v54;
+else
 {
-//Log::Warning(L"Sector[%u]", i);
+if (v1->x >= v2->x)
-v51 = pSector->uNumFloors + pSector->uNumPortals;
+{
-if (!v51)
+/*int _a58;
-continue;
-//v9 = pSector->uNumFloors;
-//v10 = v9 + pSector->uNumPortals;
-//v11 = 0;
-//v44 = v9;
-//v48 = 0;
-//v12 = -2 * v9;
-//v53 = -2 * v9;
-for (uint j = 0; j < v51; ++j)
-{
-unsigned int uFaceID;
-if (j < pSector->uNumFloors)
-uFaceID = pSector->pFloors[j];
-else
-uFaceID = pSector->pPortals[j - pSector->uNumFloors];
-auto pFace = pFaces + uFaceID;
-//v14 = (signed __int16)v13;
-//v15 = this->pFaces;
-//v46 = v13;
-//v14 *= 96;
-//v45 = v13 * sizeof(BLVFace);
-//v16 = pFaces + uFaceID;
-//v17 = v16->uPolygonType;
-if (pFace->uPolygonType == POLYGON_Floor ||
-pFace->uPolygonType == POLYGON_InBetweenFloorAndWall)
-{
-//pVertexIDs = pFace->pVertexIDs;
-//v19 = this->pVertices;
-//v20 = pVertices[pFace->pVertexIDs[0]].y;
-v54 = 0;
-//v57 = 0;
-//v5 = v16->uNumVertices == 0;
-v59 = pVertices[pFace->pVertexIDs[0]].y >= sY;
-//v21 = pFace->pVertexIDs + 1;
-for (uint k = 0; k < pFace->uNumVertices; k++)
-{
-if (v54 >= 2)
-break;
-//v49 = &pVertices[pFace->pVertexIDs[k]];
-auto v2 = &pVertices[pFace->pVertexIDs[k]];
-//v22 = pVertex->y;
-//v47 = pVertex->y;
-v50 = v2->y >= sY;
-if ( v59 != v50 )
-{
-//v58 = &pVertices[pFace->pVertexIDs[k - 1]];
-auto v1 = &pVertices[pFace->pVertexIDs[k]];
-//v23 = v58->x;
-//HIWORD(v24) = HIWORD(v49);
-//LOWORD(v24) = v49->x;
-//v49 = v24;
-//v59 = v49->x;
-v25 = v1->x >= sX ? 0 : 2;
-v26 = v25 | v2->x < sX;
-if ( v26 != 3 )
-{
-if (!v26)
-++v54;
-else
-{
-if (v1->x >= v2->x)
-{
-int _a58;
 int _a59;
 v32 = v1->x - v2->x;
 LODWORD(v33) = v32 << 16;
-HIDWORD(v33) = v32 >> 16;
+HIDWORD(v33) = v32 >> 16;*/
-_a58 = v33 / (v1->y - v2->y);
+//fixpoint_div(v1->x - v2->x, v1->y - v2->y);
-_a59 = (unsigned __int64)(_a58 * (__int64)(sY - v2->y)) >> 16;
+//_a58 = v33 / (v1->y - v2->y);
+//_a59 = fixpoint_mul(_a58, sY - v2->y);
-if (v59 + pVertices[k].x > sX)
+auto x_div_y = fixpoint_div(v1->x - v2->x, v1->y - v2->y);
-++v54;
+auto rval = fixpoint_mul(x_div_y, sY - v2->y);  // a / b * c  - looks like projection
-}
+if (rval + v2->x > sX)
-else
+++v54;
-{
+}
-int _a58;
+else
+{
+auto x_div_y = fixpoint_div(v2->x - v1->x, v2->y - v1->y);
+auto res = fixpoint_mul(x_div_y, sY - v1->y);
+if (res + v1->x > sX)
+++v54;
+/*int _a58;
 int _a59;
-v32 = v2->x - v1->x;
+auto v32 = v2->x - v1->x;
 LODWORD(v33) = v32 << 16;
 HIDWORD(v33) = v32 >> 16;
 _a58 = v33 / (v2->y - v1->y);
-_a59 = (unsigned __int64)(_a58 * (signed __int64)(sY - v1->y)) >> 16;
+_a59 = fixpoint_mul(_a58, sY - v1->y);
 if (_a59 + pVertices[k].x > sX)
-++v54;
+++v54;*/
-}
-}
-}
-}
-v59 = v50;
-}
-if (pFace->uNumVertices)
-{
-if (v54 == 1)
-{
-v35 = v55++;
-v43[v35] = uFaceID;
-}
-}
-}
 }
-v4 = v43[0];
 }
 }
+if (pFace->uNumVertices && v54 == 1)
+v43[v55++] = uFaceID;
+}
+}
+v4 = v43[0];
 if ( v55 == 1 )
 return this->pFaces[v4].uSectorID;
 v37 = 0;
 if ( !v55 )
 return 0;

Mercurial > mm7

comparison Indoor.cpp @ 791:346f7069676a