Skip to content

Commit 489e2f2

Browse files
author
kevyuu
committed
Slight type naming improvement in geometry creator
1 parent bd3a266 commit 489e2f2

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

‎src/nbl/asset/utils/CGeometryCreator.cpp

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createCube(const h
186186
// for now because no reliable RGB10A2 encode and scant support for 24-bit UTB formats
187187
snorm_normal_t* normals;
188188

189-
using UvElementT = uint8_t;
190-
constexpr auto MaxUvVal = std::numeric_limits<UvElementT>::max();
191-
hlsl::vector<UvElementT,2>* uvs;
189+
using uv_element_t = uint8_t;
190+
constexpr auto MaxUvVal = std::numeric_limits<uv_element_t>::max();
191+
hlsl::vector<uv_element_t,2>* uvs;
192192
{
193193
{
194194
shapes::AABB<4,float32_t> aabb;
@@ -209,7 +209,7 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createCube(const h
209209
}
210210

211211
{
212-
auto uvView = createUvView<UvElementT>(CubeUniqueVertices);
212+
auto uvView = createUvView<uv_element_t>(CubeUniqueVertices);
213213
uvs = reinterpret_cast<decltype(uvs)>(uvView.src.buffer->getPointer());
214214
retval->getAuxAttributeViews()->push_back(std::move(uvView));
215215
}
@@ -265,12 +265,12 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createCube(const h
265265
snorm_positive_y,
266266
snorm_negative_y
267267
};
268-
const hlsl::vector<UvElementT, 2> uv[4] =
268+
const hlsl::vector<uv_element_t, 2> uv[4] =
269269
{
270-
hlsl::vector<UvElementT,2>( 0, MaxUvVal),
271-
hlsl::vector<UvElementT,2>(MaxUvVal, MaxUvVal),
272-
hlsl::vector<UvElementT,2>(MaxUvVal, 0),
273-
hlsl::vector<UvElementT,2>( 0, 0)
270+
hlsl::vector<uv_element_t,2>( 0, MaxUvVal),
271+
hlsl::vector<uv_element_t,2>(MaxUvVal, MaxUvVal),
272+
hlsl::vector<uv_element_t,2>(MaxUvVal, 0),
273+
hlsl::vector<uv_element_t,2>( 0, 0)
274274
};
275275

276276
for (size_t f = 0ull; f < 6ull; ++f)
@@ -385,8 +385,8 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createSphere(float
385385

386386
snorm_normal_t* normals;
387387

388-
using UvElementT = uint16_t;
389-
hlsl::vector<UvElementT, 2>* uvs;
388+
using uv_element_t = uint16_t;
389+
hlsl::vector<uv_element_t, 2>* uvs;
390390
{
391391
{
392392
shapes::AABB<4, float32_t> aabb;
@@ -405,7 +405,7 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createSphere(float
405405
retval->setNormalView(std::move(normalView));
406406
}
407407
{
408-
auto uvView = createUvView<UvElementT>(vertexCount);
408+
auto uvView = createUvView<uv_element_t>(vertexCount);
409409
uvs = reinterpret_cast<decltype(uvs)>(uvView.src.buffer->getPointer());
410410
retval->getAuxAttributeViews()->push_back(std::move(uvView));
411411
}
@@ -536,8 +536,8 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createCylinder(
536536

537537
snorm_normal_t* normals;
538538

539-
using UvElementT = uint16_t;
540-
hlsl::vector<UvElementT, 2>* uvs;
539+
using uv_element_t = uint16_t;
540+
hlsl::vector<uv_element_t, 2>* uvs;
541541
{
542542
{
543543
shapes::AABB<4, float32_t> aabb;
@@ -556,7 +556,7 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createCylinder(
556556
retval->setNormalView(std::move(normalView));
557557
}
558558
{
559-
auto uvView = createUvView<UvElementT>(vertexCount);
559+
auto uvView = createUvView<uv_element_t>(vertexCount);
560560
uvs = reinterpret_cast<decltype(uvs)>(uvView.src.buffer->getPointer());
561561
retval->getAuxAttributeViews()->push_back(std::move(uvView));
562562
}
@@ -775,16 +775,16 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createRectangle(co
775775
retval->setNormalView(std::move(normalView));
776776
}
777777
{
778-
using UvElementT = uint8_t;
779-
constexpr auto MaxUvVal = std::numeric_limits<UvElementT>::max();
780-
const hlsl::vector<UvElementT, 2> uvsData[VertexCount] = {
781-
hlsl::vector<UvElementT,2>( 0, MaxUvVal),
782-
hlsl::vector<UvElementT,2>(MaxUvVal, MaxUvVal),
783-
hlsl::vector<UvElementT,2>(MaxUvVal, 0),
784-
hlsl::vector<UvElementT,2>( 0, 0)
778+
using uv_element_t = uint8_t;
779+
constexpr auto MaxUvVal = std::numeric_limits<uv_element_t>::max();
780+
const hlsl::vector<uv_element_t, 2> uvsData[VertexCount] = {
781+
hlsl::vector<uv_element_t,2>( 0, MaxUvVal),
782+
hlsl::vector<uv_element_t,2>(MaxUvVal, MaxUvVal),
783+
hlsl::vector<uv_element_t,2>(MaxUvVal, 0),
784+
hlsl::vector<uv_element_t,2>( 0, 0)
785785
};
786-
hlsl::vector<UvElementT, 2>* uvs;
787-
auto uvView = createUvView<UvElementT>(VertexCount);
786+
hlsl::vector<uv_element_t, 2>* uvs;
787+
auto uvView = createUvView<uv_element_t>(VertexCount);
788788
uvs = reinterpret_cast<decltype(uvs)>(uvView.src.buffer->getPointer());
789789
memcpy(uvs, uvsData, sizeof(uvsData));
790790
retval->getAuxAttributeViews()->push_back(std::move(uvView));
@@ -814,9 +814,9 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createDisk(const f
814814
// for now because no reliable RGB10A2 encode and scant support for 24-bit UTB formats
815815
snorm_normal_t* normals;
816816
//
817-
using UvElementT = uint16_t;
818-
constexpr uint16_t UnityUV = std::numeric_limits<UvElementT>::max();
819-
hlsl::vector<UvElementT, 2>* uvs;
817+
using uv_element_t = uint16_t;
818+
constexpr uint16_t UnityUV = std::numeric_limits<uv_element_t>::max();
819+
hlsl::vector<uv_element_t, 2>* uvs;
820820
{
821821
{
822822
shapes::AABB<4,float32_t> aabb;
@@ -837,7 +837,7 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createDisk(const f
837837
retval->setNormalView(std::move(normalView));
838838
}
839839
{
840-
auto uvView = createUvView<UvElementT>(vertexCount);
840+
auto uvView = createUvView<uv_element_t>(vertexCount);
841841
uvs = reinterpret_cast<decltype(uvs)>(uvView.src.buffer->getPointer());
842842
retval->getAuxAttributeViews()->push_back(std::move(uvView));
843843
}
@@ -1878,9 +1878,9 @@ core::smart_refctd_ptr<ICPUPolygonGeometry> CGeometryCreator::createIcoSphere(fl
18781878
});
18791879
}
18801880
{
1881-
using UvElementT = uint16_t;
1882-
hlsl::vector<UvElementT, 2>* uvs;
1883-
auto uvView = createUvView<UvElementT>(icosphere.getTexCoordCount());
1881+
using uv_element_t = uint16_t;
1882+
hlsl::vector<uv_element_t, 2>* uvs;
1883+
auto uvView = createUvView<uv_element_t>(icosphere.getTexCoordCount());
18841884
uvs = reinterpret_cast<decltype(uvs)>(uvView.src.buffer->getPointer());
18851885

18861886
for (auto uv_i = 0u; uv_i < icosphere.getTexCoordCount(); uv_i++)

0 commit comments

Comments
 (0)