Solve some convert from size_t to uint32_t case.
Change-Id: Ic7f013742e9d14d58d1b85fdc9c4a9025f368f50
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>
const bool hasTransparency = MaskMatch(mFlags, TRANSPARENCY);
// Why we add additional count here?
const bool hasTransparency = MaskMatch(mFlags, TRANSPARENCY);
// Why we add additional count here?
- uint32_t numBuffers = mTextureStages.size() + (hasTransparency ? !CheckTextures(ALBEDO) + !CheckTextures(METALLIC | ROUGHNESS) + !CheckTextures(NORMAL)
- : !CheckTextures(ALBEDO | METALLIC) + !CheckTextures(NORMAL | ROUGHNESS));
+ uint32_t numBuffers = static_cast<uint32_t>(mTextureStages.size()) + (hasTransparency ? !CheckTextures(ALBEDO) + !CheckTextures(METALLIC | ROUGHNESS) + !CheckTextures(NORMAL)
+ : !CheckTextures(ALBEDO | METALLIC) + !CheckTextures(NORMAL | ROUGHNESS));
if(numBuffers == 0)
{
return raw;
if(numBuffers == 0)
{
return raw;
}
// Assign textures to slots -- starting with 2D ones, then cubemaps, if any.
}
// Assign textures to slots -- starting with 2D ones, then cubemaps, if any.
- if(mEnvironmentIdx < environments.size())
+ if(mEnvironmentIdx < static_cast<Index>(environments.size()))
{
auto& envTextures = environments[mEnvironmentIdx].second;
// If pre-computed brdf texture is defined, set the texture.
{
auto& envTextures = environments[mEnvironmentIdx].second;
// If pre-computed brdf texture is defined, set the texture.
DALI_ASSERT_DEBUG(attribs.size() > 0); // positions
IndexProvider getIndex(raw.mIndices.data());
DALI_ASSERT_DEBUG(attribs.size() > 0); // positions
IndexProvider getIndex(raw.mIndices.data());
- const uint32_t numIndices = raw.mIndices.empty() ? attribs[0].mNumElements : raw.mIndices.size();
+ const uint32_t numIndices = raw.mIndices.empty() ? attribs[0].mNumElements : static_cast<uint32_t>(raw.mIndices.size());
auto* positions = reinterpret_cast<const Vector3*>(attribs[0].mData.data());
auto* positions = reinterpret_cast<const Vector3*>(attribs[0].mData.data());
DALI_ASSERT_DEBUG(attribs.size() > 2); // positions, normals, uvs
IndexProvider getIndex(raw.mIndices.data());
DALI_ASSERT_DEBUG(attribs.size() > 2); // positions, normals, uvs
IndexProvider getIndex(raw.mIndices.data());
- const uint32_t numIndices = raw.mIndices.empty() ? attribs[0].mNumElements : raw.mIndices.size();
+ const uint32_t numIndices = raw.mIndices.empty() ? attribs[0].mNumElements : static_cast<uint32_t>(raw.mIndices.size());
auto* positions = reinterpret_cast<const Vector3*>(attribs[0].mData.data());
auto* uvs = reinterpret_cast<const Vector2*>(attribs[2].mData.data());
auto* positions = reinterpret_cast<const Vector3*>(attribs[0].mData.data());
auto* uvs = reinterpret_cast<const Vector2*>(attribs[2].mData.data());
std::vector<uint8_t> buffer(bufferSize);
if(ReadAccessor(blendShape.deltas, binFile, buffer.data()))
{
std::vector<uint8_t> buffer(bufferSize);
if(ReadAccessor(blendShape.deltas, binFile, buffer.data()))
{
- blendShape.deltas.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
+ blendShape.deltas.mBlob.ApplyMinMax(static_cast<uint32_t>(bufferSize / sizeof(Vector3)), reinterpret_cast<float*>(buffer.data()));
// Calculate the difference with the original mesh.
// Find the max distance to normalize the deltas.
const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
// Calculate the difference with the original mesh.
// Find the max distance to normalize the deltas.
const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
std::vector<uint8_t> buffer(bufferSize);
if(ReadAccessor(blendShape.normals, binFile, buffer.data()))
{
std::vector<uint8_t> buffer(bufferSize);
if(ReadAccessor(blendShape.normals, binFile, buffer.data()))
{
- blendShape.normals.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
+ blendShape.normals.mBlob.ApplyMinMax(static_cast<uint32_t>(bufferSize / sizeof(Vector3)), reinterpret_cast<float*>(buffer.data()));
// Calculate the difference with the original mesh, and translate to make all values positive.
const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
// Calculate the difference with the original mesh, and translate to make all values positive.
const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
std::vector<uint8_t> buffer(bufferSize);
if(ReadAccessor(blendShape.tangents, binFile, buffer.data()))
{
std::vector<uint8_t> buffer(bufferSize);
if(ReadAccessor(blendShape.tangents, binFile, buffer.data()))
{
- blendShape.tangents.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
+ blendShape.tangents.mBlob.ApplyMinMax(static_cast<uint32_t>(bufferSize / sizeof(Vector3)), reinterpret_cast<float*>(buffer.data()));
// Calculate the difference with the original mesh, and translate to make all values positive.
const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
// Calculate the difference with the original mesh, and translate to make all values positive.
const Vector3* const deltasBuffer = reinterpret_cast<const Vector3* const>(buffer.data());
ExceptionFlinger(ASSERT_LOCATION) << "Failed to read positions from '" << meshPath << "'.";
}
ExceptionFlinger(ASSERT_LOCATION) << "Failed to read positions from '" << meshPath << "'.";
}
- uint32_t numVector3 = bufferSize / sizeof(Vector3);
+ uint32_t numVector3 = static_cast<uint32_t>(bufferSize / sizeof(Vector3));
if(mPositions.mBlob.mMin.size() != 3u || mPositions.mBlob.mMax.size() != 3u)
{
mPositions.mBlob.ComputeMinMax(3u, numVector3, reinterpret_cast<float*>(buffer.data()));
if(mPositions.mBlob.mMin.size() != 3u || mPositions.mBlob.mMax.size() != 3u)
{
mPositions.mBlob.ComputeMinMax(3u, numVector3, reinterpret_cast<float*>(buffer.data()));
ExceptionFlinger(ASSERT_LOCATION) << "Failed to read normals from '" << meshPath << "'.";
}
ExceptionFlinger(ASSERT_LOCATION) << "Failed to read normals from '" << meshPath << "'.";
}
- mNormals.mBlob.ApplyMinMax(bufferSize / sizeof(Vector3), reinterpret_cast<float*>(buffer.data()));
+ mNormals.mBlob.ApplyMinMax(static_cast<uint32_t>(bufferSize / sizeof(Vector3)), reinterpret_cast<float*>(buffer.data()));
raw.mAttribs.push_back({"aNormal", Property::VECTOR3, static_cast<uint32_t>(bufferSize / sizeof(Vector3)), std::move(buffer)});
}
raw.mAttribs.push_back({"aNormal", Property::VECTOR3, static_cast<uint32_t>(bufferSize / sizeof(Vector3)), std::move(buffer)});
}
- mTexCoords.mBlob.ApplyMinMax(bufferSize / sizeof(Vector2), reinterpret_cast<float*>(buffer.data()));
+ mTexCoords.mBlob.ApplyMinMax(static_cast<uint32_t>(bufferSize / sizeof(Vector2)), reinterpret_cast<float*>(buffer.data()));
raw.mAttribs.push_back({"aTexCoord", Property::VECTOR2, static_cast<uint32_t>(uvCount), std::move(buffer)});
}
if(mTangents.IsDefined())
{
raw.mAttribs.push_back({"aTexCoord", Property::VECTOR2, static_cast<uint32_t>(uvCount), std::move(buffer)});
}
if(mTangents.IsDefined())
{
- uint32_t propertySize = (mTangentType == Property::VECTOR4) ? sizeof(Vector4) : sizeof(Vector3);
+ uint32_t propertySize = static_cast<uint32_t>((mTangentType == Property::VECTOR4) ? sizeof(Vector4) : sizeof(Vector3));
DALI_ASSERT_ALWAYS(((mTangents.mBlob.mLength % propertySize == 0) ||
mTangents.mBlob.mStride >= propertySize) &&
"Tangents buffer length not a multiple of element size");
DALI_ASSERT_ALWAYS(((mTangents.mBlob.mLength % propertySize == 0) ||
mTangents.mBlob.mStride >= propertySize) &&
"Tangents buffer length not a multiple of element size");
- const uint32_t numberOfVertices = mPositions.mBlob.mLength / sizeof(Vector3);
+ const uint32_t numberOfVertices = static_cast<uint32_t>(mPositions.mBlob.mLength / sizeof(Vector3));
// Calculate the size of one buffer inside the texture.
raw.mBlendShapeBufferOffset = numberOfVertices;
// Calculate the size of one buffer inside the texture.
raw.mBlendShapeBufferOffset = numberOfVertices;
if(!mBlendShapeHeader.IsDefined())
{
if(!mBlendShapeHeader.IsDefined())
{
- CalculateTextureSize(blendShapesBlob.mLength / sizeof(Vector3), textureWidth, textureHeight);
+ CalculateTextureSize(static_cast<uint32_t>(blendShapesBlob.mLength / sizeof(Vector3)), textureWidth, textureHeight);
calculateGltf2BlendShapes = true;
}
else
calculateGltf2BlendShapes = true;
}
else
else
{
Blob unnormalizeFactorBlob;
else
{
Blob unnormalizeFactorBlob;
- unnormalizeFactorBlob.mLength = sizeof(float) * ((BlendShapes::Version::VERSION_2_0 == mBlendShapeVersion) ? 1u : numberOfBlendShapes);
+ unnormalizeFactorBlob.mLength = static_cast<uint32_t>(sizeof(float) * ((BlendShapes::Version::VERSION_2_0 == mBlendShapeVersion) ? 1u : numberOfBlendShapes));
if(blendShapesBlob.IsDefined())
{
if(blendShapesBlob.IsDefined())
{
va_list vl2;
va_copy(vl2, vl);
va_list vl2;
va_copy(vl2, vl);
- size_t sizeRequired = vsnprintf(nullptr, 0, format, vl);
+ std::string result;
+ int32_t length = vsnprintf(nullptr, 0, format, vl);
- ++sizeRequired;
- std::string result(sizeRequired, '\0');
- vsnprintf(&result[0], sizeRequired, format, vl2);
+ if(length >= 0)
+ {
+ size_t sizeRequired = static_cast<size_t>(length);
+ ++sizeRequired;
+ std::string formatString(sizeRequired, '\0');
+ vsnprintf(&formatString[0], sizeRequired, format, vl2);
+ result = formatString;
+ }
*/
DALI_SCENE3D_API constexpr size_t NthBit(size_t n)
{
*/
DALI_SCENE3D_API constexpr size_t NthBit(size_t n)
{