From 21c749181c60d9d6e69f385f476a88bda0331ed5 Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Sat, 20 Aug 2022 00:19:01 +1000 Subject: [PATCH] use correct ifdefs for iPhone/other material loading --- ios/src/FilamentViewer.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ios/src/FilamentViewer.cpp b/ios/src/FilamentViewer.cpp index cd5bbd2c..ee262d4c 100644 --- a/ios/src/FilamentViewer.cpp +++ b/ios/src/FilamentViewer.cpp @@ -65,7 +65,11 @@ #include "Log.hpp" #include "SceneResources.hpp" +#if TARGET_OS_IPHONE #include "image/imagematerials_ios.h" +#else +#include "image/imagematerial.h" +#endif #include "FilamentViewer.hpp" #include "StreamBufferAdapter.hpp" @@ -204,10 +208,18 @@ void FilamentViewer::createImageRenderable() { return; auto &em = EntityManager::get(); + #if TARGET_OS_IPHONE _imageMaterial = Material::Builder() .package(IMAGEMATERIALS_IOS_IMAGE_FILAMAT_DATA, IMAGEMATERIALS_IOS_IMAGE_FILAMAT_SIZE) .build(*_engine); + #else + _imageMaterial = + Material::Builder() + .package(IMAGEMATERIAL_IMAGE_DATA, IMAGEMATERIAL_IMAGE_SIZE) + .build(*_engine); + #endif + // TODO - can we make these resgen names consistent _imageVb = VertexBuffer::Builder() .vertexCount(3)