diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-04-29 17:26:17 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-04-29 17:26:17 -0600 |
| commit | 82311e4b44a863078fb1f47d56e9543abaae210c (patch) | |
| tree | 9da37968aca957045a4750ab1915ba85b172f427 /indra/llrender/llcubemap.h | |
| parent | f05e58715e0a18a7ba2ace87c2ae45684c864169 (diff) | |
| parent | 93a025966649e281ceff8d1471bc983cc036bc17 (diff) | |
Merge branch 'DRTVWR-559' into euclid-17277
Diffstat (limited to 'indra/llrender/llcubemap.h')
| -rw-r--r-- | indra/llrender/llcubemap.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/indra/llrender/llcubemap.h b/indra/llrender/llcubemap.h index a01636d8d4..9ce4a94bca 100644 --- a/indra/llrender/llcubemap.h +++ b/indra/llrender/llcubemap.h @@ -40,6 +40,13 @@ class LLCubeMap : public LLRefCount public: LLCubeMap(bool init_as_srgb); void init(const std::vector<LLPointer<LLImageRaw> >& rawimages); + + // init from environment map images + // Similar to init, but takes ownership of rawimages and makes this cubemap + // respect the resolution of rawimages + // Raw images must point to array of six square images that are all the same resolution + // For example usage, see LLEnvironmentMap + void initEnvironmentMap(const std::vector<LLPointer<LLImageRaw> >& rawimages); void initGL(); void initRawData(const std::vector<LLPointer<LLImageRaw> >& rawimages); void initGLData(); @@ -54,18 +61,9 @@ public: void disableTexture(void); void setMatrix(S32 stage); void restoreMatrix(); - void setReflection (void); - - void finishPaint(); GLuint getGLName(); - LLVector3 map(U8 side, U16 v_val, U16 h_val) const; - BOOL project(F32& v_val, F32& h_val, BOOL& outside, - U8 side, const LLVector3& dir) const; - BOOL project(F32& v_min, F32& v_max, F32& h_min, F32& h_max, - U8 side, LLVector3 dir[4]) const; - void paintIn(LLVector3 dir[4], const LLColor4U& col); void destroyGL(); public: |