xrCore/FMesh.cpp: Removed commented-out code and unused include.

Author: Kaffeine

src/xrCore/FMesh.cpp

@@ -1,167 +1,8 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#pragma warning(disable:4995)
-#include <d3dx9.h>
-#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<iCount; I++)
-// {
-// if (u32(pIndices[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<cnt; i++) TransferMask[tmPos++]=i;
-tmPosSrc = tmPos;
-} else {
-FATAL ("Can't convert between different vertex positions");
-}
-
-// ---------------------- "Reserved" property
-if ((dwTypeDest&D3DFVF_PSIZE) && (dwTypeSrc&D3DFVF_PSIZE))
-{ // DEST & SRC
-TransferMask[tmPos++]=tmPosSrc++;
-}
-if ((dwTypeDest&D3DFVF_PSIZE) && !(dwTypeSrc&D3DFVF_PSIZE))
-{ // DEST & !SRC
-TransferMask[tmPos++]=FAKEZ;// fake data
-}
-if (!(dwTypeDest&D3DFVF_PSIZE) && (dwTypeSrc&D3DFVF_PSIZE))
-{ // !DEST & SRC
-tmPosSrc++; // skip it
-}
-
-// ---------------------- "Normal" property
-if ((dwTypeDest&D3DFVF_NORMAL) && (dwTypeSrc&D3DFVF_NORMAL))
-{ // DEST & SRC
-TransferMask[tmPos++]=tmPosSrc++;
-TransferMask[tmPos++]=tmPosSrc++;
-TransferMask[tmPos++]=tmPosSrc++;
-}
-if ((dwTypeDest&D3DFVF_NORMAL) && !(dwTypeSrc&D3DFVF_NORMAL))
-{ // DEST & !SRC
-FATAL ("Source format doesn't have NORMAL but destination HAS");
-}
-if (!(dwTypeDest&D3DFVF_NORMAL) && (dwTypeSrc&D3DFVF_NORMAL))
-{ // !DEST & SRC
-tmPosSrc++; // skip it
-tmPosSrc++; // skip it
-tmPosSrc++; // skip it
-}
-
-// ---------------------- "Diffuse" property
-if ((dwTypeDest&D3DFVF_DIFFUSE) && (dwTypeSrc&D3DFVF_DIFFUSE))
-{ // DEST & SRC
-TransferMask[tmPos++]=tmPosSrc++;
-}
-if ((dwTypeDest&D3DFVF_DIFFUSE) && !(dwTypeSrc&D3DFVF_DIFFUSE))
-{ // DEST & !SRC
-TransferMask[tmPos++]=FAKES; // fake data - white
-}
-if (!(dwTypeDest&D3DFVF_DIFFUSE) && (dwTypeSrc&D3DFVF_DIFFUSE))
-{ // !DEST & SRC
-tmPosSrc++; // skip it
-}
-
-// ---------------------- "Specular" property
-if ((dwTypeDest&D3DFVF_SPECULAR) && (dwTypeSrc&D3DFVF_SPECULAR))
-{ // DEST & SRC
-TransferMask[tmPos++]=tmPosSrc++;
-}
-if ((dwTypeDest&D3DFVF_SPECULAR) && !(dwTypeSrc&D3DFVF_SPECULAR))
-{ // DEST & !SRC
-TransferMask[tmPos++]=FAKES; // fake data - white
-}
-if (!(dwTypeDest&D3DFVF_SPECULAR) && (dwTypeSrc&D3DFVF_SPECULAR))
-{ // !DEST & SRC
-tmPosSrc++; // skip it
-}
-
-// ---------------------- "Texture coords" property
-u32 dwTDest = ((dwTypeDest&D3DFVF_TEXCOUNT_MASK)>>D3DFVF_TEXCOUNT_SHIFT);
-u32 dwTSrc = ((dwTypeSrc &D3DFVF_TEXCOUNT_MASK)>>D3DFVF_TEXCOUNT_SHIFT);
-if (dwTDest<=dwTSrc) {
-for (u32 i=0; i<dwTDest; i++) {
-TransferMask[tmPos++]=tmPosSrc++;
-TransferMask[tmPos++]=tmPosSrc++;
-}
-} else {
-if (dwTSrc==0) {
-FATAL ("Source vertex format doesn't has texture coords at all");
-}
-// Copy real TC
-u32 dwStage0TC = tmPosSrc;
-for (u32 i=0; i<dwTSrc; i++) {
-TransferMask[tmPos++]=tmPosSrc++;
-TransferMask[tmPos++]=tmPosSrc++;
-}
-// Duplicate stage0 TC
-for (i=dwTSrc; i<dwTDest; i++) {
-TransferMask[tmPos++]=dwStage0TC;
-TransferMask[tmPos++]=dwStage0TC+1;
-}
-}
-
-// ---------------------- REAL CONVERTION USING BUILDED MASK
-for (u32 i=0; i<dwCount; i++) {
-// one vertex
-for (u32 j=0; j<dwSizeDest; j++) {
-u32 m = TransferMask[j];
-if (m == FAKES) dest[j]=0xffffffff;
-else if (m == FAKEZ) dest[j]=0;
-else dest[j]=src[m];
-}
-dest += dwSizeDest;
-src += dwSizeSrc;
-}
-return;
-}
-*/
 void ogf_desc::Load(IReader& F)
 {
     F.r_stringZ(source_file);