Skip to content

Commit

Permalink
Initial work on C99 API. #80
Browse files Browse the repository at this point in the history
  • Loading branch information
jpcy committed Sep 29, 2020
1 parent 3ec7437 commit 2b5b488
Show file tree
Hide file tree
Showing 3 changed files with 332 additions and 1 deletion.
2 changes: 1 addition & 1 deletion premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ project "xatlas"
rtti "Off"
warnings "Extra"
enablewarnings { "shadow" }
files { "xatlas.cpp", "xatlas.h" }
files { "xatlas.cpp", "xatlas.h", "xatlas_c.h" }
sanitizer()

dofile("extra/projects.lua")
111 changes: 111 additions & 0 deletions xatlas.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ MIT License
Copyright (c) 2012 Brandon Pelfrey
*/
#include "xatlas.h"
#include "xatlas_c.h"
#include <atomic>
#include <condition_variable>
#include <mutex>
Expand Down Expand Up @@ -9931,3 +9932,113 @@ const char *StringForEnum(ProgressCategory category)
}

} // namespace xatlas

// C99 API

static_assert(sizeof(xatlas::Chart) == sizeof(xatlasChart), "xatlasChart size mismatch");
static_assert(sizeof(xatlas::Vertex) == sizeof(xatlasVertex), "xatlasVertex size mismatch");
static_assert(sizeof(xatlas::Mesh) == sizeof(xatlasMesh), "xatlasMesh size mismatch");
static_assert(sizeof(xatlas::Atlas) == sizeof(xatlasAtlas), "xatlasAtlas size mismatch");
static_assert(sizeof(xatlas::MeshDecl) == sizeof(xatlasMeshDecl), "xatlasMeshDecl size mismatch");
static_assert(sizeof(xatlas::UvMeshDecl) == sizeof(xatlasUvMeshDecl), "xatlasUvMeshDecl size mismatch");
static_assert(sizeof(xatlas::ChartOptions) == sizeof(xatlasChartOptions), "xatlasChartOptions size mismatch");
static_assert(sizeof(xatlas::PackOptions) == sizeof(xatlasPackOptions), "xatlasPackOptions size mismatch");

