diff --git a/code/Common/SkeletonMeshBuilder.cpp b/code/Common/SkeletonMeshBuilder.cpp
index a4a163fc6..09d0676a6 100644
--- a/code/Common/SkeletonMeshBuilder.cpp
+++ b/code/Common/SkeletonMeshBuilder.cpp
@@ -136,31 +136,31 @@ void SkeletonMeshBuilder::CreateGeometry( const aiNode* pNode)
         aiVector3D ownpos( pNode->mTransformation.a4, pNode->mTransformation.b4, pNode->mTransformation.c4);
         ai_real sizeEstimate = ownpos.Length() * ai_real( 0.18 );
 
-        mVertices.emplace_back( -sizeEstimate, 0.0, 0.0);
-        mVertices.emplace_back( 0.0, sizeEstimate, 0.0);
-        mVertices.emplace_back( 0.0, 0.0, -sizeEstimate);
-        mVertices.emplace_back( 0.0, sizeEstimate, 0.0);
-        mVertices.emplace_back( sizeEstimate, 0.0, 0.0);
-        mVertices.emplace_back( 0.0, 0.0, -sizeEstimate);
-        mVertices.emplace_back( sizeEstimate, 0.0, 0.0);
-        mVertices.emplace_back( 0.0, -sizeEstimate, 0.0);
-        mVertices.emplace_back( 0.0, 0.0, -sizeEstimate);
-        mVertices.emplace_back( 0.0, -sizeEstimate, 0.0);
-        mVertices.emplace_back( -sizeEstimate, 0.0, 0.0);
-        mVertices.emplace_back( 0.0, 0.0, -sizeEstimate);
+        mVertices.emplace_back( -sizeEstimate, ai_real(0.0), ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), sizeEstimate, ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), ai_real(0.0), -sizeEstimate);
+        mVertices.emplace_back( ai_real(0.0), sizeEstimate, ai_real(0.0));
+        mVertices.emplace_back( sizeEstimate, ai_real(0.0), ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), ai_real(0.0), -sizeEstimate);
+        mVertices.emplace_back( sizeEstimate, ai_real(0.0), ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), -sizeEstimate, ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), ai_real(0.0), -sizeEstimate);
+        mVertices.emplace_back( ai_real(0.0), -sizeEstimate, ai_real(0.0));
+        mVertices.emplace_back( -sizeEstimate, ai_real(0.0), ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), ai_real(0.0), -sizeEstimate);
 
-        mVertices.emplace_back( -sizeEstimate, 0.0, 0.0);
-        mVertices.emplace_back( 0.0, 0.0, sizeEstimate);
-        mVertices.emplace_back( 0.0, sizeEstimate, 0.0);
-        mVertices.emplace_back( 0.0, sizeEstimate, 0.0);
-        mVertices.emplace_back( 0.0, 0.0, sizeEstimate);
-        mVertices.emplace_back( sizeEstimate, 0.0, 0.0);
-        mVertices.emplace_back( sizeEstimate, 0.0, 0.0);
-        mVertices.emplace_back( 0.0, 0.0, sizeEstimate);
-        mVertices.emplace_back( 0.0, -sizeEstimate, 0.0);
-        mVertices.emplace_back( 0.0, -sizeEstimate, 0.0);
-        mVertices.emplace_back( 0.0, 0.0, sizeEstimate);
-        mVertices.emplace_back( -sizeEstimate, 0.0, 0.0);
+        mVertices.emplace_back( -sizeEstimate, ai_real(0.0), ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), ai_real(0.0), sizeEstimate);
+        mVertices.emplace_back( ai_real(0.0), sizeEstimate, ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), sizeEstimate, ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), ai_real(0.0), sizeEstimate);
+        mVertices.emplace_back( sizeEstimate, ai_real(0.0), ai_real(0.0));
+        mVertices.emplace_back( sizeEstimate, ai_real(0.0), ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), ai_real(0.0), sizeEstimate);
+        mVertices.emplace_back( ai_real(0.0), -sizeEstimate, ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), -sizeEstimate, ai_real(0.0));
+        mVertices.emplace_back( ai_real(0.0), ai_real(0.0), sizeEstimate);
+        mVertices.emplace_back( -sizeEstimate, ai_real(0.0), ai_real(0.0));
 
         mFaces.emplace_back( vertexStartIndex + 0, vertexStartIndex + 1, vertexStartIndex + 2);
         mFaces.emplace_back( vertexStartIndex + 3, vertexStartIndex + 4, vertexStartIndex + 5);
diff --git a/code/Common/StandardShapes.cpp b/code/Common/StandardShapes.cpp
index e51fe8676..a494a4ec3 100644
--- a/code/Common/StandardShapes.cpp
+++ b/code/Common/StandardShapes.cpp
@@ -447,14 +447,14 @@ void StandardShapes::MakeCone(ai_real height,ai_real radius1,
             // generate the end 'cap'
             positions.emplace_back(s * radius2,  halfHeight, t * radius2 );
             positions.emplace_back(s2 * radius2,  halfHeight, t2 * radius2 );
-            positions.emplace_back(0.0, halfHeight, 0.0);
+            positions.emplace_back(ai_real(0.0), halfHeight, ai_real(0.0));
 
             if (radius1)
             {
                 // generate the other end 'cap'
                 positions.emplace_back(s * radius1,  -halfHeight, t * radius1 );
                 positions.emplace_back(s2 * radius1,  -halfHeight, t2 * radius1 );
-                positions.emplace_back(0.0, -halfHeight, 0.0);
+                positions.emplace_back(ai_real(0.0), -halfHeight, ai_real(0.0));
             }
         }
 
@@ -493,14 +493,14 @@ void StandardShapes::MakeCircle(ai_real radius, unsigned int tess,
 
     for (ai_real angle = 0.0; angle < angle_max;  )
     {
-        positions.emplace_back(s * radius,0.0,t * radius);
+        positions.emplace_back(s * radius,ai_real(0.0),t * radius);
 
         angle += angle_delta;
         s = std::cos(angle);
         t = std::sin(angle);
 
-        positions.emplace_back(s * radius,0.0,t * radius);
-        positions.emplace_back(0.0,0.0,0.0);
+        positions.emplace_back(s * radius,ai_real(0.0),t * radius);
+        positions.emplace_back(ai_real(0.0),ai_real(0.0),ai_real(0.0));
     }
 }