TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

MountedImage& image = mMountedImageList[i]; clarification cases

Browse source
This commit is contained in:
Azaezel 2018-03-13 19:29:08 -05:00
parent 50ed2f6d08
commit e24e917cf9
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Engine/source/T3D/shapeBase.cpp
View file

@ -3315,23 +3315,23 @@ void ShapeBase::unpackUpdate(NetConnection *con, BitStream *stream)
bool datablockChange = image.dataBlock != imageData; bool datablockChange = image.dataBlock != imageData;
if (datablockChange || (image.skinNameHandle != skinDesiredNameHandle)) if (datablockChange || (image.skinNameHandle != skinDesiredNameHandle))
{ {
MountedImage& image = mMountedImageList[i]; MountedImage& neoImage = mMountedImageList[i];
image.scriptAnimPrefix = scriptDesiredAnimPrefix; neoImage.scriptAnimPrefix = scriptDesiredAnimPrefix;
setImage( i, imageData, setImage( i, imageData,
skinDesiredNameHandle, image.loaded, skinDesiredNameHandle, neoImage.loaded,
image.ammo, image.triggerDown, image.altTriggerDown, neoImage.ammo, neoImage.triggerDown, neoImage.altTriggerDown,
image.motion, image.genericTrigger[0], image.genericTrigger[1], image.genericTrigger[2], image.genericTrigger[3], neoImage.motion, neoImage.genericTrigger[0], neoImage.genericTrigger[1], neoImage.genericTrigger[2], neoImage.genericTrigger[3],
image.target); neoImage.target);
} }
if (!datablockChange && image.scriptAnimPrefix != scriptDesiredAnimPrefix) if (!datablockChange && image.scriptAnimPrefix != scriptDesiredAnimPrefix)
{ {
// We don't have a new image, but we do have a new script anim prefix to work with. // We don't have a new image, but we do have a new script anim prefix to work with.
// Notify the image of this change. // Notify the image of this change.
MountedImage& image = mMountedImageList[i]; MountedImage& animImage = mMountedImageList[i];
image.scriptAnimPrefix = scriptDesiredAnimPrefix; animImage.scriptAnimPrefix = scriptDesiredAnimPrefix;
updateAnimThread(i, getImageShapeIndex(image)); updateAnimThread(i, getImageShapeIndex(animImage));
} }
bool isFiring = stream->readFlag(); bool isFiring = stream->readFlag();
@ -3586,8 +3586,8 @@ void ShapeBaseConvex::getFeatures(const MatrixF& mat, const VectorF& n, ConvexFe
U32 numVerts = emitString[currPos++]; U32 numVerts = emitString[currPos++];
for (i = 0; i < numVerts; i++) { for (i = 0; i < numVerts; i++) {
cf->mVertexList.increment(); cf->mVertexList.increment();
U32 index = emitString[currPos++]; U32 vListIDx = emitString[currPos++];
mat.mulP(pAccel->vertexList[index], &cf->mVertexList.last()); mat.mulP(pAccel->vertexList[vListIDx], &cf->mVertexList.last());
} }
U32 numEdges = emitString[currPos++]; U32 numEdges = emitString[currPos++];