diff --git a/Engine/source/scene/reflector.cpp b/Engine/source/scene/reflector.cpp index 5d9bdc3a8..ecaabc43a 100644 --- a/Engine/source/scene/reflector.cpp +++ b/Engine/source/scene/reflector.cpp @@ -315,20 +315,20 @@ void CubeReflector::updateReflection( const ReflectParams ¶ms ) const GFXFormat reflectFormat = REFLECTMGR->getReflectFormat(); if ( texResize || - cubemap.isNull() || - cubemap->getFormat() != reflectFormat ) + mCubemap.isNull() || + mCubemap->getFormat() != reflectFormat ) { - cubemap = GFX->createCubemap(); - cubemap->initDynamic( texDim, reflectFormat ); + mCubemap = GFX->createCubemap(); + mCubemap->initDynamic( texDim, reflectFormat ); } - GFXTexHandle depthBuff = LightShadowMap::_getDepthTarget( texDim, texDim ); + mDepthBuff = LightShadowMap::_getDepthTarget( texDim, texDim ); - if ( renderTarget.isNull() ) - renderTarget = GFX->allocRenderToTextureTarget(); + if ( mRenderTarget.isNull() ) + mRenderTarget = GFX->allocRenderToTextureTarget(); GFX->pushActiveRenderTarget(); - renderTarget->attachTexture( GFXTextureTarget::DepthStencil, depthBuff ); + mRenderTarget->attachTexture( GFXTextureTarget::DepthStencil, mDepthBuff ); F32 oldVisibleDist = gClientSceneGraph->getVisibleDistance(); @@ -407,8 +407,8 @@ void CubeReflector::updateFace( const ReflectParams ¶ms, U32 faceidx ) GFX->setWorldMatrix(matView); GFX->clearTextureStateImmediate(0); - renderTarget->attachTexture( GFXTextureTarget::Color0, cubemap, faceidx ); - GFX->setActiveRenderTarget( renderTarget ); + mRenderTarget->attachTexture( GFXTextureTarget::Color0, mCubemap, faceidx ); + GFX->setActiveRenderTarget(mRenderTarget); GFX->clear( GFXClearStencil | GFXClearTarget | GFXClearZBuffer, gCanvasClearColor, 1.0f, 0 ); SceneRenderState reflectRenderState @@ -427,7 +427,7 @@ void CubeReflector::updateFace( const ReflectParams ¶ms, U32 faceidx ) LIGHTMGR->unregisterAllLights(); // Clean up. - renderTarget->resolve(); + mRenderTarget->resolve(); } F32 CubeReflector::calcFaceScore( const ReflectParams ¶ms, U32 faceidx ) @@ -746,18 +746,18 @@ void PlaneReflector::setGFXMatrices( const MatrixF &camTrans ) MatrixF relCamTrans = invObjTrans * camTrans; MatrixF camReflectTrans = getCameraReflection( relCamTrans ); - MatrixF camTrans = mObject->getRenderTransform() * camReflectTrans; - camTrans.inverse(); + MatrixF objTrans = mObject->getRenderTransform() * camReflectTrans; + objTrans.inverse(); - GFX->setWorldMatrix( camTrans ); + GFX->setWorldMatrix(objTrans); // use relative reflect transform for modelview since clip plane is in object space - camTrans = camReflectTrans; - camTrans.inverse(); + objTrans = camReflectTrans; + objTrans.inverse(); // set new projection matrix gClientSceneGraph->setNonClipProjection( (MatrixF&) GFX->getProjectionMatrix() ); - MatrixF clipProj = getFrustumClipProj( camTrans ); + MatrixF clipProj = getFrustumClipProj(objTrans); GFX->setProjectionMatrix( clipProj ); } else diff --git a/Engine/source/scene/reflector.h b/Engine/source/scene/reflector.h index c0646d30d..fd0f3e08c 100644 --- a/Engine/source/scene/reflector.h +++ b/Engine/source/scene/reflector.h @@ -153,16 +153,16 @@ public: virtual void unregisterReflector(); virtual void updateReflection( const ReflectParams ¶ms ); - GFXCubemap* getCubemap() const { return cubemap; } + GFXCubemap* getCubemap() const { return mCubemap; } void updateFace( const ReflectParams ¶ms, U32 faceidx ); F32 calcFaceScore( const ReflectParams ¶ms, U32 faceidx ); protected: - GFXTexHandle depthBuff; - GFXTextureTargetRef renderTarget; - GFXCubemapHandle cubemap; + GFXTexHandle mDepthBuff; + GFXTextureTargetRef mRenderTarget; + GFXCubemapHandle mCubemap; U32 mLastTexSize; class CubeFaceReflector : public ReflectorBase