Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-11 16:03:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Address warnings and comments from review

Browse source
This commit is contained in:
Sam Gateau 2019-10-18 11:43:25 -07:00
parent 0321e2c2c3
commit a95a4b5aa2
7 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/animation/src/AnimSkeleton.cpp
View file

@ -34,7 +34,7 @@ AnimSkeleton::AnimSkeleton(const HFMModel& hfmModel) {
const auto& defor = hfmModel.skinDeformers[i];
std::vector<HFMCluster> dummyClustersList;
for (int j = 0; j < defor.clusters.size(); j++) {
for (int j = 0; j < (uint32_t) defor.clusters.size(); j++) {
// cast into a non-const reference, so we can mutate the FBXCluster
HFMCluster& cluster = const_cast<HFMCluster&>(defor.clusters.at(j));

2
libraries/fbx/src/OBJSerializer.cpp
View file

@ -1009,7 +1009,7 @@ HFMModel::Pointer OBJSerializer::read(const hifi::ByteArray& data, const hifi::V
}
// GO over the shapes once more to assign hte material index correctly
for (int i = 0; i < hfmModel.shapes.size(); ++i) {
for (int i = 0; i < (uint32_t) hfmModel.shapes.size(); ++i) {
auto foundMaterialIndex = materialNameToIndex.find(materialNamePerShape[i]);
if (foundMaterialIndex != materialNameToIndex.end()) {
hfmModel.shapes[i].material = foundMaterialIndex.value();

4
libraries/model-networking/src/model-networking/ModelCache.cpp
View file

@ -491,8 +491,8 @@ bool NetworkModel::areTexturesLoaded() const {
}
const std::shared_ptr<NetworkMaterial> NetworkModel::getShapeMaterial(int shapeID) const {
auto materialID = getHFMModel().shapes[shapeID].material;
if ((materialID >= 0) && (materialID < (int)_materials.size())) {
uint32_t materialID = getHFMModel().shapes[shapeID].material;
if (materialID < (uint32_t)_materials.size()) {
return _materials[materialID];
}
return nullptr;

8
libraries/render-utils/src/CauterizedModel.cpp
View file

@ -35,7 +35,7 @@ bool CauterizedModel::updateGeometry() {
// initialize the cauterizedDeforemrStates as a copy of the standard deformerStates
_cauterizeMeshStates.resize(_meshStates.size());
for (int i = 0; i < _meshStates.size(); ++i) {
for (int i = 0; i < (int) _meshStates.size(); ++i) {
_cauterizeMeshStates[i] = _meshStates[i];
}
}
@ -45,8 +45,6 @@ bool CauterizedModel::updateGeometry() {
void CauterizedModel::createRenderItemSet() {
if (_isCauterized) {
assert(isLoaded());
const auto& meshes = _renderGeometry->getMeshes();
// We should not have any existing renderItems if we enter this section of code
Q_ASSERT(_modelMeshRenderItems.isEmpty());
@ -67,7 +65,7 @@ void CauterizedModel::createRenderItemSet() {
// Run through all of the meshes, and place them into their segregated, but unsorted buckets
int shapeID = 0;
const auto& shapes = _renderGeometry->getHFMModel().shapes;
for (shapeID; shapeID < shapes.size(); shapeID++) {
for (shapeID; shapeID < (int) shapes.size(); shapeID++) {
const auto& shape = shapes[shapeID];
_modelMeshRenderItems << std::make_shared<CauterizedMeshPartPayload>(shared_from_this(), shape.mesh, shape.meshPart, shapeID, transform);
@ -124,7 +122,7 @@ void CauterizedModel::updateClusterMatrices() {
glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
auto cauterizeMatrix = _rig.getJointTransform(_rig.indexOfJoint("Neck")) * zeroScale;
for (int skinDeformerIndex = 0; skinDeformerIndex < _cauterizeMeshStates.size(); skinDeformerIndex++) {
for (int skinDeformerIndex = 0; skinDeformerIndex < (int) _cauterizeMeshStates.size(); skinDeformerIndex++) {
Model::MeshState& nonCauterizedState = _meshStates[skinDeformerIndex];
Model::MeshState& state = _cauterizeMeshStates[skinDeformerIndex];

3
libraries/render-utils/src/MeshPartPayload.cpp
View file

@ -210,11 +210,8 @@ ModelMeshPartPayload::ModelMeshPartPayload(ModelPointer model, int meshIndex, in
assert(shape.mesh == meshIndex);
assert(shape.meshPart == partIndex);
bool useDualQuaternionSkinning = model->getUseDualQuaternionSkinning();
auto& modelMesh = model->getNetworkModel()->getMeshes().at(_meshIndex);
_meshNumVertices = (int)modelMesh->getNumVertices();
// const Model::MeshState& state = model->getMeshState(_meshIndex);
updateMeshPart(modelMesh, partIndex);

2
libraries/render-utils/src/MeshPartPayload.h
View file

@ -118,7 +118,7 @@ public:
int _meshIndex;
int _shapeID;
int _deformerIndex;
uint32_t _deformerIndex;
bool _isSkinned{ false };
bool _isBlendShaped { false };

13
libraries/render-utils/src/Model.cpp
View file

@ -324,7 +324,7 @@ bool Model::updateGeometry() {
const auto& shapes = hfmModel.shapes;
_shapeStates.resize(shapes.size());
for (int s = 0; s < shapes.size(); ++s) {
for (uint32_t s = 0; s < (uint32_t) shapes.size(); ++s) {
auto& shapeState = _shapeStates[s];
shapeState._jointIndex = shapes[s].joint;
shapeState._meshIndex = shapes[s].mesh;
@ -334,7 +334,7 @@ bool Model::updateGeometry() {
updateShapeStatesFromRig();
const auto& hfmSkinDeformers = hfmModel.skinDeformers;
for (int i = 0; i < hfmSkinDeformers.size(); i++) {
for (uint32_t i = 0; i < (uint32_t) hfmSkinDeformers.size(); i++) {
const auto& dynT = hfmSkinDeformers[i];
MeshState state;
state.clusterDualQuaternions.resize(dynT.clusters.size());
@ -741,7 +741,7 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
auto itemID = _modelMeshRenderItemIDs[i];
auto& shape = _shapeStates[i];
// TODO: check to see if .partIndex matches too
if (shape._meshIndex == meshIndex) {
if (shape._meshIndex == (uint32_t) meshIndex) {
transaction.updateItem<ModelMeshPartPayload>(itemID, [=](ModelMeshPartPayload& data) {
data.updateMeshPart(mesh, partIndex);
});
@ -1424,8 +1424,7 @@ void Model::updateClusterMatrices() {
Transform clusterTransform;
Transform::mult(clusterTransform, jointTransform, cbmov.inverseBindTransform);
state.clusterDualQuaternions[clusterIndex] = Model::TransformDualQuaternion(clusterTransform);
}
else {
} else {
auto jointMatrix = _rig.getJointTransform(cbmov.jointIndex);
glm_mat4u_mul(jointMatrix, cbmov.inverseBindMatrix, state.clusterMatrices[clusterIndex]);
}
@ -1476,7 +1475,6 @@ const render::ItemIDs& Model::fetchRenderItemIDs() const {
void Model::createRenderItemSet() {
assert(isLoaded());
const auto& meshes = _renderGeometry->getMeshes();
// We should not have any existing renderItems if we enter this section of code
Q_ASSERT(_modelMeshRenderItems.isEmpty());
@ -1493,9 +1491,8 @@ void Model::createRenderItemSet() {
offset.postTranslate(_offset);
// Run through all of the meshes, and place them into their segregated, but unsorted buckets
int shapeID = 0;
const auto& shapes = _renderGeometry->getHFMModel().shapes;
for (shapeID; shapeID < shapes.size(); shapeID++) {
for (uint32_t shapeID = 0; shapeID < shapes.size(); shapeID++) {
const auto& shape = shapes[shapeID];
_modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), shape.mesh, shape.meshPart, shapeID, transform);