diff --git a/Engine/source/T3D/components/animation/animationComponent.cpp b/Engine/source/T3D/components/animation/animationComponent.cpp index cb7808b8b..59ff1fbf8 100644 --- a/Engine/source/T3D/components/animation/animationComponent.cpp +++ b/Engine/source/T3D/components/animation/animationComponent.cpp @@ -621,8 +621,6 @@ void AnimationComponent::advanceThreads(F32 dt) Thread& st = mAnimationThreads[i]; if (st.thread && st.sequence != -1) { - bool cyclic = getShape()->sequences[st.sequence].isCyclic(); - if (!getShape()->sequences[st.sequence].isCyclic() && !st.atEnd && ((st.timescale > 0.f) ? mOwnerShapeInstance->getPos(st.thread) >= 1.0 : mOwnerShapeInstance->getPos(st.thread) <= 0)) diff --git a/Engine/source/T3D/components/camera/cameraComponent.cpp b/Engine/source/T3D/components/camera/cameraComponent.cpp index 2cd1b7d08..4e566bba7 100644 --- a/Engine/source/T3D/components/camera/cameraComponent.cpp +++ b/Engine/source/T3D/components/camera/cameraComponent.cpp @@ -237,8 +237,6 @@ bool CameraComponent::getCameraTransform(F32* pos,MatrixF* mat) { // Returns camera to world space transform // Handles first person / third person camera position - bool isServer = isServerObject(); - if (mTargetNodeIdx == -1) { if (mUseParentTransform) @@ -479,7 +477,6 @@ void CameraComponent::setRotation(RotationF newRot) Frustum CameraComponent::getFrustum() { Frustum visFrustum; - F32 left, right, top, bottom; F32 aspectRatio = mClientScreen.x / mClientScreen.y; visFrustum.set(false, mDegToRad(mCameraFov), aspectRatio, 0.1f, 1000, mOwner->getTransform()); diff --git a/Engine/source/T3D/components/collision/collisionComponent.cpp b/Engine/source/T3D/components/collision/collisionComponent.cpp index 3736fbe04..5eee24a9e 100644 --- a/Engine/source/T3D/components/collision/collisionComponent.cpp +++ b/Engine/source/T3D/components/collision/collisionComponent.cpp @@ -538,7 +538,6 @@ PhysicsCollision* CollisionComponent::buildColShapes() for (S32 o = start; o < end; o++) { const TSShape::Object &object = shape->objects[o]; - const String &meshName = shape->names[object.nameIndex]; if (object.numMeshes <= detail.objectDetailNum) continue; diff --git a/Engine/source/T3D/components/game/stateMachine.cpp b/Engine/source/T3D/components/game/stateMachine.cpp index fd1ef8505..8c9f8b4f9 100644 --- a/Engine/source/T3D/components/game/stateMachine.cpp +++ b/Engine/source/T3D/components/game/stateMachine.cpp @@ -152,7 +152,6 @@ void StateMachine::readConditions(StateTransition ¤tTransition) //get our first state StateTransition::Condition firstCondition; StateField firstField; - bool fieldRead = false; readFieldName(&firstField, reader); firstCondition.field = firstField; diff --git a/Engine/source/T3D/components/game/triggerComponent.cpp b/Engine/source/T3D/components/game/triggerComponent.cpp index 290fab437..873c1307d 100644 --- a/Engine/source/T3D/components/game/triggerComponent.cpp +++ b/Engine/source/T3D/components/game/triggerComponent.cpp @@ -239,8 +239,6 @@ bool TriggerComponent::testObject(SceneObject* enter) myList.setObject(mOwner); myCI->buildPolyList(PLC_Collision, &myList, enterBox, sphere); - - bool test = true; } } } diff --git a/Engine/source/T3D/components/physics/playerControllerComponent.cpp b/Engine/source/T3D/components/physics/playerControllerComponent.cpp index 5b7455bfc..d321f7904 100644 --- a/Engine/source/T3D/components/physics/playerControllerComponent.cpp +++ b/Engine/source/T3D/components/physics/playerControllerComponent.cpp @@ -330,9 +330,6 @@ void PlayerControllerComponent::updateMove() } // Update current orientation - bool doStandardMove = true; - GameConnection* con = mOwner->getControllingClient(); - MatrixF zRot; zRot.set(EulerF(0.0f, 0.0f, mOwner->getRotation().asEulerF().z)); @@ -355,7 +352,6 @@ void PlayerControllerComponent::updateMove() mContactInfo.jump = false; mContactInfo.run = false; - bool jumpSurface = false, runSurface = false; if (!mOwner->isMounted()) findContact(&mContactInfo.run, &mContactInfo.jump, &mContactInfo.contactNormal); if (mContactInfo.jump) @@ -577,7 +573,6 @@ void PlayerControllerComponent::updatePos(const F32 travelTime) newPos = mPhysicsRep->move(mVelocity * travelTime, collisionList); bool haveCollisions = false; - bool wasFalling = mFalling; if (collisionList.getCount() > 0) { mFalling = false; diff --git a/Engine/source/T3D/convexShape.cpp b/Engine/source/T3D/convexShape.cpp index 33e2bc65c..f179ad25a 100644 --- a/Engine/source/T3D/convexShape.cpp +++ b/Engine/source/T3D/convexShape.cpp @@ -719,8 +719,6 @@ bool ConvexShape::buildExportPolyList(ColladaUtils::ExportData* exportData, cons //Convex shapes only have the one 'level', so we'll just rely on the export post-process to back-fill if (isServerObject() && getClientObject()) { - ConvexShape* clientShape = dynamic_cast(getClientObject()); - exportData->meshData.increment(); //Prep a meshData for this shape in particular diff --git a/Engine/source/T3D/entity.cpp b/Engine/source/T3D/entity.cpp index ffe724406..bb8f7becf 100644 --- a/Engine/source/T3D/entity.cpp +++ b/Engine/source/T3D/entity.cpp @@ -306,8 +306,6 @@ void Entity::onPostAdd() bool Entity::_setGameObject(void *object, const char *index, const char *data) { - Entity *e = static_cast(object); - // Sanity! AssertFatal(data != NULL, "Cannot use a NULL asset Id."); @@ -513,8 +511,6 @@ U32 Entity::packUpdate(NetConnection *con, U32 mask, BitStream *stream) for (U32 i = 0; i < mNetworkedComponents.size(); i++) { - NetworkedComponent::UpdateState state = mNetworkedComponents[i].updateState; - if (mNetworkedComponents[i].updateState == NetworkedComponent::Adding) { const char* className = mComponents[mNetworkedComponents[i].componentIndex]->getClassName(); @@ -1381,7 +1377,6 @@ bool Entity::removeComponent(Component *comp, bool deleteComponent) //to re-add them. Need to implement a clean clear function that will clear the local list, and only delete unused behaviors during an update. void Entity::clearComponents(bool deleteComponents) { - bool srv = isServerObject(); if (!deleteComponents) { while (mComponents.size() > 0) @@ -1399,8 +1394,6 @@ void Entity::clearComponents(bool deleteComponents) { comp->onComponentRemove(); //in case the behavior needs to do cleanup on the owner - bool removed = mComponents.remove(comp); - //we only need to delete them on the server side. they'll be cleaned up on the client side //via the ghosting system for us if (isServerObject()) @@ -1663,7 +1656,6 @@ void Entity::notifyComponents(String signalFunction, String argA, String argB, S void Entity::setComponentsDirty() { - bool tmp = true; /*if (mToLoadComponents.empty()) mStartComponentUpdate = true; @@ -1694,7 +1686,6 @@ void Entity::setComponentsDirty() void Entity::setComponentDirty(Component *comp, bool forceUpdate) { - bool found = false; for (U32 i = 0; i < mComponents.size(); i++) { if (mComponents[i]->getId() == comp->getId()) diff --git a/Engine/source/T3D/entity.h b/Engine/source/T3D/entity.h index 5bf9898ea..b7e325ce5 100644 --- a/Engine/source/T3D/entity.h +++ b/Engine/source/T3D/entity.h @@ -309,7 +309,6 @@ Vector Entity::getComponents() Vector foundObjects; T *curObj; - Component* comp; // Loop through our child objects. for (U32 i = 0; i < mComponents.size(); i++) diff --git a/Engine/source/T3D/fx/particleEmitter.cpp b/Engine/source/T3D/fx/particleEmitter.cpp index b10d88f8a..bd2256e7d 100644 --- a/Engine/source/T3D/fx/particleEmitter.cpp +++ b/Engine/source/T3D/fx/particleEmitter.cpp @@ -490,7 +490,7 @@ void ParticleEmitterData::unpackData(BitStream* stream) #if defined(AFX_CAP_PARTICLE_POOLS) if (stream->readFlag()) { - pool_datablock = (afxParticlePoolData*)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); + pool_datablock = (afxParticlePoolData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); stream->read(&pool_index); pool_depth_fade = stream->readFlag(); pool_radial_fade = stream->readFlag(); diff --git a/Engine/source/T3D/gameFunctions.cpp b/Engine/source/T3D/gameFunctions.cpp index c49c75cb3..db2ac5a27 100644 --- a/Engine/source/T3D/gameFunctions.cpp +++ b/Engine/source/T3D/gameFunctions.cpp @@ -553,7 +553,6 @@ void renderFrame(GFXTextureTargetRef* target, MatrixF transform, Frustum frustum GFX->setStateBlock(mDefaultGuiSB); GFXTargetRef origTarget = GFX->getActiveRenderTarget(); - U32 origStyle = GFX->getCurrentRenderStyle(); // Clear the zBuffer so GUI doesn't hose object rendering accidentally GFX->clear(GFXClearZBuffer, ColorI(20, 20, 20), 1.0f, 0); diff --git a/Engine/source/T3D/shapeBase.cpp b/Engine/source/T3D/shapeBase.cpp index 3e88c482f..a3d6a3c66 100644 --- a/Engine/source/T3D/shapeBase.cpp +++ b/Engine/source/T3D/shapeBase.cpp @@ -3259,7 +3259,7 @@ void ShapeBase::unpackUpdate(NetConnection *con, BitStream *stream) st.play = stream->readFlag(); if ( st.play ) { - st.profile = (SFXTrack*) stream->readRangedU32( DataBlockObjectIdFirst, + st.profile = (SFXTrack*)(uintptr_t)stream->readRangedU32( DataBlockObjectIdFirst, DataBlockObjectIdLast ); } diff --git a/Engine/source/T3D/shapeImage.cpp b/Engine/source/T3D/shapeImage.cpp index 56d413a2b..e616d6fae 100644 --- a/Engine/source/T3D/shapeImage.cpp +++ b/Engine/source/T3D/shapeImage.cpp @@ -1202,7 +1202,7 @@ void ShapeBaseImageData::unpackData(BitStream* stream) } projectile = (stream->readFlag() ? - (ProjectileData*)stream->readRangedU32(DataBlockObjectIdFirst, + (ProjectileData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast) : 0); cloakable = stream->readFlag(); @@ -1340,7 +1340,7 @@ void ShapeBaseImageData::unpackData(BitStream* stream) if (stream->readFlag()) { - s.emitter = (ParticleEmitterData*) stream->readRangedU32(DataBlockObjectIdFirst, + s.emitter = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); stream->read(&s.emitterTime); diff --git a/Engine/source/T3D/systems/render/meshRenderSystem.cpp b/Engine/source/T3D/systems/render/meshRenderSystem.cpp index 39b163601..6faf2a74c 100644 --- a/Engine/source/T3D/systems/render/meshRenderSystem.cpp +++ b/Engine/source/T3D/systems/render/meshRenderSystem.cpp @@ -21,11 +21,9 @@ void MeshRenderSystem::render(SceneManager *sceneManager, SceneRenderState* stat for (U32 i = 0; i < count; i++) { //Server side items exist for data, but we don't actually render them - bool isClient = MeshRenderSystemInterface::all[i]->mIsClient; if (!MeshRenderSystemInterface::all[i]->mIsClient) continue; - bool isStatic = MeshRenderSystemInterface::all[i]->mStatic; if (MeshRenderSystemInterface::all[i]->mStatic) continue; diff --git a/Engine/source/T3D/tsStatic.cpp b/Engine/source/T3D/tsStatic.cpp index 58925b29e..3e48154e7 100644 --- a/Engine/source/T3D/tsStatic.cpp +++ b/Engine/source/T3D/tsStatic.cpp @@ -1131,7 +1131,6 @@ bool TSStatic::buildExportPolyList(ColladaUtils::ExportData* exportData, const B if (isServerObject() && getClientObject()) { TSStatic* clientShape = dynamic_cast(getClientObject()); - U32 numDetails = clientShape->mShapeInstance->getNumDetails() - 1; exportData->meshData.increment(); diff --git a/Engine/source/T3D/vehicles/flyingVehicle.cpp b/Engine/source/T3D/vehicles/flyingVehicle.cpp index 2ee5bc375..bb50243b2 100644 --- a/Engine/source/T3D/vehicles/flyingVehicle.cpp +++ b/Engine/source/T3D/vehicles/flyingVehicle.cpp @@ -282,14 +282,14 @@ void FlyingVehicleData::unpackData(BitStream* stream) for (S32 i = 0; i < MaxSounds; i++) { sound[i] = NULL; if (stream->readFlag()) - sound[i] = (SFXProfile*)stream->readRangedU32(DataBlockObjectIdFirst, + sound[i] = (SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); } for (S32 j = 0; j < MaxJetEmitters; j++) { jetEmitter[j] = NULL; if (stream->readFlag()) - jetEmitter[j] = (ParticleEmitterData*)stream->readRangedU32(DataBlockObjectIdFirst, + jetEmitter[j] = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); } diff --git a/Engine/source/T3D/vehicles/hoverVehicle.cpp b/Engine/source/T3D/vehicles/hoverVehicle.cpp index 1f1d259b5..7cc204046 100644 --- a/Engine/source/T3D/vehicles/hoverVehicle.cpp +++ b/Engine/source/T3D/vehicles/hoverVehicle.cpp @@ -411,13 +411,13 @@ void HoverVehicleData::unpackData(BitStream* stream) for (S32 i = 0; i < MaxSounds; i++) sound[i] = stream->readFlag()? - (SFXProfile*) stream->readRangedU32(DataBlockObjectIdFirst, + (SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast): 0; for (S32 j = 0; j < MaxJetEmitters; j++) { jetEmitter[j] = NULL; if (stream->readFlag()) - jetEmitter[j] = (ParticleEmitterData*)stream->readRangedU32(DataBlockObjectIdFirst, + jetEmitter[j] = (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); } diff --git a/Engine/source/T3D/vehicles/vehicle.cpp b/Engine/source/T3D/vehicles/vehicle.cpp index 18a7c4466..739fd2671 100644 --- a/Engine/source/T3D/vehicles/vehicle.cpp +++ b/Engine/source/T3D/vehicles/vehicle.cpp @@ -374,7 +374,7 @@ void VehicleData::unpackData(BitStream* stream) for (i = 0; i < Body::MaxSounds; i++) { body.sound[i] = NULL; if (stream->readFlag()) - body.sound[i] = (SFXProfile*)stream->readRangedU32(DataBlockObjectIdFirst, + body.sound[i] = (SFXProfile*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast); } diff --git a/Engine/source/T3D/vehicles/wheeledVehicle.cpp b/Engine/source/T3D/vehicles/wheeledVehicle.cpp index f4f272fd3..e4e7885ea 100644 --- a/Engine/source/T3D/vehicles/wheeledVehicle.cpp +++ b/Engine/source/T3D/vehicles/wheeledVehicle.cpp @@ -494,7 +494,7 @@ void WheeledVehicleData::unpackData(BitStream* stream) Parent::unpackData(stream); tireEmitter = stream->readFlag()? - (ParticleEmitterData*) stream->readRangedU32(DataBlockObjectIdFirst, + (ParticleEmitterData*)(uintptr_t)stream->readRangedU32(DataBlockObjectIdFirst, DataBlockObjectIdLast): 0; for (S32 i = 0; i < MaxSounds; i++) diff --git a/Engine/source/afx/afxEffectGroup.cpp b/Engine/source/afx/afxEffectGroup.cpp index 749dbbddb..71c6a89b6 100644 --- a/Engine/source/afx/afxEffectGroup.cpp +++ b/Engine/source/afx/afxEffectGroup.cpp @@ -133,7 +133,7 @@ void afxEffectGroupData::unpack_fx(BitStream* stream, afxEffectList& fx) fx.clear(); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); for (int i = 0; i < n_fx; i++) - fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); + fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream)); } #define myOffset(field) Offset(field, afxEffectGroupData) diff --git a/Engine/source/afx/afxEffectWrapper.cpp b/Engine/source/afx/afxEffectWrapper.cpp index 5906947ee..3ec9d855f 100644 --- a/Engine/source/afx/afxEffectWrapper.cpp +++ b/Engine/source/afx/afxEffectWrapper.cpp @@ -608,7 +608,7 @@ void afxEffectWrapperData::unpack_mods(BitStream* stream, afxXM_BaseData* mods[] { S32 n_mods = stream->readInt(6); for (int i = 0; i < n_mods; i++) - mods[i] = (afxXM_BaseData*) readDatablockID(stream); + mods[i] = (afxXM_BaseData*)(uintptr_t)readDatablockID(stream); } bool afxEffectWrapperData::preload(bool server, String &errorStr) diff --git a/Engine/source/afx/afxEffectron.cpp b/Engine/source/afx/afxEffectron.cpp index b1b7f7eff..cf60ede4b 100644 --- a/Engine/source/afx/afxEffectron.cpp +++ b/Engine/source/afx/afxEffectron.cpp @@ -147,7 +147,7 @@ void afxEffectronData::unpack_fx(BitStream* stream, afxEffectList& fx) fx.clear(); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); for (int i = 0; i < n_fx; i++) - fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); + fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream)); } void afxEffectronData::packData(BitStream* stream) diff --git a/Engine/source/afx/afxMagicSpell.cpp b/Engine/source/afx/afxMagicSpell.cpp index 029e88e62..e169d70d7 100644 --- a/Engine/source/afx/afxMagicSpell.cpp +++ b/Engine/source/afx/afxMagicSpell.cpp @@ -304,7 +304,7 @@ void afxMagicSpellData::unpack_fx(BitStream* stream, afxEffectList& fx) fx.clear(); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); for (int i = 0; i < n_fx; i++) - fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); + fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream)); } void afxMagicSpellData::packData(BitStream* stream) @@ -356,7 +356,7 @@ void afxMagicSpellData::unpackData(BitStream* stream) mDo_move_interrupts = stream->readFlag(); stream->read(&mMove_interrupt_speed); - mMissile_db = (afxMagicMissileData*) readDatablockID(stream); + mMissile_db = (afxMagicMissileData*)(uintptr_t)readDatablockID(stream); stream->read(&mLaunch_on_server_signal); stream->read(&mPrimary_target_types); diff --git a/Engine/source/afx/afxSelectron.cpp b/Engine/source/afx/afxSelectron.cpp index 81b60c836..67cd32849 100644 --- a/Engine/source/afx/afxSelectron.cpp +++ b/Engine/source/afx/afxSelectron.cpp @@ -214,7 +214,7 @@ void afxSelectronData::unpack_fx(BitStream* stream, afxEffectList& fx) fx.clear(); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); for (int i = 0; i < n_fx; i++) - fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); + fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream)); } void afxSelectronData::packData(BitStream* stream) diff --git a/Engine/source/afx/afxSpellBook.cpp b/Engine/source/afx/afxSpellBook.cpp index cce22129b..15581ab32 100644 --- a/Engine/source/afx/afxSpellBook.cpp +++ b/Engine/source/afx/afxSpellBook.cpp @@ -128,7 +128,7 @@ void afxSpellBookData::unpackData(BitStream* stream) do_id_convert = true; for (S32 i = 0; i < pages_per_book*spells_per_page; i++) - rpg_spells[i] = (afxRPGMagicSpellData*) readDatablockID(stream); + rpg_spells[i] = (afxRPGMagicSpellData*)(uintptr_t)readDatablockID(stream); } DefineEngineMethod(afxSpellBookData, getPageSlotIndex, S32, (Point2I bookSlot),, diff --git a/Engine/source/afx/ce/afxLightBase_T3D.cpp b/Engine/source/afx/ce/afxLightBase_T3D.cpp index 56b76ccca..a6b8da051 100644 --- a/Engine/source/afx/ce/afxLightBase_T3D.cpp +++ b/Engine/source/afx/ce/afxLightBase_T3D.cpp @@ -195,8 +195,8 @@ void afxT3DLightBaseData::unpackData(BitStream* stream) stream->read( &mAnimState.animationPhase ); stream->read( &mFlareScale ); - mAnimationData = (LightAnimData*) readDatablockID(stream); - mFlareData = (LightFlareData*) readDatablockID(stream); + mAnimationData = (LightAnimData*)(uintptr_t)readDatablockID(stream); + mFlareData = (LightFlareData*)(uintptr_t)readDatablockID(stream); do_id_convert = true; } diff --git a/Engine/source/afx/ce/afxPhraseEffect.cpp b/Engine/source/afx/ce/afxPhraseEffect.cpp index 5df7dfc26..b574afbed 100644 --- a/Engine/source/afx/ce/afxPhraseEffect.cpp +++ b/Engine/source/afx/ce/afxPhraseEffect.cpp @@ -215,7 +215,7 @@ void afxPhraseEffectData::unpack_fx(BitStream* stream, afxEffectList& fx) fx.clear(); S32 n_fx = stream->readInt(EFFECTS_PER_PHRASE_BITS); for (int i = 0; i < n_fx; i++) - fx.push_back((afxEffectWrapperData*)readDatablockID(stream)); + fx.push_back((afxEffectWrapperData*)(uintptr_t)readDatablockID(stream)); } void afxPhraseEffectData::packData(BitStream* stream) diff --git a/Engine/source/app/net/serverQuery.cpp b/Engine/source/app/net/serverQuery.cpp index 17caac478..a1f60cd74 100644 --- a/Engine/source/app/net/serverQuery.cpp +++ b/Engine/source/app/net/serverQuery.cpp @@ -1611,9 +1611,7 @@ static void handleExtendedMasterServerListResponse(BitStream* stream, U32 key, U { U16 packetIndex, packetTotal; U32 i; - U16 serverCount, port; - U8 netNum[16]; - char addressBuffer[256]; + U16 serverCount; NetAddress addr; stream->read(&packetIndex); diff --git a/Engine/source/forest/editor/forestUndo.cpp b/Engine/source/forest/editor/forestUndo.cpp index 60be8d2b1..603986700 100644 --- a/Engine/source/forest/editor/forestUndo.cpp +++ b/Engine/source/forest/editor/forestUndo.cpp @@ -55,7 +55,7 @@ void ForestCreateUndoAction::addItem( ForestItemData *data, // We store the datablock ID rather than the actual pointer // since the pointer could go bad. SimObjectId dataId = item.getData()->getId(); - mItems.last().setData( (ForestItemData*)dataId ); + mItems.last().setData( (ForestItemData*)(uintptr_t)dataId ); } void ForestCreateUndoAction::redo() @@ -110,7 +110,7 @@ void ForestDeleteUndoAction::removeItem( const ForestItem &item ) SimObjectId dataId = item.getData()->getId(); mItems.push_back( item ); - mItems.last().setData( (ForestItemData*)dataId ); + mItems.last().setData( (ForestItemData*)(uintptr_t)dataId ); mData->removeItem( item.getKey(), item.getPosition() ); } @@ -171,7 +171,7 @@ void ForestUpdateAction::saveItem( const ForestItem &item ) // We store the datablock ID rather than the actual pointer // since the pointer could go bad. SimObjectId dataId = item.getData()->getId(); - mItems.last().setData( (ForestItemData*)dataId ); + mItems.last().setData( (ForestItemData*)(uintptr_t)dataId ); } void ForestUpdateAction::_swapState() @@ -215,7 +215,7 @@ void ForestUpdateAction::_swapState() item.getScale() ); // Save the state before this swap for the next swap. - newItem.setData( (ForestItemData*)data->getId() ); + newItem.setData( (ForestItemData*)(uintptr_t)data->getId() ); mItems.push_back( newItem ); } diff --git a/Engine/source/gfx/gfxStringEnumTranslate.cpp b/Engine/source/gfx/gfxStringEnumTranslate.cpp index 8a3db347c..8c08c939e 100644 --- a/Engine/source/gfx/gfxStringEnumTranslate.cpp +++ b/Engine/source/gfx/gfxStringEnumTranslate.cpp @@ -77,11 +77,11 @@ _STRING_VALUE_LOOKUP_FXN(GFXStringBlendOp); #define INIT_LOOKUPTABLE( tablearray, enumprefix, type ) \ for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \ - tablearray[i] = (type)GFX_UNINIT_VAL; + tablearray[i] = (type)(uintptr_t)GFX_UNINIT_VAL; #define INIT_LOOKUPTABLE_EX( tablearray, enumprefix, type, typeTable ) \ for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \ {\ - tablearray[i] = (type)GFX_UNINIT_VAL;\ + tablearray[i] = (type)(uintptr_t)GFX_UNINIT_VAL;\ typeTable[i] = &defaultStringValueLookup;\ } diff --git a/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.cpp b/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.cpp index 385e0ed50..3df694de9 100644 --- a/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.cpp +++ b/Engine/source/gfx/gl/gfxGLPrimitiveBuffer.cpp @@ -131,7 +131,7 @@ void GFXGLPrimitiveBuffer::finish() GLvoid* GFXGLPrimitiveBuffer::getBuffer() { // NULL specifies no offset into the hardware buffer - return (GLvoid*)mBufferOffset; + return (GLvoid*)(uintptr_t)mBufferOffset; } void GFXGLPrimitiveBuffer::zombify() diff --git a/Engine/source/gfx/gl/gfxGLVertexDecl.cpp b/Engine/source/gfx/gl/gfxGLVertexDecl.cpp index 64195164e..bfe6b6f93 100644 --- a/Engine/source/gfx/gl/gfxGLVertexDecl.cpp +++ b/Engine/source/gfx/gl/gfxGLVertexDecl.cpp @@ -130,7 +130,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = false; glElement.type = GL_FLOAT; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); } @@ -141,7 +141,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = false; glElement.type = GL_FLOAT; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); } @@ -152,7 +152,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = false; glElement.type = GL_FLOAT; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); } @@ -163,7 +163,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = false; glElement.type = GL_FLOAT; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); } @@ -174,7 +174,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = false; glElement.type = GL_FLOAT; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); } @@ -185,7 +185,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = true; glElement.type = GL_UNSIGNED_BYTE; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); } @@ -196,7 +196,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = false; glElement.type = GL_FLOAT; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); } @@ -207,7 +207,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = false; glElement.type = GL_UNSIGNED_BYTE; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); } @@ -221,7 +221,7 @@ void GFXGLVertexDecl::_initVerticesFormat(U32 stream) glElement.normalized = false; glElement.type = GL_FLOAT; glElement.stride = vertexSize; - glElement.pointerFirst = (void*)buffer; + glElement.pointerFirst = (void*)(uintptr_t)buffer; buffer += element.getSizeInBytes(); ++texCoordIndex; diff --git a/Engine/source/gui/controls/guiConsole.cpp b/Engine/source/gui/controls/guiConsole.cpp index d063272bf..3eb81e7e8 100644 --- a/Engine/source/gui/controls/guiConsole.cpp +++ b/Engine/source/gui/controls/guiConsole.cpp @@ -89,9 +89,6 @@ bool GuiConsole::onWake() S32 GuiConsole::getMaxWidth(S32 startIndex, S32 endIndex) { //sanity check - U32 size; - ConsoleLogEntry *log; - if (startIndex < 0 || (U32)endIndex >= mFilteredLog.size() || startIndex > endIndex) return 0; @@ -190,9 +187,6 @@ void GuiConsole::onPreRender() void GuiConsole::onRenderCell(Point2I offset, Point2I cell, bool /*selected*/, bool /*mouseOver*/) { - U32 size; - ConsoleLogEntry *log; - ConsoleLogEntry &entry = mFilteredLog[cell.y]; switch (entry.mLevel) { @@ -210,9 +204,6 @@ void GuiConsole::onCellSelected( Point2I cell ) { Parent::onCellSelected( cell ); - U32 size; - ConsoleLogEntry* log; - ConsoleLogEntry& entry = mFilteredLog[cell.y]; onMessageSelected_callback( entry.mLevel, entry.mString ); } diff --git a/Engine/source/gui/controls/guiListBoxCtrl.cpp b/Engine/source/gui/controls/guiListBoxCtrl.cpp index d47914d3d..cab79e1b0 100644 --- a/Engine/source/gui/controls/guiListBoxCtrl.cpp +++ b/Engine/source/gui/controls/guiListBoxCtrl.cpp @@ -631,7 +631,7 @@ DefineEngineMethod( GuiListBoxCtrl, addItem, S32, (const char* newItem, const ch else if(elementCount == 1) { U32 objId = dAtoi( color ); - return object->addItem( newItem, (void*)objId ); + return object->addItem( newItem, (void*)(uintptr_t)objId ); } else { @@ -1523,7 +1523,7 @@ void GuiListBoxCtrl::_mirror() if ( !found ) { - addItem( _makeMirrorItemName( curObj ), (void*)curId ); + addItem( _makeMirrorItemName( curObj ), (void*)(uintptr_t)curId ); } } } diff --git a/Engine/source/gui/editor/inspector/mountingGroup.cpp b/Engine/source/gui/editor/inspector/mountingGroup.cpp index 759139658..158461902 100644 --- a/Engine/source/gui/editor/inspector/mountingGroup.cpp +++ b/Engine/source/gui/editor/inspector/mountingGroup.cpp @@ -133,9 +133,6 @@ bool GuiInspectorMountingGroup::inspectGroup() clearFields(); bool bNewItems = false; - bool bMakingArray = false; - GuiStackControl *pArrayStack = NULL; - GuiRolloutCtrl *pArrayRollout = NULL; bool bGrabItems = false; AbstractClassRep* commonAncestorClass = findCommonAncestorClass(); @@ -240,7 +237,6 @@ void GuiInspectorMountingGroup::updateAllFields() void GuiInspectorMountingGroup::onMouseMove(const GuiEvent &event) { //mParent->mOverDivider = false; - bool test = false; } DefineEngineMethod(GuiInspectorMountingGroup, inspectGroup, bool, (),, "Refreshes the dynamic fields in the inspector.") diff --git a/Engine/source/gui/worldEditor/worldEditor.cpp b/Engine/source/gui/worldEditor/worldEditor.cpp index 27c9dc473..478cc2e3d 100644 --- a/Engine/source/gui/worldEditor/worldEditor.cpp +++ b/Engine/source/gui/worldEditor/worldEditor.cpp @@ -3877,8 +3877,6 @@ void WorldEditor::makeSelectionAMesh(const char *filename) fabMat.inverse(); MatrixF objMat; - SimObject *obj = NULL; - SceneObject *sObj = NULL; Vector< SceneObject* > objectList; diff --git a/Engine/source/math/mConstants.h b/Engine/source/math/mConstants.h index 42b071d1e..6218e4040 100644 --- a/Engine/source/math/mConstants.h +++ b/Engine/source/math/mConstants.h @@ -44,7 +44,7 @@ #define M_CONST_E_F 2.7182818284590452353602874f -#define POINT_EPSILON (1e-4) ///< Epsilon for point types. +#define POINT_EPSILON (0.0001f) ///< Epsilon for point types. /// Result of an overlap test. diff --git a/Engine/source/math/util/frustum.cpp b/Engine/source/math/util/frustum.cpp index bfb42a6bf..2ac1824b7 100644 --- a/Engine/source/math/util/frustum.cpp +++ b/Engine/source/math/util/frustum.cpp @@ -216,7 +216,7 @@ void Frustum::setNearFarDist( F32 nearDist, F32 farDist ) // Recalculate the frustum. MatrixF xfm( mTransform ); - const F32 CENTER_EPSILON = 0.001; + const F32 CENTER_EPSILON = 0.001f; F32 centerX = mNearLeft + (mNearRight - mNearLeft) * 0.5; F32 centerY = mNearBottom + (mNearTop - mNearBottom) * 0.5; if ((centerX > CENTER_EPSILON || centerX < -CENTER_EPSILON) || (centerY > CENTER_EPSILON || centerY < -CENTER_EPSILON) ) diff --git a/Engine/source/platform/platformNet.cpp b/Engine/source/platform/platformNet.cpp index 2a22499c4..1e5cb0a5a 100644 --- a/Engine/source/platform/platformNet.cpp +++ b/Engine/source/platform/platformNet.cpp @@ -230,7 +230,6 @@ namespace PlatformNetState // which are required for LAN queries (PC->Xbox connectivity). The wire protocol still // uses the VDP packet structure, though. S32 protocol = IPPROTO_UDP; - bool useVDP = false; #ifdef TORQUE_DISABLE_PC_CONNECTIVITY // Xbox uses a VDP (voice/data protocol) socket for networking protocol = IPPROTO_VDP; @@ -1956,7 +1955,6 @@ void Net::enableMulticast() if (error == NoError) { - NetAddress listenAddress; char listenAddressStr[256]; Net::addressToString(&multicastAddress, listenAddressStr); Con::printf("Multicast initialized on %s", listenAddressStr); diff --git a/Engine/source/scene/sceneContainer.cpp b/Engine/source/scene/sceneContainer.cpp index 128ef3edd..b08456b15 100644 --- a/Engine/source/scene/sceneContainer.cpp +++ b/Engine/source/scene/sceneContainer.cpp @@ -1392,7 +1392,7 @@ void SceneContainer::getBinRange( const F32 min, const F32 max, U32& minBin, U32 // This is truly lame, but it can happen. There must be a better way to // deal with this. if (minCoord == SceneContainer::csmTotalBinSize) - minCoord = SceneContainer::csmTotalBinSize - 0.01; + minCoord = SceneContainer::csmTotalBinSize - 0.01f; } AssertFatal(minCoord >= 0.0 && minCoord < SceneContainer::csmTotalBinSize, "Bad minCoord"); @@ -1415,7 +1415,7 @@ void SceneContainer::getBinRange( const F32 min, const F32 max, U32& minBin, U32 // This is truly lame, but it can happen. There must be a better way to // deal with this. if (minCoord == SceneContainer::csmTotalBinSize) - minCoord = SceneContainer::csmTotalBinSize - 0.01; + minCoord = SceneContainer::csmTotalBinSize - 0.01f; } AssertFatal(minCoord >= 0.0 && minCoord < SceneContainer::csmTotalBinSize, "Bad minCoord"); @@ -1426,7 +1426,7 @@ void SceneContainer::getBinRange( const F32 min, const F32 max, U32& minBin, U32 // This is truly lame, but it can happen. There must be a better way to // deal with this. if (maxCoord == SceneContainer::csmTotalBinSize) - maxCoord = SceneContainer::csmTotalBinSize - 0.01; + maxCoord = SceneContainer::csmTotalBinSize - 0.01f; } AssertFatal(maxCoord >= 0.0 && maxCoord < SceneContainer::csmTotalBinSize, "Bad maxCoord"); diff --git a/Engine/source/ts/loader/tsShapeLoader.cpp b/Engine/source/ts/loader/tsShapeLoader.cpp index 581f2a384..6cebbc7e0 100644 --- a/Engine/source/ts/loader/tsShapeLoader.cpp +++ b/Engine/source/ts/loader/tsShapeLoader.cpp @@ -412,7 +412,7 @@ void TSShapeLoader::generateObjects() AppMesh* mesh = subshape->objMeshes[iMesh]; mesh->detailSize = 2; String name = String::GetTrailingNumber( mesh->getName(), mesh->detailSize ); - name = getUniqueName( name, cmpMeshNameAndSize, meshNames, &(subshape->objMeshes), (void*)mesh->detailSize ); + name = getUniqueName( name, cmpMeshNameAndSize, meshNames, &(subshape->objMeshes), (void*)(uintptr_t)mesh->detailSize ); meshNames.push_back( name ); // Fix up any collision details that don't have a negative detail level.