FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #78 from LaurensVoerman/master

Browse Source 
visual studio 2015 warning fixes:
This commit is contained in:
OpenSceneGraph git repository
2016-06-08 16:48:29 +01:00
parent 01ae93619a 09badeb19c
commit 6db4ec5c08
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/dae/daeRAnimations.cpp
View File

@@ -467,14 +467,14 @@ void daeReader::processAnimationMap(const TargetChannelPartMap& tcm, osgAnimatio
else if (MatrixCubicBezierKeyframeContainer* cbkfCntr =
dynamic_cast<MatrixCubicBezierKeyframeContainer*>(channelPart->keyframes.get()))
{
osgAnimation::MatrixKeyframeContainer* kfCntr = new osgAnimation::MatrixKeyframeContainer;
osgAnimation::MatrixKeyframeContainer* cbCntr = new osgAnimation::MatrixKeyframeContainer;
for (size_t i = 0; i < cbkfCntr->size(); ++i)
{
const MatrixCubicBezierKeyframe& cbkf = cbkfCntr->at(i);
kfCntr->push_back(osgAnimation::MatrixKeyframe(cbkf.getTime(), cbkf.getValue().getPosition()));
cbCntr->push_back(osgAnimation::MatrixKeyframe(cbkf.getTime(), cbkf.getValue().getPosition()));
}
osgAnimation::MatrixLinearChannel* channel = new osgAnimation::MatrixLinearChannel;
channel->getOrCreateSampler()->setKeyframeContainer(kfCntr);
channel->getOrCreateSampler()->setKeyframeContainer(cbCntr);
pOsgAnimationChannel = channel;
}
}

4
src/osgPlugins/dae/daeReader.cpp
View File

@@ -185,9 +185,9 @@ bool daeReader::processDocument( const std::string& fileURI)
// identify every node as a joint, making it meaningless.
std::vector<domInstance_controller*> instanceControllers;
database->typeLookup(instanceControllers);
for (size_t i = 0; i < instanceControllers.size(); ++i)
for (size_t controller = 0; controller < instanceControllers.size(); ++controller)
{
domInstance_controller* pInstanceController = instanceControllers[i];
domInstance_controller* pInstanceController = instanceControllers[controller];
domController *pDomController = daeSafeCast<domController>(getElementFromURI(pInstanceController->getUrl()));
if (!pDomController)