#ifdef __cplusplus
extern "C" {
#endif

xatlasAtlas *xatlasCreate()
{
return (xatlasAtlas *)xatlas::Create();
}

void xatlasDestroy(xatlasAtlas *atlas)
{
xatlas::Destroy((xatlas::Atlas *)atlas);
}

xatlasAddMeshError xatlasAddMesh(xatlasAtlas *atlas, const xatlasMeshDecl *meshDecl, uint32_t meshCountHint)
{
return (xatlasAddMeshError)xatlas::AddMesh((xatlas::Atlas *)atlas, *(const xatlas::MeshDecl *)meshDecl, meshCountHint);
}

void xatlasAddMeshJoin(xatlasAtlas *atlas)
{
xatlas::AddMeshJoin((xatlas::Atlas *)atlas);
}

xatlasAddMeshError xatlasAddUvMesh(xatlasAtlas *atlas, const xatlasUvMeshDecl *decl)
{
return (xatlasAddMeshError)xatlas::AddUvMesh((xatlas::Atlas *)atlas, *(const xatlas::UvMeshDecl *)decl);
}

void xatlasComputeCharts(xatlasAtlas *atlas, const xatlasChartOptions *chartOptions)
{
xatlas::ComputeCharts((xatlas::Atlas *)atlas, chartOptions ? *(xatlas::ChartOptions *)chartOptions : xatlas::ChartOptions());
}

void xatlasPackCharts(xatlasAtlas *atlas, const xatlasPackOptions *packOptions)
{
xatlas::PackCharts((xatlas::Atlas *)atlas, packOptions ? *(xatlas::PackOptions *)packOptions : xatlas::PackOptions());
}

void xatlasGenerate(xatlasAtlas *atlas, const xatlasChartOptions *chartOptions, const xatlasPackOptions *packOptions)
{
xatlas::Generate((xatlas::Atlas *)atlas, chartOptions ? *(xatlas::ChartOptions *)chartOptions : xatlas::ChartOptions(), packOptions ? *(xatlas::PackOptions *)packOptions : xatlas::PackOptions());
}

void xatlasSetProgressCallback(xatlasAtlas *atlas, xatlasProgressFunc progressFunc, void *progressUserData)
{
xatlas::ProgressFunc pf;
*(void **)&pf = (void *)progressFunc;
xatlas::SetProgressCallback((xatlas::Atlas *)atlas, pf, progressUserData);
}

void xatlasSetAlloc(xatlasReallocFunc reallocFunc, xatlasFreeFunc freeFunc)
{
xatlas::SetAlloc((xatlas::ReallocFunc)reallocFunc, (xatlas::FreeFunc)freeFunc);
}

void xatlasSetPrint(xatlasPrintFunc print, bool verbose)
{
xatlas::SetPrint((xatlas::PrintFunc)print, verbose);
}

const char *xatlasAddMeshErrorString(xatlasAddMeshError error)
{
return xatlas::StringForEnum((xatlas::AddMeshError)error);
}

const char *xatlasProgressCategoryString(xatlasProgressCategory category)
{
return xatlas::StringForEnum((xatlas::ProgressCategory)category);
}

void xatlasMeshDeclInit(xatlasMeshDecl *meshDecl)
{
xatlas::MeshDecl init;
memcpy(meshDecl, &init, sizeof(init));
}

void xatlasUvMeshDeclInit(xatlasUvMeshDecl *uvMeshDecl)
{
xatlas::UvMeshDecl init;
memcpy(uvMeshDecl, &init, sizeof(init));
}

void xatlasChartOptionsInit(xatlasChartOptions *chartOptions)
{
xatlas::ChartOptions init;
memcpy(chartOptions, &init, sizeof(init));
}

void xatlasPackOptionsInit(xatlasPackOptions *packOptions)
{
xatlas::PackOptions init;
memcpy(packOptions, &init, sizeof(init));
}

#ifdef __cplusplus
} // extern "C"
#endif
220 changes: 220 additions & 0 deletions xatlas_c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
/*
MIT License
Copyright (c) 2018-2020 Jonathan Young
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
/*
thekla_atlas
MIT License
https://github.com/Thekla/thekla_atlas
Copyright (c) 2013 Thekla, Inc
Copyright NVIDIA Corporation 2006 -- Ignacio Castano <[email protected]>
*/
#pragma once
#ifndef XATLAS_C_H
#define XATLAS_C_H
#include <stdint.h>

