birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whitebox

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-18 16:21:19 -07:00
committed by Esteban Papp
parent 9dc13db8ba
commit 7c62fde361
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp
+1 -1
View File
@@ -1400,7 +1400,7 @@ namespace WhiteBox
HalfedgeHandle EdgeHalfedgeHandle(
const WhiteBoxMesh& whiteBox, const EdgeHandle edgeHandle, const EdgeHalfedge edgeHalfedge)
{
return wb_heh(whiteBox.mesh.halfedge_handle(om_eh(edgeHandle), EdgeHalfedgeMapping(edgeHalfedge)));
return wb_heh(whiteBox.mesh.halfedge_handle(om_eh(edgeHandle), static_cast<unsigned int>(EdgeHalfedgeMapping(edgeHalfedge))));
}
HalfedgeHandles EdgeHalfedgeHandles(const WhiteBoxMesh& whiteBox, EdgeHandle edgeHandle)
Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxBuffer.h
+2 -2
View File
@@ -85,7 +85,7 @@ namespace WhiteBox
template<typename VertexStreamDataType>
Buffer<VertexStreamDataType>::Buffer(const AZStd::vector<VertexStreamDataType>& data)
{
const uint32_t elementCount = data.size();
const uint32_t elementCount = static_cast<uint32_t>(data.size());
const uint32_t elementSize = sizeof(VertexStreamDataType);
const uint32_t bufferSize = elementCount * elementSize;
@@ -166,7 +166,7 @@ namespace WhiteBox
return false;
}
const uint32_t elementCount = data.size();
const uint32_t elementCount = static_cast<uint32_t>(data.size());
const uint32_t elementSize = sizeof(VertexStreamDataType);
const uint32_t bufferSize = elementCount * elementSize;
Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp
+4 -4
View File
@@ -58,9 +58,9 @@ namespace WhiteBox
for (size_t i = 0; i < vertCount; i++)
{
const auto normal = tangentSpaceCalculation.GetNormal(i);
const auto tangent = tangentSpaceCalculation.GetTangent(i);
const auto bitangent = tangentSpaceCalculation.GetBitangent(i);
const auto normal = tangentSpaceCalculation.GetNormal(static_cast<AZ::u32>(i));
const auto tangent = tangentSpaceCalculation.GetTangent(static_cast<AZ::u32>(i));
const auto bitangent = tangentSpaceCalculation.GetBitangent(static_cast<AZ::u32>(i));
m_aabb.AddPoint(positions[i]);
@@ -75,7 +75,7 @@ namespace WhiteBox
const uint32_t WhiteBoxMeshAtomData::VertexCount() const
{
return m_indices.size();
return static_cast<uint32_t>(m_indices.size());
}
const AZStd::vector<uint32_t>& WhiteBoxMeshAtomData::GetIndices() const
Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp
+1 -1
View File
@@ -106,7 +106,7 @@ namespace WhiteBox
WhiteBoxMesh* whiteBox = nullptr;
EditorWhiteBoxComponentRequestBus::EventResult(
whiteBox, m_entityComponentIdPair, &EditorWhiteBoxComponentRequests::GetWhiteBoxMesh);
m_selectedHandleIndex = vertexIndex;
m_selectedHandleIndex = static_cast<AZ::u32>(vertexIndex);
InitializeScaleModifier(whiteBox, action);
});
Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ namespace WhiteBox
const auto screenLength = std::fabs(currentAction.ScreenOffset().Dot(screenAxis));
if (screenLength > maxLength)
{
axisIndex = actionIndex;
axisIndex = static_cast<int>(actionIndex);
maxLength = screenLength;
}
}