Skip to content

Commit a016b8b

Browse files
committed
Use image-library branch of cesium-native
1 parent 42b9e5c commit a016b8b

5 files changed

Lines changed: 12 additions & 8 deletions

File tree

native~/extern/cesium-native

Submodule cesium-native updated 85 files

native~/src/Runtime/TextureLoader.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
#include <cstring>
1616

1717
using namespace CesiumGltf;
18+
using namespace CesiumImage;
1819
using namespace DotNet;
1920

2021
namespace CesiumForUnityNative {
2122

2223
namespace {
2324
UnityEngine::TextureFormat
24-
getCompressedPixelFormat(const CesiumGltf::ImageAsset& image) {
25+
getCompressedPixelFormat(const CesiumImage::ImageAsset& image) {
2526
switch (image.compressedPixelFormat) {
2627
case GpuCompressedPixelFormat::ETC1_RGB:
2728
return UnityEngine::TextureFormat::ETC_RGB4;
@@ -55,7 +56,7 @@ getCompressedPixelFormat(const CesiumGltf::ImageAsset& image) {
5556
}
5657

5758
UnityEngine::TextureFormat
58-
getUncompressedPixelFormat(const CesiumGltf::ImageAsset& image) {
59+
getUncompressedPixelFormat(const CesiumImage::ImageAsset& image) {
5960
switch (image.channels) {
6061
case 1:
6162
return UnityEngine::TextureFormat::R8;
@@ -72,7 +73,7 @@ getUncompressedPixelFormat(const CesiumGltf::ImageAsset& image) {
7273
} // namespace
7374

7475
UnityEngine::Texture
75-
TextureLoader::loadTexture(const CesiumGltf::ImageAsset& image, bool sRGB) {
76+
TextureLoader::loadTexture(const CesiumImage::ImageAsset& image, bool sRGB) {
7677
CESIUM_TRACE("TextureLoader::loadTexture");
7778
std::int32_t mipCount =
7879
image.mipPositions.empty() ? 1 : std::int32_t(image.mipPositions.size());

native~/src/Runtime/TextureLoader.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
namespace CesiumGltf {
66
struct Model;
77
struct Texture;
8-
struct ImageAsset;
98
} // namespace CesiumGltf
109

10+
namespace CesiumImage {
11+
struct ImageAsset;
12+
} // namespace CesiumImage
13+
1114
namespace DotNet::UnityEngine {
1215
class Texture;
1316
}
@@ -17,7 +20,7 @@ namespace CesiumForUnityNative {
1720
class TextureLoader {
1821
public:
1922
static ::DotNet::UnityEngine::Texture
20-
loadTexture(const CesiumGltf::ImageAsset& image, bool sRGB);
23+
loadTexture(const CesiumImage::ImageAsset& image, bool sRGB);
2124

2225
static ::DotNet::UnityEngine::Texture loadTexture(
2326
const CesiumGltf::Model& model,

native~/src/Runtime/UnityPrepareRendererResources.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1793,7 +1793,7 @@ void UnityPrepareRendererResources::free(
17931793
}
17941794

17951795
void* UnityPrepareRendererResources::prepareRasterInLoadThread(
1796-
CesiumGltf::ImageAsset& image,
1796+
CesiumImage::ImageAsset& image,
17971797
const std::any& rendererOptions) {
17981798
CesiumGltfReader::ImageDecoder::generateMipMaps(image);
17991799
return nullptr;

native~/src/Runtime/UnityPrepareRendererResources.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class UnityPrepareRendererResources
101101
void* pMainThreadResult) noexcept override;
102102

103103
virtual void* prepareRasterInLoadThread(
104-
CesiumGltf::ImageAsset& image,
104+
CesiumImage::ImageAsset& image,
105105
const std::any& rendererOptions) override;
106106

107107
virtual void* prepareRasterInMainThread(

0 commit comments

Comments
 (0)