Commit 2c37d5c3 authored by Christopher Tenter's avatar Christopher Tenter

fix build warnings

parent 17c8ff4c
Pipeline #216 passed with stage
......@@ -1528,8 +1528,7 @@ void MeshCompiler::resolveTriangulation()
{
int negCornerID = triIndexBuffer_[drawTriID * 3 + k];
int cornerID = -1 - negCornerID;
int vertexID = triIndexBuffer_[drawTriID * 3 + k] = getInputIndexSplit(faceID, cornerID);
assert(vertexID >= 0);
triIndexBuffer_[drawTriID * 3 + k] = getInputIndexSplit(faceID, cornerID);
}
}
}
......
......@@ -411,8 +411,6 @@ namespace ACG {
double r = real_[0];
Vec3 rv = Vec3(real_[1], real_[2], real_[3]);
Vec3 dv = Vec3(dual_[1], dual_[2], dual_[3]);
Vec3 tempVec = (rv % p) + r * p;
p+=2.0*(rv % tempVec);
......
......@@ -112,8 +112,6 @@ private:
Vec3f cursor_;
Plane enabled_;
GLdouble xy_plane_[4], yz_plane_[4], xz_plane_[4];
};
......
......@@ -2132,12 +2132,12 @@ typename PolyLineT<PointT>::CustomPropertyHandle PolyLineT<PointT>::custom_prop_
template <class PointT>
typename PolyLineT<PointT>::CustomProperty* PolyLineT<PointT>::custom_prop(CustomPropertyHandle _handle) {
return (_handle >= 0 && _handle < get_num_custom_properties() ? cprop_enum[_handle] : NULL);
return (_handle >= 0 && _handle < int(get_num_custom_properties()) ? cprop_enum[_handle] : NULL);
}
template <class PointT>
const typename PolyLineT<PointT>::CustomProperty* PolyLineT<PointT>::custom_prop(CustomPropertyHandle _handle) const {
return (_handle >= 0 && _handle < get_num_custom_properties() ? cprop_enum[_handle] : NULL);
return (_handle >= 0 && _handle < int(get_num_custom_properties()) ? cprop_enum[_handle] : NULL);
}
template <class PointT>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment