make ResourceBuffer.hpp C++ only and add constructor to create from C struct
This commit is contained in:
@@ -3,7 +3,6 @@
|
|||||||
|
|
||||||
#include "ResourceBuffer.h"
|
#include "ResourceBuffer.h"
|
||||||
|
|
||||||
#if defined(__cplusplus)
|
|
||||||
#ifndef __EMSCRIPTEN__
|
#ifndef __EMSCRIPTEN__
|
||||||
#include <thread>
|
#include <thread>
|
||||||
using namespace std::chrono_literals;
|
using namespace std::chrono_literals;
|
||||||
@@ -15,6 +14,15 @@ namespace thermion_filament
|
|||||||
struct ResourceLoaderWrapperImpl : public ResourceLoaderWrapper
|
struct ResourceLoaderWrapperImpl : public ResourceLoaderWrapper
|
||||||
{
|
{
|
||||||
|
|
||||||
|
ResourceLoaderWrapperImpl(ResourceLoaderWrapper* wrapper) {
|
||||||
|
loadFromOwner = wrapper->loadFromOwner;
|
||||||
|
freeFromOwner = wrapper->freeFromOwner;
|
||||||
|
loadResource = wrapper->loadResource;
|
||||||
|
freeResource = wrapper->freeResource;
|
||||||
|
owner = wrapper->owner;
|
||||||
|
loadToOut = wrapper->loadToOut;
|
||||||
|
}
|
||||||
|
|
||||||
ResourceLoaderWrapperImpl(LoadFilamentResource loader, FreeFilamentResource freeResource)
|
ResourceLoaderWrapperImpl(LoadFilamentResource loader, FreeFilamentResource freeResource)
|
||||||
{
|
{
|
||||||
loadFromOwner = nullptr;
|
loadFromOwner = nullptr;
|
||||||
@@ -73,4 +81,3 @@ namespace thermion_filament
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|||||||
Reference in New Issue
Block a user