#ifdef __cplusplus
extern "C" {
#endif

typedef enum
{
XATLAS_CHART_TYPE_PLANAR,
XATLAS_CHART_TYPE_ORTHO,
XATLAS_CHART_TYPE_LSCM,
XATLAS_CHART_TYPE_PIECEWISE,
XATLAS_CHART_TYPE_INVALID
}
xatlasChartType;

typedef struct
{
uint32_t *faceArray;
uint32_t atlasIndex;
uint32_t faceCount;
xatlasChartType type;
uint32_t material;
}
xatlasChart;

typedef struct
{
int32_t atlasIndex;
int32_t chartIndex;
float uv[2];
uint32_t xref;
}
xatlasVertex;

typedef struct
{
xatlasChart *chartArray;
uint32_t *indexArray;
xatlasVertex *vertexArray;
uint32_t chartCount;
uint32_t indexCount;
uint32_t vertexCount;
}
xatlasMesh;

static const uint32_t xatlasImageChartIndexMask = 0x1FFFFFFF;
static const uint32_t xatlasImageHasChartIndexBit = 0x80000000;
static const uint32_t xatlasImageIsBilinearBit = 0x40000000;
static const uint32_t xatlasImageIsPaddingBit = 0x20000000;

typedef struct
{
uint32_t *image;
xatlasMesh *meshes;
uint32_t width;
uint32_t height;
uint32_t atlasCount;
uint32_t chartCount;
uint32_t meshCount;
float *utilization;
float texelsPerUnit;
}
xatlasAtlas;

typedef enum
{
XATLAS_INDEX_FORMAT_UINT16,
XATLAS_INDEX_FORMAT_UINT32
}
xatlasIndexFormat;

typedef struct
{
const void *vertexPositionData;
const void *vertexNormalData;
const void *vertexUvData;
const void *indexData;
const bool *faceIgnoreData;
const uint32_t *faceMaterialData;
const uint8_t *faceVertexCountnullptr;
uint32_t vertexCount;
uint32_t vertexPositionStride;
uint32_t vertexNormalStride;
uint32_t vertexUvStride;
uint32_t indexCount;
int32_t indexOffset;
uint32_t faceCount;
xatlasIndexFormat indexFormat;
float epsilon;
}
xatlasMeshDecl;

typedef enum
{
XATLAS_ADD_MESH_ERROR_SUCCESS,
XATLAS_ADD_MESH_ERROR_ERROR,
XATLAS_ADD_MESH_ERROR_INDEXOUTOFRANGE,
XATLAS_ADD_MESH_ERROR_INVALIDFACEVERTEXCOUNT,
XATLAS_ADD_MESH_ERROR_INVALIDINDEXCOUNT
}
xatlasAddMeshError;

typedef struct
{
const void *vertexUvData;
const void *indexData;
const uint32_t *faceMaterialData;
uint32_t vertexCount;
uint32_t vertexStride;
uint32_t indexCount;
int32_t indexOffset;
xatlasIndexFormat indexFormat;
}
xatlasUvMeshDecl;

typedef void (*xatlasParameterizeFunc)(const float *positions, float *texcoords, uint32_t vertexCount, const uint32_t *indices, uint32_t indexCount);

typedef struct
{
bool useInputMeshUvs;
float maxChartArea;
float maxBoundaryLength;
float normalDeviationWeight;
float roundnessWeight;
float straightnessWeight;
float normalSeamWeight;
float textureSeamWeight;
float maxCost;
uint32_t maxIterations;
xatlasParameterizeFunc paramFunc;
bool fixWinding;
}
xatlasChartOptions;

typedef struct
{
bool bilinear;
bool blockAlign;
bool bruteForce;
bool createImage;
uint32_t maxChartSize;
uint32_t padding;
float texelsPerUnit;
uint32_t resolution;
bool rotateChartsToAxis;
bool rotateCharts;
}
xatlasPackOptions;

typedef enum
{
XATLAS_PROGRESS_CATEGORY_ADDMESH,
XATLAS_PROGRESS_CATEGORY_COMPUTECHARTS,
XATLAS_PROGRESS_CATEGORY_PACKCHARTS,
XATLAS_PROGRESS_CATEGORY_BUILDOUTPUTMESHES
}
xatlasProgressCategory;

typedef bool (*xatlasProgressFunc)(xatlasProgressCategory category, int progress, void *userData);
typedef void *(*xatlasReallocFunc)(void *, size_t);
typedef void (*xatlasFreeFunc)(void *);
typedef int (*xatlasPrintFunc)(const char *, ...);

xatlasAtlas *xatlasCreate();
void xatlasDestroy(xatlasAtlas *atlas);
xatlasAddMeshError xatlasAddMesh(xatlasAtlas *atlas, const xatlasMeshDecl *meshDecl, uint32_t meshCountHint);
void xatlasAddMeshJoin(xatlasAtlas *atlas);
xatlasAddMeshError xatlasAddUvMesh(xatlasAtlas *atlas, const xatlasUvMeshDecl *decl);
void xatlasComputeCharts(xatlasAtlas *atlas, const xatlasChartOptions *chartOptions);
void xatlasPackCharts(xatlasAtlas *atlas, const xatlasPackOptions *packOptions);
void xatlasGenerate(xatlasAtlas *atlas, const xatlasChartOptions *chartOptions, const xatlasPackOptions *packOptions);
void xatlasSetProgressCallback(xatlasAtlas *atlas, xatlasProgressFunc progressFunc, void *progressUserData);
void xatlasSetAlloc(xatlasReallocFunc reallocFunc, xatlasFreeFunc freeFunc);
void xatlasSetPrint(xatlasPrintFunc print, bool verbose);
const char *xatlasAddMeshErrorString(xatlasAddMeshError error);
const char *xatlasProgressCategoryString(xatlasProgressCategory category);
void xatlasMeshDeclInit(xatlasMeshDecl *meshDecl);
void xatlasUvMeshDeclInit(xatlasUvMeshDecl *uvMeshDecl);
void xatlasChartOptionsInit(xatlasChartOptions *chartOptions);
void xatlasPackOptionsInit(xatlasPackOptions *packOptions);

#ifdef __cplusplus
} // extern "C"
#endif

#endif // XATLAS_C_H

0 comments on commit 2b5b488

Please sign in to comment.