maobo/cup_edit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove using namespace filament*

Browse Source
This commit is contained in:
Nick Fisher
2024-09-13 15:27:01 +08:00
parent 820d341f67
commit 6b0f25ca59
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
thermion_dart/native/src/FilamentViewer.cpp
View File

@@ -117,7 +117,7 @@ namespace thermion_filament
using std::string; using std::string;
static constexpr float4 sFullScreenTriangleVertices[3] = { static constexpr filament::math::float4 sFullScreenTriangleVertices[3] = {
{-1.0f, -1.0f, 1.0f, 1.0f}, {-1.0f, -1.0f, 1.0f, 1.0f},
{3.0f, -1.0f, 1.0f, 1.0f}, {3.0f, -1.0f, 1.0f, 1.0f},
{-1.0f, 3.0f, 1.0f, 1.0f}}; {-1.0f, 3.0f, 1.0f, 1.0f}};
@@ -315,8 +315,8 @@ namespace thermion_filament
.sunAngularRadius(sunAngularRadius) .sunAngularRadius(sunAngularRadius)
.sunHaloSize(sunHaloSize) .sunHaloSize(sunHaloSize)
.sunHaloFalloff(sunHaloFallof) .sunHaloFalloff(sunHaloFallof)
.position(math::float3(posX, posY, posZ)) .position(filament::math::float3(posX, posY, posZ))
.direction(math::float3(dirX, dirY, dirZ)) .direction(filament::math::float3(dirX, dirY, dirZ))
.castShadows(shadows) .castShadows(shadows)
.build(*_engine, light); .build(*_engine, light);
if (result != LightManager::Builder::Result::Success) if (result != LightManager::Builder::Result::Success)
@@ -526,7 +526,7 @@ namespace thermion_filament
createBackgroundImage(); createBackgroundImage();
} }
_imageMaterial->setDefaultParameter("showImage", 0); _imageMaterial->setDefaultParameter("showImage", 0);
_imageMaterial->setDefaultParameter("backgroundColor", RgbaType::sRGB, float4(r, g, b, a)); _imageMaterial->setDefaultParameter("backgroundColor", RgbaType::sRGB, filament::math::float4(r, g, b, a));
_imageMaterial->setDefaultParameter("transform", _imageScale); _imageMaterial->setDefaultParameter("transform", _imageScale);
} }
@@ -547,7 +547,7 @@ namespace thermion_filament
.package(IMAGE_IMAGE_DATA, IMAGE_IMAGE_SIZE) .package(IMAGE_IMAGE_DATA, IMAGE_IMAGE_SIZE)
.build(*_engine); .build(*_engine);
_imageMaterial->setDefaultParameter("showImage", 0); _imageMaterial->setDefaultParameter("showImage", 0);
_imageMaterial->setDefaultParameter("backgroundColor", RgbaType::sRGB, float4(1.0f, 1.0f, 1.0f, 0.0f)); _imageMaterial->setDefaultParameter("backgroundColor", RgbaType::sRGB, filament::math::float4(1.0f, 1.0f, 1.0f, 0.0f));
_imageMaterial->setDefaultParameter("image", _dummyImageTexture, _imageSampler); _imageMaterial->setDefaultParameter("image", _dummyImageTexture, _imageSampler);
} }
catch (...) catch (...)
@@ -728,7 +728,7 @@ namespace thermion_filament
_imageScale[2][0], _imageScale[2][1], _imageScale[2][2], _imageScale[2][3], _imageScale[2][0], _imageScale[2][1], _imageScale[2][2], _imageScale[2][3],
_imageScale[3][0], _imageScale[3][1], _imageScale[3][2], _imageScale[3][3]); _imageScale[3][0], _imageScale[3][1], _imageScale[3][2], _imageScale[3][3]);
auto transform = math::mat4f::translation(math::float3(x, y, 0.0f)) * _imageScale; auto transform = math::mat4f::translation(filament::math::float3(x, y, 0.0f)) * _imageScale;
Log("transform %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f ", transform[0][0], transform[0][1], transform[0][2], transform[0][3], Log("transform %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f %f ", transform[0][0], transform[0][1], transform[0][2], transform[0][3],
transform[1][0], transform[1][1], transform[1][2], transform[1][3], transform[1][0], transform[1][1], transform[1][2], transform[1][3],
@@ -1077,7 +1077,7 @@ namespace thermion_filament
image::Ktx1Bundle *iblBundle = image::Ktx1Bundle *iblBundle =
new image::Ktx1Bundle(static_cast<const uint8_t *>(iblBuffer.data), new image::Ktx1Bundle(static_cast<const uint8_t *>(iblBuffer.data),
static_cast<uint32_t>(iblBuffer.size)); static_cast<uint32_t>(iblBuffer.size));
math::float3 harmonics[9]; filament::math::float3 harmonics[9];
iblBundle->getSphericalHarmonics(harmonics); iblBundle->getSphericalHarmonics(harmonics);
std::vector<void *> *callbackData = new std::vector<void *>{(void *)_resourceLoaderWrapper, iblBufferCopy}; std::vector<void *> *callbackData = new std::vector<void *>{(void *)_resourceLoaderWrapper, iblBufferCopy};