drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused code.

Browse Source 
Remove jai-specific workaround.
Various cleanups.
This commit is contained in:
Ignacio
2020-08-23 15:39:54 -07:00
parent 93146ffc73
commit a4712cff20
3 changed files with 3 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvtt/CubeSurface.cpp
View File

@ -1027,21 +1027,6 @@ CubeSurface CubeSurface::fastResample(int size, EdgeFixup fixupMethod) const
return resampledCube;
}
void CubeSurface::_irradianceFilter(int size, EdgeFixup fixupMethod) {
*this = irradianceFilter(size, fixupMethod);
}
void CubeSurface::_cosinePowerFilter(int size, float cosinePower, EdgeFixup fixupMethod) {
*this = cosinePowerFilter(size, cosinePower, fixupMethod);
}
void CubeSurface::_fastResample(int size, EdgeFixup fixupMethod) {
*this = fastResample(size, fixupMethod);
}
void CubeSurface::toLinear(float gamma)
{
if (isNull()) return;

11
src/nvtt/nvtt.h
View File

@ -49,7 +49,7 @@
# define NVTT_API
#endif
#define NVTT_VERSION 20100
#define NVTT_VERSION 20101
#define NVTT_FORBID_COPY(Class) \
private: \
@ -463,8 +463,8 @@ namespace nvtt
ToneMapper_Lightmap,
};
// Transform the given x,y coordinates.
typedef void WarpFunction(float & x, float & y, float & d);
// Transform the given x,y,z coordinates.
typedef void WarpFunction(float & x, float & y, float & z);
// A surface is one level of a 2D or 3D texture. (New in NVTT 2.1)
@ -664,11 +664,6 @@ namespace nvtt
NVTT_API CubeSurface fastResample(int size, EdgeFixup fixupMethod) const;
// Jai doesn't support non-pod structs as return types, so expose some other function to do the same, but operate in place:
NVTT_API void _irradianceFilter(int size, EdgeFixup fixupMethod);
NVTT_API void _cosinePowerFilter(int size, float cosinePower, EdgeFixup fixupMethod);
NVTT_API void _fastResample(int size, EdgeFixup fixupMethod);
// Spherical Harmonics:
NVTT_API void computeLuminanceIrradianceSH3(float sh[9]) const;
NVTT_API void computeIrradianceSH3(int channel, float sh[9]) const;