Merge pull request #1260 from Azaezel/alpha41/dynamicReflectionRevisions

fix dynamicCubemaps on objects
This commit is contained in:
Brian Roberts 2024-04-24 23:14:10 -05:00 committed by GitHub
commit 29ba0439b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 15 additions and 13 deletions

View file

@ -532,7 +532,7 @@ F32 PlaneReflector::calcScore( const ReflectParams &params )
return score;
}
void PlaneReflector::updateReflection( const ReflectParams &params )
void PlaneReflector::updateReflection( const ReflectParams &params, Point3F explicitPostion)
{
PROFILE_SCOPE(PlaneReflector_updateReflection);
GFXDEBUGEVENT_SCOPE( PlaneReflector_updateReflection, ColorI::WHITE );

View file

@ -97,7 +97,7 @@ public:
virtual void unregisterReflector();
virtual F32 calcScore( const ReflectParams &params );
virtual void updateReflection( const ReflectParams &params ) {}
virtual void updateReflection( const ReflectParams &params, Point3F explicitPostion = Point3F::Max) {}
GFXOcclusionQuery* getOcclusionQuery() const { return mOcclusionQuery; }
@ -151,7 +151,7 @@ public:
ReflectorDesc *inDesc );
void unregisterReflector() override;
virtual void updateReflection( const ReflectParams &params, Point3F explicitPostion = Point3F::Max);
void updateReflection( const ReflectParams &params, Point3F explicitPostion = Point3F::Max) override;
GFXCubemap* getCubemap() const { return mCubemap; }
@ -174,7 +174,7 @@ protected:
U32 faceIdx;
CubeReflector *cube;
void updateReflection( const ReflectParams &params ) override { cube->updateFace( params, faceIdx ); }
void updateReflection( const ReflectParams &params, Point3F explicitPostion = Point3F::Max) override { cube->updateFace( params, faceIdx ); }
F32 calcScore( const ReflectParams &params ) override;
};
@ -201,7 +201,7 @@ public:
ReflectorDesc *inDesc );
F32 calcScore( const ReflectParams &params ) override;
void updateReflection( const ReflectParams &params ) override;
void updateReflection( const ReflectParams &params, Point3F explicitPostion = Point3F::Max) override;
/// Set up the GFX matrices
void setGFXMatrices( const MatrixF &camTrans );
@ -233,4 +233,4 @@ public:
bool objectSpace;
};
#endif // _REFLECTOR_H_
#endif // _REFLECTOR_H_