AuroraMiddleware/UVAtlas
1
0
Fork 0
mirror of https://github.com/microsoft/UVAtlas synced 2024-09-19 14:20:00 +00:00
Code Issues Projects Releases Wiki Activity

Removed use of WINAPI macro as it's not useful in this context

Browse Source
This commit is contained in:
Chuck Walbourn 2020-02-24 21:58:25 -08:00
parent d2acd80c7e
commit 821b7c7ef5
5 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
UVAtlas/isochart/UVAtlasRepacker.cpp
View File

@ -17,18 +17,19 @@ using namespace Isochart;
using namespace IsochartRepacker;
_Use_decl_annotations_
HRESULT WINAPI IsochartRepacker::isochartpack2(std::vector<UVAtlasVertex>* pvVertexArray,
size_t VertexCount,
std::vector<uint8_t>* pvIndexFaceArray,
size_t FaceCount,
const uint32_t *pdwAdjacency,
size_t Width,
size_t Height,
float Gutter,
unsigned int Stage,
LPISOCHARTCALLBACK pCallback,
float Frequency,
size_t iNumRotate)
HRESULT IsochartRepacker::isochartpack2(
std::vector<UVAtlasVertex>* pvVertexArray,
size_t VertexCount,
std::vector<uint8_t>* pvIndexFaceArray,
size_t FaceCount,
const uint32_t *pdwAdjacency,
size_t Width,
size_t Height,
float Gutter,
unsigned int Stage,
LPISOCHARTCALLBACK pCallback,
float Frequency,
size_t iNumRotate)
{
HRESULT hr = S_OK ;

25
UVAtlas/isochart/UVAtlasRepacker.h
View File

@ -128,18 +128,19 @@ struct UVATLASATTRIBUTERANGE
the value is E_INVALIDARG.
\***************************************************************************/
HRESULT WINAPI isochartpack2(_In_ std::vector<DirectX::UVAtlasVertex>* pvVertexArray,
_In_ size_t VertexCount,
_In_ std::vector<uint8_t>* pvIndexFaceArray,
_In_ size_t FaceCount,
_In_reads_(FaceCount*3) const uint32_t *pdwAdjacency,
_In_ size_t Width,
_In_ size_t Height,
_In_ float Gutter,
_In_ unsigned int Stage,
_In_opt_ Isochart::LPISOCHARTCALLBACK pCallback = nullptr,
_In_ float Frequency = 0.01f,
_In_ size_t iNumRotate = 5);
HRESULT isochartpack2(
_In_ std::vector<DirectX::UVAtlasVertex>* pvVertexArray,
_In_ size_t VertexCount,
_In_ std::vector<uint8_t>* pvIndexFaceArray,
_In_ size_t FaceCount,
_In_reads_(FaceCount*3) const uint32_t *pdwAdjacency,
_In_ size_t Width,
_In_ size_t Height,
_In_ float Gutter,
_In_ unsigned int Stage,
_In_opt_ Isochart::LPISOCHARTCALLBACK pCallback = nullptr,
_In_ float Frequency = 0.01f,
_In_ size_t iNumRotate = 5);
class CUVAtlasRepacker
{

6
UVAtlas/isochart/imtcomputation.cpp
View File

@ -292,7 +292,7 @@ namespace
//-------------------------------------------------------------------------------------
HRESULT WINAPI Isochart::IMTFromPerVertexSignal(
HRESULT Isochart::IMTFromPerVertexSignal(
const XMFLOAT3* pV3d,
const float* pfSignalArray,
size_t dwSignalDimension,
@ -356,7 +356,7 @@ HRESULT WINAPI Isochart::IMTFromPerVertexSignal(
//-------------------------------------------------------------------------------------
HRESULT WINAPI
HRESULT
Isochart::IMTFromTextureMap(
const XMFLOAT3* pV3d, // [In] surface coordinates of face's vertices
const XMFLOAT2* pUV, // [In] Texture coordinates of each vertices in the range of 0 to 1.0f
@ -1411,7 +1411,7 @@ namespace
//-------------------------------------------------------------------------------------
HRESULT WINAPI
HRESULT
Isochart::IMTFromTextureMapEx(
const XMFLOAT3* pV3d, // [In] surface coordinates of face's vertices
const XMFLOAT2* pUV, // [In] Texture coordinates of each vertices in the range of 0 to 1.0f

4
UVAtlas/isochart/isochart.cpp
View File

@ -154,7 +154,7 @@ namespace
// E_FAIL, Exceptional errors
HRESULT WINAPI Isochart::isochart(
HRESULT Isochart::isochart(
const void* pVertexArray,
size_t VertexCount,
size_t VertexStride,
@ -289,7 +289,7 @@ LEnd:
}
_Use_decl_annotations_
HRESULT WINAPI Isochart::isochartpartition(
HRESULT Isochart::isochartpartition(
const void* pVertexArray,
size_t VertexCount,
size_t VertexStride,

10
UVAtlas/isochart/isochart.h
View File

@ -49,7 +49,7 @@ enum ISOCHARTOPTION
};
const DWORD _OPTIONMASK_ISOCHART_GEODESIC = _OPTION_ISOCHART_GEODESIC_FAST | _OPTION_ISOCHART_GEODESIC_QUALITY ;
HRESULT WINAPI
HRESULT
isochart(
const void* pVertexArray,
size_t VertexCount,
@ -74,7 +74,7 @@ isochart(
float Frequency = 0.01f, // Call callback function each time completed 1% work of all task
DWORD dwOptions = _OPTION_ISOCHART_DEFAULT );
HRESULT WINAPI
HRESULT
isochartpartition(
_In_reads_bytes_(VertexCount*VertexStride) const void* pVertexArray,
_In_ size_t VertexCount,
@ -175,14 +175,14 @@ public:
/////////////////////////////////////////////////////////////////////////
// Internal API, Compute IMT of one face from per-vertex signal
HRESULT WINAPI
HRESULT
IMTFromPerVertexSignal(
const DirectX::XMFLOAT3* pV3d, // [In] surface coordinates of face's vertices
const float* pfSignalArray, // [In] An array of 3 * dwSignalDimension FLOATs
size_t dwSignalDimension, // [In] Dimension of signal
FLOAT3* pfIMTArray); // [Out] Result IMT
HRESULT WINAPI
HRESULT
IMTFromTextureMap(
const DirectX::XMFLOAT3* pV3d, // [In] surface coordinates of face's vertices
const DirectX::XMFLOAT2* pUV, // [In] Texture coordinates of each vertices in the range of 0 to 1.0f
@ -194,7 +194,7 @@ IMTFromTextureMap(
void* lpTextureData, // Texture data, can be accessed by pfnGetSignal
FLOAT3* pfIMTArray); // [Out] Result IMT
HRESULT WINAPI
HRESULT
IMTFromTextureMapEx(
const DirectX::XMFLOAT3* pV3d, // [In] surface coordinates of face's vertices
const DirectX::XMFLOAT2* pUV, // [In] Texture coordinates of each vertices in the range of 0 to 1.0f