diff --git a/src/xrCore/FMesh.cpp b/src/xrCore/FMesh.cpp index 191e5fc8191..2aa811d1a1b 100644 --- a/src/xrCore/FMesh.cpp +++ b/src/xrCore/FMesh.cpp @@ -1,167 +1,8 @@ #include "stdafx.h" #pragma hdrstop -#pragma warning(disable:4995) -#include -#pragma warning(default:4995) #include "FMesh.hpp" -//BOOL ValidateIndices(u32 vCount, u32 iCount, u16* pIndices) -//{ -// if (vCount>65535) return FALSE; -// if (iCount%3) return FALSE; -// -// for (u32 I=0; I=vCount) return FALSE; -// } -// return TRUE; -//} - -//static u32 dwPositionPart[8] = -//{ -// 0, // no position -// 3, // x,y,z -// 4, // sx,sy,sz,rhw -// 4, // x,y,z,b1 -// 5, // x,y,z,b1,b2 -// 6, // x,y,z,b1,b2,b3 -// 7, // x,y,z,b1,b2,b3,b4 -// 8 // x,y,z,b1,b2,b3,b4,b5 -//}; - -//#define FAKES 0xffffffff -//#define FAKEZ 0xfffffffe - -/* -void ConvertVertices(u32 dwTypeDest, void *pDest, u32 dwTypeSrc, void *pSource, u32 dwCount) -// assuming that pDest is large enought to maintain all the data -{ -u32 TransferMask [64]; -u32 tmPos = 0; -u32 tmPosSrc = 0; -u32 dwSizeSrc = D3DXGetFVFVertexSize(dwTypeSrc)/4; -u32 dwSizeDest = D3DXGetFVFVertexSize(dwTypeDest)/4; -u32* dest = (u32*)pDest; -u32* src = (u32*)pSource; - -// avoid redundant processing -if (dwTypeDest==dwTypeSrc) { -CopyMemory (pDest,pSource,dwSizeDest*dwCount*4); -return; -} - -// how many bytes to 'simple copy' -u32 dwPosDest = (dwTypeDest&D3DFVF_POSITION_MASK)>>1; -u32 dwPosSrc = (dwTypeSrc&D3DFVF_POSITION_MASK)>>1; -if (dwPosDest==dwPosSrc) { -u32 cnt = dwPositionPart[dwPosSrc]; -for (u32 i=0; i>D3DFVF_TEXCOUNT_SHIFT); -u32 dwTSrc = ((dwTypeSrc &D3DFVF_TEXCOUNT_MASK)>>D3DFVF_TEXCOUNT_SHIFT); -if (dwTDest<=dwTSrc) { -for (u32 i=0; i